diff --git a/external/mit/xorg/server/xorg-server/Makefile b/external/mit/xorg/server/xorg-server/Makefile
index 075a12c60de0..04cf490c10b3 100644
--- a/external/mit/xorg/server/xorg-server/Makefile
+++ b/external/mit/xorg/server/xorg-server/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2016/08/12 01:15:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.24 2016/08/14 00:03:57 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -13,7 +13,7 @@ SUBDIR.xfont=
 SUBDIR=		doc include .WAIT
 SUBDIR+=	glx
 SUBDIR+=	dix fb mi Xext miext os randr render 
-SUBDIR+=	present dri3 pseudoramiX
+SUBDIR+=	present pseudoramiX
 SUBDIR+=	Xi xkb xkbstubs dbe record xfixes
 SUBDIR+=	damageext composite config .WAIT
 SUBDIR+=	hw
diff --git a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
index 742ea5aad2ea..ca78c220ef5a 100644
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xextbuiltin,v 1.6 2009/06/12 01:59:04 mrg Exp $
+#	$NetBSD: Makefile.Xextbuiltin,v 1.7 2016/08/14 00:03:57 mrg Exp $
 
 SRCS.Xextbuiltin=	bigreq.c geext.c shape.c sleepuntil.c \
 			sync.c xcmisc.c xtest.c
@@ -7,3 +7,4 @@ SRCS.Xextbuiltin+=	panoramiX.c panoramiXprocs.c panoramiXSwap.c
 SRCS.Xextbuiltin+=	xace.c
 SRCS.Xextbuiltin+=	security.c
 SRCS.Xextbuiltin+=	xf86bigfont.c
+SRCS.Xextbuiltin+=	hashtable.c
diff --git a/external/mit/xorg/server/xorg-server/Xi/Makefile b/external/mit/xorg/server/xorg-server/Xi/Makefile
index a74a80b3a3ea..970b4b0ec541 100644
--- a/external/mit/xorg/server/xorg-server/Xi/Makefile
+++ b/external/mit/xorg/server/xorg-server/Xi/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2016/08/11 08:32:42 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -33,7 +33,10 @@ SRCS=		allowev.c chgdctl.c chgfctl.c chgkbd.c chgkmap.c chgprop.c \
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
+		-I${DESTDIR}${X11INCDIR}/miext/damage \
 		-I${X11SRCDIR.xorg-server}/Xext \
