diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 4cce3d2a0..9580ff1c7 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -20,7 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
-#include "dix/property_priv.h"
 
 #include "selection.h"
 #include "inputstr.h"
diff --git a/dix/property_priv.h b/dix/property_priv.h
index 2c3eb8021..bd8d8c992 100644
--- a/dix/property_priv.h
+++ b/dix/property_priv.h
@@ -51,9 +51,6 @@ SOFTWARE.
 #ifndef _XSERVER_PROPERTY_PRIV_H
 #define _XSERVER_PROPERTY_PRIV_H
 
-#include <X11/X.h>
-
-#include "dix.h"
 #include "window.h"
 #include "property.h"
 
@@ -65,7 +62,4 @@ typedef struct _PropertyStateRec {
 
 extern CallbackListPtr PropertyStateCallback;
 
-int dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom proprty,
-                      ClientPtr pClient, Mask access_mode);
-
 #endif /* _XSERVER_PROPERTY_PRIV_H */
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 684999749..9d3704de1 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -34,8 +34,6 @@
 
 #include <errno.h>
 
-#include "dix/property_priv.h"
-
 #include "quartz.h"
 
 #include "misc.h"
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index db611d247..dac4b4ed6 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -33,7 +33,6 @@
 #include <X11/Xatom.h>
 
 #include "dix/dix_priv.h"
-#include "dix/property_priv.h"
 
 #include "compositeext.h"
 #include "compint.h"
diff --git a/include/property.h b/include/property.h
index 178c88dc9..e6710820e 100644
--- a/include/property.h
+++ b/include/property.h
@@ -51,6 +51,12 @@ SOFTWARE.
 
 typedef struct _Property *PropertyPtr;
 
+extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
+                                       WindowPtr /*pWin */ ,
+                                       Atom /*proprty */ ,
+                                       ClientPtr /*pClient */ ,
+                                       Mask /*access_mode */ );
+
 extern _X_EXPORT int dixChangeWindowProperty(ClientPtr pClient,
                                              WindowPtr pWin,
                                              Atom property,