diff --git a/apple/OSX/hid_pad.c b/apple/OSX/hid_pad.c
index ddb301bd1f..ee995352b2 100644
--- a/apple/OSX/hid_pad.c
+++ b/apple/OSX/hid_pad.c
@@ -14,7 +14,7 @@
  */
 
 #include <IOKit/hid/IOHIDManager.h>
-#include "apple/common/apple_input.h"
+#include "../common/apple_input.h"
 
 struct apple_pad_connection
 {
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 74544816ad..34f5834eeb 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
@@ -247,7 +247,11 @@
 					"-DHAVE_DYNAMIC,",
 					"-DHAVE_MENU,",
 					"-DWANT_RPNG,",
-					"-DHAVE_OPENGL",
+					"-DHAVE_OPENGL,",
+					"-DWANT_MINIZ,",
+					"-DHAVE_ZLIB,",
+					"-DRARCH_INTERNAL,",
+					"-DOSX",
 				);
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
@@ -266,7 +270,11 @@
 					"-DHAVE_DYNAMIC,",
 					"-DHAVE_MENU,",
 					"-DWANT_RPNG,",
-					"-DHAVE_OPENGL",
+					"-DHAVE_OPENGL,",
+					"-DWANT_MINIZ,",
+					"-DHAVE_ZLIB,",
+					"-DRARCH_INTERNAL,",
+					"-DOSX",
 				);
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
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 76fad2c48a..0f9357912b 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 31e07ec61b..2c58d2098e 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 180d2819a5..f5f7c6baeb 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 30cba25799..746b2fe271 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 f820880bf9..2383720101 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/refs.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree
index 2cea1a2f6d..469749ce4f 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 371766cb83..bbf39e10a3 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 4ae7fc14f4..69244b4327 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/symbols0.pbxsymbols b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols
index d8320185fc..28976a7794 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/apple_input.c b/apple/common/apple_input.c
index 480b3e7ffc..c2bea7ad02 100644
--- a/apple/common/apple_input.c
+++ b/apple/common/apple_input.c
@@ -17,10 +17,10 @@
 #include <unistd.h>
 
 #include "apple_gamecontroller.h"
-#include "input/input_common.h"
+#include "../../input/input_common.h"
 #include "apple_input.h"
-#include "general.h"
-#include "driver.h"
+#include "../../general.h"
+#include "../../driver.h"
 
 #include "keycode.inc"
 
diff --git a/apple/common/apple_input.h b/apple/common/apple_input.h
index 2535f95f5f..6337dc572a 100644
--- a/apple/common/apple_input.h
+++ b/apple/common/apple_input.h
@@ -16,7 +16,7 @@
 #ifndef __APPLE_RARCH_INPUT_H__
 #define __APPLE_RARCH_INPUT_H__
 
-#include "general.h"
+#include "../../general.h"
 
 // Input responder
 #define MAX_TOUCHES 16
diff --git a/apple/common/apple_joypad.c b/apple/common/apple_joypad.c
index e74bd6d302..7e4de9e859 100644
--- a/apple/common/apple_joypad.c
+++ b/apple/common/apple_joypad.c
@@ -13,8 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input/input_common.h"
-#include "general.h"
+#include "../../input/input_common.h"
+#include "../../general.h"
 
 #ifdef IOS
 #include "apple/iOS/bluetooth/btdynamic.c"
@@ -24,9 +24,9 @@
 #include "../OSX/hid_pad.c"
 #endif
 
