diff --git a/Xext/xace.h b/Xext/xace.h
index 590c5d757..b9c81accf 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 8b1b57e36..7166bf2e1 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_RESOURCE_ACCESS */
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index e6507a611..94b7458a9 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 9eef95a42..45a3c1a49 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "dix/registry_priv.h"
 #include "dix/resource_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 95924ce42..d09ec2697 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -111,6 +111,7 @@ Equipment Corporation.
 #include "dix/registry_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/selection_priv.h"
 #include "dix/window_priv.h"
 #include "include/resource.h"
 #include "miext/extinit_priv.h"
@@ -123,7 +124,6 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
-#include "selection.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
 #include "servermd.h"
diff --git a/dix/main.c b/dix/main.c
index 6f8112846..cf83a6346 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"
@@ -109,7 +110,6 @@ Equipment Corporation.
 #include "gcstruct.h"
 #include "extension.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 ada2ba68b..7425b42c5 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 c4ff4252a..e79d2b053 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -106,6 +106,7 @@ Equipment Corporation.
 #include "dix/input_priv.h"
 #include "dix/property_priv.h"
 #include "dix/resource_priv.h"
+#include "dix/selection_priv.h"
 #include "dix/window_priv.h"
 #include "mi/mi_priv.h"         /* miPaintWindow */
 #include "os/auth.h"
@@ -131,7 +132,6 @@ Equipment Corporation.
 #include "dixevents.h"
 #include "globals.h"
 #include "compint.h"
-#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 9468fe6ce..99cc68010 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -37,6 +37,8 @@
 
 #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/client_priv.h"
 #include "os/ddx_priv.h"
@@ -44,7 +46,6 @@
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
-#include <selection.h>
 #include <micmap.h>
 #include <misyncshm.h>
 #include <compositeext.h>
@@ -56,8 +57,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 54cb3829f..6e606d00a 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;