diff --git a/src/gba/EEprom.cpp b/src/gba/EEprom.cpp
index aa866e15..4dbb3b81 100644
--- a/src/gba/EEprom.cpp
+++ b/src/gba/EEprom.cpp
@@ -1,4 +1,5 @@
 #include <memory.h>
+#include <string.h>
 #include "GBA.h"
 #include "EEprom.h"
 #include "../Util.h"
diff --git a/src/gba/Flash.cpp b/src/gba/Flash.cpp
index 71e039ce..0b4a17d4 100644
--- a/src/gba/Flash.cpp
+++ b/src/gba/Flash.cpp
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include <memory.h>
 #include "GBA.h"
 #include "Globals.h"
diff --git a/src/gba/RTC.cpp b/src/gba/RTC.cpp
index 4075f371..bc060ac7 100644
--- a/src/gba/RTC.cpp
+++ b/src/gba/RTC.cpp
@@ -7,6 +7,7 @@
 
 #include <time.h>
 #include <memory.h>
+#include <string.h>
 
 enum RTCSTATE
 {
diff --git a/src/libretro/jni/Android.mk b/src/libretro/jni/Android.mk
index cb233d94..a0376182 100644
--- a/src/libretro/jni/Android.mk
+++ b/src/libretro/jni/Android.mk
@@ -15,9 +15,47 @@ ifeq ($(TARGET_ARCH),mips)
 LOCAL_CFLAGS += -DANDROID_MIPS
 endif
 
+VBADIR = ../../
+
 LOCAL_MODULE    := libretro
-LOCAL_SRC_FILES    = ../../src/gba.cpp ../../src/memory.cpp ../../src/sound.cpp ../../libretro/libretro.cpp
-LOCAL_CFLAGS = -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DSPEEDHAX -DLSB_FIRST -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565
-LOCAL_C_INCLUDES = ../src
+LOCAL_SRC_FILES    = $(VBADIR)/gba/agbprint.cpp \
+                     $(VBADIR)/gba/armdis.cpp \
+                     $(VBADIR)/gba/bios.cpp \
+                     $(VBADIR)/gba/Cheats.cpp \
+                     $(VBADIR)/gba/CheatSearch.cpp \
+                     $(VBADIR)/gba/EEprom.cpp \
+                     $(VBADIR)/gba/elf.cpp \
+                     $(VBADIR)/gba/Flash.cpp \
+                     $(VBADIR)/gba/GBA-arm.cpp \
+                     $(VBADIR)/gba/GBA.cpp \
+                     $(VBADIR)/gba/gbafilter.cpp \
+                     $(VBADIR)/gba/GBAGfx.cpp \
+                     $(VBADIR)/gba/GBALink.cpp \
+                     $(VBADIR)/gba/GBASockClient.cpp \
+                     $(VBADIR)/gba/GBA-thumb.cpp \
+                     $(VBADIR)/gba/Globals.cpp \
+                     $(VBADIR)/gba/Mode0.cpp \
+                     $(VBADIR)/gba/Mode1.cpp \
+                     $(VBADIR)/gba/Mode2.cpp \
+                     $(VBADIR)/gba/Mode3.cpp \
+                     $(VBADIR)/gba/Mode4.cpp \
+                     $(VBADIR)/gba/Mode5.cpp \
+                     $(VBADIR)/gba/remote.cpp \
+                     $(VBADIR)/gba/RTC.cpp \
+                     $(VBADIR)/gba/Sound.cpp \
+                     $(VBADIR)/gba/Sram.cpp \
+                     $(VBADIR)/apu/Blip_Buffer.cpp \
+                     $(VBADIR)/apu/Effects_Buffer.cpp \
+                     $(VBADIR)/apu/Gb_Apu.cpp \
+                     $(VBADIR)/apu/Gb_Apu_State.cpp \
+                     $(VBADIR)/apu/Gb_Oscs.cpp \
+                     $(VBADIR)/apu/Multi_Buffer.cpp \
+                     $(VBADIR)/libretro/libretro.cpp \
+                     $(VBADIR)/libretro/UtilRetro.cpp \
+                     $(VBADIR)/libretro/SoundRetro.cpp \
+                     $(VBADIR)/libretro/scrc32.cpp
+
+LOCAL_CFLAGS = -O3 -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DLSB_FIRST -D__LIBRETRO__ -DFINAL_VERSION -DC_CORE -DUSE_GBA_ONLY -DNO_LINK -DFRONTEND_SUPPORTS_RGB565
+LOCAL_C_INCLUDES = $(VBADIR)
 
 include $(BUILD_SHARED_LIBRARY)