diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 51ec3b980..3171e6dd1 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -378,7 +378,13 @@ consvar_t cv_karteliminatelast = {"karteliminatelast", "Yes", CV_NETVAR|CV_CHEAT
 
 consvar_t cv_kartusepwrlv = {"kartusepwrlv", "Yes", CV_NETVAR|CV_CHEAT, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-static CV_PossibleValue_t kartdebugitem_cons_t[] = {{-1, "MIN"}, {NUMKARTITEMS-1, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t kartdebugitem_cons_t[] =
+{
+#define X( name, n ) { n, #name }
+	KART_ITEM_ITERATOR,
+#undef  X
+	{0}
+};
 consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t kartdebugamount_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}};
 consvar_t cv_kartdebugamount = {"kartdebugamount", "1", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugamount_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
diff --git a/src/d_player.h b/src/d_player.h
index 697c0356c..853c0511b 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -197,27 +197,32 @@ typedef enum
 	NUMPOWERS
 } powertype_t;
 
+#define KART_ITEM_ITERATOR \
+	X (SAD,           -1),\
+	X (NONE,           0),\
+	X (SNEAKER,        2),\
+	X (ROCKETSNEAKER,  3),\
+	X (INVINCIBILITY,  4),\
+	X (BANANA,         5),\
+	X (EGGMAN,         6),\
+	X (ORBINAUT,       7),\
+	X (JAWZ,           8),\
+	X (MINE,           9),\
+	X (BALLHOG,       10),\
+	X (SPB,           11),\
+	X (GROW,          12),\
+	X (SHRINK,        13),\
+	X (THUNDERSHIELD, 14),\
+	X (HYUDORO,       15),\
+	X (POGOSPRING,    16),\
+	X (SUPERRING,     17),\
+	X (KITCHENSINK,   18)
+
 typedef enum
 {
-	KITEM_SAD = -1,
-	KITEM_NONE = 0,
-	KITEM_SNEAKER,
-	KITEM_ROCKETSNEAKER,
-	KITEM_INVINCIBILITY,
-	KITEM_BANANA,
-	KITEM_EGGMAN,
-	KITEM_ORBINAUT,
-	KITEM_JAWZ,
-	KITEM_MINE,
-	KITEM_BALLHOG,
-	KITEM_SPB,
-	KITEM_GROW,
-	KITEM_SHRINK,
-	KITEM_THUNDERSHIELD,
-	KITEM_HYUDORO,
-	KITEM_POGOSPRING,
-	KITEM_SUPERRING,
-	KITEM_KITCHENSINK,
+#define X( name, n ) KITEM_ ## name
+	KART_ITEM_ITERATOR,
+#undef  X
 
 	NUMKARTITEMS,