diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 42de238d5..566624534 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -1,14 +1,17 @@
 SUBDIRS = . $(UI_DIR)
 noinst_LIBRARIES = libdesmume.a
 libdesmume_a_SOURCES = \
-	ARM9.c ARM9.h \
 	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 \
-        GPU.c GPU.h debug.c debug.h \
+	debug.c debug.h \
 	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 \
+	arm9/GPU.c arm9/GPU.h \
+	arm9/ARM9.c arm9/ARM9.h \
 	windows/cflash.cpp windows/cflash.h fs.h
 libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h
index 38a115557..0f81c9ede 100644
--- a/desmume/src/armcpu.h
+++ b/desmume/src/armcpu.h
@@ -92,7 +92,7 @@ enum Mode
 	SYS = 0x1F
 };
 
-union Status_Reg
+typedef union 
 {
 	struct 
 	{
@@ -108,7 +108,7 @@ union Status_Reg
 		N : 1;
 	} bits;
         u32 val;
-};
+} Status_Reg;
 
 typedef void* armcp_t;