4 files changed, 6 insertions, 16 deletions
diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp
index 590be2ac5..de6f16a47 100644
--- a/src/saveload/map_sl.cpp
+++ b/src/saveload/map_sl.cpp
@@ -38,9 +38,7 @@ static void Load_MAPS()
 	AllocateMap(_map_dim_x, _map_dim_y);
 }
 
-enum {
-	MAP_SL_BUF_SIZE = 4096
-};
+static const uint MAP_SL_BUF_SIZE = 4096;
 
 static void Load_MAPT()
 {
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp
index c7cff7279..b0688ed7a 100644
--- a/src/saveload/oldloader.cpp
+++ b/src/saveload/oldloader.cpp
@@ -22,10 +22,8 @@
 #include "saveload_internal.h"
 #include "oldloader.h"
 
-enum {
-	TTO_HEADER_SIZE = 41,
-	TTD_HEADER_SIZE = 49,
-};
+static const int TTO_HEADER_SIZE = 41;
+static const int TTD_HEADER_SIZE = 49;
 
 uint32 _bump_assert_value;
 
diff --git a/src/saveload/oldloader.h b/src/saveload/oldloader.h
index b0f1688f2..6720a28a6 100644
--- a/src/saveload/oldloader.h
+++ b/src/saveload/oldloader.h
@@ -15,10 +15,8 @@
 #include "saveload.h"
 #include "../tile_type.h"
 
-enum {
-	BUFFER_SIZE = 4096,
-	OLD_MAP_SIZE = 256 * 256,
-};
+static const uint BUFFER_SIZE = 4096;
+static const uint OLD_MAP_SIZE = 256 * 256;
 
 struct LoadgameState {
 	FILE *file;
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index 0914a50ea..0e7c7e5f7 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -81,11 +81,7 @@ enum SLRefType {
 
 #define SL_MAX_VERSION 255
 
-enum {
-	INC_VEHICLE_COMMON = 0,
-};
-
-enum {
+enum ChunkType {
 	CH_RIFF         =  0,
 	CH_ARRAY        =  1,
 	CH_SPARSE_ARRAY =  2,