diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index cba199180..70e01bba6 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -22,6 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "dix/dix_priv.h"
+#include "dix/property_priv.h"
 #include "dix/selection_priv.h"
 #include "miext/extinit_priv.h"
 
diff --git a/dix/property_priv.h b/dix/property_priv.h
index d0984abed..e452239e5 100644
--- a/dix/property_priv.h
+++ b/dix/property_priv.h
@@ -6,6 +6,9 @@
 #ifndef _XSERVER_PROPERTY_PRIV_H
 #define _XSERVER_PROPERTY_PRIV_H
 
+#include <X11/X.h>
+
+#include "dix.h"
 #include "window.h"
 #include "property.h"
 
@@ -17,4 +20,7 @@ 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 8c6a5dde6..c6d1f6f7e 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -36,6 +36,8 @@
 
 #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 4e56ed41e..e5d45a919 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -35,6 +35,7 @@
 #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 e6710820e..178c88dc9 100644
--- a/include/property.h
+++ b/include/property.h
@@ -51,12 +51,6 @@ 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,