diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 9c6992989e..b9c509d6b5 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -5,6 +5,7 @@
 local X86_ONLY = ;
 local PPC_ONLY = ;
 local M68K_ONLY = ;
+local ARM_ONLY = ;
 if $(TARGET_ARCH) = x86 {
 	X86_ONLY = "" ;
 } else if $(TARGET_ARCH) = ppc {
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 4cabeb3447..f83c2e76a9 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -217,8 +217,7 @@ if $(TARGET_ARCH) = x86 {
 	local galliumObjects ;
 	local zipFile ;
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_MESA_FILE = mesa-8.1devel-x86-gcc4-2012-06-07.zip ;
-		#HAIKU_MESA_FILE = mesa-8.1develdbg-x86-gcc4-2012-06-07.zip ;
+		HAIKU_MESA_FILE = mesa-9.0-x86-gcc4-2012-11-17.zip ;
 		glslObject = lib.haiku/libglsl.a ;
 		galliumObjects = lib.haiku/libgallium.a ;
 	} else {
diff --git a/src/add-ons/screen_savers/flurry/Jamfile b/src/add-ons/screen_savers/flurry/Jamfile
index 54357c262c..18e487b6cb 100644
--- a/src/add-ons/screen_savers/flurry/Jamfile
+++ b/src/add-ons/screen_savers/flurry/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src add-ons screen_savers flurry ;
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 # For GCC2
diff --git a/src/add-ons/screen_savers/glife/Jamfile b/src/add-ons/screen_savers/glife/Jamfile
index 0b9d9b09d8..23010df29b 100644
--- a/src/add-ons/screen_savers/glife/Jamfile
+++ b/src/add-ons/screen_savers/glife/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src add-ons screen_savers glife ;
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
diff --git a/src/apps/glteapot/Jamfile b/src/apps/glteapot/Jamfile
index d496758179..ce1b93fcf8 100644
--- a/src/apps/glteapot/Jamfile
+++ b/src/apps/glteapot/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src apps glteapot ;
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
diff --git a/src/kits/game/DirectWindow.cpp b/src/kits/game/DirectWindow.cpp
index 5e30f64e4e..ed850a1f51 100644
--- a/src/kits/game/DirectWindow.cpp
+++ b/src/kits/game/DirectWindow.cpp
@@ -365,7 +365,7 @@ BDirectWindow::GetClippingRegion(BRegion *region, BPoint *origin) const
 	if (IsLocked() || !_LockDirect())
 		return B_ERROR;
 
-	if (fInDirectConnect) {
+	if (!fInDirectConnect) {
 		_UnlockDirect();
 		return B_ERROR;
 	}
diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile
index d5547c2858..54750c26bc 100644
--- a/src/libs/glut/Jamfile
+++ b/src/libs/glut/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src libs glut ;
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
@@ -55,9 +56,6 @@ if $(HAIKU_GCC_VERSION[1]) < 3 {
 }
 
 
-# Ensure GLU dependency is met
-Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
-	: $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
 # Ensure Mesa dependency is met
 Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
 	: $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
diff --git a/src/tests/kits/opengl/glinfo/Jamfile b/src/tests/kits/opengl/glinfo/Jamfile
index d1b503d120..c6c85deed3 100644
--- a/src/tests/kits/opengl/glinfo/Jamfile
+++ b/src/tests/kits/opengl/glinfo/Jamfile
@@ -1,5 +1,5 @@
 SubDir HAIKU_TOP src tests kits opengl glinfo ;
-
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 # For GCC2