diff --git a/desmume/src/GPU.c b/desmume/src/GPU.c
index 95b9f2cfc..1d43ccb5e 100644
--- a/desmume/src/GPU.c
+++ b/desmume/src/GPU.c
@@ -27,6 +27,8 @@
 
 #include "nds/video.h"
 
+ARM9_struct ARM9Mem;
+
 extern BOOL click;
 Screen MainScreen;
 Screen SubScreen;
diff --git a/desmume/src/GPU.h b/desmume/src/GPU.h
index c86e83bab..cdd1205f5 100644
--- a/desmume/src/GPU.h
+++ b/desmume/src/GPU.h
@@ -22,7 +22,7 @@
 #ifndef GPU_H
 #define GPU_H
 
-#include "arm9/ARM9.h"
+#include "ARM9.h"
 #include <stdio.h>
 
 #ifdef __cplusplus
diff --git a/desmume/src/MMU.h b/desmume/src/MMU.h
index ec3eb7fd1..dc0284ac7 100644
--- a/desmume/src/MMU.h
+++ b/desmume/src/MMU.h
@@ -25,7 +25,7 @@
 #include "FIFO.h"
 #include "dscard.h"
 
-#include "arm9/ARM9.h"
+#include "ARM9.h"
 #include "nds/serial.h"
 #include "mc.h"
 
diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 6ddc9d287..e9a706a48 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -11,7 +11,7 @@ libdesmume_a_SOURCES = \
         thumb_instructions.c thumb_instructions.h \
         mc.c mc.h \
 	GPU.c GPU.h \
-	arm9/ARM9.c arm9/ARM9.h \
+	ARM9.h \
         cflash.c cflash.h fs.h \
         saves.c saves.h
 libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)