diff --git a/build/linux/platform_specific_code/juce_linux_Windowing.cpp b/build/linux/platform_specific_code/juce_linux_Windowing.cpp
index c87a0f0a60..dbcbfebfc7 100644
--- a/build/linux/platform_specific_code/juce_linux_Windowing.cpp
+++ b/build/linux/platform_specific_code/juce_linux_Windowing.cpp
@@ -447,7 +447,7 @@ static bool isShmAvailable() throw()
 
             shmctl (segmentInfo.shmid, IPC_RMID, 0);
 
-            untrapErrors();
+            isAvailable &= untrapErrors();
         }
     }
 
diff --git a/build/macosx/platform_specific_code/juce_mac_Windowing.cpp b/build/macosx/platform_specific_code/juce_mac_Windowing.cpp
index 36d111bdf1..a52b52af7c 100644
--- a/build/macosx/platform_specific_code/juce_mac_Windowing.cpp
+++ b/build/macosx/platform_specific_code/juce_mac_Windowing.cpp
@@ -38,7 +38,7 @@
 #include <fnmatch.h>
 
 #if JUCE_OPENGL
-#include <agl/agl.h>
+#include <AGL/agl.h>
 #endif
 
 BEGIN_JUCE_NAMESPACE
diff --git a/extras/juce demo/src/binarydata/OpenGLDemo.cpp b/extras/juce demo/src/binarydata/OpenGLDemo.cpp
index af66e7a959..c845bffce2 100644
--- a/extras/juce demo/src/binarydata/OpenGLDemo.cpp	
+++ b/extras/juce demo/src/binarydata/OpenGLDemo.cpp	
@@ -52,8 +52,8 @@
  #include <GL/glut.h>
  #undef KeyPress
 #else
- #include <agl/agl.h>
- #include <glut/glut.h>
+ #include <AGL/agl.h>
+ #include <GLUT/glut.h>
 #endif
 
 #ifndef GL_BGRA_EXT
diff --git a/extras/juce demo/src/demos/OpenGLDemo.cpp b/extras/juce demo/src/demos/OpenGLDemo.cpp
index af66e7a959..c845bffce2 100644
--- a/extras/juce demo/src/demos/OpenGLDemo.cpp	
+++ b/extras/juce demo/src/demos/OpenGLDemo.cpp	
@@ -52,8 +52,8 @@
  #include <GL/glut.h>
  #undef KeyPress
 #else
- #include <agl/agl.h>
- #include <glut/glut.h>
+ #include <AGL/agl.h>
+ #include <GLUT/glut.h>
 #endif
 
 #ifndef GL_BGRA_EXT