diff --git a/src/xcb_auth.c b/src/xcb_auth.c
index 42a3d86..4c9f7d6 100644
--- a/src/xcb_auth.c
+++ b/src/xcb_auth.c
@@ -34,21 +34,13 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-/* FIXME: for the moment Xdmcp.h must be included before xcb.h because
- * it includes Xmd.h, but config.h (normally included from xcbint.h
- * which must be included after xcb.h) must be included before Xdmcp.h.
- * Ow. */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "xcb.h"
+#include "xcbint.h"
 
 #ifdef HASXDMAUTH
 #include <X11/Xdmcp.h>
 #endif
 
-#include "xcb.h"
-#include "xcbint.h"
-
 enum auth_protos {
 #ifdef HASXDMAUTH
     AUTH_XA1,