Move the headers under include/X11/...

I kinda hate to do this, it was nice to have everything in one place.
However, the meson build wants to be able to wrap this module as a
dependency, and code that depends on these headers includes them in the
form:

    #include <X11/Xfuncproto.h>

As a result, any include path meson can construct needs to point to the
root of a hierarchy that has the same path layout as an installed copy,
hence this change.

Signed-off-by: Adam Jackson <ajax@redhat.com>

152 files changed, 158 insertions, 147 deletions

diff --git a/Makefile.am b/Makefile.am
index 5c220fb..9074747 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,24 @@
 applewmdir = $(includedir)/X11/extensions
 applewm_HEADERS = \
-        applewmconst.h \
-	applewmproto.h
+        include/X11/extensions/applewmconst.h \
+	include/X11/extensions/applewmproto.h
 
 applewmprotopkgconfigdir = $(datadir)/pkgconfig
 applewmprotopkgconfig_DATA = applewmproto.pc
 
 bigreqsdir = $(includedir)/X11/extensions
 bigreqs_HEADERS = \
-	bigreqsproto.h \
-	bigreqstr.h
+	include/X11/extensions/bigreqsproto.h \
+	include/X11/extensions/bigreqstr.h
 
 bigreqsprotopkgconfigdir = $(datadir)/pkgconfig
 bigreqsprotopkgconfig_DATA = bigreqsproto.pc
 
 if LEGACY
 XCalibrateincludedir = $(includedir)/X11/extensions
-XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h
+XCalibrateinclude_HEADERS = 
+	include/X11/extensions/xcalibrateproto.h \
+	include/X11/extensions/xcalibratewire.h
 
 calibrateprotopkgconfigdir = $(datadir)/pkgconfig
 calibrateprotopkgconfig_DATA = xcalibrateproto.pc
@@ -26,36 +28,39 @@ endif
 
 compositedir = $(includedir)/X11/extensions
 composite_HEADERS = \
-	composite.h \
-	compositeproto.h
+	include/X11/extensions/composite.h \
+	include/X11/extensions/compositeproto.h
 
 compositeprotopkgconfigdir = $(datadir)/pkgconfig
 compositeprotopkgconfig_DATA = compositeproto.pc
 
 damagedir = $(includedir)/X11/extensions
 damage_HEADERS = \
-	damageproto.h \
-	damagewire.h
+	include/X11/extensions/damageproto.h \
+	include/X11/extensions/damagewire.h
 
 damageprotopkgconfigdir = $(datadir)/pkgconfig
 damageprotopkgconfig_DATA = damageproto.pc
 
 dmxdir = $(includedir)/X11/extensions
 dmx_HEADERS = \
-	dmx.h \
-	dmxproto.h
+	include/X11/extensions/dmx.h \
+	include/X11/extensions/dmxproto.h
 
 dmxprotopkgconfigdir = $(datadir)/pkgconfig
 dmxprotopkgconfig_DATA = dmxproto.pc
 
 dri2dir = $(includedir)/X11/extensions
-dri2_HEADERS = dri2proto.h dri2tokens.h
+dri2_HEADERS = \
+	include/X11/extensions/dri2proto.h \
+	include/X11/extensions/dri2tokens.h
 
 dri2protopkgconfigdir = $(datadir)/pkgconfig
 dri2protopkgconfig_DATA = dri2proto.pc
 
 dri3dir = $(includedir)/X11/extensions
-dri3_HEADERS = dri3proto.h
+dri3_HEADERS = \
+	include/X11/extensions/dri3proto.h
 
 dri3protopkgconfigdir = $(datadir)/pkgconfig
 dri3protopkgconfig_DATA = dri3proto.pc
@@ -63,8 +68,8 @@ dri3protopkgconfig_DATA = dri3proto.pc
 if LEGACY
 eviedir = $(includedir)/X11/extensions
 evie_HEADERS = \
-	evieproto.h \
-	Xeviestr.h
+	include/X11/extensions/evieproto.h \
+	include/X11/extensions/Xeviestr.h
 
 evieprotopkgconfigdir = $(datadir)/pkgconfig
 evieprotopkgconfig_DATA = evieproto.pc
@@ -74,8 +79,8 @@ endif
 
 fixesdir = $(includedir)/X11/extensions
 fixes_HEADERS = \
-	xfixesproto.h \
-	xfixeswire.h
+	include/X11/extensions/xfixesproto.h \
+	include/X11/extensions/xfixeswire.h
 
 fixesprotopkgconfigdir = $(datadir)/pkgconfig
 fixesprotopkgconfig_DATA = fixesproto.pc
@@ -83,9 +88,9 @@ fixesprotopkgconfig_DATA = fixesproto.pc
 if LEGACY
 fontcachedir = $(includedir)/X11/extensions
 fontcache_HEADERS = \
-	fontcache.h \
-	fontcacheP.h \
-	fontcachstr.h
+	include/X11/extensions/fontcache.h \
+	include/X11/extensions/fontcacheP.h \
+	include/X11/extensions/fontcachstr.h
 
 fontcacheprotopkgconfigdir = $(datadir)/pkgconfig
 fontcacheprotopkgconfig_DATA = fontcacheproto.pc
@@ -95,12 +100,12 @@ endif
 
 fontsdir = $(includedir)/X11/fonts
 fonts_HEADERS = \
-	font.h \
-	fontproto.h \
-	fontstruct.h \
-	FS.h \
-	fsmasks.h \
-	FSproto.h
+	include/X11/fonts/font.h \
+	include/X11/fonts/fontproto.h \
+	include/X11/fonts/fontstruct.h \
+	include/X11/fonts/FS.h \
+	include/X11/fonts/fsmasks.h \
+	include/X11/fonts/FSproto.h
 
 fontsprotopkgconfigdir = $(datadir)/pkgconfig
 fontsprotopkgconfig_DATA = fontsproto.pc
@@ -123,28 +128,29 @@ glproto_EXTRA_DIST = meson.build
 
 inputdir = $(includedir)/X11/extensions
 input_HEADERS = \
-	XI.h \
-	XIproto.h \
-	XI2.h \
-	XI2proto.h
+	include/X11/extensions/XI.h \
+	include/X11/extensions/XIproto.h \
+	include/X11/extensions/XI2.h \
+	include/X11/extensions/XI2proto.h
 
 inputprotopkgconfigdir = $(datadir)/pkgconfig
 inputprotopkgconfig_DATA = inputproto.pc
 
 kbdir = $(includedir)/X11/extensions
 kb_HEADERS = \
