67 files changed, 36 insertions, 51 deletions

diff --git a/configure.ac b/configure.ac
index 04ce6f4c7..5bc3d8032 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2170,10 +2170,9 @@ hw/xgl/glxext/Makefile
 hw/xgl/glxext/module/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
-hw/darwin/Makefile
-hw/darwin/quartz/Makefile
-hw/darwin/quartz/apple/Makefile
-hw/darwin/quartz/xpr/Makefile
+hw/xquartz/Makefile
+hw/xquartz/bundle/Makefile
+hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
 hw/kdrive/chips/Makefile
diff --git a/hw/Makefile.am b/hw/Makefile.am
index 0e65f7106..abdeabb01 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -31,7 +31,7 @@ XPRINT_SUBDIRS = xprint
 endif
 
 if XQUARTZ
-XQUARTZ_SUBDIRS = darwin
+XQUARTZ_SUBDIRS = xquartz
 endif
 
 SUBDIRS =			\
@@ -45,7 +45,7 @@ SUBDIRS =			\
 	$(KDRIVE_SUBDIRS)	\
 	$(XPRINT_SUBDIRS)
 
-DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint
+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
 
 relink:
 	for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
deleted file mode 100644
index 3f29a8174..000000000
--- a/hw/darwin/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-noinst_LTLIBRARIES = libXdarwin.la
-AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-AM_CPPFLAGS = \
-	-DINXQUARTZ \
-	-DUSE_NEW_CLUT \
-	-DXFree86Server
-
-SUBDIRS = . quartz
-
-libXdarwin_la_SOURCES = \
-	darwin.c \
-	darwinEvents.c \
-	darwinKeyboard.c \
-	darwinXinput.c \
-	$(top_srcdir)/fb/fbcmap_mi.c \
-	$(top_srcdir)/mi/miinitext.c
-
-EXTRA_DIST = \
-	darwinClut8.h \
-	darwin.h \
-	darwinKeyboard.h
diff --git a/hw/darwin/quartz/Makefile.am b/hw/xquartz/Makefile.am
index 38f48d0e2..725d20f6c 100644
--- a/hw/darwin/quartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -1,24 +1,29 @@
-noinst_LTLIBRARIES = libXQuartz.la
-
+noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-
-# TODO: This should not pull in rootless... rootless should all be in xpr
 AM_CPPFLAGS = \
-	-I$(srcdir) -I$(srcdir)/.. \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DINXQUARTZ \
+	-DUSE_NEW_CLUT \
+	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless
 
 if X11APP
-X11APP_SUBDIRS = apple
+X11APP_SUBDIRS = bundle
 endif
 
 SUBDIRS = . xpr $(X11APP_SUBDIRS)
-DIST_SUBDIRS = xpr apple
+DIST_SUBDIRS = xpr bundle
 
-libXQuartz_la_SOURCES = \
+libXquartz_la_SOURCES = \
+	$(top_srcdir)/fb/fbcmap.c \
+	$(top_srcdir)/mi/miinitext.c \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
+	darwin.c \
+	darwinEvents.c \
+	darwinKeyboard.c \
+	darwinXinput.c \
 	keysym2ucs.c \
 	pseudoramiX.c \
 	quartz.c \
@@ -32,6 +37,9 @@ EXTRA_DIST = \
 	X11Application.h \
 	X11Controller.h \
 	applewmExt.h \
+	darwinClut8.h \
+	darwin.h \
+	darwinKeyboard.h \
 	keysym2ucs.h \
 	pseudoramiX.h \
 	quartzAudio.h \
