diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h
index fa8ac3d88..2bdef6589 100644
--- a/desmume/src/armcpu.h
+++ b/desmume/src/armcpu.h
@@ -125,8 +125,6 @@ enum Mode
 	SYS = 0x1F
 };
 
-extern bool execute;
-
 union Status_Reg
 {
 	struct 
@@ -170,9 +168,9 @@ typedef struct armcpu_t
 	       
         u32 intVector;
         u8 LDTBit;  //1 : ARMv5 style 0 : non ARMv5
-	bool waitIRQ;
-	bool wIRQ;
-	bool wirq;
+	BOOL waitIRQ;
+	BOOL wIRQ;
+	BOOL wirq;
 
 
         u32 (* *swi_tab)(struct armcpu_t * cpu);
@@ -184,7 +182,7 @@ void armcpu_init(armcpu_t *armcpu, u32 adr);
 u32 armcpu_switchMode(armcpu_t *armcpu, u8 mode);
 u32 armcpu_prefetch(armcpu_t *armcpu);
 u32 armcpu_exec(armcpu_t *armcpu);
-bool armcpu_irqExeption(armcpu_t *armcpu);
-bool armcpu_prefetchExeption(armcpu_t *armcpu);
+BOOL armcpu_irqExeption(armcpu_t *armcpu);
+BOOL armcpu_prefetchExeption(armcpu_t *armcpu);
 
 #endif 
diff --git a/desmume/src/cp15.h b/desmume/src/cp15.h
index 4ba4dcd52..5e3857c5f 100644
--- a/desmume/src/cp15.h
+++ b/desmume/src/cp15.h
@@ -61,10 +61,10 @@ typedef struct
 } armcp15_t;
 
 armcp15_t *armcp15_new(armcpu_t *c);
-bool armcp15_dataProcess(armcp15_t *armcp15, u8 CRd, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
-bool armcp15_load(armcp15_t *armcp15, u8 CRd, u8 adr);
-bool armcp15_store(armcp15_t *armcp15, u8 CRd, u8 adr);
-bool armcp15_moveCP2ARM(armcp15_t *armcp15, u32 * R, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
-bool armcp15_moveARM2CP(armcp15_t *armcp15, u32 val, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
+BOOL armcp15_dataProcess(armcp15_t *armcp15, u8 CRd, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
+BOOL armcp15_load(armcp15_t *armcp15, u8 CRd, u8 adr);
+BOOL armcp15_store(armcp15_t *armcp15, u8 CRd, u8 adr);
+BOOL armcp15_moveCP2ARM(armcp15_t *armcp15, u32 * R, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
+BOOL armcp15_moveARM2CP(armcp15_t *armcp15, u32 val, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
 
 #endif /* __CP15_H__*/
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 452c0f0b0..936ed5e7a 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -26,7 +26,7 @@
 #include "../NDSSystem.hpp"
 
 extern NDSSystem nds;
-extern bool execute;
+extern BOOL execute;
 extern unsigned long glock;
 void refreshAll();
 #endif