diff --git a/dix/window_priv.h b/dix/window_priv.h
index 5985368d00..50363b4d1c 100644
--- a/dix/window_priv.h
+++ b/dix/window_priv.h
@@ -10,6 +10,13 @@
 #include "include/dix.h"
 #include "include/window.h"
 
+#define SameBackground(as, a, bs, b)				\
+    ((as) == (bs) && ((as) == None ||				\
+                      (as) == ParentRelative ||			\
+                      SamePixUnion(a,b,as == BackgroundPixel)))
+
+#define SameBorder(as, a, bs, b) EqualPixUnion(as, a, bs, b)
+
 /*
  * @brief create a window
  *
diff --git a/include/windowstr.h b/include/windowstr.h
index f32587e1f4..255ed03b38 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -60,14 +60,6 @@ SOFTWARE.
 #include "opaque.h"
 
 
-#define SameBackground(as, a, bs, b)				\
-    ((as) == (bs) && ((as) == None ||				\
-		      (as) == ParentRelative ||			\
- 		      SamePixUnion(a,b,as == BackgroundPixel)))
-
-#define SameBorder(as, a, bs, b)				\
-    EqualPixUnion(as, a, bs, b)
-
 /* used as NULL-terminated list */
 typedef struct _DevCursorNode {
     CursorPtr cursor;