diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj
index 9c5228eee6..7b21a97870 100644
--- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj
+++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj
@@ -7,13 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		7A804DFD1A1A8EF7004D8B7F /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */; };
 		7A868DD51AC85A8500B0EDDB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A868DD11AC85A8500B0EDDB /* MainMenu.xib */; };
 		7A868DD61AC85A8500B0EDDB /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A868DD31AC85A8500B0EDDB /* Settings.xib */; };
-		7AEFCD7D192128EA00FB5B6A /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7C192128EA00FB5B6A /* utility.m */; };
-		7AEFCD7F192128FE00FB5B6A /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */; };
-		7AEFCD831921292900FB5B6A /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD821921292900FB5B6A /* platform.m */; };
-		7AEFCD851921294100FB5B6A /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD841921294100FB5B6A /* settings.m */; };
+		7ACC4C501AC864B800D67175 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 7ACC4C4F1AC864B800D67175 /* griffin_objc.m */; };
 		7AEFCD871921295E00FB5B6A /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD861921295E00FB5B6A /* griffin.c */; };
 		962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 962EE0E1178B3DF6004224FF /* IOKit.framework */; };
 		96355CE31788E72A0010DBFA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96355CE21788E72A0010DBFA /* Cocoa.framework */; };
@@ -27,13 +23,9 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../common/CFExtensions.m; sourceTree = SOURCE_ROOT; };
 		7A868DD21AC85A8500B0EDDB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
 		7A868DD41AC85A8500B0EDDB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/en.lproj/Settings.xib; sourceTree = SOURCE_ROOT; };
-		7AEFCD7C192128EA00FB5B6A /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; };
-		7AEFCD7E192128FE00FB5B6A /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; };
-		7AEFCD821921292900FB5B6A /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = ../OSX/platform.m; sourceTree = SOURCE_ROOT; };
-		7AEFCD841921294100FB5B6A /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = ../OSX/settings.m; sourceTree = SOURCE_ROOT; };
+		7ACC4C4F1AC864B800D67175 /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../../griffin/griffin_objc.m; sourceTree = SOURCE_ROOT; };
 		7AEFCD861921295E00FB5B6A /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = SOURCE_ROOT; };
 		962EE0E1178B3DF6004224FF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<group>"; };
 		96355CDF1788E72A0010DBFA /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -68,18 +60,10 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		7AC3D967192E75DE00F311D6 /* osx */ = {
-			isa = PBXGroup;
-			children = (
-				7AEFCD841921294100FB5B6A /* settings.m */,
-				7AEFCD821921292900FB5B6A /* platform.m */,
-			);
-			name = osx;
-			sourceTree = "<group>";
-		};
 		7AC3D968192E75F800F311D6 /* core */ = {
 			isa = PBXGroup;
 			children = (
+				7ACC4C4F1AC864B800D67175 /* griffin_objc.m */,
 				7AEFCD861921295E00FB5B6A /* griffin.c */,
 			);
 			name = core;
@@ -89,9 +73,7 @@
 			isa = PBXGroup;
 			children = (
 				7AC3D968192E75F800F311D6 /* core */,
-				7AC3D967192E75DE00F311D6 /* osx */,
 				962EE0E1178B3DF6004224FF /* IOKit.framework */,
-				96355CE81788E72A0010DBFA /* common */,
 				967894E7178A2E9B00D6CA69 /* Assets */,
 				96355CE11788E72A0010DBFA /* Frameworks */,
 				96355CE01788E72A0010DBFA /* Products */,
@@ -124,16 +106,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		96355CE81788E72A0010DBFA /* common */ = {
-			isa = PBXGroup;
-			children = (
-				7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */,
-				7AEFCD7E192128FE00FB5B6A /* RAGameView.m */,
-				7AEFCD7C192128EA00FB5B6A /* utility.m */,
-			);
-			path = common;
-			sourceTree = "<group>";
-		};
 		96355CE91788E72A0010DBFA /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -219,12 +191,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7AEFCD7D192128EA00FB5B6A /* utility.m in Sources */,
-				7AEFCD7F192128FE00FB5B6A /* RAGameView.m in Sources */,
-				7AEFCD831921292900FB5B6A /* platform.m in Sources */,
-				7AEFCD851921294100FB5B6A /* settings.m in Sources */,
 				7AEFCD871921295E00FB5B6A /* griffin.c in Sources */,
-				7A804DFD1A1A8EF7004D8B7F /* CFExtensions.m in Sources */,
+				7ACC4C501AC864B800D67175 /* griffin_objc.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};