diff --git a/Core/gb.h b/Core/gb.h
index 4564515..61beff2 100644
--- a/Core/gb.h
+++ b/Core/gb.h
@@ -14,7 +14,7 @@
 #include "display.h"
 #include "joypad.h"
 #include "mbc.h"
-#include "memory.h"
+#include "gbmemory.h"
 #include "printer.h"
 #include "timing.h"
 #include "z80_cpu.h"
diff --git a/Core/memory.c b/Core/gbmemory.c
similarity index 100%
rename from Core/memory.c
rename to Core/gbmemory.c
diff --git a/Core/memory.h b/Core/gbmemory.h
similarity index 100%
rename from Core/memory.h
rename to Core/gbmemory.h
diff --git a/Makefile.common b/Makefile.common
index c25bf9d..6d19f96 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,7 +3,7 @@ INCFLAGS    := -I$(CORE_DIR) \
 
 SOURCES_C   := $(CORE_DIR)/Core/gb.c \
 					$(CORE_DIR)/Core/apu.c \
-					$(CORE_DIR)/Core/memory.c \
+					$(CORE_DIR)/Core/gbmemory.c \
 					$(CORE_DIR)/Core/mbc.c \
 					$(CORE_DIR)/Core/timing.c \
 					$(CORE_DIR)/Core/display.c \
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index c6bba11..219b8b7 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -24,7 +24,7 @@ CORE_DIR := ../..
 include ../../Makefile.common
 
 LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
-LOCAL_CXXFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DNDEBUG -D_USE_MATH_DEFINES 
+LOCAL_CXXFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DNDEBUG -D_USE_MATH_DEFINES  -DGB_INTERNAL
 
 LOCAL_C_INCLUDES = $(INCFLAGS)