diff --git a/Xext/shm.c b/Xext/shm.c
index 071bd1a41e..4f5f3e3724 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -43,6 +43,9 @@ in this Software without prior written authorization from The Open Group.
 #include <fcntl.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "os/auth.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
diff --git a/dix/grabs.c b/dix/grabs.c
index 53ba1d6b97..5642f7ddc3 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -50,6 +50,9 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
+
+#include "os/auth.h"
+
 #include "misc.h"
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2.h>
diff --git a/dix/window.c b/dix/window.c
index 284aa6dd76..8a5144eae1 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -100,6 +100,8 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
+#include "os/auth.h"
+
 #include "misc.h"
 #include "scrnintstr.h"
 #include "os.h"
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index a1914fff61..f072cb67d4 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -35,6 +35,7 @@
 #include <X11/Xatom.h>
 
 #include "dix/screenint_priv.h"
+#include "os/auth.h"
 
 #include <selection.h>
 #include <micmap.h>
diff --git a/include/os.h b/include/os.h
index 7b252562e6..68ade0e583 100644
--- a/include/os.h
+++ b/include/os.h
@@ -355,8 +355,6 @@ PrivsElevated(void);
 
 extern _X_EXPORT void
 CheckUserParameters(int argc, char **argv, char **envp);
-extern _X_EXPORT void
-CheckUserAuthorization(void);
 
 extern _X_EXPORT int
 AddHost(ClientPtr /*client */ ,
@@ -410,9 +408,6 @@ GetLocalClientCreds(ClientPtr, LocalClientCredRec **);
 extern _X_EXPORT void
 FreeLocalClientCreds(LocalClientCredRec *);
 
-extern _X_EXPORT int
-ChangeAccessControl(ClientPtr /*client */ , int /*fEnabled */ );
-
 extern _X_EXPORT int
 GetClientFd(ClientPtr);
 
@@ -458,52 +453,6 @@ DefineSelf(int /*fd */ );
 extern _X_EXPORT void
 AugmentSelf(void *from, int len);
 
-extern _X_EXPORT void
-RegisterAuthorizations(void);
-#endif
-
-extern _X_EXPORT void
-InitAuthorization(const char * /*filename */ );
-
-/* extern int LoadAuthorization(void); */
-
-extern _X_EXPORT int
-AuthorizationFromID(XID id,
-                    unsigned short *name_lenp,
-                    const char **namep,
-                    unsigned short *data_lenp, char **datap);
-
-extern _X_EXPORT XID
-CheckAuthorization(unsigned int /*namelength */ ,
-                   const char * /*name */ ,
-                   unsigned int /*datalength */ ,
-                   const char * /*data */ ,
-                   ClientPtr /*client */ ,
-                   const char **        /*reason */
-    );
-
-extern _X_EXPORT void
-ResetAuthorization(void);
-
-extern _X_EXPORT int
-RemoveAuthorization(unsigned short name_length,
-                    const char *name,
-                    unsigned short data_length, const char *data);
-
-extern _X_EXPORT int
-AddAuthorization(unsigned int /*name_length */ ,
-                 const char * /*name */ ,
-                 unsigned int /*data_length */ ,
-                 char * /*data */ );
-
-#ifdef XCSECURITY
-extern _X_EXPORT XID
-GenerateAuthorization(unsigned int /* name_length */ ,
-                      const char * /* name */ ,
-                      unsigned int /* data_length */ ,
-                      const char * /* data */ ,
-                      unsigned int * /* data_length_return */ ,
-                      char ** /* data_return */ );
 #endif
 
 extern _X_EXPORT int
diff --git a/os/auth.h b/os/auth.h
index f632490d60..f4fa6c065a 100644
--- a/os/auth.h
+++ b/os/auth.h
@@ -26,4 +26,44 @@ typedef int (*AuthRemCFunc) (AuthRemCArgs);
 #define AuthRstCArgs void
 typedef int (*AuthRstCFunc) (AuthRstCArgs);
 
+void CheckUserAuthorization(void);
+
+void InitAuthorization(const char *filename);
+
+int AuthorizationFromID(XID id,
+                        unsigned short *name_lenp,
+                        const char **namep,
+                        unsigned short *data_lenp, char **datap);
+
+XID CheckAuthorization(unsigned int namelength,
+                       const char *name,
+                       unsigned int datalength,
+                       const char *data,
+                       ClientPtr client,
+                       const char **reason);
+
+void ResetAuthorization(void);
+
+int RemoveAuthorization(unsigned short name_length,
+                        const char *name,
+                        unsigned short data_length, const char *data);
+
+int AddAuthorization(unsigned int name_length,
+                     const char *name,
+                     unsigned int data_length,
+                     char *data);
+
+XID GenerateAuthorization(unsigned int name_length,
+                          const char *name,
+                          unsigned int data_length,
+                          const char *data,
+                          unsigned int *data_length_return,
+                          char **data_return);
+
+void RegisterAuthorizations(void);
+
+int ChangeAccessControl(ClientPtr client, int fEnabled);
+
+int GetAccessControl(void);
+
 #endif /* _XSERVER_OS_AUTH_H */
diff --git a/os/client.c b/os/client.c
index 3295949a4c..f94cf9d429 100644
--- a/os/client.c
+++ b/os/client.c
@@ -55,6 +55,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "os/auth.h"
+
 #include "client.h"
 #include "os.h"
 #include "dixstruct.h"
diff --git a/os/connection.c b/os/connection.c
index f7e10b3ba5..f44a47033d 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -97,6 +97,9 @@ SOFTWARE.
 #include <sys/uio.h>
 
 #endif                          /* WIN32 */
+
+#include "os/auth.h"
+
 #include "misc.h"               /* for typedef of pointer */
 #include "osdep.h"
 #include "opaque.h"
diff --git a/os/utils.c b/os/utils.c
index c5fe86c8fa..9c3a6f47e9 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -103,6 +103,8 @@ __stdcall unsigned long GetTickCount(void);
 #endif
 #endif
 
+#include "os/auth.h"
+
 #include "dixstruct.h"
 #include "dix_priv.h"
 #include "xkbsrv.h"