diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 27697da31f..41d5e4e922 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -177,8 +177,8 @@ if $(TARGET_ARCH) = x86 {
 	local galliumObjects ;
 	local zipFile ;
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		#HAIKU_MESA_FILE = mesa-8.0dev-x86-gcc4-2012-01-17.zip ;
-		HAIKU_MESA_FILE = mesa-8.0devdbg-x86-gcc4-2012-01-17.zip ;
+		HAIKU_MESA_FILE = mesa-8.0dev-x86-gcc4-2012-01-23.zip ;
+		#HAIKU_MESA_FILE = mesa-8.0devdbg-x86-gcc4-2012-01-23.zip ;
 		glslObject = lib.haiku/libglsl.a ;
 		galliumObjects = lib.haiku/libgallium.a ;
 	} else {
diff --git a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
index 1b8e560231..6a3e0c892f 100644
--- a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
+++ b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
@@ -35,7 +35,6 @@ extern "C" {
 #include "main/formats.h"
 #include "main/framebuffer.h"
 #include "main/renderbuffer.h"
-#include "main/state.h"
 #include "swrast/swrast.h"
 #if __GNUC__ > 2
 #include "swrast/s_renderbuffer.h"