diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f69c780..c29040dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -809,7 +809,7 @@ set(
     src/sdl/expr.cpp
     src/sdl/exprNode.cpp
     src/sdl/expr-lex.cpp
-    src/common/version.c
+    src/common/version.cpp
 )
 
 set(
@@ -819,7 +819,7 @@ set(
     src/sdl/inputSDL.h
     src/sdl/expr.cpp.h
     src/sdl/exprNode.h
-    src/common/version_c.h
+    src/common/version_cpp.h
 )
 
 set(
diff --git a/src/common/version.c b/src/common/version.c
deleted file mode 100644
index f0fe8e37..00000000
--- a/src/common/version.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "version_c.h"
-#include "version.h"
-
-const char* vba_name_and_subversion = VBA_NAME_AND_SUBVERSION;
-
-const char* vbam_version = VERSION;
diff --git a/src/common/version.cpp b/src/common/version.cpp
new file mode 100644
index 00000000..370fe154
--- /dev/null
+++ b/src/common/version.cpp
@@ -0,0 +1,6 @@
+#include "version_cpp.h"
+#include "version.h"
+
+const char* const vba_name_and_subversion = VBA_NAME_AND_SUBVERSION;
+
+const char* const vbam_version = VBAM_VERSION;
diff --git a/src/common/version_c.h b/src/common/version_c.h
deleted file mode 100644
index d3b26a98..00000000
--- a/src/common/version_c.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef VBAM_VERSION_C_H
-#define VBAM_VERSION_C_H
-
-extern const char* vba_name_and_subversion;
-
-extern const char* vbam_version;
-
-#endif /* VBAM_VERSION_C_H */
diff --git a/src/common/version_cpp.h b/src/common/version_cpp.h
new file mode 100644
index 00000000..29b2d539
--- /dev/null
+++ b/src/common/version_cpp.h
@@ -0,0 +1,8 @@
+#ifndef VBAM_VERSION_CPP_H
+#define VBAM_VERSION_CPP_H
+
+extern const char* const vba_name_and_subversion;
+
+extern const char* const vbam_version;
+
+#endif /* VBAM_VERSION_CPP_H */
diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
index e175e041..469afe2d 100644
--- a/src/sdl/SDL.cpp
+++ b/src/sdl/SDL.cpp
@@ -41,7 +41,7 @@
 
 #include <time.h>
 
-#include "../common/version_c.h"
+#include "../common/version_cpp.h"
 
 #include "SDL.h"
 
diff --git a/src/version.h.in b/src/version.h.in
index cf63766c..cfadcb78 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -45,9 +45,9 @@
 #define VBA_NAME_AND_VERSION    VBA_NAME " " VBA_VERSION_STRING
 #define VBA_NAME_AND_SUBVERSION VBA_NAME_AND_VERSION VBA_SUBVERSION_STRING
 
-#define VERSION VBA_CURRENT_VERSION VBA_SUBVERSION_STRING
+#define VBAM_VERSION VBA_CURRENT_VERSION VBA_SUBVERSION_STRING
 
-#define VER_FILEVERSION_STR VERSION
+#define VER_FILEVERSION_STR VBAM_VERSION
 #define VER_FILEVERSION @WIN_VERSION@
 
 #endif /* VBAM_VERSION_H */
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index d14802b4..60c473aa 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -668,7 +668,7 @@ set(
     cmd-evtable.h
     # icon File
     xrc/vbam.xpm
-    ../common/version.c
+    ../common/version.cpp
 )
 
 if(APPLE)
@@ -694,7 +694,7 @@ set(
     ../sdl/text.h
     # from external source with minor modifications
     widgets/wx/checkedlistctrl.h
-    ../common/version_c.h
+    ../common/version_cpp.h
 )
 
 set(
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 156925ec..89f3e682 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -10,7 +10,7 @@
 #include <wx/wfstream.h>
 #include <wx/msgdlg.h>
 
-#include "../common/version_c.h"
+#include "../common/version_cpp.h"
 #include "../common/ConfigManager.h"
 #include "../gb/gbPrinter.h"
 #include "../gba/agbprint.h"
@@ -2723,8 +2723,6 @@ EVT_HANDLER(Translate, "Translations")
     wxLaunchDefaultBrowser(wxT("http://www.transifex.com/projects/p/vba-m"));
 }
 
-#include "../common/version_c.h"
-
 // was About
 EVT_HANDLER(wxID_ABOUT, "About...")
 {
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index ce214b24..20b6a55a 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -5,7 +5,7 @@
 #include <wx/dcbuffer.h>
 #include <SDL_joystick.h>
 
-#include "../common/version_c.h"
+#include "../common/version_cpp.h"
 #include "../common/ConfigManager.h"
 #include "../common/Patch.h"
 #include "../gb/gbPrinter.h"