-	XKBgeom.h \
-	XKB.h \
-	XKBproto.h \
-	XKBsrv.h \
-	XKBstr.h
+	include/X11/extensions/XKBgeom.h \
+	include/X11/extensions/XKB.h \
+	include/X11/extensions/XKBproto.h \
+	include/X11/extensions/XKBsrv.h \
+	include/X11/extensions/XKBstr.h
 
 kbprotopkgconfigdir = $(datadir)/pkgconfig
 kbprotopkgconfig_DATA = kbproto.pc
 
 if LEGACY
 lg3ddir = $(includedir)/X11/extensions
-lg3d_HEADERS = lgewire.h
+lg3d_HEADERS = \
+	include/X11/extensions/lgewire.h
 
 lg3dprotopkgconfigdir = $(datadir)/pkgconfig
 lg3dprotopkgconfig_DATA = lg3dproto.pc
@@ -154,8 +160,8 @@ endif
 
 xproxymngdir = $(includedir)/X11/PM
 xproxymng_HEADERS = \
-	PM.h \
-	PMproto.h
+	include/X11/PM/PM.h \
+	include/X11/PM/PMproto.h
 
 pmprotopkgconfigdir = $(datadir)/pkgconfig
 pmprotopkgconfig_DATA = xproxymngproto.pc
@@ -163,7 +169,9 @@ pmprotopkgconfig_DATA = xproxymngproto.pc
 pmproto_EXTRA_DIST = xproxymngproto.pc.in
 
 presentdir = $(includedir)/X11/extensions
-present_HEADERS = presentproto.h presenttokens.h
+present_HEADERS = \
+	include/X11/extensions/presentproto.h \
+	include/X11/extensions/presenttokens.h
 
 presentprotopkgconfigdir = $(datadir)/pkgconfig
 presentprotopkgconfig_DATA = presentproto.pc
@@ -171,8 +179,8 @@ presentprotopkgconfig_DATA = presentproto.pc
 if LEGACY
 printdir = $(includedir)/X11/extensions
 print_HEADERS = \
-	Print.h \
-	Printstr.h
+	include/X11/extensions/Print.h \
+	include/X11/extensions/Printstr.h
 
 printprotopkgconfigdir = $(datadir)/pkgconfig
 printprotopkgconfig_DATA = printproto.pc
@@ -215,53 +223,53 @@ endif
 
 randrdir = $(includedir)/X11/extensions
 randr_HEADERS = \
-	randr.h \
-	randrproto.h
+	include/X11/extensions/randr.h \
+	include/X11/extensions/randrproto.h
 
 randrprotopkgconfigdir = $(datadir)/pkgconfig
 randrprotopkgconfig_DATA = randrproto.pc
 
 recorddir = $(includedir)/X11/extensions
 record_HEADERS = \
-	recordconst.h \
-	recordproto.h \
-	recordstr.h
+	include/X11/extensions/recordconst.h \
+	include/X11/extensions/recordproto.h \
+	include/X11/extensions/recordstr.h
 
 recordprotopkgconfigdir = $(datadir)/pkgconfig
 recordprotopkgconfig_DATA = recordproto.pc
 
 renderdir = $(includedir)/X11/extensions
 render_HEADERS = \
-	render.h \
-	renderproto.h
+	include/X11/extensions/render.h \
+	include/X11/extensions/renderproto.h
 
 renderprotopkgconfigdir = $(datadir)/pkgconfig
 renderprotopkgconfig_DATA = renderproto.pc
 
 resourcedir = $(includedir)/X11/extensions
 resource_HEADERS = \
-	XResproto.h
+	include/X11/extensions/XResproto.h
 
 resourceprotopkgconfigdir = $(datadir)/pkgconfig
 resourceprotopkgconfig_DATA = resourceproto.pc
 
 scrnsaverdir = $(includedir)/X11/extensions
 scrnsaver_HEADERS = \
-	saver.h \
-	saverproto.h
+	include/X11/extensions/saver.h \
+	include/X11/extensions/saverproto.h
 
 scrnsaverprotopkgconfigdir = $(datadir)/pkgconfig
 scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc
 
 trapdir = $(includedir)/X11/extensions
 trap_HEADERS = \
-	xtrapbits.h \
-	xtrapddmi.h \
-	xtrapdi.h \
-	xtrapemacros.h \
-	xtraplib.h \
-	xtraplibp.h \
-	xtrapproto.h
+	include/X11/extensions/xtrapbits.h \
+	include/X11/extensions/xtrapddmi.h \
+	include/X11/extensions/xtrapdi.h \
+	include/X11/extensions/xtrapemacros.h \
+	include/X11/extensions/xtraplib.h \
+	include/X11/extensions/xtraplibp.h \
+	include/X11/extensions/xtrapproto.h
 
 trapprotopkgconfigdir = $(datadir)/pkgconfig
 trapprotopkgconfig_DATA = trapproto.pc
@@ -270,139 +278,142 @@ trapproto_EXTRA_DIST = trapproto.pc.in
 
 videodir = $(includedir)/X11/extensions
 video_HEADERS = \
-	vldXvMC.h \
-	Xv.h \
-	XvMC.h \
-	XvMCproto.h \
-	Xvproto.h
+	include/X11/extensions/vldXvMC.h \
+	include/X11/extensions/Xv.h \
+	include/X11/extensions/XvMC.h \
+	include/X11/extensions/XvMCproto.h \
+	include/X11/extensions/Xvproto.h
 
 videoprotopkgconfigdir = $(datadir)/pkgconfig
 videoprotopkgconfig_DATA = videoproto.pc
 
 windowswmdir = $(includedir)/X11/extensions
 windowswm_HEADERS = \
