diff --git a/dix/atom.c b/dix/atom.c
index f0e6e2dc84..194b2baecd 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -46,10 +46,13 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include <X11/X.h>
-#include <X11/Xatom.h>
 #include <stdio.h>
 #include <string.h>
+#include <X11/X.h>
+#include <X11/Xatom.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "resource.h"
 #include "dix.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 8a85ed35df..208e5b618a 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -253,4 +253,7 @@ extern Bool explicit_display;
 extern Bool disableBackingStore;
 extern Bool enableBackingStore;
 
+/* in generated BuiltInAtoms.c */
+void MakePredeclaredAtoms(void);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/generate-atoms b/dix/generate-atoms
index 86b1477a75..780548919e 100755
--- a/dix/generate-atoms
+++ b/dix/generate-atoms
@@ -25,6 +25,9 @@ cat > "$OUTPUT" << __END__
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "dix.h"
 void
diff --git a/include/misc.h b/include/misc.h
index 890e45ffab..910dd64690 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -377,8 +377,6 @@ extern _X_EXPORT void SwapLongs(CARD32 *list, unsigned long count);
 
 extern _X_EXPORT void SwapShorts(short *list, unsigned long count);
 
-extern _X_EXPORT void MakePredeclaredAtoms(void);
-
 typedef struct _xPoint *DDXPointPtr;
 typedef struct pixman_box16 *BoxPtr;
 typedef struct _xEvent *xEventPtr;