diff --git a/src/vid_cga.c b/src/vid_cga.c
index 608599e29..ab909b3f3 100644
--- a/src/vid_cga.c
+++ b/src/vid_cga.c
@@ -467,7 +467,7 @@ void *cga_standalone_init()
 
 #ifndef __unix
         cga_palette = device_get_config_int("rgb_type");
-	rebuild_cgapal();
+	cgapal_rebuild();
 #endif
 		
         return cga;
diff --git a/src/vid_hercules.c b/src/vid_hercules.c
index 8ea99e868..41dacde01 100644
--- a/src/vid_hercules.c
+++ b/src/vid_hercules.c
@@ -347,7 +347,7 @@ void *hercules_init()
 
 #ifndef __unix
         cga_palette = device_get_config_int("rgb_type");
-	rebuild_cgapal();
+	cgapal_rebuild();
 #endif
 
         return hercules;
diff --git a/src/vid_mda.c b/src/vid_mda.c
index b886c088e..9933cebab 100644
--- a/src/vid_mda.c
+++ b/src/vid_mda.c
@@ -303,7 +303,7 @@ void *mda_init()
 
 #ifndef __unix
         cga_palette = device_get_config_int("rgb_type");
-	rebuild_cgapal();
+	cgapal_rebuild();
 #endif
 
         return mda;
diff --git a/src/win-cgapal.h b/src/win-cgapal.h
index d824c8929..bb6dd7f93 100644
--- a/src/win-cgapal.h
+++ b/src/win-cgapal.h
@@ -1,4 +1,10 @@
 extern PALETTE cgapal;
 extern PALETTE cgapal_mono[6];
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 void cgapal_rebuild();
+#ifdef __cplusplus
+}
+#endif