diff --git a/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx b/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
index 7ffe4cbcc99b..989c13ea6aa5 100644
--- a/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
+++ b/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.glx,v 1.1 2008/08/03 22:11:10 mrg Exp $
+#	$NetBSD: Makefile.glx,v 1.2 2008/08/15 15:55:05 rtr Exp $
 
 LIB=		glx
 
@@ -20,7 +20,6 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/GL/glx \
 		-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
 		-I${X11SRCDIR.MesaLib}/src/mesa/main \
 		-I${X11SRCDIR.MesaLib}/src/glx/x11 \
-		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
diff --git a/external/mit/xorg/server/xorg-server/Makefile.serverlib b/external/mit/xorg/server/xorg-server/Makefile.serverlib
index 7bdf48132c4b..05d8384d1d35 100644
--- a/external/mit/xorg/server/xorg-server/Makefile.serverlib
+++ b/external/mit/xorg/server/xorg-server/Makefile.serverlib
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.serverlib,v 1.2 2008/08/15 10:31:12 rtr Exp $
+#	$NetBSD: Makefile.serverlib,v 1.3 2008/08/15 15:55:05 rtr Exp $
 
 NOLINT=         1
 NOPROFILE=      1
@@ -21,11 +21,6 @@ CPPFLAGS+=	${X11FLAGS.SERVER}
 #CPPFLAGS+=	${X11FLAGS.SERVER} -DX_BYTE_ORDER=${X_BYTE_ORDER} \
 #		-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
-.if !defined(XSERVERINCDIR)
-XSERVERINCDIR!=	cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=XSERVERINCDIR
-.endif
-
 # Architectures that can't use the XFree86 loader (such as MIPS) can use
 # dlopen() to load modules.
 .if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
diff --git a/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap b/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap
index 4b57969593c4..60ca4614b0af 100644
--- a/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap
+++ b/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xtrap,v 1.2 2008/08/03 03:16:41 mrg Exp $
+#	$NetBSD: Makefile.xtrap,v 1.3 2008/08/15 15:55:05 rtr Exp $
 
 LIB=		XTrap
 
@@ -6,7 +6,6 @@ LIB=		XTrap
 SRCS+=		xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
diff --git a/external/mit/xorg/server/xorg-server/afb/Makefile.afb b/external/mit/xorg/server/xorg-server/afb/Makefile.afb
index dbd2813c6a63..d601e25aa6c1 100644
--- a/external/mit/xorg/server/xorg-server/afb/Makefile.afb
+++ b/external/mit/xorg/server/xorg-server/afb/Makefile.afb
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.afb,v 1.2 2008/08/02 21:30:42 mrg Exp $
+#	$NetBSD: Makefile.afb,v 1.3 2008/08/15 15:55:05 rtr Exp $
 
 LIB=	afb
 
@@ -19,8 +19,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/${LIB} \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
 		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/pixman-1
 
 # XXX some path so that "../../mfb/mfbblt.c" works
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86
diff --git a/external/mit/xorg/server/xorg-server/cfb/Makefile.cfb b/external/mit/xorg/server/xorg-server/cfb/Makefile.cfb
index ba6d5ecb3ee4..97c9f5fdcce7 100644
--- a/external/mit/xorg/server/xorg-server/cfb/Makefile.cfb
+++ b/external/mit/xorg/server/xorg-server/cfb/Makefile.cfb
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.cfb,v 1.1 2008/08/02 21:19:21 mrg Exp $
+#	$NetBSD: Makefile.cfb,v 1.2 2008/08/15 15:55:05 rtr Exp $
 
 .if ${PIXELSIZE} == 8
 LIB=		cfb
@@ -74,7 +74,6 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/cfb \
 		-I${X11SRCDIR.xorg-server}/mfb \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/Xext
diff --git a/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe b/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
index 5a915071bec2..afd133372b63 100644
--- a/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
+++ b/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
@@ -1,10 +1,9 @@
-#	$NetBSD: Makefile.dbe,v 1.2 2008/08/09 09:08:25 rtr Exp $
+#	$NetBSD: Makefile.dbe,v 1.3 2008/08/15 15:55:05 rtr Exp $
 
 .PATH:		${X11SRCDIR.xorg-server}/dbe
 SRCS.dbe=	dbe.c midbe.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/pixman-1
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
diff --git a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
index bc5e19afaaf6..d608bed3cc17 100644
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/06 07:37:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:05 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -20,7 +20,6 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xorg-server}/mfb \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${X11SRCDIR.xorg-server}/os \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
index e7a1d1f45c56..4d1b39cb4669 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2008/08/09 09:07:40 rtr Exp $
+#	$NetBSD: Makefile,v 1.15 2008/08/15 15:55:05 rtr Exp $
 
 SUBDIR=		common init ddc dixmods doc dri dummy i2c int10 loader \
 		xf86modes \
