diff --git a/composite/compwindow.c b/composite/compwindow.c
index 1970860c3..e8721146e 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -44,7 +44,6 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
-#include "os/osdep.h"
 
 #include "compint.h"
 #include "compositeext_priv.h"
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 069270219..1971cf431 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -30,7 +30,6 @@
 
 #include "mi/mipointer_priv.h"
 #include "os/client_priv.h"
-#include "os/osdep.h"
 
 #include "ephyr.h"
 #include "inputstr.h"
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 9306f3367..16c477dad 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -28,7 +28,6 @@
 #include "dix/dix_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
-#include "os/osdep.h"
 
 #include "ephyr.h"
 #include "ephyrlog.h"
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index e2eb847d7..ba4feda03 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -27,8 +27,6 @@
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 
-#include "os/osdep.h"
-
 #include "kdrive.h"
 #include <mivalidate.h>
 #include <dixstruct.h>
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 71ea78e2f..9463bc118 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -42,7 +42,6 @@ from The Open Group.
 #include "mi/mipointer_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
-#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "servermd.h"
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 377766740..d1f7ba14b 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -30,7 +30,6 @@
 #include <errno.h>
 
 #include "os/ddx_priv.h"
-#include "os/osdep.h"
 
 #include "xf86.h"
 #include "xf86Config.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index bcfaf8d1d..970cc0dc4 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -58,12 +58,12 @@
 #include "mi/mi_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
-#include "os/osdep.h"
 
 #include "servermd.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "systemd-logind.h"
+
 #include "loaderProcs.h"
 
 #include "xf86.h"
diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c
index effeff6fc..9ff670d74 100644
--- a/hw/xfree86/ddc/ddc.c
+++ b/hw/xfree86/ddc/ddc.c
@@ -14,8 +14,6 @@
 #include <xorg-config.h>
 #endif
 
-#include "os/osdep.h"
-
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index ccfecf15d..97cc52299 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -21,10 +21,8 @@
 #define PRINT_PORT 0
 
 #include <unistd.h>
+
 #include <X11/Xos.h>
-
-#include "os/osdep.h"
-
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 5c1323e1a..6dafd410c 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -43,8 +43,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "os/osdep.h"
-
 #ifndef CONSOLE_X_MODE_ON
 #define CONSOLE_X_MODE_ON _IO('t',121)
 #endif
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 16c3dc535..126371aeb 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -32,7 +32,6 @@
 #include <X11/Xmd.h>
 
 #include "os/cmdline.h"
-#include "os/osdep.h"
 
 #include "compiler.h"
 #include "linux.h"
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index ca083fcfd..c007271fb 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -27,8 +27,6 @@
 
 #include <X11/X.h>
 
-#include "os/osdep.h"
-
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index 2197df6f2..58cc882d3 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -39,8 +39,6 @@
 #include <sys/kd.h>
 #endif
 
-#include "os/osdep.h"
-
 /*
  * Applications see VT number as consecutive integers starting from 1.
  * VT number			VT device
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 297d9b9c8..5bb64b4e1 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -20,7 +20,6 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 
 #include "os/client_priv.h"
-#include "os/osdep.h"
 
 #include "screenint.h"
 #include "input.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index fb30d7686..e9c5fc59b 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -23,7 +23,6 @@ is" without express or implied warranty.
 #include "dix/screenint_priv.h"
 #include "mi/mi_priv.h"
 #include "os/ddx_priv.h"
-#include "os/osdep.h"
 
 #include "screenint.h"
 #include "input.h"
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index fcfcd554a..aba4869f8 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -35,7 +35,6 @@
 #include <X11/Xproto.h>
 
 #include "os/ddx_priv.h"
-#include "os/osdep.h"
 
 #include "os.h"
 #include "servermd.h"
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 5bc3551e3..023fa22fc 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -40,7 +40,6 @@
 #include "dix/input_priv.h"
 #include "dix/property_priv.h"
 #include "os/client_priv.h"
-#include "os/osdep.h"
 #include "os/xserver_poll.h"
 
 #include <micmap.h>
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 541503552..aeb6b9f84 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -63,6 +63,8 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
                                               DWORD dwFlags, LPTSTR pszPath);
 #endif
 
+#include "dix/screenint_priv.h"
+
 #include "winmonitors.h"
 #include "nonsdk_extinit.h"
 #include "extinit_priv.h"
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index bdf03f053..3b535cb63 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -32,8 +32,6 @@
 #include <xwin-config.h>
 #endif
 
-#include "os/osdep.h"
-
 #include <../xfree86/common/xorgVersion.h>
 #include "win.h"
 
diff --git a/include/os.h b/include/os.h
index 3949ff5aa..c4e0f15fc 100644
--- a/include/os.h
+++ b/include/os.h
@@ -205,11 +205,40 @@ XNFvprintf(const char *fmt, va_list va)
 _X_ATTRIBUTE_PRINTF(1, 0)
     _X_DEPRECATED;
 
+typedef void (*OsSigHandlerPtr) (int /* sig */ );
 typedef int (*OsSigWrapperPtr) (int /* sig */ );
 
