diff --git a/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp b/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp
index 1be136ce2..70aa3f9d2 100644
--- a/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp
+++ b/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp
@@ -18,7 +18,7 @@
 #include "OGLDisplayOutput.h"
 #include "cocoa_globals.h"
 #include "utilities.h"
-#include "../filter/videofilter.h"
+#include "../../filter/videofilter.h"
 
 #include <sstream>
 
@@ -4363,7 +4363,7 @@ static void InitHQnxLUTs()
 		{
 			switch (pattern)
 			{
-				#include "../filter/lq2x.h"
+				#include "../../filter/lq2x.h"
 			}
 		}
 	}
@@ -4382,7 +4382,7 @@ static void InitHQnxLUTs()
 		{
 			switch (pattern)
 			{
-				#include "../filter/hq2x.h"
+				#include "../../filter/hq2x.h"
 			}
 		}
 	}
@@ -4401,7 +4401,7 @@ static void InitHQnxLUTs()
 		{
 			switch (pattern)
 			{
-#include "../filter/hq3x.dat"
+				#include "../../filter/hq3x.dat"
 			}
 		}
 	}
@@ -4420,7 +4420,7 @@ static void InitHQnxLUTs()
 		{
 			switch (pattern)
 			{
-				#include "../filter/hq4x.dat"
+				#include "../../filter/hq4x.dat"
 			}
 		}
 	}
diff --git a/desmume/src/frontend/cocoa/OGLDisplayOutput.h b/desmume/src/frontend/cocoa/OGLDisplayOutput.h
index edc58f71f..195f9ae03 100644
--- a/desmume/src/frontend/cocoa/OGLDisplayOutput.h
+++ b/desmume/src/frontend/cocoa/OGLDisplayOutput.h
@@ -29,7 +29,7 @@
 
 #include <set>
 #include <string>
-#include "../filter/videofilter.h"
+#include "../../filter/videofilter.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/desmume/src/frontend/cocoa/cocoa_GPU.mm b/desmume/src/frontend/cocoa/cocoa_GPU.mm
index afb415c68..50d82fa77 100644
--- a/desmume/src/frontend/cocoa/cocoa_GPU.mm
+++ b/desmume/src/frontend/cocoa/cocoa_GPU.mm
@@ -20,14 +20,14 @@
 #import "cocoa_globals.h"
 #include "utilities.h"
 
-#include "../NDSSystem.h"
-#include "../GPU.h"
-#include "../rasterize.h"
+#include "../../NDSSystem.h"
+#include "../../GPU.h"
+#include "../../rasterize.h"
 
 #ifdef MAC_OS_X_VERSION_10_7
-#include "../OGLRender_3_2.h"
+#include "../../OGLRender_3_2.h"
 #else
-#include "../OGLRender.h"
+#include "../../OGLRender.h"
 #endif
 
 #include <OpenGL/OpenGL.h>
diff --git a/desmume/src/frontend/cocoa/cocoa_cheat.mm b/desmume/src/frontend/cocoa/cocoa_cheat.mm
index b89c6618c..50331266e 100644
--- a/desmume/src/frontend/cocoa/cocoa_cheat.mm
+++ b/desmume/src/frontend/cocoa/cocoa_cheat.mm
@@ -20,8 +20,8 @@
 #import "cocoa_globals.h"
 #import "cocoa_util.h"
 
-#include "../cheatSystem.h"
-#include "../MMU.h"
+#include "../../cheatSystem.h"
+#include "../../MMU.h"
 #undef BOOL
 
 @implementation CocoaDSCheatItem
diff --git a/desmume/src/frontend/cocoa/cocoa_core.mm b/desmume/src/frontend/cocoa/cocoa_core.mm
index 52bb65817..359b6bd47 100644
--- a/desmume/src/frontend/cocoa/cocoa_core.mm
+++ b/desmume/src/frontend/cocoa/cocoa_core.mm
@@ -28,13 +28,13 @@
 #include <mach/mach.h>
 #include <mach/mach_time.h>
 
