diff --git a/Xext/security.c b/Xext/security.c
index cf5f4051a..4ea3f1c4d 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <X11/extensions/securproto.h>
+#include <X11/Xfuncproto.h>
+
 #include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 #include "os/audit.h"
@@ -41,7 +44,6 @@ in this Software without prior written authorization from The Open Group.
 #include "privates.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include <X11/extensions/securproto.h>
 #include "extinit.h"
 #include "protocol-versions.h"
 
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index 63fc18f93..65cb60217 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -32,6 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdarg.h>
 #include <libaudit.h>
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
 
 #include "dix/registry_priv.h"
 
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 5a0dc2e2d..f80aab74b 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -29,6 +29,8 @@
 
 #include "dix-config.h"
 
+#include <X11/Xfuncproto.h>
+
 #include "glamor.h"
 #include "xvdix.h"
 
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index e73aff269..6c4eaede1 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -51,6 +51,8 @@
 #ifndef _xf86Xinput_h
 #define _xf86Xinput_h
 
+#include <X11/Xfuncproto.h>
+
 #include "xf86.h"
 #include "xf86str.h"
 #include "inputstr.h"
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index dad212791..2cba7442e 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -44,6 +44,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/time.h>
 #include <unistd.h>
 #include <X11/X.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xproto.h>
 
 #include "dix/dix_priv.h"
diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index 7a46e0160..39399b7bc 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -29,6 +29,8 @@
 
 /* exported functions are/were used by the X Server */
 
+#include <X11/Xfuncproto.h>
+
 /* Device.c */
 XF86ConfDevicePtr xf86parseDeviceSection(void);
 void xf86printDeviceSection(FILE * cf, XF86ConfDevicePtr ptr);
diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h
index 3cae50b2a..c434d4838 100644
--- a/hw/xquartz/darwin.h
+++ b/hw/xquartz/darwin.h
@@ -29,6 +29,8 @@
 #define _DARWIN_H
 
 #include <IOKit/IOTypes.h>
+#include <X11/Xfuncproto.h>
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include <X11/extensions/XKB.h>
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 5c5bc70ac..a2c18e1e1 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -36,6 +36,8 @@
 
 #include <errno.h>
 #include <X11/Xlib.h>
+#include <X11/Xfuncproto.h>
+
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h
index 482f95ea6..ae3a8d34e 100644
--- a/hw/xquartz/pbproxy/pbproxy.h
+++ b/hw/xquartz/pbproxy/pbproxy.h
@@ -37,6 +37,7 @@
 
 #define  Cursor X_Cursor
 #undef _SHAPE_H_
+#include <X11/Xfuncproto.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>
 #undef   Cursor
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index bc89106f8..8198c8ee9 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -35,6 +35,7 @@
 #endif
 
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
 
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 20ccc31a9..39392082d 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
 
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 1c4af37e1..49a2031d3 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -139,9 +139,11 @@
 #endif                          /* HAVE_MMAP */
 
 #include <X11/X.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xproto.h>
 #include <X11/Xos.h>
 #include <X11/Xprotostr.h>
+
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "pixmap.h"
diff --git a/include/os.h b/include/os.h
index 7a4bc2351..3adc1f7c9 100644
--- a/include/os.h
+++ b/include/os.h
@@ -58,6 +58,8 @@ SOFTWARE.
 #include <time.h>
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #define SCREEN_SAVER_ON   0
 #define SCREEN_SAVER_OFF  1
 #define SCREEN_SAVER_FORCER 2
diff --git a/os/log.c b/os/log.c
index 9a702122b..10d95ce11 100644
--- a/os/log.c
+++ b/os/log.c
@@ -85,6 +85,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdlib.h>             /* for malloc() */
 #include <sys/stat.h>
 #include <time.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xos.h>
 
 #include "dix/dix_priv.h"
diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
index 3623fadc7..0906ac030 100644
--- a/pseudoramiX/pseudoramiX.c
+++ b/pseudoramiX/pseudoramiX.c
@@ -37,6 +37,8 @@
 #include <dix-config.h>
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #include "pseudoramiX.h"
 #include "extnsionst.h"
 #include "nonsdk_extinit.h"