diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 566624534..ff8b6a5f7 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -1,13 +1,13 @@
 SUBDIRS = . $(UI_DIR)
 noinst_LIBRARIES = libdesmume.a
 libdesmume_a_SOURCES = \
-	armcpu.cpp armcpu.hpp \
+        armcpu.cpp armcpu.hpp \
 	arm_instructions.cpp arm_instructions.hpp \
 	bios.cpp bios.hpp cp15.cpp cp15.hpp \
 	Disassembler.c Disassembler.h \
 	FIFO.c FIFO.h \
 	debug.c debug.h \
-	MMU.cpp MMU.hpp NDSSystem.cpp NDSSystem.hpp \
+        MMU.cpp MMU.hpp NDSSystem.cpp NDSSystem.hpp \
 	thumb_instructions.cpp thumb_instructions.hpp \
 	arm7/fw.c arm7/fw.h \
 	arm7/spi.c arm7/spi.h \
diff --git a/desmume/src/arm_instructions.h b/desmume/src/arm_instructions.h
index a04aa16ef..cc56e40c6 100644
--- a/desmume/src/arm_instructions.h
+++ b/desmume/src/arm_instructions.h
@@ -23,8 +23,7 @@
 #define ARMINSTRUCTION_H
 
 #include "types.h"
-
-typedef struct armcpu_t armcpu_t;
+#include "armcpu.h"
 
 extern u32 (*FASTCALL arm_instructions_set[4096])(armcpu_t * cpu);