diff --git a/fb/fb.h b/fb/fb.h
index 17a22ec2c9..f02fdd99e1 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -110,14 +110,12 @@ typedef FbBits FbStip;
 typedef int FbStride;
 
 #ifdef FB_DEBUG
-extern _X_EXPORT void fbValidateDrawable(DrawablePtr d);
 extern _X_EXPORT void fbInitializeDrawable(DrawablePtr d);
 extern _X_EXPORT void fbSetBits(FbStip * bits, int stride, FbStip data);
 
 #define FB_HEAD_BITS   (FbStip) (0xbaadf00d)
 #define FB_TAIL_BITS   (FbStip) (0xbaddf0ad)
 #else
-#define fbValidateDrawable(d)
 #define fdInitializeDrawable(d)
 #endif
 
diff --git a/fb/fb_priv.h b/fb/fb_priv.h
new file mode 100644
index 0000000000..7ff634a621
--- /dev/null
+++ b/fb/fb_priv.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef XORG_FB_PRIV_H
+#define XORG_FB_PRIV_H
+
+#include "fb/fb.h"
+
+#ifdef FB_DEBUG
+
+void fbValidateDrawable(DrawablePtr d);
+
+#else
+
+static inline void fbValidateDrawable(DrawablePtr d) {}
+
+#endif /* FB_DEBUG */
+
+#endif /* XORG_FB_PRIV_H */
diff --git a/fb/fbfill.c b/fb/fbfill.c
index 5d08e2257d..5c91c84bb2 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -22,7 +22,7 @@
 
 #include <dix-config.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 static void
 fbStipple(FbBits * dst, FbStride dstStride,
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 3ed2b56809..b5dd35538f 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 PixmapPtr
 fbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index 0fdc173801..89f4bbffb4 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -22,7 +22,7 @@
 
 #include <dix-config.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 void
 fbSetSpans(DrawablePtr pDrawable,
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 96e749a205..6dedf6afa2 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 Bool
 fbCreateWindow(WindowPtr pWin)
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index f1cdec3078..6d6c596f4d 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -36,6 +36,7 @@
 #include <assert.h>
 #include <X11/Xatom.h>
 
+#include "fb/fb_priv.h"
 #include "mi/mi_priv.h"
 #include "dix_priv.h"
 
@@ -47,7 +48,6 @@
 extern int darwinMainScreenX, darwinMainScreenY;
 extern Bool no_configure_window;
 #endif
-#include "fb.h"
 
 #include "rootlessCommon.h"
 #include "rootlessWindow.h"