diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m
index 08e15e428d..4936dc09ce 100644
--- a/apple/common/RAGameView.m
+++ b/apple/common/RAGameView.m
@@ -72,20 +72,11 @@
 static GLKView *g_view;
 static UIView *g_pause_indicator_view;
 
-#elif defined(OSX)
-
-static bool g_has_went_fullscreen;
-static NSOpenGLPixelFormat* g_format;
-
 #endif
 
-static bool g_initialized;
 static RAGameView* g_instance;
 static GLContextClass* g_context;
 
-static int g_fast_forward_skips;
-static bool g_is_syncing = true;
-
 
 @implementation RAGameView
 + (RAGameView*)get
diff --git a/apple/common/apple_gfx_context.c.inl b/apple/common/apple_gfx_context.c.inl
index 1be2888501..e08375dbde 100644
--- a/apple/common/apple_gfx_context.c.inl
+++ b/apple/common/apple_gfx_context.c.inl
@@ -1,6 +1,15 @@
 #include "../../gfx/gfx_common.h"
 #include "../../gfx/gfx_context.h"
 
+static bool g_initialized;
+static int g_fast_forward_skips;
+static bool g_is_syncing = true;
+
+#ifdef OSX
+static bool g_has_went_fullscreen;
+static NSOpenGLPixelFormat* g_format;
+#endif
+
 static RAScreen* get_chosen_screen(void)
 {
 #if defined(OSX) && !defined(MAC_OS_X_VERSION_10_6)