diff --git a/dix/window_priv.h b/dix/window_priv.h
index 3753e2f247..74912e3c39 100644
--- a/dix/window_priv.h
+++ b/dix/window_priv.h
@@ -10,6 +10,10 @@
 #include "include/dix.h"
 #include "include/window.h"
 
+extern Mask DontPropagateMasks[];
+
+#define wDontPropagateMask(w)   wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
+
 /*
  * @brief create a window
  *
diff --git a/include/windowstr.h b/include/windowstr.h
index d640ee7e4c..31c381d4c4 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -171,8 +171,6 @@ typedef struct _Window {
  * fields (or filling the appropriate default value)
  */
 
-extern _X_EXPORT Mask DontPropagateMasks[];
-
 #define wTrackParent(w,field)	((w)->optional ? \
 				    (w)->optional->field \
  				 : FindWindowWithOptional(w)->optional->field)
@@ -183,7 +181,6 @@ extern _X_EXPORT Mask DontPropagateMasks[];
 #define wVisual(w)		wTrackParent(w, visual)
 #define wCursor(w)		((w)->cursorIsNone ? None : wTrackParent(w, cursor))
 #define wColormap(w)		((w)->drawable.class == InputOnly ? None : wTrackParent(w, colormap))
-#define wDontPropagateMask(w)	wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
 #define wOtherEventMasks(w)	wUseDefault(w, otherEventMasks, 0)
 #define wOtherClients(w)	wUseDefault(w, otherClients, NULL)
 #define wOtherInputMasks(w)	wUseDefault(w, inputMasks, NULL)