-#include "../movie.h"
-#include "../NDSSystem.h"
-#include "../armcpu.h"
-#include "../driver.h"
-#include "../gdbstub.h"
-#include "../slot1.h"
-#include "../slot2.h"
+#include "../../movie.h"
+#include "../../NDSSystem.h"
+#include "../../armcpu.h"
+#include "../../driver.h"
+#include "../../gdbstub.h"
+#include "../../slot1.h"
+#include "../../slot2.h"
 #undef BOOL
 
 // Need to include assert.h this way so that GDB stub will work
diff --git a/desmume/src/frontend/cocoa/cocoa_file.mm b/desmume/src/frontend/cocoa/cocoa_file.mm
index 4315991ab..69f5541e4 100644
--- a/desmume/src/frontend/cocoa/cocoa_file.mm
+++ b/desmume/src/frontend/cocoa/cocoa_file.mm
@@ -21,11 +21,11 @@
 #import "cocoa_globals.h"
 #import "cocoa_util.h"
 
-#include "../NDSSystem.h"
-#include "../MMU.h"
-#include "../movie.h"
-#include "../path.h"
-#include "../saves.h"
+#include "../../NDSSystem.h"
+#include "../../MMU.h"
+#include "../../movie.h"
+#include "../../path.h"
+#include "../../saves.h"
 #undef BOOL
 
 @implementation CocoaDSFile
diff --git a/desmume/src/frontend/cocoa/cocoa_firmware.mm b/desmume/src/frontend/cocoa/cocoa_firmware.mm
index 196cf7622..b04615952 100644
--- a/desmume/src/frontend/cocoa/cocoa_firmware.mm
+++ b/desmume/src/frontend/cocoa/cocoa_firmware.mm
@@ -17,8 +17,8 @@
 */
 
 #import "cocoa_firmware.h"
-#include "../NDSSystem.h"
-#include "../firmware.h"
+#include "../../NDSSystem.h"
+#include "../../firmware.h"
 #undef BOOL
 
 
diff --git a/desmume/src/frontend/cocoa/cocoa_input.mm b/desmume/src/frontend/cocoa/cocoa_input.mm
index d5ce17a77..9fda1d973 100644
--- a/desmume/src/frontend/cocoa/cocoa_input.mm
+++ b/desmume/src/frontend/cocoa/cocoa_input.mm
@@ -22,8 +22,8 @@
 #include "mic_ext.h"
 #include "coreaudiosound.h"
 #include "audiosamplegenerator.h"
-#include "../NDSSystem.h"
-#include "../slot2.h"
+#include "../../NDSSystem.h"
+#include "../../slot2.h"
 #undef BOOL
 
 NullGenerator nullSampleGenerator;
diff --git a/desmume/src/frontend/cocoa/cocoa_output.mm b/desmume/src/frontend/cocoa/cocoa_output.mm
index 328812c7a..a1c0d9624 100644
--- a/desmume/src/frontend/cocoa/cocoa_output.mm
+++ b/desmume/src/frontend/cocoa/cocoa_output.mm
@@ -23,14 +23,14 @@
 #import "cocoa_core.h"
 #include "sndOSX.h"
 
-#include "../NDSSystem.h"
-#include "../common.h"
-#include "../GPU.h"
-#include "../gfx3d.h"
-#include "../SPU.h"
-#include "../movie.h"
-#include "../metaspu/metaspu.h"
-#include "../rtc.h"
+#include "../../NDSSystem.h"
+#include "../../common.h"
+#include "../../GPU.h"
+#include "../../gfx3d.h"
+#include "../../SPU.h"
+#include "../../movie.h"
+#include "../../metaspu/metaspu.h"
+#include "../../rtc.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/desmume/src/frontend/cocoa/cocoa_rom.mm b/desmume/src/frontend/cocoa/cocoa_rom.mm
index 2a9e8ebdc..7b8ab67e8 100644
--- a/desmume/src/frontend/cocoa/cocoa_rom.mm
+++ b/desmume/src/frontend/cocoa/cocoa_rom.mm
@@ -21,10 +21,10 @@
 #import "cocoa_globals.h"
 #import "cocoa_util.h"
 