+extern _X_EXPORT OsSigHandlerPtr
+OsSignal(int /* sig */ , OsSigHandlerPtr /* handler */ );
 extern _X_EXPORT OsSigWrapperPtr
 OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
 
+extern _X_EXPORT void
+OsInit(void);
+
+extern _X_EXPORT void
+OsCleanup(Bool);
+
+extern _X_EXPORT void
+OsVendorFatalError(const char *f, va_list args)
+_X_ATTRIBUTE_PRINTF(1, 0);
+
+extern _X_EXPORT void
+OsVendorInit(void);
+
+extern _X_EXPORT void
+OsBlockSignals(void);
+
+extern _X_EXPORT void
+OsReleaseSignals(void);
+
+extern void
+OsResetSignals(void);
+
+extern _X_EXPORT void
+OsAbort(void)
+    _X_NORETURN;
+
 extern _X_EXPORT Bool
 PrivsElevated(void);
 
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 0b626eba4..d0a309c94 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -24,8 +24,6 @@
 
 #include <stdlib.h>
 
-#include "os/osdep.h"
-
 #include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
diff --git a/os/connection.c b/os/connection.c
index 92b5add2b..64aca9081 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -91,7 +91,9 @@ SOFTWARE.
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #endif
+
 #include <sys/uio.h>
+
 #endif                          /* WIN32 */
 
 #include "dix/dix_priv.h"
diff --git a/os/log.c b/os/log.c
index df9589565..7f6e818f6 100644
--- a/os/log.c
+++ b/os/log.c
@@ -79,6 +79,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <dix-config.h>
 
+#include <X11/Xos.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -86,7 +87,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/stat.h>
 #include <time.h>
 #include <X11/Xfuncproto.h>
-#include <X11/Xos.h>
 
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
@@ -96,6 +96,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "os/osdep.h"
 
 #include "opaque.h"
+#include "osdep.h"
 
 #ifdef XF86BIGFONT
 #include "xf86bigfontsrv.h"
diff --git a/os/osdep.h b/os/osdep.h
index 7a1b46bf3..c93481969 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -178,19 +178,6 @@ int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
 extern void (*OsVendorVErrorFProc) (const char *, va_list args)
     _X_ATTRIBUTE_PRINTF(1, 0);
 
-typedef void (*OsSigHandlerPtr) (int sig);
-
-/* install signal handler */
-OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler);
-
-void OsInit(void);
-void OsCleanup(Bool);
-void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
-void OsVendorInit(void);
-void OsBlockSignals(void);
-void OsReleaseSignals(void);
-void OsResetSignals(void);
-void OsAbort(void) _X_NORETURN;
 void AbortServer(void) _X_NORETURN;
 
 void MakeClientGrabPervious(ClientPtr client);
diff --git a/os/osinit.c b/os/osinit.c
index 3a132faee..726602d0c 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -46,11 +46,14 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include <errno.h>
 #include <stdio.h>
-#include <signal.h>
 #include <X11/X.h>
+#include "os.h"
+#include "osdep.h"
+#include "opaque.h"
 #include <X11/Xos.h>
+#include <signal.h>
+#include <errno.h>
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
@@ -60,12 +63,9 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "os/busfault.h"
-#include "os/osdep.h"
 #include "os/serverlock.h"
 
 #include "misc.h"
-#include "os.h"
-#include "opaque.h"
 #include "dixstruct.h"
 #include "dixstruct_priv.h"
 
diff --git a/os/utils.c b/os/utils.c
index ef1d3eab0..ba5280694 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -109,7 +109,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "os/auth.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
-#include "os/osdep.h"
 #include "os/serverlock.h"
 
 #include "dixstruct.h"