-        windowswm.h \
-	windowswmstr.h
+        include/X11/extensions/windowswm.h \
+	include/X11/extensions/windowswmstr.h
 
 windowswmprotopkgconfigdir = $(datadir)/pkgconfig
 windowswmprotopkgconfig_DATA = windowswmproto.pc
 
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
-	ap_keysym.h \
-	DECkeysym.h \
-	HPkeysym.h \
-	keysymdef.h \
-	keysym.h \
-	Sunkeysym.h \
-	Xalloca.h \
-	Xarch.h \
-	Xatom.h \
-	Xdefs.h \
-	XF86keysym.h \
-	Xfuncs.h \
-	X.h \
-	Xmd.h \
-	Xosdefs.h \
-	Xos.h \
-	Xos_r.h \
-	Xproto.h \
-	Xprotostr.h \
-	Xthreads.h \
-	Xw32defs.h \
-	XWDFile.h \
-	Xwindows.h \
-	Xwinsock.h
+	include/X11/ap_keysym.h \
+	include/X11/DECkeysym.h \
+	include/X11/HPkeysym.h \
+	include/X11/keysymdef.h \
+	include/X11/keysym.h \
+	include/X11/Sunkeysym.h \
+	include/X11/Xalloca.h \
+	include/X11/Xarch.h \
+	include/X11/Xatom.h \
+	include/X11/Xdefs.h \
+	include/X11/XF86keysym.h \
+	include/X11/Xfuncs.h \
+	include/X11/X.h \
+	include/X11/Xmd.h \
+	include/X11/Xosdefs.h \
+	include/X11/Xos.h \
+	include/X11/Xos_r.h \
+	include/X11/Xproto.h \
+	include/X11/Xprotostr.h \
+	include/X11/Xthreads.h \
+	include/X11/Xw32defs.h \
+	include/X11/XWDFile.h \
+	include/X11/Xwindows.h \
+	include/X11/Xwinsock.h
 
 nodist_xproto_HEADERS = \
-	Xfuncproto.h \
-	Xpoll.h
+	include/X11/Xfuncproto.h \
+	include/X11/Xpoll.h
 
 x11protopkgconfigdir = $(datadir)/pkgconfig
 x11protopkgconfig_DATA = xproto.pc
 
 xcmiscdir = $(includedir)/X11/extensions
 xcmisc_HEADERS = \
-	xcmiscproto.h \
-	xcmiscstr.h
+	include/X11/extensions/xcmiscproto.h \
+	include/X11/extensions/xcmiscstr.h
 
 xcmiscprotopkgconfigdir = $(datadir)/pkgconfig
 xcmiscprotopkgconfig_DATA = xcmiscproto.pc
 
 xextdir = $(includedir)/X11/extensions
 xext_HEADERS = \
-	dpmsconst.h \
-	dpmsproto.h \
-        ge.h \
-        geproto.h \
-	lbx.h \
-	lbxproto.h \
-	mitmiscconst.h \
-	mitmiscproto.h \
-	multibufconst.h \
-	multibufproto.h \
-	secur.h \
-	securproto.h \
-	shapeconst.h \
-	shapeproto.h \
-	shm.h \
-	shmproto.h \
-	syncconst.h \
-	syncproto.h \
-	ag.h \
-	agproto.h \
-	cup.h \
-	cupproto.h \
-	dbe.h \
-	dbeproto.h \
-	EVI.h \
-	EVIproto.h \
-	xtestext1proto.h \
-	xtestext1const.h \
-	xtestconst.h \
-	xtestproto.h
+	include/X11/extensions/dpmsconst.h \
+	include/X11/extensions/dpmsproto.h \
+        include/X11/extensions/ge.h \
+        include/X11/extensions/geproto.h \
+	include/X11/extensions/lbx.h \
+	include/X11/extensions/lbxproto.h \
+	include/X11/extensions/mitmiscconst.h \
+	include/X11/extensions/mitmiscproto.h \
+	include/X11/extensions/multibufconst.h \
+	include/X11/extensions/multibufproto.h \
+	include/X11/extensions/secur.h \
+	include/X11/extensions/securproto.h \
+	include/X11/extensions/shapeconst.h \
+	include/X11/extensions/shapeproto.h \
+	include/X11/extensions/shm.h \
+	include/X11/extensions/shmproto.h \
+	include/X11/extensions/syncconst.h \
+	include/X11/extensions/syncproto.h \
+	include/X11/extensions/ag.h \
+	include/X11/extensions/agproto.h \
+	include/X11/extensions/cup.h \
+	include/X11/extensions/cupproto.h \
+	include/X11/extensions/dbe.h \
+	include/X11/extensions/dbeproto.h \
+	include/X11/extensions/EVI.h \
+	include/X11/extensions/EVIproto.h \
+	include/X11/extensions/xtestext1proto.h \
+	include/X11/extensions/xtestext1const.h \
+	include/X11/extensions/xtestconst.h \
+	include/X11/extensions/xtestproto.h
 
 compatdir = $(xextdir)
 compat_HEADERS = \
-	shapestr.h \
-	shmstr.h \
-	syncstr.h
+	include/X11/extensions/shapestr.h \
+	include/X11/extensions/shmstr.h \
+	include/X11/extensions/syncstr.h
 
 xextprotopkgconfigdir = $(datadir)/pkgconfig
 xextprotopkgconfig_DATA = xextproto.pc
 
 xf86bigfontdir = $(includedir)/X11/extensions
 xf86bigfont_HEADERS = \
-	xf86bigfont.h \
-	xf86bigfproto.h \
-	xf86bigfstr.h
+	include/X11/extensions/xf86bigfont.h \
+	include/X11/extensions/xf86bigfproto.h \
+	include/X11/extensions/xf86bigfstr.h
 
 xf86bigfontprotopkgconfigdir = $(datadir)/pkgconfig
 xf86bigfontprotopkgconfig_DATA = xf86bigfontproto.pc
 
 xf86dgadir = $(includedir)/X11/extensions
 xf86dga_HEADERS = \
-	xf86dga.h \
-	xf86dga1const.h \
-	xf86dga1str.h \
-	xf86dga1proto.h \
-	xf86dgaconst.h \
-	xf86dgaproto.h \
-	xf86dgastr.h
+	include/X11/extensions/xf86dga.h \
+	include/X11/extensions/xf86dga1const.h \
+	include/X11/extensions/xf86dga1str.h \
+	include/X11/extensions/xf86dga1proto.h \
+	include/X11/extensions/xf86dgaconst.h \
+	include/X11/extensions/xf86dgaproto.h \
+	include/X11/extensions/xf86dgastr.h
 
 xf86dgaprotopkgconfigdir = $(datadir)/pkgconfig
 xf86dgaprotopkgconfig_DATA = xf86dgaproto.pc
 
 xf86dridir = $(includedir)/X11/dri
-xf86dri_HEADERS = xf86dri.h xf86dristr.h xf86driproto.h
+xf86dri_HEADERS = \
+	include/X11/dri/xf86dri.h \
+	include/X11/dri/xf86dristr.h \
+	include/X11/dri/xf86driproto.h
 
 xf86driprotopkgconfigdir = $(datadir)/pkgconfig
 xf86driprotopkgconfig_DATA = xf86driproto.pc
 
 xf86miscdir = $(includedir)/X11/extensions
 xf86misc_HEADERS = \
