diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef26e4010..4b0410fd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,10 +388,9 @@ if(ENABLE_VULKAN)
     set(ALL_SOURCES ${ALL_SOURCES} ${RENDERER_VK_SOURCE_FILES})
 endif()
 
-if(ANDROID AND NOT BUILD_HYDRA_CORE)
+if(ANDROID)
     set(HEADER_FILES ${HEADER_FILES} include/jni_driver.hpp)
     set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp)
-    target_compile_definitions(Alber PRIVATE PANDA3DS_FRONTEND_PANDROID=1)
 endif()
 
 if(BUILD_HYDRA_CORE)
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 8881812de..a4dd6e546 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -6,7 +6,7 @@
 #include "loader/ncch.hpp"
 #include "memory.hpp"
 
-#ifdef PANDA3DS_FRONTEND_PANDROID
+#ifdef __ANDROID__
 #include "jni_driver.hpp"    
 #endif
 
@@ -260,7 +260,7 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
 	}
 
 	// In the Android version, notify the application that we're loading an SMDH file, to extract data for the title list
-#ifdef PANDA3DS_FRONTEND_PANDROID
+#ifdef __ANDROID__
 	Pandroid::onSmdhLoaded(smdh);
 #endif