diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b0410fd..ef26e401 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,9 +388,10 @@ if(ENABLE_VULKAN)
     set(ALL_SOURCES ${ALL_SOURCES} ${RENDERER_VK_SOURCE_FILES})
 endif()
 
-if(ANDROID)
+if(ANDROID AND NOT BUILD_HYDRA_CORE)
     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 a294f0e6..ac1eb629 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -259,7 +259,8 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
 		return false;
 	}
 
-#ifdef __ANDROID__
+	// 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
 	Pandroid::onSmdhLoaded(smdh);
 #endif