diff --git a/api/boinc_api.C b/api/boinc_api.C
index fbc15fe024..5c698c6de9 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include <sys/stat.h>
 #include <afxwin.h>
@@ -73,8 +73,6 @@ extern BOOL    win_loop_done;
 #ifdef __APPLE_CC__
 #include <CoreServices/CoreServices.h>
 #include "mac_app_opengl.h"
-
-MPQueueID drawQueue;
 #endif
 
 #include "boinc_api.h"
@@ -98,7 +96,6 @@ static bool check_susp_quit = false;
 static bool write_frac_done = false;
 static bool this_process_active;
 static bool time_to_suspend = false,time_to_quit = false;
-int ok_to_draw = 0;
 bool using_opengl = false;
 
 // read the INIT_DATA and FD_INIT files
@@ -495,11 +492,6 @@ int set_timer(double period) {
 #endif
 #endif
 
-#if defined BOINC_APP_GRAPHICS && defined __APPLE_CC__
-    // Create notification queue for drawing
-    MPCreateQueue( &drawQueue );
-#endif
-
 #if HAVE_SIGNAL_H
 #if HAVE_SYS_TIME_H
     struct sigaction sa;
diff --git a/api/graphics_api.h b/api/graphics_api.h
index 9b6b412ae4..dae6051745 100755
--- a/api/graphics_api.h
+++ b/api/graphics_api.h
@@ -28,8 +28,8 @@ extern "C" {
 #endif
 GLenum InitGL(GLvoid);
 GLenum ReSizeGLScene(GLsizei width, GLsizei height);
+extern bool app_render(int xs, int ys, double time_of_day);
 #ifdef __cplusplus
 }
 #endif
-bool app_render(int xs, int ys, double time_of_day);
 #endif