diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 2675515b8..c6a83450c 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -59,10 +59,6 @@ extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec;
 extern _X_EXPORT ScrnInfoPtr *xf86Screens;      /* List of pointers to ScrnInfoRecs */
 extern _X_EXPORT const unsigned char byte_reversed[256];
 
-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
-extern _X_EXPORT Bool sbusSlotClaimed;
-#endif
-
 #if defined(XSERVER_PLATFORM_BUS)
 extern _X_EXPORT int platformSlotClaimed;
 #endif
diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h
index 221ccf00b..0ef24217f 100644
--- a/hw/xfree86/common/xf86Bus.h
+++ b/hw/xfree86/common/xf86Bus.h
@@ -68,5 +68,6 @@ int xf86AllocateEntity(void);
 BusType StringToBusType(const char *busID, const char **retID);
 
 extern Bool fbSlotClaimed;
+extern Bool sbusSlotClaimed;
 
 #endif                          /* _XF86_BUS_H */