diff --git a/api/boinc_api.C b/api/boinc_api.C
index 40b53acb50..8dda0d27ee 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -49,13 +49,14 @@ MMRESULT timer_id;
 #include <sys/types.h>
 
 #ifdef BOINC_APP_GRAPHICS
-
 #ifdef _WIN32
 HANDLE hQuitEvent;
 extern HANDLE graphics_threadh;
 extern BOOL    win_loop_done;
 #endif
-
+#ifdef __APPLE_CC__
+#include <Carbon/Carbon.h>
+#endif
 #endif
 
 #include "parse.h"
diff --git a/apps/upper_case.C b/apps/upper_case.C
index 8ffde3b32d..2dd8effd2d 100755
--- a/apps/upper_case.C
+++ b/apps/upper_case.C
@@ -80,8 +80,8 @@ int do_checkpoint(MFILE& mf, int nchars) {
     FILE *app_time, *client_time;
 
     if (cpu_time) {
-        app_time = fopen("../../app.time", "w"), 
-        client_time = fopen("../../client.time", "w");
+        app_time = fopen("app.time", "w"), 
+        client_time = fopen("client.time", "w");
         boinc_get_init_data(uc_aid);
     }
     boinc_resolve_filename("temp", resolved_name, sizeof(resolved_name));
@@ -180,7 +180,7 @@ int main(int argc, char **argv) {
         fprintf(stderr, "APP: upper_case output open failed %d\n", retval);
         exit(1);
     }
-    time_file.open("../../time.xml", "w");
+    time_file.open("time.xml", "w");
     while (1) {
         c = fgetc(in);
         if (c == EOF) break;
@@ -232,14 +232,16 @@ int main(int argc, char **argv) {
     
     boinc_finish_opengl();
     boinc_finish(0);
-  
-  
+    
     return 0;
 }
 
 #ifdef BOINC_APP_GRAPHICS
 extern GLuint			main_font;
 
+void app_init_gl() {
+}
+
 bool app_render(int xs, int ys, double time_of_day)
 {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);    // Clear Screen And Depth Buffer
diff --git a/mac_build/boinc.pbproj/project.pbxproj b/mac_build/boinc.pbproj/project.pbxproj
index bbed52e57f..293019093e 100755
--- a/mac_build/boinc.pbproj/project.pbxproj
+++ b/mac_build/boinc.pbproj/project.pbxproj
@@ -202,7 +202,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DHOSTTYPE=\\\\\\\"MacOSX\\\\\\\" -DHOST=\\\\\\\"MacOSX\\\\\\\" -DMAJOR_VERSION=0 -DMINOR_VERSION=13 -DHAVE_SYS_SOCKET_H -DHAVE_SYS_RESOURCE_H -DHAVE_NETDB_H -DHAVE_UNISTD_H -DHAVE_SYS_WAIT_H -DHAVE_NETINET_IN_H -DHAVE_SIGNAL_H -DHAVE_ARPA_INET_H -DHAVE_SYS_TIME_H -DHAVE_SYS_TYPES_H -DHAVE_DIRENT_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H -DHAVE_SYS_SYSCTL_H -DHAVE_SYS_MOUNT_H -DHAVE_SYS_VMMETER_H -DHAVE_FLOCK -DHAVE_SYS_IPC_H -DHAVE_SYS_SHM_H";
+				OTHER_CFLAGS = "-DHOSTTYPE=\\\\\\\"MacOSX\\\\\\\" -DHOST=\\\\\\\"MacOSX\\\\\\\" -DMAJOR_VERSION=1 -DMINOR_VERSION=00 -DHAVE_SYS_SOCKET_H -DHAVE_SYS_RESOURCE_H -DHAVE_NETDB_H -DHAVE_UNISTD_H -DHAVE_SYS_WAIT_H -DHAVE_NETINET_IN_H -DHAVE_SIGNAL_H -DHAVE_ARPA_INET_H -DHAVE_SYS_TIME_H -DHAVE_SYS_TYPES_H -DHAVE_DIRENT_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H -DHAVE_SYS_SYSCTL_H -DHAVE_SYS_MOUNT_H -DHAVE_SYS_VMMETER_H -DHAVE_FLOCK -DHAVE_SYS_IPC_H -DHAVE_SYS_SHM_H";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = BOINC;
@@ -282,10 +282,6 @@
 				F5EAD47A031AF001018E201A,
 				F54E2C0B03453580019A4414,
 				AA7639FF04002B2800A80164,
-				AA763A1C0400355200A80164,
-				AA763A1E0400363A00A80164,
-				AA763A220400363C00A80164,
-				AA763A230400363D00A80164,
 				AAA31C9A042157A800A80164,
 				AA8B6B1E046C364400A80164,
 				AA8B6B26046C366200A80164,
@@ -350,14 +346,11 @@
 				F5EAD477031AEFF8018E201A,
 				F5EAD47B031AF001018E201A,
 				F54E2C0C03453581019A4414,
-				AA763A1D0400355200A80164,
-				AA763A1F0400363A00A80164,
-				AA763A200400363B00A80164,
-				AA763A210400363B00A80164,
 				AA763BF1040374F900A80164,
 				AAA31C99042157A800A80164,
 				AA8B6B1D046C364400A80164,
 				AA8B6B25046C366200A80164,
+				AAE6EE670471AB2600A80164,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -400,54 +393,6 @@
 			settings = {
 			};
 		};
-		AA763A1C0400355200A80164 = {
-			fileRef = F5E0787E03048833017846D9;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		AA763A1D0400355200A80164 = {
-			fileRef = F51BDF6503087327012012A7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		AA763A1E0400363A00A80164 = {
-			fileRef = F5265C160307B062016EE2A0;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		AA763A1F0400363A00A80164 = {
-			fileRef = F51BDF630308731E012012A7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		AA763A200400363B00A80164 = {
-			fileRef = F51BDF5F030872AC012012A7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		AA763A210400363B00A80164 = {
-			fileRef = F51BDF7E0308775A012012A7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		AA763A220400363C00A80164 = {
-			fileRef = F51BDF60030872AC012012A7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		AA763A230400363D00A80164 = {
-			fileRef = F51BDF7F0308775A012012A7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		AA763BF0040374F900A80164 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -557,6 +502,24 @@
 			settings = {
 			};
 		};
+		AAE6EE670471AB2600A80164 = {
+			fileRef = F51BDF6503087327012012A7;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		AAE6EE680471AC5800A80164 = {
+			fileRef = AAA31C97042157A800A80164;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		AAE6EE690471AC5900A80164 = {
+			fileRef = AAA31C98042157A800A80164;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 //AA0
 //AA1
 //AA2
@@ -1860,7 +1823,7 @@
 				F54FF8A7029F2FAA012012A7,
 			);
 			buildSettings = {
-				OTHER_CFLAGS = "-DHAVE_DIRENT_H -DHAVE_SYS_TIME_H -DHAVE_SYS_RESOURCE_H -DHAVE_UNISTD_H ";
+				OTHER_CFLAGS = "-DHAVE_DIRENT_H -DHAVE_SYS_TIME_H -DHAVE_SYS_RESOURCE_H -DHAVE_SYS_SHM_H -DHAVE_UNISTD_H ";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = concat;
@@ -2034,7 +1997,7 @@
 			);
 			buildSettings = {
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.1;
-				OTHER_CFLAGS = "-DHAVE_DIRENT_H -DHAVE_SYS_RESOURCE_H -DHAVE_UNISTD_H -DHAVE_SIGNAL_H -DHAVE_SYS_TIME_H -DBOINC_APP_GRAPHICS";
+				OTHER_CFLAGS = "-DHAVE_DIRENT_H -DHAVE_SYS_RESOURCE_H -DHAVE_UNISTD_H -DHAVE_SIGNAL_H -DHAVE_SYS_SHM_H -DHAVE_SYS_TIME_H -DBOINC_APP_GRAPHICS";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = upper_case;
@@ -2091,6 +2054,7 @@
 				F5895D9A035A2BEC012012A7,
 				F5895D9C035A2BEE012012A7,
 				AA8B6B22046C364400A80164,
+				AAE6EE690471AC5900A80164,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2116,6 +2080,7 @@
 				F5895D99035A2BEC012012A7,
 				F5895D9B035A2BEE012012A7,
 				AA8B6B21046C364400A80164,
+				AAE6EE680471AC5800A80164,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;