diff --git a/SConstruct b/SConstruct
index 4989ea253..8cf380901 100644
--- a/SConstruct
+++ b/SConstruct
@@ -754,7 +754,7 @@ class DXXProgram(DXXCommon):
 'main/aipath.cpp',
 'main/automap.cpp',
 'main/cntrlcen.cpp',
-'main/config.c',
+'main/config.cpp',
 'main/console.c',
 'main/controls.c',
 'main/credits.c',
diff --git a/common/main/config.h b/common/main/config.h
index 311f20d3b..32da12d1a 100644
--- a/common/main/config.h
+++ b/common/main/config.h
@@ -24,6 +24,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "player.h"
 #include "mission.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct Cfg
 {
 	ubyte DigiVolume;
@@ -65,4 +69,8 @@ extern struct Cfg GameCfg;
 extern int ReadConfigFile(void);
 extern int WriteConfigFile(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/similar/main/config.c b/similar/main/config.cpp
similarity index 100%
rename from similar/main/config.c
rename to similar/main/config.cpp