diff --git a/os/auth.c b/os/auth.c
index 2518b5293..9f33d86c2 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -50,6 +50,7 @@ from The Open Group.
 
 #include "rpcauth.h"
 #include "xdmcp.h"
+#include "xdmauth.h"
 
 struct protocol {
     unsigned short name_length;
diff --git a/os/osdep.h b/os/osdep.h
index fb08d8588..07d42d0c8 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -162,14 +162,4 @@ extern int MitFromID(AuthFromIDArgs);
 extern int MitRemoveCookie(AuthRemCArgs);
 extern int MitResetCookie(AuthRstCArgs);
 
-/* in xdmauth.c */
-#ifdef HASXDMAUTH
-extern XID XdmCheckCookie(AuthCheckArgs);
-extern int XdmAddCookie(AuthAddCArgs);
-extern int XdmFromID(AuthFromIDArgs);
-extern int XdmRemoveCookie(AuthRemCArgs);
-extern int XdmResetCookie(AuthRstCArgs);
-extern void XdmAuthenticationInit(const char *cookie, int cookie_length);
-#endif
-
 #endif                          /* _OSDEP_H_ */
diff --git a/os/xdmauth.c b/os/xdmauth.c
index aa1c113d2..cffd70ad0 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -46,6 +46,7 @@ from The Open Group.
 #include "os.h"
 #include "osdep.h"
 #include "xdmcp.h"
+#include "xdmauth.h"
 #include "dixstruct.h"
 
 #ifdef HASXDMAUTH
diff --git a/os/xdmauth.h b/os/xdmauth.h
new file mode 100644
index 000000000..7a42c8215
--- /dev/null
+++ b/os/xdmauth.h
@@ -0,0 +1,13 @@
+#ifndef _XSERVER_OS_XDMAUTH_H
+#define _XSERVER_OS_XDMAUTH_H
+
+#include "osdep.h"
+
+XID XdmCheckCookie(AuthCheckArgs);
+int XdmAddCookie(AuthAddCArgs);
+int XdmFromID(AuthFromIDArgs);
+int XdmRemoveCookie(AuthRemCArgs);
+int XdmResetCookie(AuthRstCArgs);
+void XdmAuthenticationInit(const char *cookie, int cookie_length);
+
+#endif /* _XSERVER_OS_XDMAUTH_H */
diff --git a/os/xdmcp.c b/os/xdmcp.c
index a264d96af..4d4690c70 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -41,6 +41,7 @@
 #include "misc.h"
 #include "osdep.h"
 #include "xdmcp.h"
+#include "xdmauth.h"
 #include "input.h"
 #include "dixstruct.h"
 #include "opaque.h"