diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 7d07a7d19ab..8e30d9f78b6 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -101,17 +101,11 @@ set_verbose_flags(const char *str)
       GLbitfield flag;
    };
    static const struct option opts[] = {
-      { "varray",    VERBOSE_VARRAY },
       { "tex",       VERBOSE_TEXTURE },
       { "mat",       VERBOSE_MATERIAL },
-      { "pipe",      VERBOSE_PIPELINE },
-      { "driver",    VERBOSE_DRIVER },
       { "state",     VERBOSE_STATE },
       { "api",       VERBOSE_API },
       { "list",      VERBOSE_DISPLAY_LIST },
-      { "lighting",  VERBOSE_LIGHTING },
-      { "disassem",  VERBOSE_DISASSEM },
-      { "swap",      VERBOSE_SWAPBUFFERS }
    };
    GLuint i;
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f0ee58059ca..2fca622a31d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3670,19 +3670,11 @@ extern int MESA_DEBUG_FLAGS;
 /** The MESA_VERBOSE var is a bitmask of these flags */
 enum _verbose
 {
-   VERBOSE_VARRAY		= 0x0001,
-   VERBOSE_TEXTURE		= 0x0002,
-   VERBOSE_MATERIAL		= 0x0004,
-   VERBOSE_PIPELINE		= 0x0008,
-   VERBOSE_DRIVER		= 0x0010,
-   VERBOSE_STATE		= 0x0020,
-   VERBOSE_API			= 0x0040,
-   VERBOSE_DISPLAY_LIST		= 0x0100,
-   VERBOSE_LIGHTING		= 0x0200,
-   VERBOSE_PRIMS		= 0x0400,
-   VERBOSE_VERTS		= 0x0800,
-   VERBOSE_DISASSEM		= 0x1000,
-   VERBOSE_SWAPBUFFERS          = 0x4000
+   VERBOSE_TEXTURE      = 0x0001,
+   VERBOSE_MATERIAL     = 0x0002,
+   VERBOSE_STATE        = 0x0004,
+   VERBOSE_API          = 0x0008,
+   VERBOSE_DISPLAY_LIST = 0x0010,
 };