diff --git a/apple/OSX/platform.h b/apple/OSX/platform.h
index 9cd372faea..701896f3b0 100644
--- a/apple/OSX/platform.h
+++ b/apple/OSX/platform.h
@@ -18,9 +18,14 @@
 #define __RARCH_OSX_PLATFORM_H
 
 #include <AppKit/AppKit.h>
+#ifdef HAVE_LOCATION
 #include <CoreLocation/CoreLocation.h>
+#endif
 
-@interface RAGameView : NSView<CLLocationManagerDelegate>
+@interface RAGameView : NSView
+#ifdef HAVE_LOCATION
+<CLLocationManagerDelegate>
+#endif
 
 + (RAGameView*)get;
 - (void)display;
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj b/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj
index f38647480a..079f633501 100644
--- a/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj
+++ b/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj
@@ -11,6 +11,10 @@
 		7AA19E9618AA09D000D16488 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AA19E9518AA09D000D16488 /* OpenGL.framework */; };
 		7AA19E9E18AA0C9900D16488 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AA19E9D18AA0C9900D16488 /* platform.m */; };
 		7AA19EA018AA0CA600D16488 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AA19E9F18AA0CA600D16488 /* settings.m */; };
+		7AA19ECD18AA0F6900D16488 /* apple_gamecontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AA19ECC18AA0F6900D16488 /* apple_gamecontroller.m */; };
+		7AA19ED518AA0F9D00D16488 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AA19ED418AA0F9D00D16488 /* main.m */; };
+		7AA19ED718AA0FA900D16488 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AA19ED618AA0FA900D16488 /* RAGameView.m */; };
+		7AA19EE418AA107A00D16488 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AA19EE318AA107A00D16488 /* utility.m */; };
 		7AD7B1E718A83D0100A1C0C1 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 7AD7B1E618A83D0100A1C0C1 /* griffin.c */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@@ -26,6 +30,10 @@
 		7AA19E9518AA09D000D16488 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		7AA19E9D18AA0C9900D16488 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = ../OSX/platform.m; sourceTree = SOURCE_ROOT; };
 		7AA19E9F18AA0CA600D16488 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = ../OSX/settings.m; sourceTree = SOURCE_ROOT; };
+		7AA19ECC18AA0F6900D16488 /* apple_gamecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = apple_gamecontroller.m; path = ../common/apple_gamecontroller.m; sourceTree = SOURCE_ROOT; };
+		7AA19ED418AA0F9D00D16488 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../common/main.m; sourceTree = SOURCE_ROOT; };
+		7AA19ED618AA0FA900D16488 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; };
+		7AA19EE318AA107A00D16488 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; };
 		7AD7B1E618A83D0100A1C0C1 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = SOURCE_ROOT; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* RetroArch_OSX_PPC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch_OSX_PPC.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -93,8 +101,8 @@
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				7AA19E9F18AA0CA600D16488 /* settings.m */,
-				7AA19E9D18AA0C9900D16488 /* platform.m */,
+				7AA19ECB18AA0F4B00D16488 /* common */,
+				7AA19ECA18AA0F4000D16488 /* OSX */,
 				7AD7B1E818A83D0600A1C0C1 /* griffin */,
 			);
 			name = "Other Sources";
@@ -119,6 +127,26 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		7AA19ECA18AA0F4000D16488 /* OSX */ = {
+			isa = PBXGroup;
+			children = (
+				7AA19E9F18AA0CA600D16488 /* settings.m */,
+				7AA19E9D18AA0C9900D16488 /* platform.m */,
+			);
+			name = OSX;
+			sourceTree = "<group>";
+		};
+		7AA19ECB18AA0F4B00D16488 /* common */ = {
+			isa = PBXGroup;
+			children = (
+				7AA19EE318AA107A00D16488 /* utility.m */,
+				7AA19ED618AA0FA900D16488 /* RAGameView.m */,
+				7AA19ED418AA0F9D00D16488 /* main.m */,
+				7AA19ECC18AA0F6900D16488 /* apple_gamecontroller.m */,
+			);
+			name = common;
+			sourceTree = "<group>";
+		};
 		7AD7B1E818A83D0600A1C0C1 /* griffin */ = {
 			isa = PBXGroup;
 			children = (
@@ -185,6 +213,10 @@
 				7AD7B1E718A83D0100A1C0C1 /* griffin.c in Sources */,
 				7AA19E9E18AA0C9900D16488 /* platform.m in Sources */,
 				7AA19EA018AA0CA600D16488 /* settings.m in Sources */,
+				7AA19ECD18AA0F6900D16488 /* apple_gamecontroller.m in Sources */,
+				7AA19ED518AA0F9D00D16488 /* main.m in Sources */,
+				7AA19ED718AA0FA900D16488 /* RAGameView.m in Sources */,
+				7AA19EE418AA107A00D16488 /* utility.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/categories.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/categories.pbxbtree
index ed612e4061..b46a68325d 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/categories.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/categories.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree
index 9d09076bf1..abbceec093 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree
index 11e3c323ac..1d790cb953 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/files.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/files.pbxbtree
index 0e605ae07a..f61eaa626c 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/files.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/files.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree
index 49b2e73448..17b6b5b5d0 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header
index 50269d7574..1f7ba4eb1f 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/protocols.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/protocols.pbxbtree
index 88dd9a3054..fc8a2086e6 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/protocols.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/protocols.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree
index 7a6c4dda02..db86efdaf8 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control
index bce86f987d..5d23233e7b 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/strings b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/strings
index e7774901f1..da64a6a427 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/strings and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/strings differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/subclasses.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/subclasses.pbxbtree
index b1eee473ca..d36a29db5e 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/subclasses.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/subclasses.pbxbtree differ
diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols
index 4ab1e50d09..84df521617 100644
Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols differ
diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m
index 84f8b71c76..1fed01c00d 100644
--- a/apple/common/RAGameView.m
+++ b/apple/common/RAGameView.m
@@ -15,11 +15,11 @@
  */
 
 #import "RetroArch_Apple.h"
-#include "rarch_wrapper.h"
+#include "../common/rarch_wrapper.h"
 
 #include "../../general.h"
-#include "gfx/gfx_common.h"
-#include "gfx/gfx_context.h"
+#include "../../gfx/gfx_common.h"
+#include "../../gfx/gfx_context.h"
 
 #ifdef HAVE_LOCATION
 #include <CoreLocation/CoreLocation.h>
diff --git a/apple/common/main.m b/apple/common/main.m
index abe5a01dd0..40df9d55d3 100644
--- a/apple/common/main.m
+++ b/apple/common/main.m
@@ -22,7 +22,7 @@
 
 #include "apple_input.h"
 
-#include "file.h"
+#include "../../file.h"
 
 id<RetroArch_Platform> apple_platform;
 
diff --git a/apple/common/utility.m b/apple/common/utility.m
index 8326fdfe08..a3b6d246b4 100644
--- a/apple/common/utility.m
+++ b/apple/common/utility.m
@@ -18,8 +18,8 @@
 #include "RetroArch_Apple.h"
 #include "setting_data.h"
 
-#include "general.h"
-#include "file.h"
+#include "../../general.h"
+#include "../../file.h"
 
 void apple_display_alert(NSString* message, NSString* title)
 {