diff --git a/desmume/src/MMU.h b/desmume/src/MMU.h
index 8020244b5..53beb855f 100644
--- a/desmume/src/MMU.h
+++ b/desmume/src/MMU.h
@@ -32,12 +32,9 @@
 #include "ARM9.h"
 #include "mc.h"
 
-//HACK!!!! REMOVE ME SOON!
-#ifndef ARMCPU_ARM7
 #define ARMCPU_ARM7 1
 #define ARMCPU_ARM9 0
-#define ARMPROC (PROCNUM?NDS_ARM7:NDS_ARM9)
-#endif
+#define ARMPROC (PROCNUM ? NDS_ARM7:NDS_ARM9)
 
 typedef const u8 TWaitState;
 
diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h
index 8770c12aa..420f453f4 100644
--- a/desmume/src/armcpu.h
+++ b/desmume/src/armcpu.h
@@ -22,10 +22,6 @@
 #ifndef ARM_CPU
 #define ARM_CPU
 
-#define ARMCPU_ARM7 1
-#define ARMCPU_ARM9 0
-#define ARMPROC (PROCNUM?NDS_ARM7:NDS_ARM9)
-
 #include "types.h"
 #include "bits.h"
 #include "MMU.h"
@@ -158,34 +154,34 @@ typedef void* armcp_t;
 
 typedef struct armcpu_t
 {
-        u32 proc_ID;
-        u32 instruction; //4
-        u32 instruct_adr; //8
-        u32 next_instruction; //12
+	u32 proc_ID;
+	u32 instruction; //4
+	u32 instruct_adr; //8
+	u32 next_instruction; //12
 
-        u32 R[16]; //16
+	u32 R[16]; //16
 	Status_Reg CPSR;  //80
 	Status_Reg SPSR;
 
-        u32 R13_usr, R14_usr;
-        u32 R13_svc, R14_svc;
-        u32 R13_abt, R14_abt;
-        u32 R13_und, R14_und;
-        u32 R13_irq, R14_irq;
-        u32 R8_fiq, R9_fiq, R10_fiq, R11_fiq, R12_fiq, R13_fiq, R14_fiq;
+	u32 R13_usr, R14_usr;
+	u32 R13_svc, R14_svc;
+	u32 R13_abt, R14_abt;
+	u32 R13_und, R14_und;
+	u32 R13_irq, R14_irq;
+	u32 R8_fiq, R9_fiq, R10_fiq, R11_fiq, R12_fiq, R13_fiq, R14_fiq;
 	Status_Reg SPSR_svc, SPSR_abt, SPSR_und, SPSR_irq, SPSR_fiq;
 
 	armcp_t *coproc[16];
 
-        u32 intVector;
-        u8 LDTBit;  //1 : ARMv5 style 0 : non ARMv5
+	u32 intVector;
+	u8 LDTBit;  //1 : ARMv5 style 0 : non ARMv5
 	BOOL waitIRQ;
 	BOOL wIRQ;
 	BOOL wirq;
 
 	u32 newIrqFlags;
 
-        u32 (* *swi_tab)();
+	u32 (* *swi_tab)();
 
 #ifdef GDB_STUB
   /** there is a pending irq for the cpu */