diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index ab8f24456..b79f60174 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -38,9 +38,6 @@
 #include "xf86Privstr.h"
 #include "input.h"
 
-#ifdef HAVE_ACPI
-extern _X_EXPORT Bool xf86acpiDisableFlag;
-#endif
 extern _X_EXPORT char *xf86LayoutName;
 extern _X_EXPORT char *xf86ScreenName;
 extern _X_EXPORT char *xf86PointerName;
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index e796e5f3d..7af6cf865 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -25,6 +25,7 @@ extern Bool xf86bsEnableFlag;
 extern Bool xf86bsDisableFlag;
 extern Bool xf86silkenMouseDisableFlag;
 extern Bool xf86xkbdirFlag;
+extern Bool xf86acpiDisableFlag;
 
 /* xf86Cursor.c */
 void xf86LockZoom(ScreenPtr pScreen, int lock);
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index 5993d620e..e453dc9b3 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -8,7 +8,7 @@
 #include "os/log_priv.h"
 
 #include "os.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSproc.h"