@@ -23,7 +23,6 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xorg-server}/mfb \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${X11SRCDIR.xorg-server}/os \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
index 236b4513acdf..b6f5f7f03df3 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/09 01:23:43 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:05 rtr Exp $
 
 .include <bsd.sys.mk> # for HOST_SH
 
@@ -75,8 +75,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
 		-I${X11SRCDIR.xorg-server}/render \
 		-I${X11SRCDIR.xorg-server}/randr \
-		-I. \
-		-I${XSERVERINCDIR}
+		-I.
 
 CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
 		${X11FLAGS.DIX} \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
index 03f00001244a..a4cac6c3b154 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/06 07:16:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:05 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -13,8 +13,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	-DXFree86LOADER
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod
index cb0102bd9e05..4a71859f610a 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.dixmod,v 1.2 2008/08/09 07:22:21 rtr Exp $
+#	$NetBSD: Makefile.dixmod,v 1.3 2008/08/15 15:55:05 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -16,8 +16,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/dbe \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	${X11FLAGS.DIX} \
 		-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
index 291444e34357..4b4433be7703 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/09 05:40:34 rtr Exp $
+# $NetBSD: Makefile,v 1.5 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -24,7 +24,6 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR} \
 		-I${X11SRCDIR.xorg-server}/../include
 
 CPPFLAGS+=	${X11FLAGS.DIX} \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
index 160b21dc2386..c205d4e10edc 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/10 06:21:36 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules/extensions
 
@@ -22,8 +22,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${DESTDIR}${X11INCDIR}/X11/dri \
 		-I${DESTDIR}${X11INCDIR}/X11/drm \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT} \
 		-DXF86DRI \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile
index ad96079aabb3..c817c4ed839f 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/03 23:00:41 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 MKX11LOADABLE=no
 
@@ -25,8 +25,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/dummylib \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 COPTS.fatalerror.c+=	-Wno-error
 COPTS.xf86info.c+=	-Wno-error
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
index d47e542bf672..070185112cb4 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/05 04:50:18 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -18,8 +18,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-		-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR}
+		-I${X11SRCDIR.xorg-server}/include
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT} \
 		${X11FLAGS.DIX}
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
index fe9ebccdc065..d3f068fda58e 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/09 01:16:39 rtr Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 .include <bsd.sys.mk> # for HOST_SH
 
@@ -36,8 +36,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
 		-I${X11SRCDIR.xorg-server}/render \
 		-I${X11SRCDIR.xorg-server}/randr \
-		-I. \
-		-I${XSERVERINCDIR}
+		-I.
 
 CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
 		${X11FLAGS.DIX} \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
index 0927ab189606..6544c9d68085 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/05 05:58:52 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -27,8 +27,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/pixman-1
 
 .include <bsd.x11.mk>
 LIBDIR=	${XMODULEDIR}
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
index 667809a97acd..85f1d1cb9877 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/05 05:58:52 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -30,8 +30,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	${X11FLAGS.OS_DEFINES} -DDLOPEN_SUPPORT -DHAS_SHM \
 		-DIN_LOADER \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
index f8fa741b740a..d9b9670206f2 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/09 01:16:39 rtr Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 # XXX this one is installed in modular-xorg-server
 
@@ -27,8 +27,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
 		-I${X11SRCDIR.xorg-server}/rac \
-		-I. \
-		-I${XSERVERINCDIR}
+		-I.
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
index bd6ff546d646..e5a8ee1bb8b1 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/05 05:58:12 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/15 15:55:06 rtr Exp $
 
 #XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -16,8 +16,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	${X11FLAGS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci/Makefile
index e7d6834b185d..bb408ca9a68f 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/05 04:49:42 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:06 rtr Exp $
 
 # XXX this one is installed in modular-xorg-server
 
@@ -27,8 +27,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
 		-I${X11SRCDIR.xorg-server}/rac \
-		-I. \
-		-I${XSERVERINCDIR}
+		-I.
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
index 03a609b6b18d..4643daf14e4d 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -18,8 +18,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${X11SRCDIR.xorg-server}/render \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/X11/extensions
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
index 7b93413ffcad..15c2e685f5b2 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
@@ -1,8 +1,7 @@
-#	$NetBSD: Makefile.utils,v 1.4 2008/08/09 03:26:39 rtr Exp $
+#	$NetBSD: Makefile.utils,v 1.5 2008/08/15 15:55:06 rtr Exp $
 
 .include <bsd.own.mk>
 
