diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 6ba1b03ed6..5e03920c75 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -11,16 +11,16 @@ LOCAL_HEADER_FILES := \
 	jni_helper.h \
 	jni_string.h \
 	logging.h \
-	platform.h \
-	framework.h \
+	android_platform.hpp \
+	android_framework.hpp \
 	rendering.h \	
 
 LOCAL_SRC_FILES := \
 	main_native.cpp \
 	jni_helper.cpp \
 	jni_string.cpp \
-	platform.cpp \
-	framework.cpp \
+	android_platform.cpp \
+	android_framework.cpp \
 	logging.cpp \
 	temp_stubs.cpp \
 	rendering.cpp \
diff --git a/android/jni/framework.cpp b/android/jni/android_framework.cpp
similarity index 100%
rename from android/jni/framework.cpp
rename to android/jni/android_framework.cpp
diff --git a/android/jni/framework.h b/android/jni/android_framework.hpp
similarity index 100%
rename from android/jni/framework.h
rename to android/jni/android_framework.hpp
diff --git a/android/jni/platform.cpp b/android/jni/android_platform.cpp
similarity index 100%
rename from android/jni/platform.cpp
rename to android/jni/android_platform.cpp
diff --git a/android/jni/platform.h b/android/jni/android_platform.hpp
similarity index 100%
rename from android/jni/platform.h
rename to android/jni/android_platform.hpp
diff --git a/android/jni/main_native.cpp b/android/jni/main_native.cpp
index 1cca678514..58c0657e94 100644
--- a/android/jni/main_native.cpp
+++ b/android/jni/main_native.cpp
@@ -1,6 +1,6 @@
 #include "logging.h"
-#include "platform.h"
-#include "framework.h"
+#include "android_platform.hpp"
+#include "android_framework.hpp"
 
 #include "../../storage/storage.hpp"