diff --git a/src/xgi.h b/src/xgi.h
index 839dbfe..bab9839 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -147,7 +147,6 @@ extern Bool g_bRunTimeDebug;
 #include "xf86xv.h"
 #include "compiler.h"
 
-#ifdef XORG_VERSION_CURRENT
 #include "xorgVersion.h"
 
 /* #if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(7,0,0,0,0) */
@@ -159,8 +158,6 @@ extern Bool g_bRunTimeDebug;
 #define XGI_USE_EXA
 #endif
 
-#endif
-
 /* Jong 01/13/2009; support EXA */
 #ifdef HAVE_XAA_H
 #define XGI_USE_XAA 
@@ -177,13 +174,6 @@ extern Bool g_bRunTimeDebug;
 #include "vgaHW.h"
 #include "vbe.h"
 
-/*
-#ifdef XORG_VERSION_CURRENT
-#include "xorgVersion.h"
-#endif */
-
-/* #define XGIISXORGPOST70 */
-
 #include "xgi_pci.h"
 #include "osdef.h"
 #include "vgatypes.h"
@@ -195,24 +185,15 @@ extern Bool g_bRunTimeDebug;
 #define XGINEWDRI
 #undef XGINEWDRI2
 
-#ifdef XF86_VERSION_CURRENT
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,4,99,99,0)	/* Adapt this when the time has come */
-#define XGINEWDRI2
-#endif
-#endif /* XF86_VERSION_CURRENT */
-
 #include "xf86drm.h"
 #include "sarea.h"
 #define _XF86DRI_SERVER_
 
-/* Jong@09032009 */
-#ifdef XORG_VERSION_CURRENT
 #if ( (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,9,0,0,0)) || (XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(2,0,0,0,0)) )
 #include "X11/dri/xf86dri.h"
 #else
 #include "xf86dri.h"
 #endif
-#endif
 
 #include "dri.h"
 #include "xgi_dri.h"
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 51a0c9d..8dcdc59 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -230,11 +230,7 @@ static XF86ModuleVersionInfo xgiVersRec = {
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-#ifdef XORG_VERSION_CURRENT
     XORG_VERSION_CURRENT,
-#else
-    XF86_VERSION_CURRENT,
-#endif
     PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,         /* This is a video driver */
 #ifdef ABI_VIDEODRV_VERSION
diff --git a/src/xgi_video.c b/src/xgi_video.c
index 1836173..320514f 100644
--- a/src/xgi_video.c
+++ b/src/xgi_video.c
@@ -45,16 +45,12 @@
 #include "config.h"
 #endif
 
-/* Jong@09022009 */
-#ifdef XORG_VERSION_CURRENT
 #include "xorgVersion.h"
 
 #if (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,9,0,0,0) )
 #define VC //video capture
 #endif
 
-#endif
-
 # ifdef VC
 #include <stdio.h>
 #include <stdlib.h>