-#XSERVERINCDIR!=	cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 #SCANPCIINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/bin/xf86cfg && ${PRINTOBJDIR}
 #XF86OBJDIR!=	cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xf86config && ${PRINTOBJDIR}
 #XLOADEROBJDIR!=	cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xloader && ${PRINTOBJDIR}
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
index 3677658eabe5..1e0f0e1e364f 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -19,8 +19,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
-		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
-		-I${XSERVERINCDIR}
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
index af7660c770f9..5729f36d54eb 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -22,8 +22,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
-		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
-		-I${XSERVERINCDIR}
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/x86emu/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/x86emu/Makefile
index 2c28bfc544de..3466cb05e252 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/x86emu/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/x86emu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:41 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -17,8 +17,7 @@ SRCS=	debug.c \
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	${X11FLAGS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
index 2f96134e4fa1..d61f00bca975 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -39,8 +39,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/include/extensions \
 		-I${X11SRCDIR.xorg-server}/mi \
-		-I${X11SRCDIR.xorg-server}/render \
-		-I${XSERVERINCDIR}
+		-I${X11SRCDIR.xorg-server}/render
 
 # XXX to find files lokoing for "../../../../hw/something"
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile
index 5d8b243047ab..50a65305fb95 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 06:14:33 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -65,8 +65,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/mfb \
                 -I${X11SRCDIR.xorg-server}/hw/xfree86 \
                 -I${DESTDIR}${X11INCDIR}/X11 \
                 -I${DESTDIR}${X11INCDIR}/pixman-1 \
-                -I${DESTDIR}${X11INCDIR}/xorg \
-                -I${XSERVERINCDIR}
+                -I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile
index 1ac24b786ec9..90aede1eebdd 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 06:14:33 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -59,8 +59,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	-DXF86VGA16 -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
index 7bf7cbb383ff..90d914a7837d 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/09 01:15:19 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -23,8 +23,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	${X11FLAGS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
index 6c90b270490c..65e1fb79588b 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 06:14:33 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -20,8 +20,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${XSERVERINCDIR}
+		-I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile
index fd0dc9ab3a72..73a13011d7f5 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 06:14:33 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -35,8 +35,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${X11SRCDIR.xorg-server}/Xext \
-		-I${XSERVERINCDIR}
+		-I${X11SRCDIR.xorg-server}/Xext
 
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
index a4c47e19943b..9b0233594f17 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/09 05:20:52 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:06 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -102,8 +102,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared \
-		-I${X11SRCDIR.xc}/extras/drm/shared \
-		-I${XSERVERINCDIR}
+		-I${X11SRCDIR.xc}/extras/drm/shared
 .if ${X11DRI} != "no"
 CPPFLAGS+=	${X11FLAGS.DRI}
 .endif
diff --git a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
index 09242a24d622..924551d690e2 100644
--- a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2008/08/09 06:50:17 rtr Exp $
+#	$NetBSD: Makefile,v 1.5 2008/08/15 15:55:06 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -23,7 +23,6 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${X11SRCDIR.xorg-server}/os \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
diff --git a/external/mit/xorg/server/xorg-server/mfb/Makefile.mfb b/external/mit/xorg/server/xorg-server/mfb/Makefile.mfb
index 74a2b2c1aad8..9d6f067096d2 100644
--- a/external/mit/xorg/server/xorg-server/mfb/Makefile.mfb
+++ b/external/mit/xorg/server/xorg-server/mfb/Makefile.mfb
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mfb,v 1.1 2008/08/02 20:41:29 mrg Exp $
+#	$NetBSD: Makefile.mfb,v 1.2 2008/08/15 15:55:06 rtr Exp $
 
 LIB=		mfb
 .PATH:		${X11SRCDIR.xorg-server}/mfb
@@ -20,7 +20,6 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/mfb \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/../include
diff --git a/external/mit/xorg/server/xorg-server/os/Makefile b/external/mit/xorg/server/xorg-server/os/Makefile
index aa4421cee34b..b9c4d172278b 100644
--- a/external/mit/xorg/server/xorg-server/os/Makefile
+++ b/external/mit/xorg/server/xorg-server/os/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/03 08:09:52 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2008/08/15 15:55:06 rtr Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -12,7 +12,6 @@ SRCS=	WaitFor.c access.c auth.c connection.c io.c mitauth.c \
 	rpcauth.c secauth.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
diff --git a/external/mit/xorg/server/xorg-server/xkb/Makefile b/external/mit/xorg/server/xorg-server/xkb/Makefile
index 8bd6f6a15b80..a396b8e2cf43 100644
--- a/external/mit/xorg/server/xorg-server/xkb/Makefile
+++ b/external/mit/xorg/server/xorg-server/xkb/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/03 03:55:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:07 rtr Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -21,7 +21,6 @@ X11SRCS=	XKBMisc.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c
 SRCS=		${DDXSRCS} ${DIXSRCS} ${XKBFILESRCS} ${X11SRCS}
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
-		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \