diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index ca1ef3d2e..f54afc99e 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -36,7 +36,7 @@
 #undef BOOL
 #define BOOL xBOOL
 #include "rootless.h"
-#include "applewmExt.h"
+#include "quartz/applewmExt.h"
 #include "windowstr.h"
 #undef BOOL
 
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index 9c26a7667..0e358ab26 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -36,12 +36,12 @@
 #undef BOOL
 #define BOOL xBOOL
 #include "darwin.h"
-#include "quartz.h"
-#include "quartzCursor.h"
+#include "quartz/quartz.h"
+#include "quartz/quartzCursor.h"
 #include "rootless.h"
-#include "safeAlpha.h"
-#include "pseudoramiX.h"
-#include "applewmExt.h"
+#include "safeAlpha/safeAlpha.h"
+#include "quartz/pseudoramiX.h"
+#include "quartz/applewmExt.h"
 
 #include "regionstr.h"
 #include "scrnintstr.h"
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index 2116ebdf2..ce3036fe1 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -31,8 +31,8 @@
 #endif
 #include "quartzCommon.h"
 #include "darwin.h"
-#include "quartz.h"
-#include "quartzCursor.h"
+#include "quartz/quartz.h"
+#include "quartz/quartzCursor.h"
 #include "colormapst.h"
 #include "scrnintstr.h"
 #include "micmap.h"
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
index e67abb6d5..17d3600a4 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@@ -36,7 +36,6 @@
 #include "Xplugin.h"
 #include <X11/X.h>
 
-
 static int xprSetWindowLevel(
     WindowPtr pWin,
     int level)
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index 739cefcba..c8e30051b 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -110,9 +110,8 @@ eventHandler(unsigned int type, const void *arg,
     }
 }
 
-
 /*
- * displayScreenBounds
+ * displayAtIndex
  *  Return the display ID for a particular display index.
  */
 static CGDirectDisplayID
@@ -129,7 +128,6 @@ displayAtIndex(int index)
         return kCGNullDirectDisplay;
 }
 
-
 /*
  * displayScreenBounds
  *  Return the bounds of a particular display.
@@ -152,7 +150,6 @@ displayScreenBounds(CGDirectDisplayID id)
     return frame;
 }
 
-
 /*
  * xprAddPseudoramiXScreens
  *  Add a single virtual screen encompassing all the physical screens
@@ -208,7 +205,6 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height)
     xfree(displayList);
 }
 
-
 /*
  * xprDisplayInit
  *  Find number of CoreGraphics displays and initialize Xplugin.
@@ -231,9 +227,7 @@ xprDisplayInit(void)
         darwinScreensFound =  1;
 
     if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)
-    {
         FatalError("Could not initialize the Xplugin library.");
-    }
 
     xp_select_events(XP_EVENT_DISPLAY_CHANGED
                      | XP_EVENT_WINDOW_STATE_CHANGED
@@ -246,7 +240,6 @@ xprDisplayInit(void)
     xprAppleWMInit();
 }
 
-
 /*
  * xprAddScreen
  *  Init the framebuffer and record pixmap parameters for the screen.
@@ -316,7 +309,6 @@ xprAddScreen(int index, ScreenPtr pScreen)
     return TRUE;
 }
 
-
 /*
  * xprSetupScreen
  *  Setup the screen for rootless access.
@@ -353,7 +345,6 @@ xprSetupScreen(int index, ScreenPtr pScreen)
     return DRIFinishScreenInit(pScreen);
 }
 
-
 /*
  * xprUpdateScreen
  *  Update screen after configuation change.
@@ -370,7 +361,6 @@ xprUpdateScreen(ScreenPtr pScreen)
     RootlessUpdateScreenPixmap(pScreen);
 }
 
-
 /*
  * xprInitInput
  *  Finalize xpr specific setup.
@@ -387,7 +377,6 @@ xprInitInput(int argc, char **argv)
         AppleWMSetScreenOrigin(WindowTable[i]);
 }
 
-
 /*
  * Quartz display mode function list.
  */
@@ -413,7 +402,6 @@ static QuartzModeProcsRec xprModeProcs = {
     DRIDestroySurface
 };
 
-
 /*
  * QuartzModeBundleInit
  *  Initialize the display mode bundle after loading.