diff --git a/libraries/libvapours/include/vapours/util.hpp b/libraries/libvapours/include/vapours/util.hpp
index 6a57fefe1..f0a9250e1 100644
--- a/libraries/libvapours/include/vapours/util.hpp
+++ b/libraries/libvapours/include/vapours/util.hpp
@@ -46,8 +46,8 @@
 #include <vapours/util/util_format_string.hpp>
 #include <vapours/util/util_range.hpp>
 
-#include <vapours/util/util_fixed_tree.hpp>
 #include <vapours/util/util_fixed_map.hpp>
+#include <vapours/util/util_fixed_set.hpp>
 
 #ifdef ATMOSPHERE_IS_STRATOSPHERE
 #include <vapours/util/util_mutex_utils.hpp>
diff --git a/libraries/libvapours/include/vapours/util/util_fixed_set.hpp b/libraries/libvapours/include/vapours/util/util_fixed_set.hpp
new file mode 100644
index 000000000..f5436a2a8
--- /dev/null
+++ b/libraries/libvapours/include/vapours/util/util_fixed_set.hpp
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
+#include <vapours/util/util_fixed_tree.hpp>
+
+namespace ams::util {
+
+    template<typename Element, typename Compare = std::less<Element>, size_t BufferAlignment = 8>
+    class FixedSet : public ::ams::util::FixedTree<Element, Compare, const Element, BufferAlignment> {
+        /* ... */
+    };
+
+}
diff --git a/libraries/libvapours/include/vapours/util/util_fixed_tree.hpp b/libraries/libvapours/include/vapours/util/util_fixed_tree.hpp
index 493133b60..b0f348ba7 100644
--- a/libraries/libvapours/include/vapours/util/util_fixed_tree.hpp
+++ b/libraries/libvapours/include/vapours/util/util_fixed_tree.hpp
@@ -993,4 +993,6 @@ namespace ams::util {
             }
     };
 
+
+
 }