diff --git a/Xext/security.c b/Xext/security.c
index c76c37f1fe..e28c3ef455 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group.
 #include "propertyst.h"
 #include "colormapst.h"
 #include "privates.h"
-#include "registry.h"
 #include "xacestr.h"
 #include "securitysrv.h"
 #include <X11/extensions/securproto.h>
diff --git a/Xext/xres.c b/Xext/xres.c
index ff0259bd1c..96c1844fdb 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -19,7 +19,6 @@
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include "registry.h"
 #include <X11/extensions/XResproto.h>
 #include "pixmapstr.h"
 #include "windowstr.h"
diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
index b71d08266e..dd14617b1b 100644
--- a/Xext/xselinux_label.c
+++ b/Xext/xselinux_label.c
@@ -25,7 +25,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "dix/registry_priv.h"
 
-#include "registry.h"
 #include "xselinuxint.h"
 
 /* selection and property atom cache */
diff --git a/Xext/xselinuxint.h b/Xext/xselinuxint.h
index 5a5874075a..dddae86e24 100644
--- a/Xext/xselinuxint.h
+++ b/Xext/xselinuxint.h
@@ -28,7 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dixstruct.h"
 #include "privates.h"
 #include "resource.h"
-#include "registry.h"
 #include "inputstr.h"
 #include "xselinux.h"
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index b947a02d2a..6b5de56889 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -128,7 +128,6 @@ Equipment Corporation.
 #include "xfixesint.h"
 
 #ifdef XSERVER_DTRACE
-#include "registry.h"
 #include "probes.h"
 #endif
 
diff --git a/dix/extension.c b/dix/extension.c
index a970f1b89b..dbe6c0a971 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "dispatch.h"
 #include "privates.h"
-#include "registry.h"
 #include "xace.h"
 
 #define LAST_ERROR 255
diff --git a/dix/main.c b/dix/main.c
index 74da47b350..637f98b0c5 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -106,7 +106,6 @@ Equipment Corporation.
 #include "dixfont.h"
 #include "extnsionst.h"
 #include "privates.h"
-#include "registry.h"
 #include "client.h"
 #include "exevents.h"
 #ifdef PANORAMIX
diff --git a/dix/registry.c b/dix/registry.c
index 0cee107891..a599d8c31b 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -29,7 +29,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dix/registry_priv.h"
 
 #include "resource.h"
-#include "registry.h"
 
 #define BASE_SIZE 16
 
diff --git a/dix/resource.c b/dix/resource.c
index 0cff047588..f8be25c2c6 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -143,7 +143,6 @@ Equipment Corporation.
 #endif
 #include "xace.h"
 #include <assert.h>
-#include "registry.h"
 #include "gcstruct.h"
 
 #ifdef XSERVER_DTRACE
diff --git a/glx/glxext.c b/glx/glxext.c
index 99f8661044..c3f67a5ecc 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -36,7 +36,6 @@
 #include "glxserver.h"
 #include <windowstr.h>
 #include <propertyst.h>
-#include <registry.h>
 #include "privates.h"
 #include <os.h>
 #include "extinit.h"
diff --git a/include/registry.h b/include/registry.h
deleted file mode 100644
index afc8e1c765..0000000000
--- a/include/registry.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/***********************************************************
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************/
-
-#ifndef DIX_REGISTRY_H
-#define DIX_REGISTRY_H
-
-#include "resource.h"
-#include "extnsionst.h"
-
-#endif                          /* DIX_REGISTRY_H */