Bug #2428: #ifdef GLX_DIRECT_RENDERING in DRI drivers is pointless.

65 files changed, 3 insertions, 223 deletions

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 700bf16849b..df7acff0833 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -48,11 +48,6 @@ SHARED_INCLUDES = \
 	-I$(TOP)/src/mesa/swrast \
 	-I$(TOP)/src/mesa/swrast_setup
 
-# Of course we're direct rendering.  Redundant #ifdefs in the code
-# from prehistory require this:
-#
-DEFINES += -DGLX_DIRECT_RENDERING 
-
 ##### RULES #####
 
 .c.o:
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index eff21af0eaa..a4de0b6496a 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -25,8 +25,6 @@
  */
 
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <assert.h>
 #include <stdarg.h>
 #include <unistd.h>
@@ -1689,5 +1687,3 @@ driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, int64_t last_swap_ust,
 }
 
 /*@}*/
-
-#endif /* GLX_DIRECT_RENDERING */
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index 9c6e7196436..001313c4c8a 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -49,8 +49,6 @@
 #ifndef _DRI_UTIL_H_
 #define _DRI_UTIL_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 #define CAPI  /* XXX this should be globally defined somewhere */
 
 #ifdef DRI_NEW_INTERFACE_ONLY
@@ -575,6 +573,4 @@ extern void
 (*glXGetProcAddress(const GLubyte *procname))( void );
 #endif
 
-#endif /* GLX_DIRECT_RENDERING */
-
 #endif /* _DRI_UTIL_H_ */
diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index 4e38d082373..722b870f5e9 100644
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -25,8 +25,6 @@
  *    David S. Miller <[email protected]>
  */
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "ffb_xmesa.h"
 #include "context.h"
 #include "matrix.h"
@@ -580,6 +578,3 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
    psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &ffbAPI);
    return (void *) psp;
 }
-
-
-#endif /* GLX_DIRECT_RENDERING */
diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.h b/src/mesa/drivers/dri/ffb/ffb_xmesa.h
index 5569bd86624..b7580780a62 100644
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.h
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.h
@@ -3,8 +3,6 @@
 #ifndef _FFB_XMESA_H_
 #define _FFB_XMESA_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <sys/time.h>
 #include "dri_util.h"
 #include "mtypes.h"
@@ -25,6 +23,4 @@ typedef struct {
 	int				rp_active;
 } ffbScreenPrivate;
 
-#endif /* GLX_DIRECT_RENDERING */
-
 #endif /* !(_FFB_XMESA_H) */
diff --git a/src/mesa/drivers/dri/gamma/gamma_lock.h b/src/mesa/drivers/dri/gamma/gamma_lock.h
index 8b66e19aa4a..2d117320da2 100644
--- a/src/mesa/drivers/dri/gamma/gamma_lock.h
+++ b/src/mesa/drivers/dri/gamma/gamma_lock.h
@@ -1,8 +1,6 @@
 #ifndef __GAMMA_LOCK_H__
 #define __GAMMA_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void gammaGetLock( gammaContextPtr gmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -72,8 +70,6 @@ extern int prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