-	xf86misc.h \
-	xf86mscstr.h
+	include/X11/extensions/xf86misc.h \
+	include/X11/extensions/xf86mscstr.h
 
 xf86miscprotopkgconfigdir = $(datadir)/pkgconfig
 xf86miscprotopkgconfig_DATA = xf86miscproto.pc
@@ -412,8 +423,8 @@ xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in
 if LEGACY
 xf86rushdir = $(includedir)/X11/extensions
 xf86rush_HEADERS = \
-	xf86rush.h \
-	xf86rushstr.h
+	include/X11/extensions/xf86rush.h \
+	include/X11/extensions/xf86rushstr.h
 
 xf86rushprotopkgconfigdir = $(datadir)/pkgconfig
 xf86rushprotopkgconfig_DATA = xf86rushproto.pc
@@ -423,16 +434,16 @@ endif
 
 xf86vidmodedir = $(includedir)/X11/extensions
 xf86vidmode_HEADERS = \
-	xf86vm.h \
-	xf86vmproto.h \
-	xf86vmstr.h
+	include/X11/extensions/xf86vm.h \
+	include/X11/extensions/xf86vmproto.h \
+	include/X11/extensions/xf86vmstr.h
 
 xf86vidmodeprotopkgconfigdir = $(datadir)/pkgconfig
 xf86vidmodeprotopkgconfig_DATA = xf86vidmodeproto.pc
 
 xineramadir = $(includedir)/X11/extensions
 xinerama_HEADERS = \
-	panoramiXproto.h
+	include/X11/extensions/panoramiXproto.h
 
 xineramaprotopkgconfigdir = $(datadir)/pkgconfig
 xineramaprotopkgconfig_DATA = xineramaproto.pc
diff --git a/configure.ac b/configure.ac
index 44b0a40..4c2db89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ XORG_WITH_XSLTPROC
 XORG_CHECK_SGML_DOCTOOLS(1.8)
 
 AC_CONFIG_HEADERS([do-not-use-config.h])
-AC_CONFIG_HEADERS([Xfuncproto.h])
+AC_CONFIG_HEADERS([include/X11/Xfuncproto.h])
 
 AC_CANONICAL_HOST
 