diff --git a/hw/darwin/quartz/X11Application.h b/hw/xquartz/X11Application.h
index 861565798..861565798 100644
--- a/hw/darwin/quartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
diff --git a/hw/darwin/quartz/X11Application.m b/hw/xquartz/X11Application.m
index 3e37dd436..3e37dd436 100644
--- a/hw/darwin/quartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
diff --git a/hw/darwin/quartz/X11Controller.h b/hw/xquartz/X11Controller.h
index f1399dc49..f1399dc49 100644
--- a/hw/darwin/quartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
diff --git a/hw/darwin/quartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 0f64e4571..0f64e4571 100644
--- a/hw/darwin/quartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
diff --git a/hw/darwin/quartz/applewm.c b/hw/xquartz/applewm.c
index 72dca28e7..72dca28e7 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/xquartz/applewm.c
diff --git a/hw/darwin/quartz/applewmExt.h b/hw/xquartz/applewmExt.h
index 60d49ef59..60d49ef59 100644
--- a/hw/darwin/quartz/applewmExt.h
+++ b/hw/xquartz/applewmExt.h
diff --git a/hw/darwin/quartz/apple/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/English.lproj/InfoPlist.strings
index 88e1f04ac..88e1f04ac 100644
--- a/hw/darwin/quartz/apple/English.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/English.lproj/InfoPlist.strings
diff --git a/hw/darwin/quartz/apple/English.lproj/Localizable.strings b/hw/xquartz/bundle/English.lproj/Localizable.strings
index c83b08536..c83b08536 100644
--- a/hw/darwin/quartz/apple/English.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/English.lproj/Localizable.strings
diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib b/hw/xquartz/bundle/English.lproj/main.nib/classes.nib
index a82159bd5..a82159bd5 100644
--- a/hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib
+++ b/hw/xquartz/bundle/English.lproj/main.nib/classes.nib
diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/info.nib b/hw/xquartz/bundle/English.lproj/main.nib/info.nib
index 88bc6260d..88bc6260d 100644
--- a/hw/darwin/quartz/apple/English.lproj/main.nib/info.nib
+++ b/hw/xquartz/bundle/English.lproj/main.nib/info.nib
diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
index 8b31450ff..8b31450ff 100644
--- a/hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
diff --git a/hw/darwin/quartz/apple/Info.plist b/hw/xquartz/bundle/Info.plist
index 66f1f6be1..66f1f6be1 100644
--- a/hw/darwin/quartz/apple/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
diff --git a/hw/darwin/quartz/apple/Makefile.am b/hw/xquartz/bundle/Makefile.am
index a6e2dfbf9..a6e2dfbf9 100644
--- a/hw/darwin/quartz/apple/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
diff --git a/hw/darwin/quartz/apple/X11.icns b/hw/xquartz/bundle/X11.icns
index d770e617d..d770e617d 100644
--- a/hw/darwin/quartz/apple/X11.icns
+++ b/hw/xquartz/bundle/X11.icns
diff --git a/hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
index 225f371c5..225f371c5 100644
--- a/hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj
+++ b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
diff --git a/hw/darwin/quartz/apple/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index c436d51bb..c436d51bb 100644
--- a/hw/darwin/quartz/apple/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
diff --git a/hw/darwin/quartz/apple/launcher-main.c b/hw/xquartz/bundle/launcher-main.c
index 60a1624b9..60a1624b9 100644
--- a/hw/darwin/quartz/apple/launcher-main.c
+++ b/hw/xquartz/bundle/launcher-main.c
diff --git a/hw/darwin/quartz/apple/org.x.X11.plist b/hw/xquartz/bundle/org.x.X11.plist
index 6c6be91ab..6c6be91ab 100644
--- a/hw/darwin/quartz/apple/org.x.X11.plist
+++ b/hw/xquartz/bundle/org.x.X11.plist
diff --git a/hw/darwin/quartz/apple/server-main.c b/hw/xquartz/bundle/server-main.c
index 26fcbb0ab..26fcbb0ab 100644
--- a/hw/darwin/quartz/apple/server-main.c
+++ b/hw/xquartz/bundle/server-main.c
diff --git a/hw/darwin/darwin.c b/hw/xquartz/darwin.c
index b46b7687e..b46b7687e 100644
--- a/hw/darwin/darwin.c
+++ b/hw/xquartz/darwin.c
diff --git a/hw/darwin/darwin.h b/hw/xquartz/darwin.h
index 0f5f492b6..0f5f492b6 100644
--- a/hw/darwin/darwin.h
+++ b/hw/xquartz/darwin.h
diff --git a/hw/darwin/darwinClut8.h b/hw/xquartz/darwinClut8.h
index 8e914f3fd..8e914f3fd 100644
--- a/hw/darwin/darwinClut8.h
+++ b/hw/xquartz/darwinClut8.h
diff --git a/hw/darwin/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 629fb2c9d..629fb2c9d 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
diff --git a/hw/darwin/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c
index 1c83cbce4..1c83cbce4 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/xquartz/darwinKeyboard.c
diff --git a/hw/darwin/darwinKeyboard.h b/hw/xquartz/darwinKeyboard.h
index 12104418e..5cf64c7d1 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/xquartz/darwinKeyboard.h
@@ -27,7 +27,7 @@
 #ifndef DARWIN_KEYBOARD_H
 #define DARWIN_KEYBOARD_H 1
 
-#include "darwinKeyboard_interface.h"
+#include "quartzKeyboard.h"
 
 /* Provided for darwinEvents.c */
 extern darwinKeyboardInfo keyInfo;
