diff --git a/libraries/libvapours/include/vapours/includes.hpp b/libraries/libvapours/include/vapours/includes.hpp
index 8d4e73436..9180881e0 100644
--- a/libraries/libvapours/include/vapours/includes.hpp
+++ b/libraries/libvapours/include/vapours/includes.hpp
@@ -26,36 +26,29 @@
 #include <climits>
 #include <cctype>
 
-
+/* C++ headers. */
 #include <type_traits>
 #include <algorithm>
 #include <iterator>
 #include <limits>
 #include <random>
-
-/* Stratosphere wants stdlib headers, others do not.. */
-#ifdef ATMOSPHERE_IS_STRATOSPHERE
-
-/* C++ headers. */
 #include <atomic>
 #include <utility>
 #include <optional>
-#include <memory>
-#include <mutex>
-#include <shared_mutex>
 #include <functional>
 #include <tuple>
 #include <array>
+
+/* Stratosphere wants additional libstdc++ headers, others do not. */
+#ifdef ATMOSPHERE_IS_STRATOSPHERE
+
+#include <memory>
+#include <mutex>
+#include <shared_mutex>
 #include <map>
 #include <unordered_map>
 #include <set>
 
-#endif /* ATMOSPHERE_IS_STRATOSPHERE */
-
-#ifdef ATMOSPHERE_BOARD_NINTENDO_SWITCH
-
-#ifdef ATMOSPHERE_IS_STRATOSPHERE
-
 /* Libnx. */
 #include <switch.h>
 
@@ -64,13 +57,7 @@
 /* Non-EL0 code can't include libnx. */
 #include "types.hpp"
 
-#endif
-
-#else
-
-#error "Unsupported board"
-
-#endif /* ATMOSPHERE_BOARD_NINTENDO_SWITCH */
+#endif /* ATMOSPHERE_IS_STRATOSPHERE */
 
 /* Atmosphere meta. */
 #include "ams_version.h"