4 files changed, 1 insertions, 13 deletions
diff --git a/src/glx/mini/driver.h b/src/glx/mini/driver.h
index 9e8bf6fa7cf..39c0f9b5fa6 100644
--- a/src/glx/mini/driver.h
+++ b/src/glx/mini/driver.h
@@ -47,8 +47,6 @@
 #ifndef _driver_H_
 #define _driver_H_
 
-#define CAPI  /* XXX this should be globally defined somewhere */
-
 #include "GL/gl.h"
 #include "GL/internal/glcore.h"
 
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index e43e6532500..8639535abb2 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_
 
-#define CAPI  /* XXX this should be globally defined somewhere */
-
 #include <GL/gl.h>
 #include "drm.h"
 #include "drm_sarea.h"
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 2a132502389..9de7a89c998 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -12,14 +12,6 @@
  *
  * Eventually, I want to move roll the glheader.h file into this.
  *
- * The OpenGL SI's __GLimports structure allows per-context specification of
- * replacements for the standard C lib functions.  In practice that's probably
- * never needed; compile-time replacements are far more likely.
- *
- * The _mesa_*() functions defined here don't in general take a context
- * parameter.  I guess we can change that someday, if need be.
- * So for now, the __GLimports stuff really isn't used.
- *
  * \todo Functions still needed:
  * - scanf
  * - qsort
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 58efa0b4f5a..89cdc790897 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -36,7 +36,7 @@
 
 
 #include "glheader.h"
-#include <GL/internal/glcore.h>	/* GLimports/GLexports/GLcontextModes */
+#include <GL/internal/glcore.h>	/* __GLcontextModes (GLvisual) */
 #include "config.h"		/* Hardwired parameters */
 #include "glapitable.h"
 #include "glthread.h"