diff --git a/hw/darwin/darwinXinput.c b/hw/xquartz/darwinXinput.c
index ee456a43a..ee456a43a 100644
--- a/hw/darwin/darwinXinput.c
+++ b/hw/xquartz/darwinXinput.c
diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/xquartz/keysym2ucs.c
index 8626ebc4e..8626ebc4e 100644
--- a/hw/darwin/quartz/keysym2ucs.c
+++ b/hw/xquartz/keysym2ucs.c
diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/xquartz/keysym2ucs.h
index f5b7a18f2..f5b7a18f2 100644
--- a/hw/darwin/quartz/keysym2ucs.h
+++ b/hw/xquartz/keysym2ucs.h
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index b19c6050f..b19c6050f 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/xquartz/pseudoramiX.h
index df5010d1d..df5010d1d 100644
--- a/hw/darwin/quartz/pseudoramiX.h
+++ b/hw/xquartz/pseudoramiX.h
diff --git a/hw/darwin/quartz/quartz.c b/hw/xquartz/quartz.c
index 2483d12d7..2483d12d7 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/xquartz/quartz.c
diff --git a/hw/darwin/quartz/quartz.h b/hw/xquartz/quartz.h
index e74a1082b..e74a1082b 100644
--- a/hw/darwin/quartz/quartz.h
+++ b/hw/xquartz/quartz.h
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
index 1eb099ba6..1eb099ba6 100644
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/xquartz/quartzAudio.c
diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/xquartz/quartzAudio.h
index c406bbc2a..c406bbc2a 100644
--- a/hw/darwin/quartz/quartzAudio.h
+++ b/hw/xquartz/quartzAudio.h
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m
index 0086c5ca4..0086c5ca4 100644
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/xquartz/quartzCocoa.m
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/xquartz/quartzCommon.h
index f0d5a7a08..f0d5a7a08 100644
--- a/hw/darwin/quartz/quartzCommon.h
+++ b/hw/xquartz/quartzCommon.h
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/xquartz/quartzCursor.c
index 6e86acbc4..6e86acbc4 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/xquartz/quartzCursor.c
diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/xquartz/quartzCursor.h
index 56a02098d..56a02098d 100644
--- a/hw/darwin/quartz/quartzCursor.h
+++ b/hw/xquartz/quartzCursor.h
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index c69fb9f96..0a50d06ac 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -40,7 +40,7 @@
 #include <CoreServices/CoreServices.h>
 #include <Carbon/Carbon.h>
 
-#include "darwinKeyboard_interface.h"
+#include "quartzKeyboard.h"
 #include "X11/keysym.h"
 #include "keysym2ucs.h"
 
diff --git a/hw/darwin/darwinKeyboard_interface.h b/hw/xquartz/quartzKeyboard.h
index f41f46318..f27fcdeac 100644
--- a/hw/darwin/darwinKeyboard_interface.h
+++ b/hw/xquartz/quartzKeyboard.h
@@ -24,8 +24,8 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
-#ifndef DARWIN_KEYBOARD_INTERFACE_H
-#define DARWIN_KEYBOARD_INTERFACE_H 1
+#ifndef QUARTZ_KEYBOARD_H
+#define QUARTZ_KEYBOARD_H 1
 
 #define XK_TECHNICAL		// needed to get XK_Escape
 #define XK_PUBLISHING
@@ -49,4 +49,4 @@ void DarwinKeyboardReload(DeviceIntPtr pDev);
 Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info);
 unsigned int DarwinModeSystemKeymapSeed(void);
 
-#endif /* DARWIN_KEYBOARD_INTERFACE_H */
+#endif /* QUARTZ_KEYBOARD_H */
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/xquartz/quartzPasteboard.c
index 0cecff54a..0cecff54a 100644
--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/xquartz/quartzPasteboard.c
diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/xquartz/quartzPasteboard.h
index afcb6e587..afcb6e587 100644
--- a/hw/darwin/quartz/quartzPasteboard.h
+++ b/hw/xquartz/quartzPasteboard.h
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index e20c16b7a..e20c16b7a 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index 769662276..3cc2aba12 100644
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -5,7 +5,7 @@ man1_MANS = Xquartz.man
 
 AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	-I$(srcdir) -I$(srcdir)/.. \
 	-I$(top_srcdir)/miext \
 	-I$(top_srcdir)/miext/rootless \
 	-I$(top_srcdir)/miext/rootless/safeAlpha
@@ -22,8 +22,7 @@ Xquartz_SOURCES = \
 	x-list.c
 
 Xquartz_LDADD = \
