diff --git a/os/connection.c b/os/connection.c
index 4c39251da..2b34a1fff 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -294,9 +294,7 @@ CreateWellKnownSockets(void)
 
     InitParentProcess();
 
-#ifdef XDMCP
     XdmcpInit();
-#endif
 }
 
 void
@@ -342,9 +340,7 @@ ResetWellKnownSockets(void)
     /*
      * restart XDMCP
      */
-#ifdef XDMCP
     XdmcpReset();
-#endif
 }
 
 void
diff --git a/os/utils.c b/os/utils.c
index 3b35bf533..90b3e41c5 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -336,9 +336,7 @@ UseMsg(void)
     ErrorF("+extension name        Enable extension\n");
     ErrorF("-extension name        Disable extension\n");
     ListStaticExtensions();
-#ifdef XDMCP
     XdmcpUseMsg();
-#endif
     XkbUseMsg();
     ddxUseMsg();
 }
@@ -749,11 +747,9 @@ ProcessCommandLine(int argc, char *argv[])
         else if (strncmp(argv[i], "tty", 3) == 0) {
             /* init supplies us with this useless information */
         }
-#ifdef XDMCP
         else if ((skip = XdmcpOptions(argc, argv, i)) != i) {
             i = skip - 1;
         }
-#endif
         else if (strcmp(argv[i], "-dumbSched") == 0) {
             InputThreadEnable = FALSE;
 #ifdef HAVE_SETITIMER
diff --git a/os/xdmcp.h b/os/xdmcp.h
index 45853c7bd..8ecd308b1 100644
--- a/os/xdmcp.h
+++ b/os/xdmcp.h
@@ -7,6 +7,19 @@
 /* in xdmcp.c */
 void XdmcpUseMsg(void);
 int XdmcpOptions(int argc, char **argv, int i);
+void XdmcpInit(void);
+void XdmcpReset(void);
+#else
+static inline void XdmcpUseMsg(void) {}
+static inline XdmcpOptions(int argc, char **argv, int i) { return i; }
+static inline void XdmcpInit(void) {}
+static inline XdmcpReset(void) {}
+#endif
+
+/* in xdmcp.c */
+#ifdef XDMCP
+void XdmcpUseMsg(void);
+int XdmcpOptions(int argc, char **argv, int i);
 void XdmcpRegisterConnection(int type, const char *address, int addrlen);
 void XdmcpRegisterAuthorizations(void);
 void XdmcpRegisterAuthorization(const char *name, int namelen);
@@ -21,7 +34,6 @@ void XdmcpRegisterAuthentication(const char *name,
                                  ValidatorFunc Validator,
                                  GeneratorFunc Generator,
                                  AddAuthorFunc AddAuth);
-
 struct sockaddr_in;
 void XdmcpRegisterBroadcastAddress(const struct sockaddr_in *addr);
 #endif /* XDMCP */