5 files changed, 6 insertions, 12 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index adcdce09cd3..a8352bbe2f4 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1195,7 +1195,6 @@ _mesa_initialize_context( GLcontext *ctx,
 
    if (!init_attrib_groups( ctx )) {
       free_shared_state(ctx, ctx->Shared);
-      fprintf(stderr, "%s: failed to init attrib groups\n", __FUNCTION__);
       return GL_FALSE;
    }
 
@@ -1313,7 +1312,6 @@ _mesa_initialize_context( GLcontext *ctx,
 
 #endif
 
-   fprintf(stderr, "%s: succeded\n", __FUNCTION__);
    return GL_TRUE;
 }
 
@@ -1398,7 +1396,8 @@ _mesa_free_context_data( GLcontext *ctx )
       free_shared_state( ctx, ctx->Shared );
    }
 
-   _mesa_extensions_dtr(ctx);
+   if (ctx->Extensions.String)
+      FREE((void *) ctx->Extensions.String);
 
    FREE(ctx->Exec);
    FREE(ctx->Save);
diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index fa7eb63b069..32c61622f7a 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -26,8 +26,9 @@
 #include "glheader.h"
 #include "imports.h"
 #include "context.h"
-#include "enums.h"
 #include "depth.h"
+#include "enums.h"
+#include "hash.h"
 #include "macros.h"
 #include "mtypes.h"
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index db5c43e42d0..efc92673ab6 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -427,10 +427,3 @@ _mesa_make_extension_string( GLcontext *ctx )
 
    return s;
 }
-
-void 
-_mesa_extensions_dtr( GLcontext *ctx ) 
-{
-   if (ctx->Extensions.String)
-      FREE((void *) ctx->Extensions.String);
-}
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 7e2d91e631c..6a3485876d3 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -42,6 +42,7 @@
 #include "matrix.h"
 #include "mtypes.h"
 #include "math/m_matrix.h"
+#include "math/m_xform.h"
 
 
 /**
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 59fd7a9928d..d61b2019e57 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -2987,5 +2987,5 @@ void _mesa_free_texture_data( GLcontext *ctx )
    (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.ProxyRect );
 
    for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
-      _mesa_free_colortable_data( &ctx->Texture.Unit[i].ColorTable );
+      _mesa_free_one_colortable( &ctx->Texture.Unit[i].ColorTable );
 }