diff --git a/os/auth.h b/os/auth.h
new file mode 100644
index 000000000..f632490d6
--- /dev/null
+++ b/os/auth.h
@@ -0,0 +1,29 @@
+#ifndef _XSERVER_OS_AUTH_H
+#define _XSERVER_OS_AUTH_H
+
+#include <X11/X.h>
+
+#include "dix.h"
+
+#define AuthInitArgs void
+typedef void (*AuthInitFunc) (AuthInitArgs);
+
+#define AuthAddCArgs unsigned short data_length, const char *data, XID id
+typedef int (*AuthAddCFunc) (AuthAddCArgs);
+
+#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, const char **reason
+typedef XID (*AuthCheckFunc) (AuthCheckArgs);
+
+#define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap
+typedef int (*AuthFromIDFunc) (AuthFromIDArgs);
+
+#define AuthGenCArgs unsigned data_length, const char *data, XID id, unsigned *data_length_return, char **data_return
+typedef XID (*AuthGenCFunc) (AuthGenCArgs);
+
+#define AuthRemCArgs unsigned short data_length, const char *data
+typedef int (*AuthRemCFunc) (AuthRemCArgs);
+
+#define AuthRstCArgs void
+typedef int (*AuthRstCFunc) (AuthRstCArgs);
+
+#endif /* _XSERVER_OS_AUTH_H */
diff --git a/os/mitauth.h b/os/mitauth.h
index d67a58c95..143fa46bc 100644
--- a/os/mitauth.h
+++ b/os/mitauth.h
@@ -1,7 +1,7 @@
 #ifndef _XSERVER_OS_MITAUTH_H
 #define _XSERVER_OS_MITAUTH_H
 
-#include "osdep.h"
+#include "auth.h"
 
 XID MitCheckCookie(AuthCheckArgs);
 XID MitGenerateCookie(AuthGenCArgs);
diff --git a/os/osdep.h b/os/osdep.h
index 19a7430d9..5b64f1a38 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -85,29 +85,6 @@ typedef struct _connectionOutput *ConnectionOutputPtr;
 
 struct _osComm;
 
-#define AuthInitArgs void
-typedef void (*AuthInitFunc) (AuthInitArgs);
-
-#define AuthAddCArgs unsigned short data_length, const char *data, XID id
-typedef int (*AuthAddCFunc) (AuthAddCArgs);
-
-#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, const char **reason
-typedef XID (*AuthCheckFunc) (AuthCheckArgs);
-
-#define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap
-typedef int (*AuthFromIDFunc) (AuthFromIDArgs);
-
-#define AuthGenCArgs unsigned data_length, const char *data, XID id, unsigned *data_length_return, char **data_return
-typedef XID (*AuthGenCFunc) (AuthGenCArgs);
-
-#define AuthRemCArgs unsigned short data_length, const char *data
-typedef int (*AuthRemCFunc) (AuthRemCArgs);
-
-#define AuthRstCArgs void
-typedef int (*AuthRstCFunc) (AuthRstCArgs);
-
-typedef void (*OsCloseFunc) (ClientPtr);
-
 typedef int (*OsFlushFunc) (ClientPtr who, struct _osComm * oc, char *extraBuf,
                             int extraCount);
 
diff --git a/os/rpcauth.h b/os/rpcauth.h
index 10fc33840..255eafcea 100644
--- a/os/rpcauth.h
+++ b/os/rpcauth.h
@@ -1,7 +1,7 @@
 #ifndef _XSERVER_OS_RPCAUTH_H
 #define _XSERVER_OS_RPCAUTH_H
 
-#include "osdep.h"
+#include "auth.h"
 
 void SecureRPCInit(AuthInitArgs);
 XID SecureRPCCheck(AuthCheckArgs);
diff --git a/os/xdmauth.h b/os/xdmauth.h
index 7a42c8215..e922b2e99 100644
--- a/os/xdmauth.h
+++ b/os/xdmauth.h
@@ -1,7 +1,7 @@
 #ifndef _XSERVER_OS_XDMAUTH_H
 #define _XSERVER_OS_XDMAUTH_H
 
-#include "osdep.h"
+#include "auth.h"
 
 XID XdmCheckCookie(AuthCheckArgs);
 int XdmAddCookie(AuthAddCArgs);