diff --git a/src/editor/editloop.cpp b/src/editor/editloop.cpp
index ca2512c09..702f0348c 100644
--- a/src/editor/editloop.cpp
+++ b/src/editor/editloop.cpp
@@ -1863,7 +1863,7 @@ static void CreateEditor(void)
 
 	ReplayRevealMap = 1;
 	FlagRevealMap = 0;
-	SelectedPlayer = 15;
+	SelectedPlayer = PlayerNumNeutral;
 
 	//
 	// Place the start points, which the loader discarded.
@@ -1871,7 +1871,7 @@ static void CreateEditor(void)
 	for (i = 0; i < PlayerMax; ++i) {
 		if (TheMap.Info.PlayerType[i] != PlayerNobody) {
 			// Set SelectedPlayer to a valid player
-			if (SelectedPlayer == 15) {
+			if (SelectedPlayer == PlayerNumNeutral) {
 				SelectedPlayer = i;
 			}
 #if 0
diff --git a/src/editor/edmap.cpp b/src/editor/edmap.cpp
index 4b7be5bac..d4fe21696 100644
--- a/src/editor/edmap.cpp
+++ b/src/editor/edmap.cpp
@@ -686,13 +686,13 @@ static void EditorRandomizeUnit(const char* unit_type, int count, int value)
 		TileFill(mx - rx - 1, mx - ry - 1, tile, z * 2);
 
 		// FIXME: can overlap units
-		unit = MakeUnitAndPlace(rx, ry , type, &Players[15]);
+		unit = MakeUnitAndPlace(rx, ry , type, &Players[PlayerNumNeutral]);
 		unit->ResourcesHeld = value;
-		unit = MakeUnitAndPlace(mx - rx - tw, ry, type, &Players[15]);
+		unit = MakeUnitAndPlace(mx - rx - tw, ry, type, &Players[PlayerNumNeutral]);
 		unit->ResourcesHeld = value;
-		unit = MakeUnitAndPlace(rx, my - ry - th, type, &Players[15]);
+		unit = MakeUnitAndPlace(rx, my - ry - th, type, &Players[PlayerNumNeutral]);
 		unit->ResourcesHeld = value;
-		unit = MakeUnitAndPlace(mx - rx - tw, mx - ry - th, type, &Players[15]);
+		unit = MakeUnitAndPlace(mx - rx - tw, mx - ry - th, type, &Players[PlayerNumNeutral]);
 		unit->ResourcesHeld = value;
 	}
 }
diff --git a/src/include/player.h b/src/include/player.h
index d6e073358..8c2ec274f 100644
--- a/src/include/player.h
+++ b/src/include/player.h
@@ -443,10 +443,7 @@ enum PlayerAis {
 	PlayerAiUniversal = 0xFF,  ///< attack best possible
 };
 
-#define PlayerNumNeutral 15  ///< this is the neutral player slot
-#if 0
-#define PlayerMax 16  ///< maximal players supported
-#endif
+#define PlayerNumNeutral (PlayerMax - 1)  ///< this is the neutral player slot
 
 /**
 **  Notify types. Noties are send to the player.