diff --git a/os/osdep.h b/os/osdep.h
index 49661c4864..a7dc13cf3a 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -50,10 +50,6 @@ SOFTWARE.
 
 #include <X11/Xdefs.h>
 
-#if defined(XDMCP) || defined(HASXDMAUTH)
-#include <X11/Xdmcp.h>
-#endif
-
 #include <limits.h>
 #include <stddef.h>
 #include <X11/Xos.h>
diff --git a/os/xdmcp.h b/os/xdmcp.h
index 8e14396e1e..7288162845 100644
--- a/os/xdmcp.h
+++ b/os/xdmcp.h
@@ -1,6 +1,8 @@
 #ifndef _XSERVER_OS_XDMCP_H
 #define _XSERVER_OS_XDMCP_H
 
+#include <X11/Xdmcp.h>
+
 #include "osdep.h"
 
 typedef Bool (*ValidatorFunc) (ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type);