-#include "apple/common/hidpad/wiimote.c"
-#include "apple/common/hidpad/apple_ps3_pad.c"
-#include "apple/common/hidpad/apple_wii_pad.c"
+#include "hidpad/wiimote.c"
+#include "hidpad/apple_ps3_pad.c"
+#include "hidpad/apple_wii_pad.c"
 
 typedef struct
 {
diff --git a/apple/common/hidpad/apple_ps3_pad.c b/apple/common/hidpad/apple_ps3_pad.c
index 495fd09802..dbd3a1f3fa 100644
--- a/apple/common/hidpad/apple_ps3_pad.c
+++ b/apple/common/hidpad/apple_ps3_pad.c
@@ -17,8 +17,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "boolean.h"
-#include "apple/common/apple_input.h"
+#include "../../../boolean.h"
+#include "../apple_input.h"
 
 struct hidpad_ps3_data
 {
diff --git a/apple/common/hidpad/apple_wii_pad.c b/apple/common/hidpad/apple_wii_pad.c
index b87deae7f8..5198b63915 100644
--- a/apple/common/hidpad/apple_wii_pad.c
+++ b/apple/common/hidpad/apple_wii_pad.c
@@ -17,8 +17,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "boolean.h"
-#include "apple/common/rarch_wrapper.h"
+#include "../../../boolean.h"
+#include "../rarch_wrapper.h"
 
 #include "wiimote.h"
 
@@ -47,10 +47,10 @@ static int16_t hidpad_wii_get_axis(struct wiimote_t* device, unsigned axis)
    {
       switch (axis)
       {
-         case 0: return device->exp.classic.ljs.x.value * 0x7FFF;
-         case 1: return device->exp.classic.ljs.y.value * 0x7FFF;
-         case 2: return device->exp.classic.rjs.x.value * 0x7FFF;
-         case 3: return device->exp.classic.rjs.y.value * 0x7FFF;
+         case 0: return device->exp.cc.classic.ljs.x.value * 0x7FFF;
+         case 1: return device->exp.cc.classic.ljs.y.value * 0x7FFF;
+         case 2: return device->exp.cc.classic.rjs.x.value * 0x7FFF;
+         case 3: return device->exp.cc.classic.rjs.y.value * 0x7FFF;
          default: return 0;
       }
    }
@@ -91,7 +91,7 @@ static void hidpad_wii_packet_handler(struct wiimote_t* device, uint8_t *packet,
       }
    }
 
-   g_current_input_data.pad_buttons[device->unid] = device->btns | (device->exp.classic.btns << 16);
+   g_current_input_data.pad_buttons[device->unid] = device->btns | (device->exp.cc.classic.btns << 16);
    for (int i = 0; i < 4; i ++)
       g_current_input_data.pad_axis[device->unid][i] = hidpad_wii_get_axis(device, i);
 }
diff --git a/apple/common/hidpad/wiimote.c b/apple/common/hidpad/wiimote.c
index 7fb6af8c73..0e8e7e79e6 100644
--- a/apple/common/hidpad/wiimote.c
+++ b/apple/common/hidpad/wiimote.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include "boolean.h"
+#include "../../../boolean.h"
 
 #include "wiimote.h"
 
