From 0e2ed7c746fa6329a2a5f147cc0d02d12216d480 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sun, 12 Apr 2015 16:55:50 +0200
Subject: [PATCH] (Apple) Cleanups

---
 apple/common/apple_cocoa_common.m    |  9 ---------
 gfx/drivers_context/apple_cocoa_gl.m | 17 ++++++-----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/apple/common/apple_cocoa_common.m b/apple/common/apple_cocoa_common.m
index 526abb895b..4691508550 100644
--- a/apple/common/apple_cocoa_common.m
+++ b/apple/common/apple_cocoa_common.m
@@ -191,21 +191,12 @@ void apple_display_alert(const char *message, const char *title)
 static RAGameView* g_instance;
 
 #ifdef OSX
-#include <OpenGL/CGLTypes.h>
-#include <OpenGL/OpenGL.h>
-
 void *nsview_get_ptr(void)
 {
     return g_instance;
 }
 #endif
 
-#include "../../gfx/video_viewport.h"
-#include "../../gfx/video_monitor.h"
-#include "../../gfx/video_context_driver.h"
-#include "../../gfx/drivers/gl_common.h"
-#include "../../runloop.h"
-
 /* forward declarations */
 void apple_gfx_ctx_update(void);
 void *glkitview_init(void);
diff --git a/gfx/drivers_context/apple_cocoa_gl.m b/gfx/drivers_context/apple_cocoa_gl.m
index 1970a08fbe..fcd621441d 100644
--- a/gfx/drivers_context/apple_cocoa_gl.m
+++ b/gfx/drivers_context/apple_cocoa_gl.m
@@ -17,9 +17,13 @@
 //#define HAVE_NSOPENGL
 
 #include <CoreGraphics/CGGeometry.h>
-#ifdef OSX
+#if defined(OSX)
+#include <OpenGL/CGLTypes.h>
+#include <OpenGL/OpenGL.h>
 #include <AppKit/NSScreen.h>
 #include <AppKit/NSOpenGL.h>
+#elif defined(IOS)
+#include <GLKit/GLKit.h>
 #endif
 #import "../../apple/common/RetroArch_Apple.h"
 #include "../video_context_driver.h"
@@ -55,16 +59,7 @@
 #define RAScreen NSScreen
 #endif
 
-#if defined(OSX)
-
-/* RAGameView is a container on iOS; 
- * on OSX these are both the same object
- */
-#define g_view g_instance
-
-#elif defined(IOS)
-
-#include <GLKit/GLKit.h>
+#if defined(IOS)
 #define ALMOST_INVISIBLE (.021f)
 static GLKView *g_view;
 static UIView *g_pause_indicator_view;