-
 #define GAMMAHW_LOCK( gmesa )						\
    DRM_UNLOCK(gmesa->driFd, gmesa->driHwLock, gmesa->hHWContext);	\
    DRM_SPINLOCK(&gmesa->driScreen->pSAREA->drawable_lock,		\
diff --git a/src/mesa/drivers/dri/gamma/gamma_macros.h b/src/mesa/drivers/dri/gamma/gamma_macros.h
index bf9cf5f11f7..974fe569df6 100644
--- a/src/mesa/drivers/dri/gamma/gamma_macros.h
+++ b/src/mesa/drivers/dri/gamma/gamma_macros.h
@@ -35,8 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _GAMMA_MACROS_H_
 #define _GAMMA_MACROS_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 #define DEBUG_DRMDMA
 #define DEBUG_ERRORS
 #define DEBUG_COMMANDS_NOT
@@ -323,6 +321,4 @@ do {                                          \
     while (__s > 1) { ++l2; __s >>= 1; }      \
 } while (0)
 
-#endif
-
 #endif /* _GAMMA_MACROS_H_ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h
index 9edd5867c02..d82fca5aa8c 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.h
+++ b/src/mesa/drivers/dri/mach64/mach64_context.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_CONTEXT_H__
 #define __MACH64_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "dri_util.h"
 #include "drm.h"
 #include "mach64_drm.h"
@@ -403,5 +401,4 @@ extern int MACH64_DEBUG;
 #define DEBUG_VERBOSE_PRIMS	0x040
 #define DEBUG_VERBOSE_COUNT	0x080
 #define DEBUG_NOWAIT		0x100
-#endif
 #endif /* __MACH64_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_dd.h b/src/mesa/drivers/dri/mach64/mach64_dd.h
index 92b10c6078e..74cf1d304fd 100644
--- a/src/mesa/drivers/dri/mach64/mach64_dd.h
+++ b/src/mesa/drivers/dri/mach64/mach64_dd.h
@@ -31,9 +31,6 @@
 #ifndef __MACH64_DD_H__
 #define __MACH64_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64InitDriverFuncs( struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/mach64/mach64_ioctl.h b/src/mesa/drivers/dri/mach64/mach64_ioctl.h
index d78fac4111c..8bd958531c1 100644
--- a/src/mesa/drivers/dri/mach64/mach64_ioctl.h
+++ b/src/mesa/drivers/dri/mach64/mach64_ioctl.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_IOCTL_H__
 #define __MACH64_IOCTL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "mach64_dri.h"
 #include "mach64_reg.h"
 #include "mach64_lock.h"
@@ -147,5 +145,4 @@ do {						\
 } while (0)
 
 
-#endif
 #endif /* __MACH64_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_lock.h b/src/mesa/drivers/dri/mach64/mach64_lock.h
index 3a77c1c690c..973880ee254 100644
--- a/src/mesa/drivers/dri/mach64/mach64_lock.h
+++ b/src/mesa/drivers/dri/mach64/mach64_lock.h
@@ -31,8 +31,6 @@
 #ifndef __MACH64_LOCK_H__
 #define __MACH64_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64GetLock( mach64ContextPtr mmesa, GLuint flags );
 
 
@@ -103,5 +101,4 @@ extern int   prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
 #endif /* __MACH64_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_reg.h b/src/mesa/drivers/dri/mach64/mach64_reg.h
index 2fd31de6c79..abbba295a53 100644
--- a/src/mesa/drivers/dri/mach64/mach64_reg.h
+++ b/src/mesa/drivers/dri/mach64/mach64_reg.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_REG_H__
 #define __MACH64_REG_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 /*
  * Not sure how this compares with the G200, but the Rage Pro has two
  * banks of registers, with bank 0 at (aperture base + memmap offset - 1KB)
@@ -405,5 +403,4 @@
 #define MACH64_LAST_FRAME_REG			MACH64_PAT_REG0
 #define MACH64_LAST_DISPATCH_REG		MACH64_PAT_REG1
 
-#endif
 #endif /* __MACH64_REG_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.h b/src/mesa/drivers/dri/mach64/mach64_screen.h
index 298c0e6c833..5305058e2fb 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.h
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_SCREEN_H__
 #define __MACH64_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "xmlconfig.h"
 
 typedef struct {
@@ -77,5 +75,4 @@ typedef struct {
    driOptionCache optionCache;
 } mach64ScreenRec, *mach64ScreenPtr;
 
-#endif
 #endif /* __MACH64_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_span.h b/src/mesa/drivers/dri/mach64/mach64_span.h
index 52883ba1e94..b83ac7c721f 100644
--- a/src/mesa/drivers/dri/mach64/mach64_span.h
+++ b/src/mesa/drivers/dri/mach64/mach64_span.h
@@ -31,9 +31,6 @@
 #ifndef __MACH64_SPAN_H__
 #define __MACH64_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64DDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/mach64/mach64_state.h b/src/mesa/drivers/dri/mach64/mach64_state.h
index 41d78716f58..95bcab3653d 100644
--- a/src/mesa/drivers/dri/mach64/mach64_state.h
+++ b/src/mesa/drivers/dri/mach64/mach64_state.h
@@ -31,8 +31,6 @@
 #ifndef __MACH64_STATE_H__
 #define __MACH64_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "mach64_context.h"
 
 extern void mach64DDInitState( mach64ContextPtr mmesa );
@@ -47,4 +45,3 @@ extern void mach64DDUpdateHWState( GLcontext *ctx );
 extern void mach64EmitHwStateLocked( mach64ContextPtr mmesa );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.h b/src/mesa/drivers/dri/mach64/mach64_tex.h
index acae887d303..d950dd12b44 100644
--- a/src/mesa/drivers/dri/mach64/mach64_tex.h
+++ b/src/mesa/drivers/dri/mach64/mach64_tex.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_TEX_H__
 #define __MACH64_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64UpdateTextureState( GLcontext *ctx );
 
 extern void mach64SwapOutTexObj( mach64ContextPtr mach64ctx,
@@ -99,4 +97,3 @@ static __inline__ GLuint mach64PackColor( GLuint cpp,
 }
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.h b/src/mesa/drivers/dri/mga/mga_xmesa.h
index 51cab51dada..f78f806c771 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.h
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.h
@@ -29,8 +29,6 @@
 #ifndef _MGA_INIT_H_
 #define _MGA_INIT_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <sys/time.h>
 #include "dri_util.h"
 #include "mga_drm.h"
@@ -149,4 +147,3 @@ do {						\
 #define MGA_WRITE( reg, val )	do { MGA_DEREF( reg ) = val; } while (0)
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r128/r128_context.h b/src/mesa/drivers/dri/r128/r128_context.h
index 4574f298bf8..e91257f7fc8 100644
--- a/src/mesa/drivers/dri/r128/r128_context.h
+++ b/src/mesa/drivers/dri/r128/r128_context.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_CONTEXT_H__
 #define __R128_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "dri_util.h"
 #include "drm.h"
 #include "r128_drm.h"
@@ -268,5 +266,4 @@ extern int R128_DEBUG;
 #define DEBUG_VERBOSE_2D	0x40
 #define DEBUG_VERBOSE_FALL	0x80
 
-#endif
 #endif /* __R128_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_dd.h b/src/mesa/drivers/dri/r128/r128_dd.h
index 1c8a5030500..7a0abb73f83 100644
--- a/src/mesa/drivers/dri/r128/r128_dd.h
+++ b/src/mesa/drivers/dri/r128/r128_dd.h
@@ -36,9 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_DD_H__
 #define __R128_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128InitDriverFuncs( struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.h b/src/mesa/drivers/dri/r128/r128_ioctl.h
index 1ee17cf7c62..d2f2dded8b5 100644
--- a/src/mesa/drivers/dri/r128/r128_ioctl.h
+++ b/src/mesa/drivers/dri/r128/r128_ioctl.h
@@ -35,8 +35,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_IOCTL_H__
 #define __R128_IOCTL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r128_dri.h"
 #include "r128_reg.h"
 #include "r128_lock.h"
@@ -143,5 +141,4 @@ do {									\
       UNLOCK_HARDWARE( rmesa );						\
    } while (0)
 
-#endif
 #endif /* __R128_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_lock.h b/src/mesa/drivers/dri/r128/r128_lock.h
index e734ba29def..39bdde98200 100644
--- a/src/mesa/drivers/dri/r128/r128_lock.h
+++ b/src/mesa/drivers/dri/r128/r128_lock.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_LOCK_H__
 #define __R128_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128GetLock( r128ContextPtr rmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -107,5 +105,4 @@ extern int prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
 #endif /* __R128_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_screen.h b/src/mesa/drivers/dri/r128/r128_screen.h
index 45e5114e8c8..8db8eea3587 100644
--- a/src/mesa/drivers/dri/r128/r128_screen.h
+++ b/src/mesa/drivers/dri/r128/r128_screen.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_SCREEN_H__
 #define __R128_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "xmlconfig.h"
 
 typedef struct {
@@ -83,5 +81,4 @@ typedef struct {
 } r128ScreenRec, *r128ScreenPtr;
 
 
-#endif
 #endif /* __R128_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_span.h b/src/mesa/drivers/dri/r128/r128_span.h
index 44356c5b241..03de567b32e 100644
--- a/src/mesa/drivers/dri/r128/r128_span.h
+++ b/src/mesa/drivers/dri/r128/r128_span.h
@@ -36,9 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_SPAN_H__
 #define __R128_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128DDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r128/r128_state.h b/src/mesa/drivers/dri/r128/r128_state.h
index c51ac239427..ac33853b167 100644
--- a/src/mesa/drivers/dri/r128/r128_state.h
+++ b/src/mesa/drivers/dri/r128/r128_state.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_STATE_H__
 #define __R128_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r128_context.h"
 
 extern void r128DDInitState( r128ContextPtr rmesa );
@@ -51,4 +49,3 @@ extern void r128UpdateWindow( GLcontext *ctx );
 extern void r128EmitHwStateLocked( r128ContextPtr rmesa );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r128/r128_tex.h b/src/mesa/drivers/dri/r128/r128_tex.h
index d6d2aeff954..54053b8b315 100644
--- a/src/mesa/drivers/dri/r128/r128_tex.h
+++ b/src/mesa/drivers/dri/r128/r128_tex.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_TEX_H__
 #define __R128_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128UpdateTextureState( GLcontext *ctx );
 
 extern void r128UploadTexImages( r128ContextPtr rmesa, r128TexObjPtr t );
@@ -84,5 +82,4 @@ static __inline__ u_int32_t r128PackColor( GLuint cpp,
     }
 }
 
-#endif
 #endif /* __R128_TEX_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h
index bb5a3cf30dc..cedf1b974f1 100644
--- a/src/mesa/drivers/dri/r200/r200_context.h
+++ b/src/mesa/drivers/dri/r200/r200_context.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_CONTEXT_H__
 #define __R200_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "tnl/t_vertex.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -990,5 +988,4 @@ extern int R200_DEBUG;
 #define DEBUG_PIXEL     0x2000
 #define DEBUG_MEMORY    0x4000
 
-#endif
 #endif /* __R200_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h
index 939dab36853..8927acd7faa 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.h
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_IOCTL_H__
 #define __R200_IOCTL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "simple_list.h"
 #include "radeon_dri.h"
 #include "r200_lock.h"
@@ -214,8 +212,4 @@ static __inline char *r200AllocCmdBuf( r200ContextPtr rmesa,
    return head;
 }
 
-
-
-
-#endif
 #endif /* __R200_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_lock.h b/src/mesa/drivers/dri/r200/r200_lock.h
index 587e4fe5ccd..e4c3a7e9352 100644
--- a/src/mesa/drivers/dri/r200/r200_lock.h
+++ b/src/mesa/drivers/dri/r200/r200_lock.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_LOCK_H__
 #define __R200_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200GetLock( r200ContextPtr rmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -106,5 +104,4 @@ extern int prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
 #endif /* __R200_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_maos.h b/src/mesa/drivers/dri/r200/r200_maos.h
index a430497db98..b9e4d3c2392 100644
--- a/src/mesa/drivers/dri/r200/r200_maos.h
+++ b/src/mesa/drivers/dri/r200/r200_maos.h
@@ -36,12 +36,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_MAOS_H__
 #define __R200_MAOS_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 extern void r200EmitArrays( GLcontext *ctx, GLuint inputs );
 extern void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_pixel.h b/src/mesa/drivers/dri/r200/r200_pixel.h
index 9282d2b147d..8f3923b6b16 100644
--- a/src/mesa/drivers/dri/r200/r200_pixel.h
+++ b/src/mesa/drivers/dri/r200/r200_pixel.h
@@ -35,9 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_PIXEL_H__
 #define __R200_PIXEL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200InitPixelFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_screen.h b/src/mesa/drivers/dri/r200/r200_screen.h
index 42200f8962b..fa8c33faadf 100644
--- a/src/mesa/drivers/dri/r200/r200_screen.h
+++ b/src/mesa/drivers/dri/r200/r200_screen.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_SCREEN_H__
 #define __R200_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "xf86drm.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -103,5 +101,4 @@ typedef struct {
    driOptionCache optionCache;
 } r200ScreenRec, *r200ScreenPtr;
 
-#endif
 #endif /* __R200_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_span.h b/src/mesa/drivers/dri/r200/r200_span.h
index 72911e9455c..9ddf245b636 100644
--- a/src/mesa/drivers/dri/r200/r200_span.h
+++ b/src/mesa/drivers/dri/r200/r200_span.h
@@ -36,9 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_SPAN_H__
 #define __R200_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200InitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_state.h b/src/mesa/drivers/dri/r200/r200_state.h
index 9d9de8e9a28..d467d73bd80 100644
--- a/src/mesa/drivers/dri/r200/r200_state.h
+++ b/src/mesa/drivers/dri/r200/r200_state.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_STATE_H__
 #define __R200_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 extern void r200InitState( r200ContextPtr rmesa );
@@ -67,4 +65,3 @@ extern void r200Fallback( GLcontext *ctx, GLuint bit, GLboolean mode );
 extern void r200LightingSpaceChange( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.h b/src/mesa/drivers/dri/r200/r200_tcl.h
index 7dd43bf7fac..ac5bc119468 100644
--- a/src/mesa/drivers/dri/r200/r200_tcl.h
+++ b/src/mesa/drivers/dri/r200/r200_tcl.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_TCL_H__
 #define __R200_TCL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 extern void r200TclPrimitive( GLcontext *ctx, GLenum prim, int hw_prim );
@@ -68,6 +66,4 @@ extern float r200ComputeFogBlendFactor( GLcontext *ctx, GLfloat fogcoord );
 
 #define TCL_FALLBACK( ctx, bit, mode )	r200TclFallback( ctx, bit, mode )
 
-
-#endif
 #endif
diff --git a/src/mesa/drivers/dri/r200/r200_tex.h b/src/mesa/drivers/dri/r200/r200_tex.h
index 7c507a7fd0b..acabbc11bd1 100644
--- a/src/mesa/drivers/dri/r200/r200_tex.h
+++ b/src/mesa/drivers/dri/r200/r200_tex.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_TEX_H__
 #define __R200_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200UpdateTextureState( GLcontext *ctx );
 
 extern int r200UploadTexImages( r200ContextPtr rmesa, r200TexObjPtr t, GLuint face );
@@ -46,5 +44,4 @@ extern void r200DestroyTexObj( r200ContextPtr rmesa, r200TexObjPtr t );
 
 extern void r200InitTextureFuncs( struct dd_function_table *functions );
 
-#endif
 #endif /* __R200_TEX_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.h b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
index 071a74082ff..82cbda2742b 100644
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.h
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_VTXFMT_H__
 #define __R200_VTXFMT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 
@@ -122,6 +120,4 @@ struct dynfn *r200_makeX86MultiTexCoord2fvARB( GLcontext *, const int * );
 struct dynfn *r200_makeX86MultiTexCoord1fARB( GLcontext *, const int * );
 struct dynfn *r200_makeX86MultiTexCoord1fvARB( GLcontext *, const int * );
 
-
-#endif
 #endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
index c1803130969..53860c12b84 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
@@ -38,8 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_CONTEXT_H__
 #define __RADEON_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "dri_util.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -850,5 +848,4 @@ extern int RADEON_DEBUG;
 #define DEBUG_SANITY    0x800
 #define DEBUG_SYNC     0x1000
 
-#endif
 #endif /* __RADEON_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.h b/src/mesa/drivers/dri/radeon/radeon_ioctl.h
index 79b3b72c60e..8b21920c527 100644
--- a/src/mesa/drivers/dri/radeon/radeon_ioctl.h
+++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.h
@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_IOCTL_H__
 #define __RADEON_IOCTL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "simple_list.h"
 #include "radeon_lock.h"
 
@@ -216,8 +214,4 @@ static __inline char *radeonAllocCmdBuf( radeonContextPtr rmesa,
    }
 }
 
-
-
-
-#endif
 #endif /* __RADEON_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/radeon/radeon_lock.h b/src/mesa/drivers/dri/radeon/radeon_lock.h
index c2e0c3706b8..4e8617eb8f1 100644
--- a/src/mesa/drivers/dri/radeon/radeon_lock.h
+++ b/src/mesa/drivers/dri/radeon/radeon_lock.h
@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_LOCK_H__
 #define __RADEON_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void radeonGetLock( radeonContextPtr rmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -107,5 +105,4 @@ extern int prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
 #endif /* __RADEON_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/radeon/radeon_maos.h b/src/mesa/drivers/dri/radeon/radeon_maos.h
index 8c8aa15c59f..09039d68403 100644
--- a/src/mesa/drivers/dri/radeon/radeon_maos.h
+++ b/src/mesa/drivers/dri/radeon/radeon_maos.h
@@ -36,12 +36,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_MAOS_H__
 #define __RADEON_MAOS_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "radeon_context.h"
 
 extern void radeonEmitArrays( GLcontext *ctx, GLuint inputs );
 extern void radeonReleaseArrays( GLcontext *ctx, GLuint newinputs );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h
index 000e7347378..b7ad8c0769c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.h
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.h
@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_SCREEN_H__
 #define __RADEON_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 /*
  * IMPORTS: these headers contain all the DRI, X and kernel-related
  * definitions that we need.
@@ -105,5 +103,4 @@ typedef struct {
 extern radeonScreenPtr radeonCreateScreen( __DRIscreenPrivate *sPriv );
 extern void radeonDestroyScreen( __DRIscreenPrivate *sPriv );
 
-#endif
 #endif /* __RADEON_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.h b/src/mesa/drivers/dri/radeon/radeon_span.h
index 011e8eff57c..097af4b1bf0 100644
--- a/src/mesa/drivers/dri/radeon/radeon_span.h
+++ b/src/mesa/drivers/dri/radeon/radeon_span.h
@@ -37,9 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_SPAN_H__
 #define __RADEON_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void radeonInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.h b/src/mesa/drivers/dri/radeon/radeon_state.h
index a181d427e6d..07739be9491 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.h
+++ b/src/mesa/drivers/dri/radeon/radeon_state.h
@@ -38,8 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_STATE_H__
 #define __RADEON_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "radeon_context.h"
 
 extern void radeonInitState( radeonContextPtr rmesa );
@@ -74,4 +72,3 @@ extern void radeonFallback( GLcontext *ctx, GLuint bit, GLboolean mode );
 #define TEXMAT_2   5
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_tcl.h b/src/mesa/drivers/dri/radeon/radeon_tcl.h
index 881264a2676..e292d23037b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tcl.h
+++ b/src/mesa/drivers/dri/radeon/radeon_tcl.h
@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_TCL_H__
 #define __RADEON_TCL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "radeon_context.h"
 
 extern void radeonTclPrimitive( GLcontext *ctx, GLenum prim, int hw_prim );
@@ -65,6 +63,4 @@ extern void radeonTclFallback( GLcontext *ctx, GLuint bit, GLboolean mode );
 
 #define TCL_FALLBACK( ctx, bit, mode )	radeonTclFallback( ctx, bit, mode )
 
-
-#endif
 #endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.h b/src/mesa/drivers/dri/radeon/radeon_tex.h
index 9d9285e530a..a806981ae62 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tex.h
+++ b/src/mesa/drivers/dri/radeon/radeon_tex.h
@@ -38,8 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_TEX_H__
 #define __RADEON_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void radeonUpdateTextureState( GLcontext *ctx );
 
 extern int radeonUploadTexImages( radeonContextPtr rmesa, radeonTexObjPtr t,
@@ -49,5 +47,4 @@ extern void radeonDestroyTexObj( radeonContextPtr rmesa, radeonTexObjPtr t );
 
 extern void radeonInitTextureFuncs( struct dd_function_table *functions );
 
-#endif
 #endif /* __RADEON_TEX_H__ */
diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
index 78033908238..950d530ae55 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_VTXFMT_H__
 #define __RADEON_VTXFMT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "radeon_context.h"
 
 
@@ -119,6 +117,4 @@ struct dynfn *radeon_makeX86MultiTexCoord2fvARB( GLcontext *, int );
 struct dynfn *radeon_makeX86MultiTexCoord1fARB( GLcontext *, int );
 struct dynfn *radeon_makeX86MultiTexCoord1fvARB( GLcontext *, int );
 
-
-#endif
 #endif
diff --git a/src/mesa/drivers/dri/s3v/s3v_lock.h b/src/mesa/drivers/dri/s3v/s3v_lock.h
index f1bb2a9bf22..c39d24a38ac 100644
--- a/src/mesa/drivers/dri/s3v/s3v_lock.h
+++ b/src/mesa/drivers/dri/s3v/s3v_lock.h
@@ -7,8 +7,6 @@
 
 #include <sys/ioctl.h>
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void s3vGetLock( s3vContextPtr vmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -78,8 +76,6 @@ extern int prevLockLine;
       DEBUG_RESET(); \
    } while (0)
 
-#endif
-
 #define S3VHW_LOCK( vmesa )	\
    DRM_UNLOCK(vmesa->driFd, vmesa->driHwLock, vmesa->hHWContext); \
    DRM_SPINLOCK(&vmesa->driScreen->pSAREA->drawable_lock, \
diff --git a/src/mesa/drivers/dri/s3v/s3v_macros.h b/src/mesa/drivers/dri/s3v/s3v_macros.h
index 0779006cdcd..3bc871b7eaf 100644
--- a/src/mesa/drivers/dri/s3v/s3v_macros.h
+++ b/src/mesa/drivers/dri/s3v/s3v_macros.h
@@ -5,8 +5,6 @@
 #ifndef _S3V_MACROS_H_
 #define _S3V_MACROS_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 /**************/
 /* DRI macros */
 /**************/
@@ -204,8 +202,6 @@ do { \
 	DEBUG(("GOING HOME\n")); \
 } while (0)
 
-#endif
-
 /**************************/
 /* generic, global macros */
 /**************************/
diff --git a/src/mesa/drivers/dri/savage/savage_init.h b/src/mesa/drivers/dri/savage/savage_init.h
index 27539bea163..74b40d8729e 100644
--- a/src/mesa/drivers/dri/savage/savage_init.h
+++ b/src/mesa/drivers/dri/savage/savage_init.h
@@ -26,8 +26,6 @@
 #ifndef _SAVAGE_INIT_H_
 #define _SAVAGE_INIT_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <sys/time.h>
 #include "dri_util.h"
 #include "mtypes.h"
@@ -160,4 +158,3 @@ enum S3CHIPTAGS {
 };
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index 171cbde90ef..5592d0906a7 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -23,8 +23,6 @@
  */
 
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <X11/Xlibint.h>
 #include <stdio.h>
 
@@ -940,5 +938,3 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc
    return (void *) psp;
 }
 #endif /* USE_NEW_INTERFACE */
-
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_common2.h b/src/mesa/drivers/dri/sis/sis_common2.h
index 40ae451be58..c52abd5e510 100644
--- a/src/mesa/drivers/dri/sis/sis_common2.h
+++ b/src/mesa/drivers/dri/sis/sis_common2.h
@@ -44,10 +44,9 @@ extern void *sis_debug_malloc(int x);
 #include "sis_debug.h"
 #endif
 
-#ifdef GLX_DIRECT_RENDERING
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 typedef struct _Box
 {
   short x1, y1, x2, y2;
@@ -55,7 +54,6 @@ typedef struct _Box
 BoxRec;
 #define NullBox ((BoxPtr)0)
 typedef struct _Box *BoxPtr;
-#endif /* GLX_DIRECT_RENDERING */
 
 /* BitBlt Commands */
 #define CMD0_DD_ENABLE      0x06
diff --git a/src/mesa/drivers/dri/sis/sis_dd.h b/src/mesa/drivers/dri/sis/sis_dd.h
index a016bf8b266..da76596e92b 100644
--- a/src/mesa/drivers/dri/sis/sis_dd.h
+++ b/src/mesa/drivers/dri/sis/sis_dd.h
@@ -32,11 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_DD_H__
 #define __SIS_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisUpdateBufferSize( sisContextPtr smesa );
 
 extern void sisInitDriverFuncs( struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_span.h b/src/mesa/drivers/dri/sis/sis_span.h
index d95a0eef301..c9760e4d268 100644
--- a/src/mesa/drivers/dri/sis/sis_span.h
+++ b/src/mesa/drivers/dri/sis/sis_span.h
@@ -32,12 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_SPAN_H__
 #define __SIS_SPAN_H__
  
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisSpanRenderStart( GLcontext *ctx );
 extern void sisSpanRenderFinish( GLcontext *ctx );
 
 extern void sisDDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_state.h b/src/mesa/drivers/dri/sis/sis_state.h
index b7251157fbe..770ba478a48 100644
--- a/src/mesa/drivers/dri/sis/sis_state.h
+++ b/src/mesa/drivers/dri/sis/sis_state.h
@@ -32,8 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_STATE_H__
 #define __SIS_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "sis_context.h"
 
 extern void sisDDInitState( sisContextPtr smesa );
@@ -54,4 +52,3 @@ extern void sisDDDrawBuffer( GLcontext *ctx, GLenum mode );
 extern void sisUpdateHWState( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_stencil.h b/src/mesa/drivers/dri/sis/sis_stencil.h
index db6098ff049..4a36c98f3db 100644
--- a/src/mesa/drivers/dri/sis/sis_stencil.h
+++ b/src/mesa/drivers/dri/sis/sis_stencil.h
@@ -32,9 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_STENCIL_H__
 #define __SIS_STENCIL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisDDInitStencilFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_tex.h b/src/mesa/drivers/dri/sis/sis_tex.h
index 2349824885a..8ddc7c469ee 100644
--- a/src/mesa/drivers/dri/sis/sis_tex.h
+++ b/src/mesa/drivers/dri/sis/sis_tex.h
@@ -32,10 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_TEX_H__
 #define __SIS_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisInitTextureFuncs( struct dd_function_table *table );
 extern void sisUpdateTextureState( GLcontext *ctx );
 
-#endif /* GLX_DIRECT_RENDERING */
 #endif /* __SIS_TEX_H__ */
diff --git a/src/mesa/drivers/dri/tdfx/dri_glide.h b/src/mesa/drivers/dri/tdfx/dri_glide.h
index df5a3ca24b5..52a53f7dd30 100644
--- a/src/mesa/drivers/dri/tdfx/dri_glide.h
+++ b/src/mesa/drivers/dri/tdfx/dri_glide.h
@@ -37,8 +37,6 @@
 #ifndef __DRI_GLIDE_H__
 #define __DRI_GLIDE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <glide.h>
 #include "dri_mesaint.h"
 
@@ -60,4 +58,3 @@ extern void grDRIInvalidateAll( void );
 extern void grDRIResetSAREA( void );
 extern void grDRIBufferSwap( FxU32 swapInterval );
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.h b/src/mesa/drivers/dri/tdfx/tdfx_context.h
index 5af5a3d16ac..7d18e77c4df 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.h
@@ -40,8 +40,6 @@
 #ifndef __TDFX_CONTEXT_H__
 #define __TDFX_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <sys/time.h>
 #include "dri_util.h"
 #ifdef XFree86Server
@@ -1005,6 +1003,4 @@ extern int TDFX_DEBUG;
 #define FX_COMPRESS_S3TC_AS_FXT1_HACK 1
 #define FX_TC_NAPALM 0
 
-#endif /* GLX_DIRECT_RENDERING */
-
 #endif /* __TDFX_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_dd.h b/src/mesa/drivers/dri/tdfx/tdfx_dd.h
index e49d8e2a339..5ceba9d5f09 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_dd.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_dd.h
@@ -37,12 +37,9 @@
 #ifndef __TDFX_DD_H__
 #define __TDFX_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 
 extern void tdfxDDInitDriverFuncs( const __GLcontextModes *visual,
                                    struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_lock.h b/src/mesa/drivers/dri/tdfx/tdfx_lock.h
index 90d49376281..616e65b2a15 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_lock.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_lock.h
@@ -37,8 +37,6 @@
 #ifndef __TDFX_LOCK_H__
 #define __TDFX_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 /* You can turn this on to find locking conflicts.
  */
 #define DEBUG_LOCKING		0
@@ -143,7 +141,4 @@ extern void tdfxGetLock( tdfxContextPtr fxMesa );
     UNLOCK_HARDWARE( fxMesa );			\
   } while (0)
 
-
-#endif /* GLX_DIRECT_RENDERING */
-
 #endif /* __TDFX_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_pixels.h b/src/mesa/drivers/dri/tdfx/tdfx_pixels.h
index 93b7b8874fd..c38ce070cae 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_pixels.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_pixels.h
@@ -39,8 +39,6 @@
 #ifndef __TDFX_PIXELS_H__
 #define __TDFX_PIXELS_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 
 extern void
@@ -77,4 +75,3 @@ tdfx_drawpixels_R8G8B8A8( GLcontext *ctx, GLint x, GLint y,
 			  const GLvoid *pixels );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_render.h b/src/mesa/drivers/dri/tdfx/tdfx_render.h
index 395e09f7e94..09d0d90197d 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_render.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_render.h
@@ -37,8 +37,6 @@
 #ifndef __TDFX_RENDER_H__
 #define __TDFX_RENDER_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "tdfx_context.h"
 
 extern void tdfxInitRenderFuncs( struct dd_function_table *functions );
@@ -49,6 +47,4 @@ extern void tdfxUploadClipping( tdfxContextPtr fxMesa );
 
 #define FLUSH_BATCH( fxMesa )
 
-
-#endif
 #endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.h b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
index 3faeb84e752..f6c2e8ee3ae 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_screen.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
@@ -37,8 +37,6 @@
 #ifndef __TDFX_SCREEN_H__
 #define __TDFX_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 typedef struct {
    drm_handle_t handle;
    drmSize size;
@@ -70,4 +68,3 @@ typedef struct {
 
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_span.h b/src/mesa/drivers/dri/tdfx/tdfx_span.h
index 8373d1af40a..a95aad5dbf6 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_span.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_span.h
@@ -38,11 +38,8 @@
 #ifndef __TDFX_SPAN_H__
 #define __TDFX_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 
 extern void tdfxDDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_state.h b/src/mesa/drivers/dri/tdfx/tdfx_state.h
index 5e59a160164..b10c38f5910 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_state.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_state.h
@@ -38,8 +38,6 @@
 #ifndef __TDFX_STATE_H__
 #define __TDFX_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 #include "tdfx_context.h"
 
@@ -61,4 +59,3 @@ extern void tdfxUpdateViewport( GLcontext *ctx );
 
 
 #endif
-#endif