diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 3257a20e1d13..78a12a91ee9b 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -22,8 +22,6 @@ CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xnest man/man1/Xnest.1.gz
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${STAGEDIR}${PREFIX}/bin/
 .if defined(WITH_NEW_XORG)
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 0d6babf32eb0..0f367c7c3c06 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -16,14 +16,12 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
 CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
-		--without-xmlto --disable-docs --disable-devel1-docs \
+		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xvfb man/man1/Xvfb.1.gz
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/vfb/Xvfb ${STAGEDIR}${PREFIX}/bin/
 .if defined(WITH_NEW_XORG)