diff --git a/src/osg/ApplicationUsage.cpp b/src/osg/ApplicationUsage.cpp
index 44d12a1ed..55a6f74d2 100644
--- a/src/osg/ApplicationUsage.cpp
+++ b/src/osg/ApplicationUsage.cpp
@@ -222,7 +222,7 @@ void ApplicationUsage::writeEnvironmentSettings(std::ostream& output)
     {
         std::string::size_type len = citr->first.find_first_of("\n\r\t ");
         if (len == std::string::npos) len = citr->first.size();
-        maxNumCharsInOptions = maximum(maxNumCharsInOptions,len);
+        maxNumCharsInOptions = maximum(maxNumCharsInOptions,(unsigned int) len);
     }
     
     unsigned int optionPos = 2;
diff --git a/src/osgPlugins/osg/CameraNode.cpp b/src/osgPlugins/osg/CameraNode.cpp
index 6d5a306cb..41ac04107 100644
--- a/src/osgPlugins/osg/CameraNode.cpp
+++ b/src/osgPlugins/osg/CameraNode.cpp
@@ -152,7 +152,12 @@ bool CameraNode_readLocalData(Object& obj, Input& fr)
 
             if (fr.matchSequence("internalFormat %i")) 
             {
-                fr[1].getUInt(attachment._internalFormat);
+                // In their infinite wisdom, the Apple engineers changed the type
+                // of GLenum from 'unsigned int' to 'unsigned long', thus breaking
+                // the call by reference of getUInt.
+                unsigned int format;
+                fr[1].getUInt(format);
+                attachment._internalFormat = format;
                 fr += 2;
                 localAdvance = true;
             }
diff --git a/src/osgPlugins/quicktime/MovieData.h b/src/osgPlugins/quicktime/MovieData.h
index 511a5215e..0b0001789 100644
--- a/src/osgPlugins/quicktime/MovieData.h
+++ b/src/osgPlugins/quicktime/MovieData.h
@@ -13,7 +13,7 @@
 #include <osg/Notify>
 #include <osg/Image>
 #include <string>
-#include <Quicktime/Quicktime.h>
+#include <QuickTime/QuickTime.h>
 
 namespace osg {
     
@@ -54,4 +54,4 @@ namespace osg {
 
 } // namespace
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/osgPlugins/quicktime/QTUtils.cpp b/src/osgPlugins/quicktime/QTUtils.cpp
index 01bf2e928..6f0e4a25f 100644
--- a/src/osgPlugins/quicktime/QTUtils.cpp
+++ b/src/osgPlugins/quicktime/QTUtils.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <osg/Notify>
-#include <Quicktime/Quicktime.h>
+#include <QuickTime/QuickTime.h>
 #include <Carbon/Carbon.h>
 #include "QTUtils.h"
 
@@ -78,4 +78,4 @@ namespace osgQuicktime {
 
 
 
-} // namespace
\ No newline at end of file
+} // namespace
diff --git a/src/osgPlugins/quicktime/QTUtils.h b/src/osgPlugins/quicktime/QTUtils.h
index c01c7051e..ba6113f60 100644
--- a/src/osgPlugins/quicktime/QTUtils.h
+++ b/src/osgPlugins/quicktime/QTUtils.h
@@ -8,7 +8,7 @@
  */
 
 #include <Carbon/Carbon.h>
-#include <Quicktime/Quicktime.h>
+#include <QuickTime/QuickTime.h>
 
 namespace osgQuicktime {
 
@@ -17,4 +17,4 @@ namespace osgQuicktime {
 	OSStatus MakeFSSpecFromPath(const char* path, FSSpec* spec);
 	OSStatus MakeMovieFromPath(const char* path, Movie* movie);
 
-}
\ No newline at end of file
+}
diff --git a/src/osgPlugins/quicktime/ReaderWriterQT.cpp b/src/osgPlugins/quicktime/ReaderWriterQT.cpp
index 678f662f6..4e2ffa40d 100644
--- a/src/osgPlugins/quicktime/ReaderWriterQT.cpp
+++ b/src/osgPlugins/quicktime/ReaderWriterQT.cpp
@@ -17,7 +17,7 @@
 #  define SEEK_SET 0
 #endif
 #include <Carbon/Carbon.h>
-#include <Quicktime/Quicktime.h>
+#include <QuickTime/QuickTime.h>
 #include "QTtexture.h"
 #include "QuicktimeImageStream.h"