2 files changed, 1 insertions, 8 deletions
diff --git a/dix/main.c b/dix/main.c
index 335706b70..532b32534 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -253,10 +253,10 @@ main(int argc, char *argv[], char *envp[])
     PrinterInitGlobals();
 #endif
 
+#ifdef XQUARTZ
     /* Quartz support on Mac OS X requires that the Cocoa event loop be in
      * the main thread. This allows the X server main to be called again
      * from another thread. */
-#if defined(__DARWIN__) && defined(DARWIN_WITH_QUARTZ)
     DarwinHandleGUI(argc, argv, envp);
 #endif
 
diff --git a/dix/window.c b/dix/window.c
index f12c82b08..0404655d4 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -146,13 +146,6 @@ _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
 
 _X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
 
-#if 0
-extern void DeleteWindowFromAnyEvents();
-extern Mask EventMaskForClient();
-extern void WindowHasNewCursor();
-extern void RecalculateDeliverableEvents();
-#endif
-
 static Bool TileScreenSaver(int i, int kind);