diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index a1e1f37af3..19deb74c48 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -761,4 +761,6 @@ static inline int xmitClientEvent(ClientPtr pClient, xEvent ev)
 int dixAllocColor(ClientPtr client, Colormap cmap, CARD16 *red,
                   CARD16 *green, CARD16 *blue, CARD32 *pixel);
 
+void ReplyNotSwappd(ClientPtr pClient, int size, void *pbuf)  _X_NORETURN;
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/swaprep.c b/dix/swaprep.c
index e8765a5a6c..78b9074d8e 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -48,9 +48,12 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/fonts/fontstruct.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "dixstruct.h"
-#include <X11/fonts/fontstruct.h>
 #include "scrnintstr.h"
 #include "swaprep.h"
 #include "globals.h"
diff --git a/dix/tables.c b/dix/tables.c
index b3cc94a6ec..fcf948f0ba 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -49,6 +49,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/reqhandlers_priv.h"
 
 #include "windowstr.h"
diff --git a/include/dixstruct.h b/include/dixstruct.h
index e98ff83fc6..11f69e9ef2 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -53,11 +53,6 @@ typedef void (*ReplySwapPtr) (ClientPtr /* pClient */ ,
                               int /* size */ ,
                               void * /* pbuf */ );
 
-extern _X_EXPORT void
-ReplyNotSwappd(ClientPtr /* pClient */ ,
-               int /* size */ ,
-               void * /* pbuf */ ) _X_NORETURN;
-
 typedef enum { ClientStateInitial,
     ClientStateRunning,
     ClientStateRetained,