-	$(top_builddir)/hw/darwin/quartz/libXquartz.la \
-	$(top_builddir)/hw/darwin/libXdarwin.la \
+	$(top_builddir)/hw/xquartz/libXquartz.la \
 	$(top_builddir)/dix/dixfonts.lo \
 	$(top_builddir)/dix/libdix.la \
 	$(top_builddir)/os/libos.la \
diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/xquartz/xpr/Xplugin.h
index a10b1b8e1..a10b1b8e1 100644
--- a/hw/darwin/quartz/xpr/Xplugin.h
+++ b/hw/xquartz/xpr/Xplugin.h
diff --git a/hw/darwin/quartz/xpr/Xquartz.man b/hw/xquartz/xpr/Xquartz.man
index 37a7f1a26..37a7f1a26 100644
--- a/hw/darwin/quartz/xpr/Xquartz.man
+++ b/hw/xquartz/xpr/Xquartz.man
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 95a443976..95a443976 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
diff --git a/hw/darwin/quartz/xpr/appledri.h b/hw/xquartz/xpr/appledri.h
index c4e43be12..c4e43be12 100644
--- a/hw/darwin/quartz/xpr/appledri.h
+++ b/hw/xquartz/xpr/appledri.h
diff --git a/hw/darwin/quartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h
index 8649fd329..8649fd329 100644
--- a/hw/darwin/quartz/xpr/appledristr.h
+++ b/hw/xquartz/xpr/appledristr.h
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
index e5591abcb..e5591abcb 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/xquartz/xpr/dri.c
diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/xquartz/xpr/dri.h
index cf2638a9f..cf2638a9f 100644
--- a/hw/darwin/quartz/xpr/dri.h
+++ b/hw/xquartz/xpr/dri.h
diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/xquartz/xpr/dristruct.h
index 9a3d01c9b..9a3d01c9b 100644
--- a/hw/darwin/quartz/xpr/dristruct.h
+++ b/hw/xquartz/xpr/dristruct.h
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/xquartz/xpr/x-hash.c
index 55d28bacd..55d28bacd 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/xquartz/xpr/x-hash.c
diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/xquartz/xpr/x-hash.h
index 3456dbedf..3456dbedf 100644
--- a/hw/darwin/quartz/xpr/x-hash.h
+++ b/hw/xquartz/xpr/x-hash.h
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c
index bb873bbfb..bb873bbfb 100644
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/xquartz/xpr/x-hook.c
diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/xquartz/xpr/x-hook.h
index 392352d50..392352d50 100644
--- a/hw/darwin/quartz/xpr/x-hook.h
+++ b/hw/xquartz/xpr/x-hook.h
diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c
index 3596dd355..3596dd355 100644
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/xquartz/xpr/x-list.c
diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/xquartz/xpr/x-list.h
index 04af024a2..04af024a2 100644
--- a/hw/darwin/quartz/xpr/x-list.h
+++ b/hw/xquartz/xpr/x-list.h
diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/xquartz/xpr/xpr.h
index ddc6d0cb1..ddc6d0cb1 100644
--- a/hw/darwin/quartz/xpr/xpr.h
+++ b/hw/xquartz/xpr/xpr.h
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c
index 5539c51cc..bd82df03c 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/xquartz/xpr/xprAppleWM.c
@@ -32,7 +32,7 @@
 #endif
 
 #include "xpr.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 #include "rootless.h"
 #include "Xplugin.h"
 #include <X11/X.h>
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index 160b5d908..db195a8ec 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -33,7 +33,7 @@
 #include <dix-config.h>
 #endif
 
-#include "quartz/quartzCommon.h"
+#include "quartzCommon.h"
 #include "xpr.h"
 #include "darwin.h"
 #include "Xplugin.h"
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
index 1b0ba9102..2d97f2754 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/xquartz/xpr/xprFrame.c
@@ -36,7 +36,7 @@
 #include "Xplugin.h"
 #include "x-hash.h"
 #include "x-list.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 
 #include "propertyst.h"
 #include "dix.h"
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 28ed159fe..068b7b177 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -31,17 +31,17 @@
 #include <dix-config.h>
 #endif
 
-#include "quartz/quartzCommon.h"
-#include "quartz/quartz.h"
+#include "quartzCommon.h"
+#include "quartz.h"
 #include "xpr.h"
-#include "quartz/pseudoramiX.h"
+#include "pseudoramiX.h"
 #include "darwin.h"
 #include "rootless.h"
 #include "safeAlpha/safeAlpha.h"
 #include "dri.h"
 #include "globals.h"
 #include "Xplugin.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 
 // From xprFrame.c
 WindowPtr xprGetXWindow(xp_window_id wid);