diff --git a/Xext/xace.h b/Xext/xace.h
index 8026886f7..8d71c4392 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -25,12 +25,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_MAJOR_VERSION		2
 #define XACE_MINOR_VERSION		0
 
+#include "dix/selection_priv.h"
+
 #include "extnsionst.h"
 #include "pixmap.h"
 #include "region.h"
 #include "window.h"
 #include "property.h"
-#include "selection.h"
 
 /* Default window background */
 #define XaceBackgroundNoneState(w) ((w)->forcedBG ? BackgroundPixel : None)
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 6fe8eecc8..7c4276dec 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -20,13 +20,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XACESTR_H
 #define _XACESTR_H
 
+#include "dix/selection_priv.h"
+
 #include "dix.h"
 #include "resource.h"
 #include "extnsionst.h"
 #include "window.h"
 #include "input.h"
 #include "property.h"
-#include "selection.h"
 #include "xace.h"
 
 /* XACE_CORE_DISPATCH */
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 95fd07fd2..5442ec4b4 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/property_priv.h"
+#include "dix/selection_priv.h"
 #include "miext/extinit_priv.h"
 
-#include "selection.h"
 #include "inputstr.h"
 #include "windowstr.h"
 #include "propertyst.h"
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index 4007958a9..789f2464e 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/Xfuncproto.h>
 
 #include "dix/registry_priv.h"
+#include "dix/selection_priv.h"
 #include "os/client_priv.h"
 
-#include "selection.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
diff --git a/damageext/damageextint.h b/damageext/damageextint.h
index 7a7096d27..a7e521dd6 100644
--- a/damageext/damageextint.h
+++ b/damageext/damageextint.h
@@ -29,13 +29,15 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/damageproto.h>
+
+#include "dix/selection_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/damageproto.h>
 #include "windowstr.h"
-#include "selection.h"
 #include "scrnintstr.h"
 #include "damage.h"
 #include "xfixes.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 05466b24c..14f16e453 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -110,6 +110,7 @@ Equipment Corporation.
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/selection_priv.h"
 #include "include/resource.h"
 #include "miext/extinit_priv.h"
 #include "os/auth.h"
@@ -121,7 +122,6 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
-#include "selection.h"
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
diff --git a/dix/main.c b/dix/main.c
index aa7b020b2..a079150f3 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -91,6 +91,7 @@ Equipment Corporation.
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
+#include "dix/selection_priv.h"
 #include "os/audit.h"
 #include "os/auth.h"
 #include "os/client_priv.h"
@@ -110,7 +111,6 @@ Equipment Corporation.
 #include "colormap.h"
 #include "colormapst.h"
 #include "cursorstr.h"
-#include "selection.h"
 #include "servermd.h"
 #include "dixfont.h"
 #include "extnsionst.h"
diff --git a/dix/selection.c b/dix/selection.c
index ec9b4e85b..ad4a1a9b8 100644
--- a/dix/selection.c
+++ b/dix/selection.c
@@ -47,11 +47,11 @@ SOFTWARE.
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "dix/selection_priv.h"
 
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "dispatch.h"
-#include "selection.h"
 #include "xace.h"
 
 /*****************************************************************
diff --git a/include/selection.h b/dix/selection_priv.h
similarity index 100%
rename from include/selection.h
rename to dix/selection_priv.h
diff --git a/dix/window.c b/dix/window.c
index 915cfa76a..29f370915 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -104,6 +104,7 @@ Equipment Corporation.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "dix/property_priv.h"
+#include "dix/selection_priv.h"
 #include "mi/mi_priv.h"         /* miPaintWindow */
 #include "os/auth.h"
 #include "os/client_priv.h"
@@ -133,7 +134,6 @@ Equipment Corporation.
 #ifdef COMPOSITE
 #include "compint.h"
 #endif
-#include "selection.h"
 #include "inpututils.h"
 #include "privates.h"
 #include "xace.h"
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 3663c44e8..13a63165f 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -37,12 +37,13 @@
 
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/selection_priv.h"
+#include "os/auth.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
-#include <selection.h>
 #include <micmap.h>
 #include <misyncshm.h>
 #include <compositeext.h>
@@ -54,8 +55,6 @@
 #include <version-config.h>
 #include "extinit.h"
 
-#include "os/auth.h"
-
 #include "xwayland-screen.h"
 #include "xwayland-vidmode.h"
 
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 44372b9ec..b84118a69 100644
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -51,13 +51,15 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xfixesproto.h>
+
+#include "dix/selection_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/xfixesproto.h>
 #include "windowstr.h"
-#include "selection.h"
 #include "xfixes.h"
 
 extern int XFixesEventBase;