+		-I${X11SRCDIR.xorg-server}/xfixes \
+		-I${X11SRCDIR.xorg-server}/Xi \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/dix/Makefile b/external/mit/xorg/server/xorg-server/dix/Makefile
index 8565762916dd..0195a01154cd 100644
--- a/external/mit/xorg/server/xorg-server/dix/Makefile
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2016/08/11 08:32:42 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -18,6 +18,7 @@ SRCS=		atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.c \
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/pixman-1
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/xorg
+CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/miext/sync
 CPPFLAGS+=	${X11FLAGS.PERVASIVE_EXTENSION}
 CPPFLAGS+=	${X11FLAGS.DIX} ${X11INCS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/doc/Makefile b/external/mit/xorg/server/xorg-server/doc/Makefile
index e77605b02a50..27ae3322f74c 100644
--- a/external/mit/xorg/server/xorg-server/doc/Makefile
+++ b/external/mit/xorg/server/xorg-server/doc/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.4 2011/08/02 07:41:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2016/08/14 00:03:58 mrg Exp $
 
 .include <bsd.own.mk>
 
 .include "../dix/Makefile.common"
 
 .PATH: ${X11SRCDIR.xorg-server}/doc
-.PATH: ${X11SRCDIR.xorg-server}/doc/man
+.PATH: ${X11SRCDIR.xorg-server}/man
 MAN=	Xserver.1
 X11EXTRAMANDEFS+=	-e 's%__default_font_path__%${X11DEFAULTFONTPATH:ts,:S/,/, /g}%g'
 
diff --git a/external/mit/xorg/server/xorg-server/dri3/Makefile b/external/mit/xorg/server/xorg-server/dri3/Makefile
index d890a128fcbc..ebf8ce402ece 100644
--- a/external/mit/xorg/server/xorg-server/dri3/Makefile
+++ b/external/mit/xorg/server/xorg-server/dri3/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2016/08/12 01:15:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -11,6 +11,7 @@ SRCS=           dri3.c \
 		dri3_screen.c
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/xorg \
+		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
index fdd031172c46..f28d6212b99d 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.13 2016/08/12 01:15:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -24,6 +24,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/os \
 		-I${X11SRCDIR.xorg-server}/Xext \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
@@ -79,7 +80,8 @@ LDADD+=	${LDADD.dix} \
 	-lpixman-1 \
 	-lXdmcp \
 	-lz \
-	-lm
+	-lm \
+	-lGL
 
 DPADD+=	${DPADD.dix} \
 	${DPADD.fb} \
@@ -108,7 +110,8 @@ DPADD+=	${DPADD.dix} \
 	${LIBPIXMAN1} \
 	${LIBXDMCP} \
 	${LIBZ} \
-	${LIBM}
+	${LIBM} \
+	${LIBGL}
 
 .if ${MKCRYPTO:Uno} != "no"
 LDADD+=	-lcrypto
diff --git a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
index ea62888485bc..b29f63e121ae 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.17 2016/08/12 01:15:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.18 2016/08/14 00:03:58 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -25,6 +25,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/os \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/../include \
diff --git a/external/mit/xorg/server/xorg-server/include/Makefile b/external/mit/xorg/server/xorg-server/include/Makefile
index ca9ae3ed39eb..b1d31661d068 100644
--- a/external/mit/xorg/server/xorg-server/include/Makefile
+++ b/external/mit/xorg/server/xorg-server/include/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.14 2016/08/12 01:15:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2016/08/14 00:03:58 mrg Exp $
 
 .include <bsd.own.mk>
 
 XORGSRC=	${X11SRCDIR.xorg-server}
 
-XORGINC_SUBDIR=	Xext composite dbe exa fb include mi \
-		miext/damage miext/shadow randr render xkb record
+XORGINC_SUBDIR=	Xext composite dbe dri3 exa fb include mi \
+		miext/damage miext/shadow present randr render xkb record
 XF86_SUBDIR=	common ddc dri fbdevhw i2c int10 modes \
 		os-support os-support/bus parser rac ramdac shadowfb \
 		vbe vgahw xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2
@@ -22,7 +22,6 @@ XF86_SUBDIR=	common ddc dri fbdevhw i2c int10 modes \
 
 INCSDIR=${X11INCDIR}/xorg
 INCS=	BT.h IBM.h TI.h XIstubs.h Xprintf.h \
-	bt829.h \
 	callback.h client.h closestr.h closure.h colormap.h \
 	colormapst.h compiler.h compositeext.h cursor.h cursorstr.h \
 	damage.h damagestr.h \
@@ -33,27 +32,29 @@ INCS=	BT.h IBM.h TI.h XIstubs.h Xprintf.h \
 	edid.h exa.h exevents.h \
 	eventconvert.h events.h eventstr.h list.h \
 	extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \
-	fbpict.h fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \
+	fbpict.h fbrop.h fourcc.h gc.h gcstruct.h geext.h globals.h \
 	glx_extinit.h glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \
 	mi.h micmap.h micoord.h \
 	migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
-	mistruct.h mizerarc.h msp3430.h opaque.h \
+	mistruct.h mizerarc.h opaque.h \
 	nonsdk_extinit.h optionstr.h \
 	os.h picture.h picturestr.h pixmap.h pixmapstr.h \
 	present.h presentext.h \
 	property.h protocol-versions.h \
 	propertyst.h randrstr.h region.h regionstr.h resource.h \
-	rgb.h sarea.h screenint.h scrnintstr.h selection.h servermd.h \
+	rgb.h sarea.h screenint.h scrnintstr.h \
+	securitysrv.h selection.h servermd.h \
 	shadow.h shadowfb.h shmint.h site.h \
-	tda8425.h tda9850.h \
-	tda9885.h uda1380.h validate.h vbe.h vbeModes.h vgaHW.h \
+	validate.h vbe.h vbeModes.h vgaHW.h \
 	window.h windowstr.h \
+	xaarop.h \
 	xkbDflts.h xkb.h set.h \
-	xf86.h xf86Crtc.h xf86Cursor.h xf86DDC.h \
-	xf86Modes.h xf86Module.h \
-	xf86Opt.h xf86Optrec.h xf86Parser.h xf86Pci.h xf86PciInfo.h \
+	xf86.h xf86platformBus.h \
+	xf86Crtc.h xf86Cursor.h xf86DDC.h \
+	xf86Modes.h xf86Module.h xf86Optionstr.h xf86Opt.h xf86Optrec.h \
+	xf86Parser.h xf86Pci.h xf86PciInfo.h \
 	xf86Priv.h xf86Privstr.h xf86RamDac.h xf86RandR12.h \
-	xf86Rename.h xf86Xinput.h xf86_OSlib.h \
+	xf86Xinput.h xf86_OSlib.h \
 	xf86_OSproc.h xf86cmap.h xf86fbman.h \
 	xf86i2c.h xf86int10.h xf86sbusBus.h xf86str.h xf86xv.h \
 	xkbstr.h xkbrules.h xserver-properties.h \
diff --git a/external/mit/xorg/server/xorg-server/mi/Makefile b/external/mit/xorg/server/xorg-server/mi/Makefile
index 425fb418044c..7f007db75aa0 100644
--- a/external/mit/xorg/server/xorg-server/mi/Makefile
+++ b/external/mit/xorg/server/xorg-server/mi/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2016/08/12 01:15:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -24,6 +24,9 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/../include \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/miext/damage \
 		-I${X11SRCDIR.xorg-server}/Xi \
+		-I${X11SRCDIR.xorg-server}/composite \
+		-I${X11SRCDIR.xorg-server}/damageext \
+		-I${X11SRCDIR.xorg-server}/xfixes \
 		-I${X11SRCDIR.xorg-server}/hw/xnest \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
diff --git a/external/mit/xorg/server/xorg-server/os/Makefile b/external/mit/xorg/server/xorg-server/os/Makefile
index 6b2dbaab5f76..d42f18f5d9d8 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.12 2016/08/12 01:15:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -10,7 +10,8 @@ SRCS=	WaitFor.c access.c auth.c backtrace.c client.c connection.c \
 	io.c mitauth.c \
 	oscolor.c osinit.c utils.c xdmauth.c \
 	xstrans.c xprintf.c log.c xdmcp.c \
-	rpcauth.c xprintf.c xsha1.c
+	rpcauth.c xsha1.c \
+	reallocarray.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
@@ -29,37 +30,12 @@ CPPFLAGS+=	${X11FLAGS.DIX} \
 		-DUSE_RGB_TXT \
 		-UDDXTIME \
 		-DHAVE_SHA1_IN_LIBC \
+		-DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
+		-DHAVE_STRCASESTR \
 		-DMONOTONIC_CLOCK
 
 .include "../Makefile.common"
 
-.if 0
-# XXX The XFree86 Xserver has its own GetTimeInMillis(), however if we are
-#     building XFree86 and Xmacppc or Xsun* we want both copies.  The copy
-#     here is linked into the non XFree86 server.
-#.if ${XSERVER_XFREE86} == "no" || \
-#    ${XSERVER_XMACPPC} != "no" || \
-#    ${XSERVER_XSUN} != "no"
-SRCS+=	GetTimeInMillis.c
-SRCS+=	ddxInitGlobals.c
-#.endif
-
-XDMCP_DEFINES=		-DXDMCP -DXDMCP_NO_IPV6
-
-CPPFLAGS.WaitFor.c=	${X11FLAGS.EXTENSION}
-CPPFLAGS.access.c=	${XDMCP_DEFINES} -DBSD44SOCKETS -DHAS_GETIFADDRS
-CPPFLAGS.auth.c=	${XDMCP_DEFINES} -DHAVE_ARC4RANDOM
-CPPFLAGS.connection.c=	${XDMCP_DEFINES} -DBSD44SOCKETS
-CPPFLAGS.io.c=		${X11FLAGS.EXTENSION}
-CPPFLAGS.lbxio.c=	${X11FLAGS.EXTENSION}
-CPPFLAGS.oscolor.c=	-DNDBM
-CPPFLAGS.osinit.c=	-DADMPATH=\"/var/log/X\%smsgs\"
-CPPFLAGS.transport.c=	-DBSD44SOCKETS
-CPPFLAGS.utils.c=	${XDMCP_DEFINES} ${X11FLAGS.EXTENSION}
-CPPFLAGS.xdmauth.c=	${XDMCP_DEFINES}
-CPPFLAGS.xdmcp.c=	${XDMCP_DEFINES} -DBSD44SOCKETS
-.endif
-
 COPTS.xdmauth.c=	-Wno-error	# XXX
 COPTS.xstrans.c=	-Wno-error	# XXX
 COPTS.access.c=		-Wno-error	# XXX bigreqstr.h
diff --git a/external/mit/xorg/server/xorg-server/present/Makefile b/external/mit/xorg/server/xorg-server/present/Makefile
index 7e84a4c70a4c..3e9a80cdec01 100644
--- a/external/mit/xorg/server/xorg-server/present/Makefile
+++ b/external/mit/xorg/server/xorg-server/present/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2016/08/12 01:15:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -15,6 +15,11 @@ SRCS=           present.c \
 		present_screen.c
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/xorg \
+		-I${DESTDIR}${X11INCDIR}/pixman-1 \
+		-I${X11SRCDIR.xorg-server}/Xext \
+		-I${X11SRCDIR.xorg-server}/miext/sync \
+		-I${X11SRCDIR.xorg-server}/xfixes \
+		-I${X11SRCDIR.xorg-server}/Xi \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile b/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile
index e50471e0bfdd..4b6130899baf 100644
--- a/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile
+++ b/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2016/08/12 01:15:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -9,6 +9,7 @@ LIB=            pseudoramiX
 SRCS=           pseudoramiX.c
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/xorg \
+		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
diff --git a/external/mit/xorg/server/xorg-server/xfixes/Makefile b/external/mit/xorg/server/xorg-server/xfixes/Makefile
index 9ae9c917838c..699b6163bf7f 100644
--- a/external/mit/xorg/server/xorg-server/xfixes/Makefile
+++ b/external/mit/xorg/server/xorg-server/xfixes/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/08/22 02:40:28 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2016/08/14 00:03:58 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -14,6 +14,10 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/fixes \
 		-I${X11SRCDIR.xorg-server}/render \
+		-I${X11SRCDIR.xorg-server}/miext/damage \
+		-I${X11SRCDIR.xorg-server}/Xi \
+		-I${X11SRCDIR.xorg-server}/xfixes \
+		-I${X11SRCDIR.xorg-server}/mi \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/../include
diff --git a/external/mit/xorg/server/xorg-server/xkb/Makefile b/external/mit/xorg/server/xorg-server/xkb/Makefile
index d12fe675c952..5ab2fabde7c6 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.9 2016/08/11 08:32:44 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2016/08/14 00:03:59 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -25,6 +25,8 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/Xi \
+		-I${X11SRCDIR.xorg-server}/miext/damage \
+		-I${X11SRCDIR.xorg-server}/render \
 		-I${X11SRCDIR.xorg-server}/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/../include
diff --git a/external/mit/xorg/server/xorg-server/xkbstubs/Makefile b/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
index b715fc91a785..d5f9241aa363 100644
--- a/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
+++ b/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/08/11 08:32:44 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2016/08/14 00:03:59 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -16,6 +16,8 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/mi \
+		-I${X11SRCDIR.xorg-server}/miext/damage \
+		-I${X11SRCDIR.xorg-server}/render \
 		-I${X11SRCDIR.xorg-server}/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/../include