diff --git a/src/vgatypes.h b/src/vgatypes.h
index f26ea57..484dfd0 100644
--- a/src/vgatypes.h
+++ b/src/vgatypes.h
@@ -56,7 +56,7 @@
 #include "osdef.h"
 
 #ifdef LINUX_XF86
-#include "xf86Version.h"
+#include "xorgVersion.h"
 #include "xf86Pci.h"
 #endif
 
diff --git a/src/xgi.h b/src/xgi.h
index 9a89bd7..30b6846 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -107,7 +107,7 @@
 #ifdef XF86DRI
 #define XGINEWDRI
 #undef XGINEWDRI2
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,4,99,99,0)	/* Adapt this when the time has come */
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,4,99,99,0)	/* Adapt this when the time has come */
 #define XGINEWDRI2
 #endif
 #include "xf86drm.h"
diff --git a/src/xgi_dac.c b/src/xgi_dac.c
index 9a95001..3f21143 100644
--- a/src/xgi_dac.c
+++ b/src/xgi_dac.c
@@ -47,7 +47,7 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Version.h"
+#include "xorgVersion.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86DDC.h"
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 6be0363..b4558bd 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -60,7 +60,7 @@
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
 #include "dixstruct.h"
-#include "xf86Version.h"
+#include "xorgVersion.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86cmap.h"
diff --git a/src/xgi_setup.c b/src/xgi_setup.c
index 806dff7..cd39165 100644
--- a/src/xgi_setup.c
+++ b/src/xgi_setup.c
@@ -43,7 +43,7 @@
 #include "xf4bpp.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86Version.h"
+#include "xorgVersion.h"
 
 #include "xf86cmap.h"
 
diff --git a/src/xgi_vga.c b/src/xgi_vga.c
index 4639d3e..c6c6b4b 100644
--- a/src/xgi_vga.c
+++ b/src/xgi_vga.c
@@ -38,7 +38,7 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Version.h"
+#include "xorgVersion.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"