diff --git a/api/graphics_lib.h b/api/graphics_lib.h
index 7c75b1cc90..5d28f06611 100644
--- a/api/graphics_lib.h
+++ b/api/graphics_lib.h
@@ -19,16 +19,17 @@
 
 #include "boinc_api.h"
 
-extern void* graphics_lib_handle;
-
 #ifdef __cplusplus
 extern "C" {
-  extern int boinc_init_graphics_lib(void (*worker)(), char* argv0);
+    extern int boinc_init_graphics_lib(void (*worker)(), char* argv0);
+    extern void* graphics_lib_handle;
 }
 
 extern int boinc_init_options_graphics_lib(
     BOINC_OPTIONS&, void (*worker)(), char* argv0
 );
+
 #else
-  extern int boinc_init_graphics_lib(void (*worker)(), char* argv0);
+    extern int boinc_init_graphics_lib(void (*worker)(), char* argv0);
+    extern void* graphics_lib_handle;
 #endif