From e3a99e8522688e20f730084799a1dfad305d90eb Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 1 Feb 2010 00:22:50 -0800
Subject: [PATCH] glx: Remove unnecessary headers.

---
 src/glx/x11/compsize.c      | 1 -
 src/glx/x11/dri2_glx.c      | 1 -
 src/glx/x11/dri_glx.c       | 1 -
 src/glx/x11/drisw_glx.c     | 1 -
 src/glx/x11/glx_pbuffer.c   | 2 --
 src/glx/x11/glxcurrent.c    | 4 ----
 src/glx/x11/glxext.c        | 1 -
 src/glx/x11/glxextensions.c | 1 -
 8 files changed, 12 deletions(-)

diff --git a/src/glx/x11/compsize.c b/src/glx/x11/compsize.c
index eca572feb3c..5ba6dc919e5 100644
--- a/src/glx/x11/compsize.c
+++ b/src/glx/x11/compsize.c
@@ -29,7 +29,6 @@
  */
 
 #include <GL/gl.h>
-#include "indirect_size.h"
 #include "glxclient.h"
 
 /*
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
index 22289581441..7a5740a4d89 100644
--- a/src/glx/x11/dri2_glx.c
+++ b/src/glx/x11/dri2_glx.c
@@ -37,7 +37,6 @@
 #include <X11/extensions/Xdamage.h>
 #include "glapi.h"
 #include "glxclient.h"
-#include "glcontextmodes.h"
 #include "xf86dri.h"
 #include <dlfcn.h>
 #include <fcntl.h>
diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index e658644eca5..0ff53c324f5 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -38,7 +38,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/Xdamage.h>
 #include "glxclient.h"
-#include "glcontextmodes.h"
 #include "xf86dri.h"
 #include "dri2.h"
 #include "sarea.h"
diff --git a/src/glx/x11/drisw_glx.c b/src/glx/x11/drisw_glx.c
index 6a51d748afe..eed9a8c4723 100644
--- a/src/glx/x11/drisw_glx.c
+++ b/src/glx/x11/drisw_glx.c
@@ -25,7 +25,6 @@
 
 #include <X11/Xlib.h>
 #include "glxclient.h"
-#include "glcontextmodes.h"
 #include <dlfcn.h>
 #include "dri_common.h"
 
diff --git a/src/glx/x11/glx_pbuffer.c b/src/glx/x11/glx_pbuffer.c
index 501500afc3d..a0a02238b00 100644
--- a/src/glx/x11/glx_pbuffer.c
+++ b/src/glx/x11/glx_pbuffer.c
@@ -35,9 +35,7 @@
 #include <X11/extensions/Xext.h>
 #include <assert.h>
 #include <string.h>
-#include "glapi.h"
 #include "glxextensions.h"
-#include "glcontextmodes.h"
 
 #define WARN_ONCE_GLX_1_3(a, b) {		\
 		static int warned=1;		\
diff --git a/src/glx/x11/glxcurrent.c b/src/glx/x11/glxcurrent.c
index 50de7d612b8..c28360bdde9 100644
--- a/src/glx/x11/glxcurrent.c
+++ b/src/glx/x11/glxcurrent.c
@@ -37,10 +37,6 @@
 #include "glapi.h"
 #include "indirect_init.h"
 
-#ifdef GLX_DIRECT_RENDERING
-#include "xf86dri.h"
-#endif
-
 /*
 ** We setup some dummy structures here so that the API can be used
 ** even if no context is current.
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 09bb8503196..1b4ab716828 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -41,7 +41,6 @@
 #include "glxclient.h"
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
-#include "glapi.h"
 #include "glxextensions.h"
 #include "glcontextmodes.h"
 
diff --git a/src/glx/x11/glxextensions.c b/src/glx/x11/glxextensions.c
index 25a5c492930..56c69cbfcba 100644
--- a/src/glx/x11/glxextensions.c
+++ b/src/glx/x11/glxextensions.c
@@ -32,7 +32,6 @@
 #include <X11/extensions/extutil.h>
 #include <X11/extensions/Xext.h>
 #include <string.h>
-#include "glapi.h"
 #include "glxextensions.h"
 
 
-- 
2.30.2