@@ -134,7 +134,7 @@ void wiimote_pressed_buttons(struct wiimote_t* wm, byte* msg) {
 void wiimote_handle_expansion(struct wiimote_t* wm, byte* msg) {
 	switch (wm->exp.type) {
 		case EXP_CLASSIC:
-			classic_ctrl_event(&wm->exp.classic, msg);
+			classic_ctrl_event(&wm->exp.cc.classic, msg);
 			break;
 		default:
 			break;
@@ -302,7 +302,7 @@ int wiimote_handshake(struct wiimote_t* wm,  byte event, byte* data, unsigned sh
                if(event !=  WM_RPT_READ)
                   return 0;
 
-               classic_ctrl_handshake(wm, &wm->exp.classic, data,len);
+               classic_ctrl_handshake(wm, &wm->exp.cc.classic, data,len);
                wm->handshake_state = 3;
                continue;
 
diff --git a/apple/common/hidpad/wiimote.h b/apple/common/hidpad/wiimote.h
index 96c44eb4f0..fa9a5d5f1e 100644
--- a/apple/common/hidpad/wiimote.h
+++ b/apple/common/hidpad/wiimote.h
@@ -159,7 +159,7 @@ extern "C" {
 
       union {
          struct classic_ctrl_t classic;
-      };
+      } cc;
    } expansion_t;
 
    /**
diff --git a/apple/common/keycode.h b/apple/common/keycode.h
index f0b8a1219a..ec23de6b5a 100644
--- a/apple/common/keycode.h
+++ b/apple/common/keycode.h
@@ -156,7 +156,7 @@ enum {
 
 //
 
-#include "input/input_common.h" // < For rarch_key_map
+#include "../../input/input_common.h" // < For rarch_key_map
 
 struct apple_key_name_map_entry
 {
diff --git a/apple/common/rarch_wrapper.h b/apple/common/rarch_wrapper.h
index a5d8d08e80..008672c2b4 100644
--- a/apple/common/rarch_wrapper.h
+++ b/apple/common/rarch_wrapper.h
@@ -17,7 +17,7 @@
 #ifndef __APPLE_RARCH_WRAPPER_H__
 #define __APPLE_RARCH_WRAPPER_H__
 
-#include "gfx/gfx_context.h"
+#include "../../gfx/gfx_context.h"
 
 // These functions must only be called in gfx/context/apple_gl_context.c
 bool apple_gfx_ctx_init(void);
diff --git a/gfx/gl.c b/gfx/gl.c
index b074a25737..b6367240de 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1725,9 +1725,11 @@ static bool resolve_extensions(gl_t *gl)
    }
    gl->has_fp_fbo = gl_query_extension(gl, "OES_texture_float_linear");
 #else
+#ifdef HAVE_FBO
    // Float FBO is core in 3.2.
    gl->has_fp_fbo = gl->core_context || gl_query_extension(gl, "ARB_texture_float");
 #endif
+#endif
 
 #ifdef GL_DEBUG
    // Useful for debugging, but kinda obnoxious otherwise.
diff --git a/gfx/glsym/glsym_gl.h b/gfx/glsym/glsym_gl.h
index 812e5ee9a0..efccbb67d7 100644
--- a/gfx/glsym/glsym_gl.h
+++ b/gfx/glsym/glsym_gl.h
@@ -22,7 +22,9 @@ typedef void *GLeglImageOES;
 typedef GLint GLfixed;
 #endif
 #if defined(OSX) && !defined(MAC_OS_X_VERSION_10_7)
-#define OSX_10_6_SNOW_LEOPARD 1
+typedef long long int GLint64;
+typedef unsigned long long int GLuint64;
+typedef struct __GLsync *GLsync;
 #endif
 typedef void (APIENTRYP RGLSYMGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
 typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONPROC) (GLenum mode);
@@ -333,10 +335,8 @@ typedef void (APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint fir
 typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount);
 typedef void (APIENTRYP RGLSYMGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
 typedef void (APIENTRYP RGLSYMGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
-#ifndef OSX_10_6_SNOW_LEOPARD
 typedef void (APIENTRYP RGLSYMGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
 typedef void (APIENTRYP RGLSYMGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
-#endif
 typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
 typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
 typedef void (APIENTRYP RGLSYMGLMINSAMPLESHADINGPROC) (GLfloat value);
@@ -595,7 +595,6 @@ typedef void (APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, G
 typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex);
 typedef void (APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex);
 typedef void (APIENTRYP RGLSYMGLPROVOKINGVERTEXPROC) (GLenum mode);
-#ifndef OSX_10_6_SNOW_LEOPARD
 typedef GLsync (APIENTRYP RGLSYMGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
 typedef GLboolean (APIENTRYP RGLSYMGLISSYNCPROC) (GLsync sync);
 typedef void (APIENTRYP RGLSYMGLDELETESYNCPROC) (GLsync sync);
@@ -603,7 +602,6 @@ typedef GLenum (APIENTRYP RGLSYMGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield f
 typedef void (APIENTRYP RGLSYMGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
 typedef void (APIENTRYP RGLSYMGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
 typedef void (APIENTRYP RGLSYMGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif
 
 typedef void (APIENTRYP RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
 typedef void (APIENTRYP RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);