diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e757c868..778e66096 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,8 +225,8 @@ file (GLOB CXBXR_SOURCE_COMMON
  "${CXBXR_ROOT_DIR}/src/common/xbe/XbePrinter.cpp"
  "${CXBXR_ROOT_DIR}/src/common/xdvdfs-tools/buffered_io.cpp"
  "${CXBXR_ROOT_DIR}/src/common/xdvdfs-tools/xdvdfs.cpp"
- "${CXBXR_ROOT_DIR}/src/gui/DbgConsole.cpp"
  "${CXBXR_ROOT_DIR}/src/CxbxVersion.cpp"
+ "${CXBXR_ROOT_DIR}/src/gui/DbgConsole.cpp"
  "${CXBXR_ROOT_DIR}/src/HighPerformanceGraphicsEnabler.c"
 )
 
diff --git a/src/CxbxVersion.cpp b/src/CxbxVersion.cpp
index edae25b16..f3b0be0d3 100644
--- a/src/CxbxVersion.cpp
+++ b/src/CxbxVersion.cpp
@@ -1,35 +1,11 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-// ******************************************************************
-// *
-// *  This file is part of the Cxbx project.
-// *
-// *  Cxbx and Cxbe are free software; you can redistribute them
-// *  and/or modify them under the terms of the GNU General Public
-// *  License as published by the Free Software Foundation; either
-// *  version 2 of the license, or (at your option) any later version.
-// *
-// *  This program is distributed in the hope that it will be useful,
-// *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// *  GNU General Public License for more details.
-// *
-// *  You should have recieved a copy of the GNU General Public License
-// *  along with this program; see the file COPYING.
-// *  If not, write to the Free Software Foundation, Inc.,
-// *  59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA.
-// *
-// *  (c) 2019 Patrick van Logchem <pvanlogchem@gmail.com>
-// *
-// *  All rights reserved
-// *
-// ******************************************************************
 #include "Version.h"
 #include "CxbxVersion.h"
 
 /*! version string dependent on trace flag */
 #ifndef _DEBUG_TRACE
-char * CxbxVersionStr = _GIT_VERSION " (" __DATE__  ")";
+const char* CxbxVersionStr = _GIT_VERSION " (" __DATE__  ")";
 #else
-char * CxbxVersionStr = _GIT_VERSION "-Trace (" __DATE__  ")";
-#endif
\ No newline at end of file
+const char* CxbxVersionStr = _GIT_VERSION "-Trace (" __DATE__  ")";
+#endif
diff --git a/src/CxbxVersion.h b/src/CxbxVersion.h
index 85fb54acf..17983832b 100644
--- a/src/CxbxVersion.h
+++ b/src/CxbxVersion.h
@@ -2,4 +2,4 @@
 
 #include "version.h"
 
-extern char * CxbxVersionStr;
\ No newline at end of file
+extern const char* CxbxVersionStr;
diff --git a/src/common/xbe/XbePrinter.cpp b/src/common/xbe/XbePrinter.cpp
index 1353e9a31..2d7e6ba62 100644
--- a/src/common/xbe/XbePrinter.cpp
+++ b/src/common/xbe/XbePrinter.cpp
@@ -170,9 +170,9 @@ std::string XbePrinter::GameRatingToString()
 std::string XbePrinter::GenDumpHeader()
 {
     std::string text;
-	text.append("XBE information generated by Cxbx-Reloaded (Version ");
-	text.append(CxbxVersionStr);
-	text.append(")\n\n");
+    text.append("XBE information generated by Cxbx-Reloaded (Version ");
+    text.append(CxbxVersionStr);
+    text.append(")\n\n");
     text.append("Title identified as \"");
     text.append(Xbe_to_print->m_szAsciiTitle);
     text.append("\"\n\n");