diff --git a/os/log.c b/os/log.c
index 7f6e818f6..8aff8f40d 100644
--- a/os/log.c
+++ b/os/log.c
@@ -91,6 +91,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "os/audit.h"
+#include "os/client_priv.h"
 #include "os/ddx_priv.h"
 #include "os/fmt.h"
 #include "os/osdep.h"
@@ -815,6 +816,26 @@ LogHdrMessageVerb(MessageType type, int verb, const char *msg_format,
     va_end(hdr_args);
 }
 
+void
+AbortServer(void)
+    _X_NORETURN;
+
+void
+AbortServer(void)
+{
+#ifdef XF86BIGFONT
+    XF86BigfontCleanup();
+#endif
+    CloseWellKnownConnections();
+    OsCleanup(TRUE);
+    AbortDevices();
+    ddxGiveUp(EXIT_ERR_ABORT);
+    fflush(stderr);
+    if (CoreDump)
+        OsAbort();
+    exit(1);
+}
+
 #define AUDIT_PREFIX "AUDIT: %s: %ld: "
 #ifndef AUDIT_TIMEOUT
 #define AUDIT_TIMEOUT ((CARD32)(120 * 1000))    /* 2 mn */
diff --git a/os/osdep.h b/os/osdep.h
index 9ed8a3623..c8702855a 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -178,8 +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);
 
-void AbortServer(void) _X_NORETURN;
-
 void MakeClientGrabPervious(ClientPtr client);
 void MakeClientGrabImpervious(ClientPtr client);
 
diff --git a/os/utils.c b/os/utils.c
index 23f15bf4a..57c21a448 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -78,7 +78,6 @@ __stdcall unsigned long GetTickCount(void);
 #include <X11/Xtrans/Xtrans.h>
 
 #include "os/audit.h"
-#include "os/client_priv.h"
 
 #include "input.h"
 #include "dixfont.h"
@@ -1548,22 +1547,6 @@ os_move_fd(int fd)
 }
 #endif
 
-void
-AbortServer(void)
-{
-#ifdef XF86BIGFONT
-    XF86BigfontCleanup();
-#endif
-    CloseWellKnownConnections();
-    OsCleanup(TRUE);
-    AbortDevices();
-    ddxGiveUp(EXIT_ERR_ABORT);
-    fflush(stderr);
-    if (CoreDump)
-        OsAbort();
-    exit(1);
-}
-
 /* Exported version for binary compatibility with modules which call it */
 #undef Ones
 _X_EXPORT int Ones(unsigned long);