diff --git a/SConstruct b/SConstruct
index 7147b009a..c6606a417 100644
--- a/SConstruct
+++ b/SConstruct
@@ -759,7 +759,7 @@ class DXXProgram(DXXCommon):
 'main/controls.cpp',
 'main/credits.cpp',
 'main/digiobj.cpp',
-'main/effects.c',
+'main/effects.cpp',
 'main/fvi.c',
 'main/game.c',
 'main/gamecntl.c',
diff --git a/common/main/vclip.h b/common/main/vclip.h
index 3dbcd1b2a..b20ae26eb 100644
--- a/common/main/vclip.h
+++ b/common/main/vclip.h
@@ -25,6 +25,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "object.h"
 #include "piggy.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define VCLIP_SMALL_EXPLOSION       2
 #define VCLIP_PLAYER_HIT            1
 #define VCLIP_MORPHING_ROBOT        10
@@ -69,4 +73,8 @@ extern void draw_weapon_vclip(object *obj);
  */
 extern int vclip_read_n(vclip *vc, int n, PHYSFS_file *fp);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _VCLIP_H */
diff --git a/similar/main/effects.c b/similar/main/effects.cpp
similarity index 100%
rename from similar/main/effects.c
rename to similar/main/effects.cpp