diff --git a/sc2/src/sc2code/gamestr.h b/sc2/src/sc2code/gamestr.h
index fa0676ccd..f86998db4 100644
--- a/sc2/src/sc2code/gamestr.h
+++ b/sc2/src/sc2code/gamestr.h
@@ -25,27 +25,54 @@
 
 #include "libs/strlib.h"
 
-#define STAR_STRING_BASE 0
-#define DEVICE_STRING_BASE 133
-#define CARGO_STRING_BASE 162
-#define ELEMENTS_STRING_BASE 172
-#define SCAN_STRING_BASE 305
-#define STAR_NUMBER_BASE 361
-#define PLANET_NUMBER_BASE 375
-#define MONTHS_STRING_BASE 407
-#define FEEDBACK_STRING_BASE 419
-#define STARBASE_STRING_BASE 421
-#define ENCOUNTER_STRING_BASE 426
-#define NAVIGATION_STRING_BASE 434
-#define NAMING_STRING_BASE 440
-#define MELEE_STRING_BASE 444
-#define SAVEGAME_STRING_BASE 453
-#define OPTION_STRING_BASE 458
-#define QUITMENU_STRING_BASE 463
-#define STATUS_STRING_BASE 468
-#define FLAGSHIP_STRING_BASE 474
-#define ORBITSCAN_STRING_BASE 487
-#define MAINMENU_STRING_BASE 506
+#define STAR_STRING_COUNT       133
+#define DEVICE_STRING_COUNT      29
+#define CARGO_STRING_COUNT       10
+#define ELEMENTS_STRING_COUNT   133
+#define SCAN_STRING_COUNT        56
+#define STAR_NUMBER_COUNT        14
+#define PLANET_NUMBER_COUNT      32
+#define MONTHS_STRING_COUNT      12
+#define FEEDBACK_STRING_COUNT     2
+#define STARBASE_STRING_COUNT     5
+#define ENCOUNTER_STRING_COUNT    8
+#define NAVIGATION_STRING_COUNT   6
+#define NAMING_STRING_COUNT       4
+#define MELEE_STRING_COUNT        9
+#define SAVEGAME_STRING_COUNT     5
+#define OPTION_STRING_COUNT       5
+#define QUITMENU_STRING_COUNT     5
+#define STATUS_STRING_COUNT       6
+#define FLAGSHIP_STRING_COUNT     6
+#define ORBITSCAN_STRING_COUNT   19
+#define MAINMENU_STRING_COUNT    56
+
+enum {
+	STAR_STRING_BASE       = 0,
+	DEVICE_STRING_BASE     = STAR_STRING_BASE + STAR_STRING_COUNT,
+	CARGO_STRING_BASE      = DEVICE_STRING_BASE + DEVICE_STRING_COUNT,
+	ELEMENTS_STRING_BASE   = CARGO_STRING_BASE + CARGO_STRING_COUNT,
+	SCAN_STRING_BASE       = ELEMENTS_STRING_BASE + ELEMENTS_STRING_COUNT,
+	STAR_NUMBER_BASE       = SCAN_STRING_BASE + SCAN_STRING_COUNT,
+	PLANET_NUMBER_BASE     = STAR_NUMBER_BASE + STAR_NUMBER_COUNT,
+	MONTHS_STRING_BASE     = PLANET_NUMBER_BASE + PLANET_NUMBER_COUNT,
+	FEEDBACK_STRING_BASE   = MONTHS_STRING_BASE + MONTHS_STRING_COUNT,
+	STARBASE_STRING_BASE   = FEEDBACK_STRING_BASE + FEEDBACK_STRING_COUNT,
+	ENCOUNTER_STRING_BASE  = STARBASE_STRING_BASE + STARBASE_STRING_COUNT,
+	NAVIGATION_STRING_BASE = ENCOUNTER_STRING_BASE + ENCOUNTER_STRING_COUNT,
+	NAMING_STRING_BASE     = NAVIGATION_STRING_BASE + NAVIGATION_STRING_COUNT,
+	MELEE_STRING_BASE      = NAMING_STRING_BASE + NAMING_STRING_COUNT,
+	SAVEGAME_STRING_BASE   = MELEE_STRING_BASE + MELEE_STRING_COUNT,
+	OPTION_STRING_BASE     = SAVEGAME_STRING_BASE + SAVEGAME_STRING_COUNT,
+	QUITMENU_STRING_BASE   = OPTION_STRING_BASE + OPTION_STRING_COUNT,
+	STATUS_STRING_BASE     = QUITMENU_STRING_BASE + QUITMENU_STRING_COUNT,
+	FLAGSHIP_STRING_BASE   = STATUS_STRING_BASE + STATUS_STRING_COUNT,
+	ORBITSCAN_STRING_BASE  = FLAGSHIP_STRING_BASE + FLAGSHIP_STRING_COUNT,
+	MAINMENU_STRING_BASE   = ORBITSCAN_STRING_BASE + ORBITSCAN_STRING_COUNT,
+
+	GAMESTR_COUNT          = MAINMENU_STRING_BASE + MAINMENU_STRING_COUNT
+};
+
 
 #define GAME_STRING(i) ((UNICODE *)GetStringAddress (SetAbsStringTableIndex (GameStrings, (i))))