diff --git a/fb/fb.h b/fb/fb.h
index 676379a00..0eb50d158 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -89,11 +89,6 @@ typedef FbBits FbStip;
 
 typedef int FbStride;
 
-#ifdef FB_DEBUG
-#define FB_HEAD_BITS   (FbStip) (0xbaadf00d)
-#define FB_TAIL_BITS   (FbStip) (0xbaddf0ad)
-#endif
-
 #include "fbrop.h"
 
 #if BITMAP_BIT_ORDER == LSBFirst
diff --git a/fb/fb_priv.h b/fb/fb_priv.h
index 3fdfdae19..22310ec49 100644
--- a/fb/fb_priv.h
+++ b/fb/fb_priv.h
@@ -14,6 +14,9 @@
 
 #ifdef FB_DEBUG
 
+#define FB_HEAD_BITS   (FbStip) (0xbaadf00d)
+#define FB_TAIL_BITS   (FbStip) (0xbaddf0ad)
+
 void fbValidateDrawable(DrawablePtr d);
 void fbSetBits(FbStip * bits, int stride, FbStip data);