diff --git a/include/property.h b/include/property.h
index 5782565070..79469d94bc 100644
--- a/include/property.h
+++ b/include/property.h
@@ -49,8 +49,6 @@ SOFTWARE.
 
 #include "window.h"
 
-typedef struct _Property *PropertyPtr;
-
 extern _X_EXPORT int dixChangeWindowProperty(ClientPtr pClient,
                                              WindowPtr pWin,
                                              Atom property,
diff --git a/include/window.h b/include/window.h
index 8b5dcf2556..b5c779d297 100644
--- a/include/window.h
+++ b/include/window.h
@@ -71,6 +71,7 @@ struct _Cursor;
 
 typedef struct _BackingStore *BackingStorePtr;
 typedef struct _Window *WindowPtr;
+typedef struct _Property *PropertyPtr;
 
 enum RootClipMode {
     ROOT_CLIP_NONE = 0, /**< resize the root window to 0x0 */