diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am
index 4220f7f9c..442c58172 100644
--- a/GL/apple/Makefile.am
+++ b/GL/apple/Makefile.am
@@ -1,9 +1,11 @@
-AM_CFLAGS = -I$(top_srcdir) \
-	 -I$(top_srcdir)/GL/glx \
-	 -I$(top_srcdir)/GL/include \
-	 -I$(top_srcdir)/GL/mesa/glapi \
-	 -I$(top_srcdir)/hw/darwin/quartz \
-	 -I$(top_srcdir)/hw/darwin/quartz/xpr
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/GL/glx \
+	-I$(top_srcdir)/GL/include \
+	-I$(top_srcdir)/GL/mesa/glapi \
+	-I$(top_srcdir)/hw/darwin/quartz \
+	-I$(top_srcdir)/hw/darwin/quartz/xpr \
+	-I$(top_srcdir)/miext/damage
 
 noinst_LIBRARIES = libCGLcore.a 
 libCGLcore_a_SOURCES = indirect.c \
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index f1740e344..e21a04548 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -1,56 +1,69 @@
-AM_CFLAGS = @XORG_CFLAGS@
-AM_CPPFLAGS = @XORG_INCS@ -I$(top_srcdir)/Xext -I$(top_srcdir)/miext/rootless -DUSE_NEW_CLUT -DBUILD_DATE=\"$(BUILD_DATE)\" -DHAVE_XORG_CONFIG_H -DXFree86Server -DINXQUARTZ
+AM_CFLAGS = $(XORG_CFLAGS)
+AM_CPPFLAGS = $(XORG_INCS) \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DHAVE_XORG_CONFIG_H \
+	-DINXQUARTZ \
+	-DUSE_NEW_CLUT \
+	-DXFree86Server \
+	-I$(top_srcdir)/fb \
+	-I$(top_srcdir)/mi \
+	-I$(top_srcdir)/miext/rootless \
+	-I$(top_srcdir)/render \
+	-I$(top_srcdir)/Xext
 
 SUBDIRS = quartz utils
 
 bin_PROGRAMS = Xquartz
 man1_MANS = Xquartz.man
 
-Xquartz_SOURCES = darwin.c \
-		  darwinEvents.c \
-		  darwinKeyboard.c \
-		  darwinXinput.c \
-		  $(top_srcdir)/fb/fbcmap.c \
-		  $(top_srcdir)/mi/miinitext.c
+Xquartz_SOURCES = \
+	darwin.c \
+	darwinEvents.c \
+	darwinKeyboard.c \
+	darwinXinput.c \
+	$(top_srcdir)/fb/fbcmap.c \
+	$(top_srcdir)/mi/miinitext.c
 
 #		We should probably add these once they're working, or are these obsolete and to be removed?
 #		./quartz/cr/libcr.a
 #		./quartz/fullscreen/libfullscreen.a
 
-Xquartz_LDADD = ./quartz/libXquartz.a \
-		./quartz/xpr/libxpr.a \
-		$(top_builddir)/dix/dixfonts.lo \
-		$(top_builddir)/dix/libdix.la \
-		$(top_builddir)/os/libos.la \
-		$(top_builddir)/dix/libxpstubs.la \
-		$(top_builddir)/miext/shadow/libshadow.la \
-		$(top_builddir)/fb/libfb.la \
-		$(top_builddir)/mi/libmi.la \
-		$(top_builddir)/composite/libcomposite.la \
-		$(top_builddir)/damageext/libdamageext.la \
-		$(top_builddir)/miext/damage/libdamage.la \
-		$(top_builddir)/xfixes/libxfixes.la \
-		$(top_builddir)/miext/cw/libcw.la \
-		$(top_builddir)/Xext/libXext.la \
-		$(top_builddir)/xkb/libxkb.la \
-		$(top_builddir)/xkb/libxkbstubs.la \
-		$(top_builddir)/Xi/libXi.la \
-		$(top_builddir)/dbe/libdbe.la \
-		$(top_builddir)/record/librecord.la \
-		$(top_builddir)/XTrap/libxtrap.la \
-		$(top_builddir)/miext/rootless/librootless.la \
-		$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
-		$(top_builddir)/miext/rootless/accel/librlAccel.la \
-		$(DARWIN_LIBS) $(XSERVER_LIBS) -lXplugin
+Xquartz_LDADD = \
+	./quartz/libXquartz.a \
+	./quartz/xpr/libxpr.a \
+	$(top_builddir)/dix/dixfonts.lo \
+	$(top_builddir)/dix/libdix.la \
+	$(top_builddir)/os/libos.la \
+	$(top_builddir)/dix/libxpstubs.la \
+	$(top_builddir)/miext/shadow/libshadow.la \
+	$(top_builddir)/fb/libfb.la \
+	$(top_builddir)/mi/libmi.la \
+	$(top_builddir)/composite/libcomposite.la \
+	$(top_builddir)/damageext/libdamageext.la \
+	$(top_builddir)/miext/damage/libdamage.la \
+	$(top_builddir)/xfixes/libxfixes.la \
+	$(top_builddir)/miext/cw/libcw.la \
+	$(top_builddir)/Xext/libXext.la \
+	$(top_builddir)/xkb/libxkb.la \
+	$(top_builddir)/xkb/libxkbstubs.la \
+	$(top_builddir)/Xi/libXi.la \
+	$(top_builddir)/dbe/libdbe.la \
+	$(top_builddir)/record/librecord.la \
+	$(top_builddir)/XTrap/libxtrap.la \
+	$(top_builddir)/miext/rootless/librootless.la \
+	$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
+	$(top_builddir)/miext/rootless/accel/librlAccel.la \
+	$(DARWIN_LIBS) $(XSERVER_LIBS) -lXplugin
 
