diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 7fec44087..f3dc4cc74 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -39,6 +39,7 @@
 #include "windowstr.h"
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86Opt_priv.h"
 #ifdef DPMSExtension
 #include <X11/extensions/dpmsconst.h>
 #include "dpmsproc.h"
diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c
index 1e6ff7f65..2e952f324 100644
--- a/hw/xfree86/common/xf86Extensions.c
+++ b/hw/xfree86/common/xf86Extensions.c
@@ -35,7 +35,7 @@
 #include "xf86Config.h"
 #include "xf86Module.h"
 #include "xf86Extensions.h"
-#include "xf86Opt.h"
+#include "xf86Opt_priv.h"
 #include "optionstr.h"
 
 #ifdef XSELINUX
diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h
index ad366e027..18cb97c97 100644
--- a/hw/xfree86/common/xf86Opt.h
+++ b/hw/xfree86/common/xf86Opt.h
@@ -106,7 +106,6 @@ extern _X_EXPORT XF86OptionPtr xf86FindOption(XF86OptionPtr options,
                                               const char *name);
 extern _X_EXPORT const char *xf86FindOptionValue(XF86OptionPtr options,
                                                  const char *name);
-extern _X_EXPORT void xf86MarkOptionUsed(XF86OptionPtr option);
 extern _X_EXPORT void xf86MarkOptionUsedByName(XF86OptionPtr options,
                                                const char *name);
 extern _X_EXPORT void xf86ShowUnusedOptions(int scrnIndex,
diff --git a/hw/xfree86/common/xf86Opt_priv.h b/hw/xfree86/common/xf86Opt_priv.h
index d390f776c..221200896 100644
--- a/hw/xfree86/common/xf86Opt_priv.h
+++ b/hw/xfree86/common/xf86Opt_priv.h
@@ -8,5 +8,6 @@
 #include "xf86Opt.h"
 
 void xf86OptionListReport(XF86OptionPtr parm);
+void xf86MarkOptionUsed(XF86OptionPtr option);
 
 #endif /* _XORG_XF86OPTION_PRIV_H */
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index dbae465fc..a88df982b 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -47,6 +47,7 @@
 #include "xf86.h"
 #include "xf86_os_support.h"
 #include "xf86_OSproc.h"
+#include "xf86Opt_priv.h"
 #include "xf86Priv.h"
 #include "xf86str.h"
 #include "xf86Bus.h"