diff --git a/mk/windows/vs2017-64/libzetaglest.vcxproj b/mk/windows/vs2017-64/libzetaglest.vcxproj
index 39a0c6498..b512e19da 100644
--- a/mk/windows/vs2017-64/libzetaglest.vcxproj
+++ b/mk/windows/vs2017-64/libzetaglest.vcxproj
@@ -454,7 +454,7 @@
-
+
diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index 404e669e2..4c7a8dd05 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -37,7 +37,7 @@
#include
#include
#include "common_scoped_ptr.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#ifndef WIN32
#include
diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
index aac4040b9..74e7349f1 100644
--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -32,7 +32,7 @@
#include "cache_manager.h"
#include "errno.h"
#include "leak_dumper.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
using namespace Shared;
using namespace Shared::Util;
diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index f3b24e37d..473d745a2 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -41,7 +41,7 @@
#include "cache_manager.h"
#include "conversion.h"
#include "steam.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
using namespace Shared;
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 4806d1f08..90199c5f0 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -60,7 +60,7 @@
#include "lua_script.h"
#include "interpolation.h"
#include "common_scoped_ptr.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
// To handle signal catching
#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__FreeBSD__) && !defined(BSD)
diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index ba7f8db8c..17998de39 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -42,7 +42,7 @@
#include "map_preview.h"
#include
#include "compression_utils.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 35ded40ed..dc1396ab3 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -45,7 +45,7 @@
#include
#include "map_preview.h"
#include "gen_uuid.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
using namespace Shared;
diff --git a/source/glest_game/menu/menu_state_load_game.cpp b/source/glest_game/menu/menu_state_load_game.cpp
index 476b0820f..cd3ea165d 100644
--- a/source/glest_game/menu/menu_state_load_game.cpp
+++ b/source/glest_game/menu/menu_state_load_game.cpp
@@ -31,7 +31,7 @@
#include "network_message.h"
#include "game.h"
#include "auto_test.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index c0d8ade36..d8d8441ae 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -39,7 +39,7 @@
#include "masterserver_info.h"
#include
#include "cache_manager.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
using namespace Shared;
diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp
index 24b27d10e..8561f3b35 100644
--- a/source/glest_game/menu/menu_state_mods.cpp
+++ b/source/glest_game/menu/menu_state_mods.cpp
@@ -34,7 +34,7 @@
#include "cache_manager.h"
// Need the include below for vc++ 2010 because Microsoft messed up their STL!
#include
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
using namespace Shared;
diff --git a/source/glest_game/menu/menu_state_root.cpp b/source/glest_game/menu/menu_state_root.cpp
index aabf69f1c..e63a9a878 100644
--- a/source/glest_game/menu/menu_state_root.cpp
+++ b/source/glest_game/menu/menu_state_root.cpp
@@ -39,7 +39,7 @@
#include "cache_manager.h"
#include "steam.h"
#include
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
diff --git a/source/glest_game/menu/server_line.cpp b/source/glest_game/menu/server_line.cpp
index ca20bc403..11f6bfc89 100644
--- a/source/glest_game/menu/server_line.cpp
+++ b/source/glest_game/menu/server_line.cpp
@@ -29,7 +29,7 @@
#include "metrics.h"
#include "auto_test.h"
#include "masterserver_info.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
diff --git a/source/glest_game/network/client_interface.cpp b/source/glest_game/network/client_interface.cpp
index 6740a0c85..d1a2f9795 100644
--- a/source/glest_game/network/client_interface.cpp
+++ b/source/glest_game/network/client_interface.cpp
@@ -33,7 +33,7 @@
#include "config.h"
#include
#include
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
using namespace std;
diff --git a/source/glest_game/network/connection_slot.cpp b/source/glest_game/network/connection_slot.cpp
index 721d6122a..29747e78d 100644
--- a/source/glest_game/network/connection_slot.cpp
+++ b/source/glest_game/network/connection_slot.cpp
@@ -27,7 +27,7 @@
#include "network_message.h"
#include "platform_util.h"
#include
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index a7efeddd8..d7e650bd1 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -40,7 +40,7 @@
#include
#include
#include
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp
index 96d6f383a..3ac447cdd 100644
--- a/source/glest_map_editor/main.cpp
+++ b/source/glest_map_editor/main.cpp
@@ -33,7 +33,7 @@
#include
#endif
#include "common_scoped_ptr.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
//#include
using namespace Shared;
diff --git a/source/shared_lib/include/platform/common/shared_definitions.h b/source/shared_lib/include/platform/common/shared_const.h
similarity index 88%
rename from source/shared_lib/include/platform/common/shared_definitions.h
rename to source/shared_lib/include/platform/common/shared_const.h
index 3c2882c12..62271903e 100644
--- a/source/shared_lib/include/platform/common/shared_definitions.h
+++ b/source/shared_lib/include/platform/common/shared_const.h
@@ -9,11 +9,11 @@
// License, or (at your option) any later version
// ==============================================================
-#ifndef _SHARED_PLATFORM_DEFINITIONS_H_
-#define _SHARED_PLATFORM_DEFINITIONS_H_
+#ifndef _SHARED_CONST_H_
+#define _SHARED_CONST_H_
#include
-#include "versions.h"
+#include
#include "leak_dumper.h"
namespace Shared {
diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp
index 45996a628..a4d9a0d92 100644
--- a/source/shared_lib/sources/platform/common/platform_common.cpp
+++ b/source/shared_lib/sources/platform/common/platform_common.cpp
@@ -71,7 +71,7 @@
#include "platform_util.h"
#include "utf8.h"
#include "byte_order.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500 || _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED
#include
diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
index e4aa0add4..73672d1a5 100644
--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
@@ -38,7 +38,7 @@
#include
#include
#include "conversion.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
using namespace Shared::Util;
using namespace Shared::PlatformCommon;
diff --git a/source/shared_lib/sources/util/properties.cpp b/source/shared_lib/sources/util/properties.cpp
index 7b7b5a05a..bf76d8676 100644
--- a/source/shared_lib/sources/util/properties.cpp
+++ b/source/shared_lib/sources/util/properties.cpp
@@ -33,7 +33,7 @@
#include "utf8.h"
#include "font.h"
#include "string_utils.h"
-#include "shared_definitions.h"
+#include "shared_const.h"
#include "leak_dumper.h"
using namespace std;