Index: SDL-1.2/src/video/quartz/SDL_QuartzVideo.h
===================================================================
--- SDL-1.2/src/video/quartz/SDL_QuartzVideo.h	(revision 2651)
+++ SDL-1.2/src/video/quartz/SDL_QuartzVideo.h	(working copy)
@@ -54,7 +54,7 @@
 #include <Cocoa/Cocoa.h>
 #include <Carbon/Carbon.h>
 #include <QuickTime/QuickTime.h>
-#include <OpenGL/CGLTypes.h>	/* For CGLContextObj */
+#include <OpenGL/OpenGL.h>	/* For CGL functions and types */
 #include <IOKit/IOKitLib.h>	/* For powersave handling */
 #include <pthread.h>
 
Index: SDL-1.2/src/video/quartz/SDL_QuartzVideo.m
===================================================================
--- SDL-1.2/src/video/quartz/SDL_QuartzVideo.m	(revision 2651)
+++ SDL-1.2/src/video/quartz/SDL_QuartzVideo.m	(working copy)
@@ -43,21 +43,6 @@
 @end
 
 
-/* 
-    Structure for rez switch gamma fades
-    We can hide the monitor flicker by setting the gamma tables to 0
-*/
-#define QZ_GAMMA_TABLE_SIZE 256
-
-typedef struct {
-
-    CGGammaValue red[QZ_GAMMA_TABLE_SIZE];
-    CGGammaValue green[QZ_GAMMA_TABLE_SIZE];
-    CGGammaValue blue[QZ_GAMMA_TABLE_SIZE];
-
-} SDL_QuartzGammaTable;
-
-
 /* Bootstrap functions */
 static int              QZ_Available ();
 static SDL_VideoDevice* QZ_CreateDevice (int device_index);
@@ -385,10 +370,10 @@
             CGLSetFullScreen (NULL);
         }
         if (to_desktop) {
+            ShowMenuBar ();
             /* Restore original screen resolution/bpp */
             CGDisplaySwitchToMode (display_id, save_mode);
             CGReleaseAllDisplays ();
-            ShowMenuBar ();
             /* 
                 Reset the main screen's rectangle
                 See comment in QZ_SetVideoFullscreen for why we do this