diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index d0ddf22e6d..55fd54a5bf 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -26,7 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <errno.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 52594c692a..4347f6d2f7 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -27,8 +27,6 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
-
 #include "xf86.h"
 #include "xf86Config.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 6a349f4c61..404c37e464 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -53,11 +53,9 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
-
 #include "misc.h"
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index f2094a9108..34ddec4246 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -36,9 +36,7 @@
 #include "dix-config.h"
 #endif
 
-#include <errno.h>
 #include <time.h>
-
 #include "list.h"
 #include "xf86.h"
 #include "driver.h"
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index b33091cdcc..cf2d4cfe40 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -36,10 +36,8 @@
 #include "dix-config.h"
 #endif
 
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c
index f0b8d59190..f6903adb2d 100644
--- a/hw/xfree86/drivers/modesetting/pageflip.c
+++ b/hw/xfree86/drivers/modesetting/pageflip.c
@@ -24,8 +24,6 @@
 #include "dix-config.h"
 #endif
 
-#include <errno.h>
-
 #include <xserver_poll.h>
 #include <xf86drm.h>
 
diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c
index c89aa3f17b..c7aeb9f169 100644
--- a/hw/xfree86/drivers/modesetting/vblank.c
+++ b/hw/xfree86/drivers/modesetting/vblank.c
@@ -29,9 +29,7 @@
 #include "dix-config.h"
 #endif
 
-#include <errno.h>
 #include <unistd.h>
-
 #include <xf86.h>
 #include <xf86Crtc.h>
 #include "driver.h"
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 9e52305d92..850663b73a 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -7,7 +7,6 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 721c09af85..b4038bd2b5 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -27,9 +27,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
-
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 587b9d3acb..180d70543f 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -60,9 +60,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
-
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 63f3aef71b..ac24f19507 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -29,9 +29,8 @@
 #include <device/device.h>
 #include <mach/machine/mach_i386.h>
 #include <hurd.h>
-#include <errno.h>
-#include <X11/X.h>
 
+#include <X11/X.h>
 #include "input.h"
 #include "scrnintstr.h"
 
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index 58c904afb0..3aec5397c5 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -11,9 +11,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
-
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index b3270c5b30..4ea791a899 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -27,7 +27,6 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index ee2b2154a0..50f88cdc94 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -56,9 +56,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
-
 #include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index e3f0774dc5..ad8af60939 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -56,9 +56,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
-
 #include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c
index 8728e920e9..d8bff2fda3 100644
--- a/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/hw/xfree86/os-support/solaris/sun_agp.c
@@ -32,9 +32,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
-
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index 6516372d78..11549aaf0c 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -53,9 +53,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/X.h>
-
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index 6aa0a37a33..69ea50c477 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -24,7 +24,6 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
 #include <sys/audio.h>
 #include <sys/uio.h>
 #include <limits.h>
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index 415cdb1c84..d7bf2e54b3 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -26,8 +26,6 @@
 #include <xorg-config.h>
 #endif
 
-#include <errno.h>
-
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 60bcb593f8..4afd7f86f1 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -91,6 +91,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <errno.h>
+
 #if defined(_NEED_SYSI86)
 #if !(defined (__sun) && defined (SVR4))
 #include <sys/immu.h>
@@ -186,6 +188,8 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
 #include <sys/param.h>
 #endif
 
+#include <errno.h>
+
 #include <sys/stat.h>
 
 #include <sys/mman.h>
@@ -215,6 +219,8 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
 #define termio termios
 #define POSIX_TTY
 
+#include <errno.h>
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 8cd92f296c..e743a861e5 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -34,8 +34,6 @@
 #include <dix-config.h>
 #endif
 
-#include <errno.h>
-
 #include "quartz.h"
 
 #include "misc.h"
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 5c5bc70ac7..de82e2280c 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -34,7 +34,6 @@
 #include <dix-config.h>
 #endif
 
-#include <errno.h>
 #include <X11/Xlib.h>
 #include <assert.h>
 #include <unistd.h>
diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index 89de93afc4..e4a297ab58 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -29,7 +29,6 @@
 #include <inpututils.h>
 #include <libgen.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include <libei.h>
 
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 2a62e9a282..4d4690c70b 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -34,7 +34,6 @@
 #include <netdb.h>
 #endif
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/X.h>