diff --git a/libraries/libmesosphere/Makefile b/libraries/libmesosphere/Makefile
index 79213e4fc..c9c190e90 100644
--- a/libraries/libmesosphere/Makefile
+++ b/libraries/libmesosphere/Makefile
@@ -6,7 +6,8 @@ include  $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../config/common.mk
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-PRECOMPILED_HEADERS := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/include/mesosphere.hpp
+#PRECOMPILED_HEADERS := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/include/mesosphere.hpp
+PRECOMPILED_HEADERS :=
 
 DEFINES     := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_MESOSPHERE
 SETTINGS    := $(ATMOSPHERE_SETTINGS) -O2 -mgeneral-regs-only -ffixed-x18 -Werror -fno-non-call-exceptions
diff --git a/libraries/libvapours/source/crypto/impl/crypto_ctr_mode_impl.arch.arm64.cpp b/libraries/libvapours/source/crypto/impl/crypto_ctr_mode_impl.arch.arm64.cpp
index 5d32196a6..5917f1e9c 100644
--- a/libraries/libvapours/source/crypto/impl/crypto_ctr_mode_impl.arch.arm64.cpp
+++ b/libraries/libvapours/source/crypto/impl/crypto_ctr_mode_impl.arch.arm64.cpp
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <vapours.hpp>
+
+#ifdef ATMOSPHERE_IS_STRATOSPHERE
 #include <arm_neon.h>
 
 namespace ams::crypto::impl {
 
-#ifdef ATMOSPHERE_IS_STRATOSPHERE
-
     /* Variable management macros. */
     #define DECLARE_ROUND_KEY_VAR(n) \
     const uint8x16_t round_key_##n = vld1q_u8(keys + (BlockSize * n))
@@ -579,10 +579,13 @@ namespace ams::crypto::impl {
         vst1q_u8(this->counter, ctr0);
     }
 
+}
+
 #else
 
-    /* TODO: Non-EL0 implementation. */
+/* TODO: Non-EL0 implementation. */
+namespace ams::crypto::impl {
+
+}
 
 #endif
-
-}
\ No newline at end of file
diff --git a/libraries/libvapours/source/crypto/impl/crypto_xts_mode_impl.arch.arm64.cpp b/libraries/libvapours/source/crypto/impl/crypto_xts_mode_impl.arch.arm64.cpp
index e526f8507..11a822558 100644
--- a/libraries/libvapours/source/crypto/impl/crypto_xts_mode_impl.arch.arm64.cpp
+++ b/libraries/libvapours/source/crypto/impl/crypto_xts_mode_impl.arch.arm64.cpp
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <vapours.hpp>
-#include <arm_neon.h>
 #include "crypto_update_impl.hpp"
 
+#ifdef ATMOSPHERE_IS_STRATOSPHERE
+#include <arm_neon.h>
+
 namespace ams::crypto::impl {
 
-#ifdef ATMOSPHERE_IS_STRATOSPHERE
 
     /* Variable management macros. */
     #define DECLARE_ROUND_KEY_VAR(n) \
@@ -1178,10 +1179,14 @@ namespace ams::crypto::impl {
         return processed;
     }
 
+}
+
 #else
 
-    /* TODO: Non-EL0 implementation. */
+/* TODO: Non-EL0 implementation. */
+namespace ams::crypto::impl {
+
+}
 
 #endif
 
-}