diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 3cbdfbfe7b..d2c0918004 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -17,7 +17,6 @@
 
 #include <algorithm>
 
-#include "android/jni/app-android.h"
 #include "base/display.h"
 #include "base/logging.h"
 #include "base/timeutil.h"
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index c374c6a0dd..8e60f5f93e 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -101,9 +101,9 @@
 
 static UI::Theme ui_theme;
 
-#ifdef ARM
+#if defined(ARM) && defined(ANDROID)
 #include "../../android/jni/ArmEmitterTest.h"
-#elif defined(ARM64)
+#elif defined(ARM64) && defined(ANDROID)
 #include "../../android/jni/Arm64EmitterTest.h"
 #endif