diff --git a/desmume/src/cocoa/cocoa_cheat.mm b/desmume/src/cocoa/cocoa_cheat.mm
index 6fcf1b866..b89c6618c 100644
--- a/desmume/src/cocoa/cocoa_cheat.mm
+++ b/desmume/src/cocoa/cocoa_cheat.mm
@@ -22,6 +22,7 @@
 
 #include "../cheatSystem.h"
 #include "../MMU.h"
+#undef BOOL
 
 @implementation CocoaDSCheatItem
 
diff --git a/desmume/src/cocoa/cocoa_core.mm b/desmume/src/cocoa/cocoa_core.mm
index 075fbaf2f..a77e2e378 100644
--- a/desmume/src/cocoa/cocoa_core.mm
+++ b/desmume/src/cocoa/cocoa_core.mm
@@ -35,7 +35,6 @@
 #include "../gdbstub.h"
 #include "../slot1.h"
 #include "../slot2.h"
-#include "../movie.h"
 #undef BOOL
 
 class OSXDriver : public BaseDriver
diff --git a/desmume/src/cocoa/cocoa_firmware.mm b/desmume/src/cocoa/cocoa_firmware.mm
index f8664ed54..196cf7622 100644
--- a/desmume/src/cocoa/cocoa_firmware.mm
+++ b/desmume/src/cocoa/cocoa_firmware.mm
@@ -19,6 +19,7 @@
 #import "cocoa_firmware.h"
 #include "../NDSSystem.h"
 #include "../firmware.h"
+#undef BOOL
 
 
 @implementation CocoaDSFirmware
diff --git a/desmume/src/cocoa/cocoa_slot2.mm b/desmume/src/cocoa/cocoa_slot2.mm
index 7783521b0..1b07ef3db 100644
--- a/desmume/src/cocoa/cocoa_slot2.mm
+++ b/desmume/src/cocoa/cocoa_slot2.mm
@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2014 DeSmuME Team
+	Copyright (C) 2014-2015 DeSmuME Team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -19,8 +19,6 @@
 #import "cocoa_globals.h"
 #import "cocoa_util.h"
 
-#include "../NDSSystem.h"
-#undef BOOL
 
 @implementation CocoaDSSlot2Device