-Xquartz_LDFLAGS =  -XCClinker -Objc \
-		   -Wl,-u,_miDCInitialize \
-		   -Wl,-framework,Carbon \
-		   -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
-		   -Wl,-framework,OpenGL \
-		   -Wl,-framework,Cocoa \
-		   -Wl,-framework,CoreAudio \
-	  	   -Wl,-framework,IOKit
+Xquartz_LDFLAGS =  \
+	-XCClinker -Objc \
+	-Wl,-u,_miDCInitialize \
+	-Wl,-framework,Carbon \
+	-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
+	-Wl,-framework,OpenGL \
+	-Wl,-framework,Cocoa \
+	-Wl,-framework,CoreAudio \
+	-Wl,-framework,IOKit
 
 if X11APP
 bin_SCRIPTS = x11app x11launcher
diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am
index 4c650e607..09f86a018 100644
--- a/hw/darwin/quartz/Makefile.am
+++ b/hw/darwin/quartz/Makefile.am
@@ -1,23 +1,34 @@
 noinst_LIBRARIES = libXQuartz.a
 
-AM_CFLAGS = @XORG_CFLAGS@
-AM_OBJCFLAGS = @XORG_CFLAGS@
-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)/miext/rootless @XORG_INCS@ -DXBINDIR=\"${bindir}\" -DHAS_KL_API -DHAVE_XORG_CONFIG_H
+AM_CFLAGS = $(XORG_CFLAGS)
+AM_OBJCFLAGS = $(XORG_CFLAGS)
+AM_CPPFLAGS = $(XORG_INCS) \
+	-DXBINDIR=\"${bindir}\" \
+	-DHAS_KL_API \
+	-DHAVE_XORG_CONFIG_H \
+	-I$(srcdir) -I$(srcdir)/.. \
+	-I$(top_srcdir)/fb \
+	-I$(top_srcdir)/mi \
+	-I$(top_srcdir)/miext/rootless \
+	-I$(top_srcdir)/render
 
-SUBDIRS = cr fullscreen xpr
+SUBDIRS = xpr
+
+# Keeping around cr and fullscreen for reference for now, but don't need to build them
+DIST_SUBDIRS = cr fullscreen xpr
 
 libXQuartz_a_SOURCES = \
-		  X11Application.m \
-		  X11Controller.m \
-	          applewm.c \
-	          keysym2ucs.c \
-	          pseudoramiX.c \
-	          quartz.c \
-	          quartzAudio.c \
-	          quartzCocoa.m \
-	          quartzKeyboard.c \
-	          quartzPasteboard.c \
-	          quartzStartup.c
+	X11Application.m \
+	X11Controller.m \
+	applewm.c \
+	keysym2ucs.c \
+	pseudoramiX.c \
+	quartz.c \
+	quartzAudio.c \
+	quartzCocoa.m \
+	quartzKeyboard.c \
+	quartzPasteboard.c \
+	quartzStartup.c
 
 EXTRA_DIST = \
 	X11Application.h \
diff --git a/hw/darwin/quartz/cr/Makefile.am b/hw/darwin/quartz/cr/Makefile.am
index ff6043d46..b200b03dc 100644
--- a/hw/darwin/quartz/cr/Makefile.am
+++ b/hw/darwin/quartz/cr/Makefile.am
@@ -1,21 +1,22 @@
 noinst_LIBRARIES = libcr.a
