Index: glshader.h
===================================================================
--- glshader.h	(revision 4608)
+++ glshader.h	(working copy)
@@ -14,6 +14,8 @@
 #include <vector>
 #include <iostream>
 #include <celmath/vecmath.h>
+#include "gl.h"
+#include "glext.h"
 
 class GLShaderLoader;
 
@@ -29,14 +31,14 @@
 class GLShader
 {
  protected:
-    GLShader(int _id);
+    GLShader(GLhandleARB _id);
     virtual ~GLShader();
 
  public:
-    int getID() const;
+    GLhandleARB getID() const;
 
  private:
-    int id;
+    GLhandleARB id;
 
     GLShaderStatus compile(const std::vector<std::string>& source);
 
@@ -47,7 +49,7 @@
 class GLVertexShader : public GLShader
 {
  private:
-    GLVertexShader(int _id) : GLShader(_id) {};
+    GLVertexShader(GLhandleARB _id) : GLShader(_id) {};
 
  friend class GLShaderLoader;
 };
@@ -56,7 +58,7 @@
 class GLFragmentShader : public GLShader
 {
  private:
-    GLFragmentShader(int _id) : GLShader(_id) {};
+    GLFragmentShader(GLhandleARB _id) : GLShader(_id) {};
 
  friend class GLShaderLoader;
 };
@@ -65,7 +67,7 @@
 class GLProgram
 {
  private:
-    GLProgram(int _id);
+    GLProgram(GLhandleARB _id);
 
     void attach(const GLShader&);
 
@@ -75,10 +77,10 @@
     GLShaderStatus link();
 
     void use() const;
-    int getID() const { return id; }
+    GLhandleARB getID() const { return id; }
 
  private:
-    int id;
+    GLhandleARB id;
 
  friend class GLShaderLoader;
 };
@@ -88,7 +90,7 @@
 {
  public:
     FloatShaderParameter();
-    FloatShaderParameter(int _obj, const char* name);
+    FloatShaderParameter(GLhandleARB _obj, const char* name);
 
     FloatShaderParameter& operator=(float);
     
@@ -101,7 +103,7 @@
 {
  public:
     Vec3ShaderParameter();
-    Vec3ShaderParameter(int _obj, const char* name);
+    Vec3ShaderParameter(GLhandleARB _obj, const char* name);
 
     Vec3ShaderParameter& operator=(const Vec3f&);
     Vec3ShaderParameter& operator=(const Point3f&);
@@ -115,7 +117,7 @@
 {
  public:
     Vec4ShaderParameter();
-    Vec4ShaderParameter(int _obj, const char* name);
+    Vec4ShaderParameter(GLhandleARB _obj, const char* name);
 
     Vec4ShaderParameter& operator=(const Vec4f&);
 
Index: glshader.cpp
===================================================================
--- glshader.cpp	(revision 4608)
+++ glshader.cpp	(working copy)
@@ -15,19 +15,19 @@
 using namespace std;
 
 
-static const string GetInfoLog(int obj);
+static const string GetInfoLog(GLhandleARB obj);
 
 
 ostream* g_shaderLogFile = NULL;
 
 
-GLShader::GLShader(int _id) :
+GLShader::GLShader(GLhandleARB _id) :
     id(_id)
 {
 }
 
 
-int
+GLhandleARB
 GLShader::getID() const
 {
     return id;
@@ -76,7 +76,7 @@
 {
 }
 
-FloatShaderParameter::FloatShaderParameter(int obj, const char* name)
+FloatShaderParameter::FloatShaderParameter(GLhandleARB obj, const char* name)
 {
     slot = glx::glGetUniformLocationARB(obj, name);
 }
@@ -95,7 +95,7 @@
 {
 }
 
-Vec3ShaderParameter::Vec3ShaderParameter(int obj, const char* name)
+Vec3ShaderParameter::Vec3ShaderParameter(GLhandleARB obj, const char* name)
 {
     slot = glx::glGetUniformLocationARB(obj, name);
 }
@@ -122,7 +122,7 @@
 {
 }
 
-Vec4ShaderParameter::Vec4ShaderParameter(int obj, const char* name)
+Vec4ShaderParameter::Vec4ShaderParameter(GLhandleARB obj, const char* name)
 {
     slot = glx::glGetUniformLocationARB(obj, name);
 }
@@ -138,7 +138,7 @@
 
 //************* GLProgram **************
 
-GLProgram::GLProgram(int _id) :
+GLProgram::GLProgram(GLhandleARB _id) :
     id(_id)
 {
 }
@@ -192,7 +192,7 @@
 GLShaderLoader::CreateVertexShader(const vector<string>& source,
                                    GLVertexShader** vs)
 {
-    GLint vsid = glx::glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
+    GLhandleARB vsid = glx::glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
 
     GLVertexShader* shader = new GLVertexShader(vsid);
     if (!shader)
@@ -219,7 +219,7 @@
 GLShaderLoader::CreateFragmentShader(const vector<string>& source,
                                      GLFragmentShader** fs)
 {
-    GLint fsid = glx::glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
+    GLhandleARB fsid = glx::glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
 
     GLFragmentShader* shader = new GLFragmentShader(fsid);
     if (!shader)
@@ -268,7 +268,7 @@
                               const GLFragmentShader& fs,
                               GLProgram** progOut)
 {
-    GLint progid = glx::glCreateProgramObjectARB();
+    GLhandleARB progid = glx::glCreateProgramObjectARB();
 
     GLProgram* prog = new GLProgram(progid);
     if (!prog)
@@ -335,10 +335,10 @@
 
 
 const string
-GetInfoLog(int obj)
+GetInfoLog(GLhandleARB obj)
 {
-    int logLength = 0;
-    int charsWritten = 0;
+    GLint logLength = 0;
+    GLsizei charsWritten = 0;
 
     glx::glGetObjectParameterivARB(obj, GL_OBJECT_INFO_LOG_LENGTH_ARB,
                                    &logLength);
Index: mesh.h
===================================================================
--- mesh.h	(revision 4608)
+++ mesh.h	(working copy)
@@ -17,6 +17,7 @@
 #include <celmath/aabox.h>
 #include <vector>
 #include <string>
+#include "gl.h"
 
 
 class RenderContext;
@@ -217,7 +218,7 @@
 
     uint32 nVertices;
     void* vertices;
-    mutable uint32 vbObject;
+    mutable GLuint vbObject;
     mutable bool vbInitialized;
 
     std::vector<PrimitiveGroup*> groups;
Index: astro.cpp
===================================================================
--- astro.cpp	(revision 4608)
+++ astro.cpp	(working copy)
@@ -522,7 +522,12 @@
     cal_time.tm_sec = (int)seconds;
     cal_time.tm_wday = wday;
     cal_time.tm_gmtoff = utc_offset;
+#ifdef TARGET_OS_MAC
+    // tm_zone is a non-const string field on the Mac (why?)
+    cal_time.tm_zone = const_cast<char*>(tzname.c_str());
+#else
     cal_time.tm_zone = tzname.c_str();
+#endif
 
     const char* strftime_format;
     switch(format)