-#include "../NDSSystem.h"
-#include "../GPU.h"
-#include "../common.h"
-#include "../mc.h"
+#include "../../NDSSystem.h"
+#include "../../GPU.h"
+#include "../../Database.h"
+#include "../../mc.h"
 #undef BOOL
 
 
@@ -349,7 +349,7 @@ static NSMutableDictionary *saveTypeValues = nil;
 		return nil;
 	}
 	
-	return [NSString stringWithCString:getDeveloperNameByID(ndsRomHeader->makerCode).c_str() encoding:NSUTF8StringEncoding];
+	return [NSString stringWithCString:(Database::MakerNameForMakerCode(ndsRomHeader->makerCode, true)) encoding:NSUTF8StringEncoding];
 }
 
 - (NSString *) developerNameAndCode
@@ -360,7 +360,7 @@ static NSMutableDictionary *saveTypeValues = nil;
 		return nil;
 	}
 	
-	return [NSString stringWithFormat:@"%s [0x%04X]", getDeveloperNameByID(ndsRomHeader->makerCode).c_str(), ndsRomHeader->makerCode];
+	return [NSString stringWithFormat:@"%s [0x%04X]", Database::MakerNameForMakerCode(ndsRomHeader->makerCode, true), ndsRomHeader->makerCode];
 }
 
 - (NSString *) unitCodeStringUsingID:(NSInteger)unitCodeID
diff --git a/desmume/src/frontend/cocoa/cocoa_slot2.h b/desmume/src/frontend/cocoa/cocoa_slot2.h
index 39a5288af..e4dc70ea6 100644
--- a/desmume/src/frontend/cocoa/cocoa_slot2.h
+++ b/desmume/src/frontend/cocoa/cocoa_slot2.h
@@ -16,7 +16,7 @@
  */
 
 #import <Cocoa/Cocoa.h>
-#include "../slot2.h"
+#include "../../slot2.h"
 #undef BOOL
 
 @interface CocoaDSSlot2Device : NSObject
diff --git a/desmume/src/frontend/cocoa/cocoa_util.mm b/desmume/src/frontend/cocoa/cocoa_util.mm
index d202f03b2..a65537311 100644
--- a/desmume/src/frontend/cocoa/cocoa_util.mm
+++ b/desmume/src/frontend/cocoa/cocoa_util.mm
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
-#include "../version.h"
+#include "../../version.h"
 
 #undef BOOL
 
diff --git a/desmume/src/frontend/cocoa/cocoa_videofilter.h b/desmume/src/frontend/cocoa/cocoa_videofilter.h
index 29ce7a33b..3dbbba90d 100644
--- a/desmume/src/frontend/cocoa/cocoa_videofilter.h
+++ b/desmume/src/frontend/cocoa/cocoa_videofilter.h
@@ -17,7 +17,7 @@
 */
 
 #import <Foundation/Foundation.h>
-#include "../filter/videofilter.h"
+#include "../../filter/videofilter.h"
 #undef BOOL
 
 @class NSImage;
diff --git a/desmume/src/frontend/cocoa/mic_ext.cpp b/desmume/src/frontend/cocoa/mic_ext.cpp
index 5eed6ac71..4bbeeda2e 100644
--- a/desmume/src/frontend/cocoa/mic_ext.cpp
+++ b/desmume/src/frontend/cocoa/mic_ext.cpp
@@ -18,8 +18,8 @@
 
 #import "cocoa_globals.h"
 #include "mic_ext.h"
-#include "../emufile.h"
-#include "../readwrite.h"
+#include "../../emufile.h"
+#include "../../readwrite.h"
 
 
 MicResetCallback _micResetCallback = &Mic_DefaultResetCallback;
diff --git a/desmume/src/frontend/cocoa/sndOSX.h b/desmume/src/frontend/cocoa/sndOSX.h
index 49ba92a5d..e109d7ebb 100644
--- a/desmume/src/frontend/cocoa/sndOSX.h
+++ b/desmume/src/frontend/cocoa/sndOSX.h
@@ -20,7 +20,7 @@
 #define _OSXSOUNDINTERFACE_
 
 #include <pthread.h>
-#include "../SPU.h"
+#include "../../SPU.h"
 #undef BOOL
 
 #define SNDCORE_OSX 58325 //hopefully this is unique number