-AM_CFLAGS =  @XORG_CFLAGS@
-AM_OBJCFLAGS =  @XORG_CFLAGS@
-AM_CPPFLAGS = -DDEFER_NSWINDOW \
-	   @XORG_INCS@ \
-	   -I../fullscreen \
-	   -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
-	   -I$(top_srcdir)/miext/rootless \
-	   -I$(top_srcdir)/miext/rootless/safeAlpha \
-	   -I$(top_srcdir)/mi
+AM_CFLAGS = $(XORG_CFLAGS)
+AM_OBJCFLAGS = $(XORG_CFLAGS)
+AM_CPPFLAGS = $(XORG_INCS) \
+	-DDEFER_NSWINDOW \
+	-I../fullscreen \
+	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	-I$(top_srcdir)/mi \
+	-I$(top_srcdir)/miext/rootless \
+	-I$(top_srcdir)/miext/rootless/safeAlpha \
+	-I$(top_srcdir)/render
 
-libcr_a_SOURCES = crAppleWM.m \
-	           crFrame.m \
-	           crScreen.m \
-	           ../fullscreen/quartzCursor.c \
-	           XView.m
+libcr_a_SOURCES = \
+	crAppleWM.m \
+	crFrame.m \
+	crScreen.m \
+	../fullscreen/quartzCursor.c \
+	XView.m
 
 EXTRA_DIST = \
 	cr.h \
 	XView.h 
-	
diff --git a/hw/darwin/quartz/fullscreen/Makefile.am b/hw/darwin/quartz/fullscreen/Makefile.am
index 5e471ad30..823cec112 100644
--- a/hw/darwin/quartz/fullscreen/Makefile.am
+++ b/hw/darwin/quartz/fullscreen/Makefile.am
@@ -1,9 +1,15 @@
 noinst_LIBRARIES = libfullscreen.a
-AM_CFLAGS = @XORG_CFLAGS@
-AM_CPPFLAGS = @XORG_INCS@ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. 
+AM_CFLAGS = $(XORG_CFLAGS)
+AM_CPPFLAGS = $(XORG_INCS) \
+	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	-I$(top_srcdir)/miext/damage \
+	-I$(top_srcdir)/miext/shadow \
+	-I$(top_srcdir)/mi
 
-libfullscreen_a_SOURCES = fullscreen.c \
-			   quartzCursor.c
+libfullscreen_a_SOURCES = \
+	fullscreen.c \
+	quartzCursor.c
 
 EXTRA_DIST = \
 	quartzCursor.h
+
diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am
index 1f19fe90b..67c833907 100644
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/darwin/quartz/xpr/Makefile.am
@@ -1,22 +1,26 @@
 noinst_LIBRARIES = libxpr.a
-AM_CFLAGS =  @XORG_CFLAGS@
-AM_CPPFLAGS = @XORG_INCS@ \
-	   -DHAVE_XORG_CONFIG_H \
-	   -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
-	   -I$(top_srcdir)/miext/rootless \
-	   -I$(top_srcdir)/miext/rootless/safeAlpha \
-	   -I$(top_srcdir)/miext
+AM_CFLAGS =  $(XORG_CFLAGS) $(PIXMAN_CFLAGS)
+AM_CPPFLAGS = $(XORG_INCS) \
+	-DHAVE_XORG_CONFIG_H \
+	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	-I$(top_srcdir)/fb \
+	-I$(top_srcdir)/mi \
+	-I$(top_srcdir)/miext \
+	-I$(top_srcdir)/miext/damage \
+	-I$(top_srcdir)/miext/rootless \
+	-I$(top_srcdir)/miext/rootless/safeAlpha \
+	-I$(top_srcdir)/render
 
 libxpr_a_SOURCES = \
 	appledri.c \
-        dri.c \
-        xprAppleWM.c \
-        xprCursor.c \
-        xprFrame.c \
-        xprScreen.c \
-        x-hash.c \
-        x-hook.c \
-        x-list.c
+	dri.c \
+	xprAppleWM.c \
+	xprCursor.c \
+	xprFrame.c \
+	xprScreen.c \
+	x-hash.c \
+	x-hook.c \
+	x-list.c
 
 EXTRA_DIST = \
 	dri.h \
diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index f40a662d6..3729f62f2 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = bus @XORG_OS_SUBDIR@ misc
-DIST_SUBDIRS = bsd bus misc linux lynxos sysv sco usl hurd
+DIST_SUBDIRS = bsd bus misc linux lynxos sysv sco solaris usl hurd
 
 sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \
               assyntax.h xf86OSKbd.h xf86OSmouse.h