diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index cd4227ae3..7d09a1bcc 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -41,8 +41,10 @@
 #ifndef _XF86MODULE_H
 #define _XF86MODULE_H
 
-#include "misc.h"
-#include "extension.h"
+#include <X11/Xfuncproto.h>
+#include <X11/Xdefs.h>
+#include <X11/Xmd.h>
+
 #ifndef NULL
 #define NULL ((void *)0)
 #endif