diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h
index 9cfcbc574..ab74e3da3 100644
--- a/hw/xfree86/common/xf86sbusBus.h
+++ b/hw/xfree86/common/xf86sbusBus.h
@@ -40,21 +40,8 @@
 #define SBUS_DEVICE_GT		0x000c
 #define SBUS_DEVICE_MGX		0x000d
 
-typedef struct sbus_prom_node {
-    int node;
-    /* Because of misdesigned openpromio */
-    int cookie[2];
-} sbusPromNode, *sbusPromNodePtr;
-
-typedef struct sbus_device {
-    int devId;
-    int fbNum;
-    int fd;
-    int width, height;
-    sbusPromNode node;
-    const char *descr;
-    const char *device;
-} sbusDevice, *sbusDevicePtr;
+typedef struct sbus_prom_node *sbusPromNodePtr;
+typedef struct sbus_device *sbusDevicePtr;
 
 struct sbus_devtable {
     int devId;
@@ -104,8 +91,4 @@ extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
 extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
 extern _X_EXPORT char *sparcDriverName(void);
 
-extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
-extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,
-                                    GDevRec * GDev);
-
 #endif                          /* _XF86_SBUSBUS_H */
diff --git a/hw/xfree86/common/xf86sbusBus_priv.h b/hw/xfree86/common/xf86sbusBus_priv.h
new file mode 100644
index 000000000..d317ce277
--- /dev/null
+++ b/hw/xfree86/common/xf86sbusBus_priv.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ * Copyright © 2000 Jakub Jelinek (jakub@redhat.com)
+ */
+#ifndef _XSERVER_XF86_SBUSBUS_H
+#define _XSERVER_XF86_SBUSBUS_H
+
+#include <X11/Xdefs.h>
+
+#include "xf86sbusBus.h"
+
+typedef struct sbus_prom_node {
+    int node;
+    /* Because of misdesigned openpromio */
+    int cookie[2];
+} sbusPromNode, *sbusPromNodePtr;
+
+typedef struct sbus_device {
+    int devId;
+    int fbNum;
+    int fd;
+    int width, height;
+    sbusPromNode node;
+    const char *descr;
+    const char *device;
+} sbusDevice, *sbusDevicePtr;
+
+Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
+void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec* GDev);
+
+#endif /* _XSERVER_XF86_SBUSBUS_H */