@@ -247,6 +247,7 @@ AC_CONFIG_FILES([applewmproto.pc
 		 fontcacheproto.pc
 		 fontsproto.pc
 		 glproto.pc
+		 include/X11/Xpoll.h
 		 inputproto.pc
 		 kbproto.pc
 		 lg3dproto.pc
@@ -271,7 +272,6 @@ AC_CONFIG_FILES([applewmproto.pc
 		 xf86rushproto.pc
 		 xf86vidmodeproto.pc
 		 xineramaproto.pc
-		 Xpoll.h
 		 xproto.pc
 		 xproxymngproto.pc])
 		 
diff --git a/DECkeysym.h b/include/X11/DECkeysym.h
index 0730716..0730716 100644
--- a/DECkeysym.h
+++ b/include/X11/DECkeysym.h
diff --git a/HPkeysym.h b/include/X11/HPkeysym.h
index 4a0655a..4a0655a 100644
--- a/HPkeysym.h
+++ b/include/X11/HPkeysym.h
diff --git a/PM.h b/include/X11/PM/PM.h
index c96644c..c96644c 100644
--- a/PM.h
+++ b/include/X11/PM/PM.h
diff --git a/PMproto.h b/include/X11/PM/PMproto.h
index 754e460..754e460 100644
--- a/PMproto.h
+++ b/include/X11/PM/PMproto.h
diff --git a/Sunkeysym.h b/include/X11/Sunkeysym.h
index 78d1286..78d1286 100644
--- a/Sunkeysym.h
+++ b/include/X11/Sunkeysym.h
diff --git a/X.h b/include/X11/X.h
index 5cf695d..5cf695d 100644
--- a/X.h
+++ b/include/X11/X.h
diff --git a/XF86keysym.h b/include/X11/XF86keysym.h
index c0d12c1..c0d12c1 100644
--- a/XF86keysym.h
+++ b/include/X11/XF86keysym.h
diff --git a/XWDFile.h b/include/X11/XWDFile.h
index 50e17df..50e17df 100644
--- a/XWDFile.h
+++ b/include/X11/XWDFile.h
diff --git a/Xalloca.h b/include/X11/Xalloca.h
index 1919884..1919884 100644
--- a/Xalloca.h
+++ b/include/X11/Xalloca.h
diff --git a/Xarch.h b/include/X11/Xarch.h
index f80c580..f80c580 100644
--- a/Xarch.h
+++ b/include/X11/Xarch.h
diff --git a/Xatom.h b/include/X11/Xatom.h
index 485a423..485a423 100644
--- a/Xatom.h
+++ b/include/X11/Xatom.h
diff --git a/Xdefs.h b/include/X11/Xdefs.h
index e25a208..e25a208 100644
--- a/Xdefs.h
+++ b/include/X11/Xdefs.h
diff --git a/Xfuncproto.h.in b/include/X11/Xfuncproto.h.in
index b88493d..b88493d 100644
--- a/Xfuncproto.h.in
+++ b/include/X11/Xfuncproto.h.in
diff --git a/Xfuncs.h b/include/X11/Xfuncs.h
index b7c4029..b7c4029 100644
--- a/Xfuncs.h
+++ b/include/X11/Xfuncs.h
diff --git a/Xmd.h b/include/X11/Xmd.h
index 492465e..492465e 100644
--- a/Xmd.h
+++ b/include/X11/Xmd.h
diff --git a/Xos.h b/include/X11/Xos.h
index 28dfc67..28dfc67 100644
--- a/Xos.h
+++ b/include/X11/Xos.h
diff --git a/Xos_r.h b/include/X11/Xos_r.h
index f963b64..f963b64 100644
--- a/Xos_r.h
+++ b/include/X11/Xos_r.h
diff --git a/Xosdefs.h b/include/X11/Xosdefs.h
index 33eaee4..33eaee4 100644
--- a/Xosdefs.h
+++ b/include/X11/Xosdefs.h
diff --git a/Xpoll.h.in b/include/X11/Xpoll.h.in
index 9f127e1..9f127e1 100644
--- a/Xpoll.h.in
+++ b/include/X11/Xpoll.h.in
diff --git a/Xproto.h b/include/X11/Xproto.h
index 6cdea89..6cdea89 100644
--- a/Xproto.h
+++ b/include/X11/Xproto.h
diff --git a/Xprotostr.h b/include/X11/Xprotostr.h
index a9e854d..a9e854d 100644
--- a/Xprotostr.h
+++ b/include/X11/Xprotostr.h
diff --git a/Xthreads.h b/include/X11/Xthreads.h
index 2027127..2027127 100644
--- a/Xthreads.h
+++ b/include/X11/Xthreads.h
diff --git a/Xw32defs.h b/include/X11/Xw32defs.h
index b2e4b33..b2e4b33 100644
--- a/Xw32defs.h
+++ b/include/X11/Xw32defs.h
diff --git a/Xwindows.h b/include/X11/Xwindows.h
index 70e1deb..70e1deb 100644
--- a/Xwindows.h
+++ b/include/X11/Xwindows.h
diff --git a/Xwinsock.h b/include/X11/Xwinsock.h
index a81dd7a..a81dd7a 100644
--- a/Xwinsock.h
+++ b/include/X11/Xwinsock.h
diff --git a/ap_keysym.h b/include/X11/ap_keysym.h
index 9a11971..9a11971 100644
--- a/ap_keysym.h
+++ b/include/X11/ap_keysym.h
diff --git a/xf86dri.h b/include/X11/dri/xf86dri.h
index 00fb8ba..00fb8ba 100644
--- a/xf86dri.h
+++ b/include/X11/dri/xf86dri.h
diff --git a/xf86driproto.h b/include/X11/dri/xf86driproto.h
index 4b71469..4b71469 100644
--- a/xf86driproto.h
+++ b/include/X11/dri/xf86driproto.h
diff --git a/xf86dristr.h b/include/X11/dri/xf86dristr.h
index 048491e..048491e 100644
--- a/xf86dristr.h
+++ b/include/X11/dri/xf86dristr.h
diff --git a/EVI.h b/include/X11/extensions/EVI.h
index 7f3f733..7f3f733 100644
--- a/EVI.h
+++ b/include/X11/extensions/EVI.h
diff --git a/EVIproto.h b/include/X11/extensions/EVIproto.h
index afa282a..afa282a 100644
--- a/EVIproto.h
+++ b/include/X11/extensions/EVIproto.h
diff --git a/Print.h b/include/X11/extensions/Print.h
index 266069a..266069a 100644
--- a/Print.h
+++ b/include/X11/extensions/Print.h
diff --git a/Printstr.h b/include/X11/extensions/Printstr.h
index 1d763c6..1d763c6 100644
--- a/Printstr.h
+++ b/include/X11/extensions/Printstr.h
diff --git a/XI.h b/include/X11/extensions/XI.h
index 7b44399..7b44399 100644
--- a/XI.h
+++ b/include/X11/extensions/XI.h
diff --git a/XI2.h b/include/X11/extensions/XI2.h
index 5a1c66a..5a1c66a 100644
--- a/XI2.h
+++ b/include/X11/extensions/XI2.h
diff --git a/XI2proto.h b/include/X11/extensions/XI2proto.h
index 4cdaa0d..4cdaa0d 100644
--- a/XI2proto.h
+++ b/include/X11/extensions/XI2proto.h
diff --git a/XIproto.h b/include/X11/extensions/XIproto.h
index 82323d8..82323d8 100644
--- a/XIproto.h
+++ b/include/X11/extensions/XIproto.h
diff --git a/XKB.h b/include/X11/extensions/XKB.h
index ee4f740..ee4f740 100644
--- a/XKB.h
+++ b/include/X11/extensions/XKB.h
diff --git a/XKBgeom.h b/include/X11/extensions/XKBgeom.h
index cef78fa..cef78fa 100644
--- a/XKBgeom.h
+++ b/include/X11/extensions/XKBgeom.h
diff --git a/XKBproto.h b/include/X11/extensions/XKBproto.h
index b867659..b867659 100644
--- a/XKBproto.h
+++ b/include/X11/extensions/XKBproto.h
diff --git a/XKBsrv.h b/include/X11/extensions/XKBsrv.h
index be7e978..be7e978 100644
--- a/XKBsrv.h
+++ b/include/X11/extensions/XKBsrv.h
diff --git a/XKBstr.h b/include/X11/extensions/XKBstr.h
index 893a04b..893a04b 100644
--- a/XKBstr.h
+++ b/include/X11/extensions/XKBstr.h
diff --git a/XResproto.h b/include/X11/extensions/XResproto.h
index d7e20b1..d7e20b1 100644
--- a/XResproto.h
+++ b/include/X11/extensions/XResproto.h
diff --git a/Xeviestr.h b/include/X11/extensions/Xeviestr.h
index 78871f1..78871f1 100644
--- a/Xeviestr.h
+++ b/include/X11/extensions/Xeviestr.h
diff --git a/Xv.h b/include/X11/extensions/Xv.h
index f662df6..f662df6 100644
--- a/Xv.h
+++ b/include/X11/extensions/Xv.h
diff --git a/XvMC.h b/include/X11/extensions/XvMC.h
index 47cc6db..47cc6db 100644
--- a/XvMC.h
+++ b/include/X11/extensions/XvMC.h
diff --git a/XvMCproto.h b/include/X11/extensions/XvMCproto.h
index 43ec688..43ec688 100644
--- a/XvMCproto.h
+++ b/include/X11/extensions/XvMCproto.h
diff --git a/Xvproto.h b/include/X11/extensions/Xvproto.h
index 94bd9cc..94bd9cc 100644
--- a/Xvproto.h
+++ b/include/X11/extensions/Xvproto.h
diff --git a/ag.h b/include/X11/extensions/ag.h
index be5883a..be5883a 100644
--- a/ag.h
+++ b/include/X11/extensions/ag.h
diff --git a/agproto.h b/include/X11/extensions/agproto.h
index 1086661..1086661 100644
--- a/agproto.h
+++ b/include/X11/extensions/agproto.h
diff --git a/applewmconst.h b/include/X11/extensions/applewmconst.h
index 4877c34..4877c34 100644
--- a/applewmconst.h
+++ b/include/X11/extensions/applewmconst.h
diff --git a/applewmproto.h b/include/X11/extensions/applewmproto.h
index d8be4e6..d8be4e6 100644
--- a/applewmproto.h
+++ b/include/X11/extensions/applewmproto.h
diff --git a/bigreqsproto.h b/include/X11/extensions/bigreqsproto.h
index bd0f8e5..bd0f8e5 100644
--- a/bigreqsproto.h
+++ b/include/X11/extensions/bigreqsproto.h
diff --git a/bigreqstr.h b/include/X11/extensions/bigreqstr.h
index 0a023db..0a023db 100644
--- a/bigreqstr.h
+++ b/include/X11/extensions/bigreqstr.h
diff --git a/composite.h b/include/X11/extensions/composite.h
index e460118..e460118 100644
--- a/composite.h
+++ b/include/X11/extensions/composite.h
diff --git a/compositeproto.h b/include/X11/extensions/compositeproto.h
index 0417f2c..0417f2c 100644
--- a/compositeproto.h
+++ b/include/X11/extensions/compositeproto.h
diff --git a/cup.h b/include/X11/extensions/cup.h
index cbbc34b..cbbc34b 100644
--- a/cup.h
+++ b/include/X11/extensions/cup.h
diff --git a/cupproto.h b/include/X11/extensions/cupproto.h
index f61c9f0..f61c9f0 100644
--- a/cupproto.h
+++ b/include/X11/extensions/cupproto.h
diff --git a/damageproto.h b/include/X11/extensions/damageproto.h
index 107e192..107e192 100644
--- a/damageproto.h
+++ b/include/X11/extensions/damageproto.h
diff --git a/damagewire.h b/include/X11/extensions/damagewire.h
index d90a0dd..d90a0dd 100644
--- a/damagewire.h
+++ b/include/X11/extensions/damagewire.h
diff --git a/dbe.h b/include/X11/extensions/dbe.h
index 7968552..7968552 100644
--- a/dbe.h
+++ b/include/X11/extensions/dbe.h
diff --git a/dbeproto.h b/include/X11/extensions/dbeproto.h
index 784926e..784926e 100644
--- a/dbeproto.h
+++ b/include/X11/extensions/dbeproto.h
diff --git a/dmx.h b/include/X11/extensions/dmx.h
index 8cbd4d3..8cbd4d3 100644
--- a/dmx.h
+++ b/include/X11/extensions/dmx.h
diff --git a/dmxproto.h b/include/X11/extensions/dmxproto.h
index 4bb160e..4bb160e 100644
--- a/dmxproto.h
+++ b/include/X11/extensions/dmxproto.h
diff --git a/dpmsconst.h b/include/X11/extensions/dpmsconst.h
index 75f0586..75f0586 100644
--- a/dpmsconst.h
+++ b/include/X11/extensions/dpmsconst.h
diff --git a/dpmsproto.h b/include/X11/extensions/dpmsproto.h
index 63fd3fc..63fd3fc 100644
--- a/dpmsproto.h
+++ b/include/X11/extensions/dpmsproto.h
diff --git a/dri2proto.h b/include/X11/extensions/dri2proto.h
index 128b807..128b807 100644
--- a/dri2proto.h
+++ b/include/X11/extensions/dri2proto.h
diff --git a/dri2tokens.h b/include/X11/extensions/dri2tokens.h
index bdca866..bdca866 100644
--- a/dri2tokens.h
+++ b/include/X11/extensions/dri2tokens.h
diff --git a/dri3proto.h b/include/X11/extensions/dri3proto.h
index ceddee8..ceddee8 100644
--- a/dri3proto.h
+++ b/include/X11/extensions/dri3proto.h
diff --git a/evieproto.h b/include/X11/extensions/evieproto.h
index 649c91a..649c91a 100644
--- a/evieproto.h
+++ b/include/X11/extensions/evieproto.h
diff --git a/fontcache.h b/include/X11/extensions/fontcache.h
index b767db1..b767db1 100644
--- a/fontcache.h
+++ b/include/X11/extensions/fontcache.h
diff --git a/fontcacheP.h b/include/X11/extensions/fontcacheP.h
index 75677f3..75677f3 100644
--- a/fontcacheP.h
+++ b/include/X11/extensions/fontcacheP.h
diff --git a/fontcachstr.h b/include/X11/extensions/fontcachstr.h
index eab704e..eab704e 100644
--- a/fontcachstr.h
+++ b/include/X11/extensions/fontcachstr.h
diff --git a/ge.h b/include/X11/extensions/ge.h
index aca1d8a..aca1d8a 100644
--- a/ge.h
+++ b/include/X11/extensions/ge.h
diff --git a/geproto.h b/include/X11/extensions/geproto.h
index c8860dd..c8860dd 100644
--- a/geproto.h
+++ b/include/X11/extensions/geproto.h
diff --git a/lbx.h b/include/X11/extensions/lbx.h
index ecd24ff..ecd24ff 100644
--- a/lbx.h
+++ b/include/X11/extensions/lbx.h
diff --git a/lbxproto.h b/include/X11/extensions/lbxproto.h
index a1ae62b..a1ae62b 100644
--- a/lbxproto.h
+++ b/include/X11/extensions/lbxproto.h
diff --git a/lgewire.h b/include/X11/extensions/lgewire.h
index 75ec0a4..75ec0a4 100644
--- a/lgewire.h
+++ b/include/X11/extensions/lgewire.h
diff --git a/mitmiscconst.h b/include/X11/extensions/mitmiscconst.h
index adc5f94..adc5f94 100644
--- a/mitmiscconst.h
+++ b/include/X11/extensions/mitmiscconst.h
diff --git a/mitmiscproto.h b/include/X11/extensions/mitmiscproto.h
index 18c202a..18c202a 100644
--- a/mitmiscproto.h
+++ b/include/X11/extensions/mitmiscproto.h
diff --git a/multibufconst.h b/include/X11/extensions/multibufconst.h
index 2d1238c..2d1238c 100644
--- a/multibufconst.h
+++ b/include/X11/extensions/multibufconst.h
diff --git a/multibufproto.h b/include/X11/extensions/multibufproto.h
index e2184d3..e2184d3 100644
--- a/multibufproto.h
+++ b/include/X11/extensions/multibufproto.h
diff --git a/panoramiXproto.h b/include/X11/extensions/panoramiXproto.h
index 6fd1a02..6fd1a02 100644
--- a/panoramiXproto.h
+++ b/include/X11/extensions/panoramiXproto.h
diff --git a/presentproto.h b/include/X11/extensions/presentproto.h
index 08ddc05..08ddc05 100644
--- a/presentproto.h
+++ b/include/X11/extensions/presentproto.h
diff --git a/presenttokens.h b/include/X11/extensions/presenttokens.h
index acb7576..acb7576 100644
--- a/presenttokens.h
+++ b/include/X11/extensions/presenttokens.h
diff --git a/randr.h b/include/X11/extensions/randr.h
index 6fcda87..6fcda87 100644
--- a/randr.h
+++ b/include/X11/extensions/randr.h
diff --git a/randrproto.h b/include/X11/extensions/randrproto.h
index 48be7aa..48be7aa 100644
--- a/randrproto.h
+++ b/include/X11/extensions/randrproto.h
diff --git a/recordconst.h b/include/X11/extensions/recordconst.h
index 4819de7..4819de7 100644
--- a/recordconst.h
+++ b/include/X11/extensions/recordconst.h
diff --git a/recordproto.h b/include/X11/extensions/recordproto.h
index 01bc952..01bc952 100644
--- a/recordproto.h
+++ b/include/X11/extensions/recordproto.h
diff --git a/recordstr.h b/include/X11/extensions/recordstr.h
index 7f269b7..7f269b7 100644
--- a/recordstr.h
+++ b/include/X11/extensions/recordstr.h
diff --git a/render.h b/include/X11/extensions/render.h
index 7ecde3f..7ecde3f 100644
--- a/render.h
+++ b/include/X11/extensions/render.h
diff --git a/renderproto.h b/include/X11/extensions/renderproto.h
index b7b72c1..b7b72c1 100644
--- a/renderproto.h
+++ b/include/X11/extensions/renderproto.h
diff --git a/saver.h b/include/X11/extensions/saver.h
index e8da625..e8da625 100644
--- a/saver.h
+++ b/include/X11/extensions/saver.h
diff --git a/saverproto.h b/include/X11/extensions/saverproto.h
index 7197084..7197084 100644
--- a/saverproto.h
+++ b/include/X11/extensions/saverproto.h
diff --git a/secur.h b/include/X11/extensions/secur.h
index ca27b29..ca27b29 100644
--- a/secur.h
+++ b/include/X11/extensions/secur.h
diff --git a/securproto.h b/include/X11/extensions/securproto.h
index 409a4c5..409a4c5 100644
--- a/securproto.h
+++ b/include/X11/extensions/securproto.h
diff --git a/shapeconst.h b/include/X11/extensions/shapeconst.h
index 9088956..9088956 100644
--- a/shapeconst.h
+++ b/include/X11/extensions/shapeconst.h
diff --git a/shapeproto.h b/include/X11/extensions/shapeproto.h
index 49bd1a1..49bd1a1 100644
--- a/shapeproto.h
+++ b/include/X11/extensions/shapeproto.h
diff --git a/shapestr.h b/include/X11/extensions/shapestr.h
index 20fde1d..20fde1d 100644
--- a/shapestr.h
+++ b/include/X11/extensions/shapestr.h
diff --git a/shm.h b/include/X11/extensions/shm.h
index be49f5e..be49f5e 100644
--- a/shm.h
+++ b/include/X11/extensions/shm.h
diff --git a/shmproto.h b/include/X11/extensions/shmproto.h
index 8136aa9..8136aa9 100644
--- a/shmproto.h
+++ b/include/X11/extensions/shmproto.h
diff --git a/shmstr.h b/include/X11/extensions/shmstr.h
index 78f3759..78f3759 100644
--- a/shmstr.h
+++ b/include/X11/extensions/shmstr.h
diff --git a/syncconst.h b/include/X11/extensions/syncconst.h
index 3acc387..3acc387 100644
--- a/syncconst.h
+++ b/include/X11/extensions/syncconst.h
diff --git a/syncproto.h b/include/X11/extensions/syncproto.h
index 1453e44..1453e44 100644
--- a/syncproto.h
+++ b/include/X11/extensions/syncproto.h
diff --git a/syncstr.h b/include/X11/extensions/syncstr.h
index 25a4827..25a4827 100644
--- a/syncstr.h
+++ b/include/X11/extensions/syncstr.h
diff --git a/vldXvMC.h b/include/X11/extensions/vldXvMC.h
index fbd251e..fbd251e 100644
--- a/vldXvMC.h
+++ b/include/X11/extensions/vldXvMC.h
diff --git a/windowswm.h b/include/X11/extensions/windowswm.h
index 2c3379f..2c3379f 100644
--- a/windowswm.h
+++ b/include/X11/extensions/windowswm.h
diff --git a/windowswmstr.h b/include/X11/extensions/windowswmstr.h
index 37ceb53..37ceb53 100644
--- a/windowswmstr.h
+++ b/include/X11/extensions/windowswmstr.h
diff --git a/xcalibrateproto.h b/include/X11/extensions/xcalibrateproto.h
index feded32..feded32 100644
--- a/xcalibrateproto.h
+++ b/include/X11/extensions/xcalibrateproto.h
diff --git a/xcalibratewire.h b/include/X11/extensions/xcalibratewire.h
index 0a1c904..0a1c904 100644
--- a/xcalibratewire.h
+++ b/include/X11/extensions/xcalibratewire.h
diff --git a/xcmiscproto.h b/include/X11/extensions/xcmiscproto.h
index 482c2dc..482c2dc 100644
--- a/xcmiscproto.h
+++ b/include/X11/extensions/xcmiscproto.h
diff --git a/xcmiscstr.h b/include/X11/extensions/xcmiscstr.h
index c2b6433..c2b6433 100644
--- a/xcmiscstr.h
+++ b/include/X11/extensions/xcmiscstr.h
diff --git a/xf86bigfont.h b/include/X11/extensions/xf86bigfont.h
index 1bf47e9..1bf47e9 100644
--- a/xf86bigfont.h
+++ b/include/X11/extensions/xf86bigfont.h
diff --git a/xf86bigfproto.h b/include/X11/extensions/xf86bigfproto.h
index c041c9a..c041c9a 100644
--- a/xf86bigfproto.h
+++ b/include/X11/extensions/xf86bigfproto.h
diff --git a/xf86bigfstr.h b/include/X11/extensions/xf86bigfstr.h
index cf6735d..cf6735d 100644
--- a/xf86bigfstr.h
+++ b/include/X11/extensions/xf86bigfstr.h
diff --git a/xf86dga.h b/include/X11/extensions/xf86dga.h
index 7b5d635..7b5d635 100644
--- a/xf86dga.h
+++ b/include/X11/extensions/xf86dga.h
diff --git a/xf86dga1const.h b/include/X11/extensions/xf86dga1const.h
index eca06f6..eca06f6 100644
--- a/xf86dga1const.h
+++ b/include/X11/extensions/xf86dga1const.h
diff --git a/xf86dga1proto.h b/include/X11/extensions/xf86dga1proto.h
index 5c53cb2..5c53cb2 100644
--- a/xf86dga1proto.h
+++ b/include/X11/extensions/xf86dga1proto.h
diff --git a/xf86dga1str.h b/include/X11/extensions/xf86dga1str.h
index d8e73e8..d8e73e8 100644
--- a/xf86dga1str.h
+++ b/include/X11/extensions/xf86dga1str.h
diff --git a/xf86dgaconst.h b/include/X11/extensions/xf86dgaconst.h
index 63829bc..63829bc 100644
--- a/xf86dgaconst.h
+++ b/include/X11/extensions/xf86dgaconst.h
diff --git a/xf86dgaproto.h b/include/X11/extensions/xf86dgaproto.h
index 8b7f13d..8b7f13d 100644
--- a/xf86dgaproto.h
+++ b/include/X11/extensions/xf86dgaproto.h
diff --git a/xf86dgastr.h b/include/X11/extensions/xf86dgastr.h
index f4809d1..f4809d1 100644
--- a/xf86dgastr.h
+++ b/include/X11/extensions/xf86dgastr.h
diff --git a/xf86misc.h b/include/X11/extensions/xf86misc.h
index f5d7a56..f5d7a56 100644
--- a/xf86misc.h
+++ b/include/X11/extensions/xf86misc.h
diff --git a/xf86mscstr.h b/include/X11/extensions/xf86mscstr.h
index 637d3a5..637d3a5 100644
--- a/xf86mscstr.h
+++ b/include/X11/extensions/xf86mscstr.h
diff --git a/xf86rush.h b/include/X11/extensions/xf86rush.h
index 1db7d13..1db7d13 100644
--- a/xf86rush.h
+++ b/include/X11/extensions/xf86rush.h
diff --git a/xf86rushstr.h b/include/X11/extensions/xf86rushstr.h
index 8dca46a..8dca46a 100644
--- a/xf86rushstr.h
+++ b/include/X11/extensions/xf86rushstr.h
diff --git a/xf86vm.h b/include/X11/extensions/xf86vm.h
index ddf4dac..ddf4dac 100644
--- a/xf86vm.h
+++ b/include/X11/extensions/xf86vm.h
diff --git a/xf86vmproto.h b/include/X11/extensions/xf86vmproto.h
index 0d3955c..0d3955c 100644
--- a/xf86vmproto.h
+++ b/include/X11/extensions/xf86vmproto.h
diff --git a/xf86vmstr.h b/include/X11/extensions/xf86vmstr.h
index f521335..f521335 100644
--- a/xf86vmstr.h
+++ b/include/X11/extensions/xf86vmstr.h
diff --git a/xfixesproto.h b/include/X11/extensions/xfixesproto.h
index fcf409a..fcf409a 100644
--- a/xfixesproto.h
+++ b/include/X11/extensions/xfixesproto.h
diff --git a/xfixeswire.h b/include/X11/extensions/xfixeswire.h
index 432349a..432349a 100644
--- a/xfixeswire.h
+++ b/include/X11/extensions/xfixeswire.h
diff --git a/xtestconst.h b/include/X11/extensions/xtestconst.h
index e74b904..e74b904 100644
--- a/xtestconst.h
+++ b/include/X11/extensions/xtestconst.h
diff --git a/xtestext1const.h b/include/X11/extensions/xtestext1const.h
index 656edc6..656edc6 100644
--- a/xtestext1const.h
+++ b/include/X11/extensions/xtestext1const.h
diff --git a/xtestext1proto.h b/include/X11/extensions/xtestext1proto.h
index e9bdee0..e9bdee0 100644
--- a/xtestext1proto.h
+++ b/include/X11/extensions/xtestext1proto.h
diff --git a/xtestproto.h b/include/X11/extensions/xtestproto.h
index 4f8db26..4f8db26 100644
--- a/xtestproto.h
+++ b/include/X11/extensions/xtestproto.h
diff --git a/xtrapbits.h b/include/X11/extensions/xtrapbits.h
index 1189dc7..1189dc7 100644
--- a/xtrapbits.h
+++ b/include/X11/extensions/xtrapbits.h
diff --git a/xtrapddmi.h b/include/X11/extensions/xtrapddmi.h
index c187a3a..c187a3a 100644
--- a/xtrapddmi.h
+++ b/include/X11/extensions/xtrapddmi.h
diff --git a/xtrapdi.h b/include/X11/extensions/xtrapdi.h
index 34aa94c..34aa94c 100644
--- a/xtrapdi.h
+++ b/include/X11/extensions/xtrapdi.h
diff --git a/xtrapemacros.h b/include/X11/extensions/xtrapemacros.h
index f59ea33..f59ea33 100644
--- a/xtrapemacros.h
+++ b/include/X11/extensions/xtrapemacros.h
diff --git a/xtraplib.h b/include/X11/extensions/xtraplib.h
index db0289f..db0289f 100644
--- a/xtraplib.h
+++ b/include/X11/extensions/xtraplib.h
diff --git a/xtraplibp.h b/include/X11/extensions/xtraplibp.h
index 0c6ced2..0c6ced2 100644
--- a/xtraplibp.h
+++ b/include/X11/extensions/xtraplibp.h
diff --git a/xtrapproto.h b/include/X11/extensions/xtrapproto.h
index b3e29cf..b3e29cf 100644
--- a/xtrapproto.h
+++ b/include/X11/extensions/xtrapproto.h
diff --git a/FS.h b/include/X11/fonts/FS.h
index 605b5a8..605b5a8 100644
--- a/FS.h
+++ b/include/X11/fonts/FS.h
diff --git a/FSproto.h b/include/X11/fonts/FSproto.h
index 028156f..028156f 100644
--- a/FSproto.h
+++ b/include/X11/fonts/FSproto.h
diff --git a/font.h b/include/X11/fonts/font.h
index b596ba2..b596ba2 100644
--- a/font.h
+++ b/include/X11/fonts/font.h
diff --git a/fontproto.h b/include/X11/fonts/fontproto.h
index ca341da..ca341da 100644
--- a/fontproto.h
+++ b/include/X11/fonts/fontproto.h
diff --git a/fontstruct.h b/include/X11/fonts/fontstruct.h
index 55c89da..55c89da 100644
--- a/fontstruct.h
+++ b/include/X11/fonts/fontstruct.h
diff --git a/fsmasks.h b/include/X11/fonts/fsmasks.h
index c86be83..c86be83 100644
--- a/fsmasks.h
+++ b/include/X11/fonts/fsmasks.h
diff --git a/keysym.h b/include/X11/keysym.h
index 4f58488..4f58488 100644
--- a/keysym.h
+++ b/include/X11/keysym.h
diff --git a/keysymdef.h b/include/X11/keysymdef.h
index 147ecf5..147ecf5 100644
--- a/keysymdef.h
+++ b/include/X11/keysymdef.h