diff --git a/src/common/engine/namedef.h b/src/common/engine/namedef.h
index 7f90245381..af8e2bca05 100644
--- a/src/common/engine/namedef.h
+++ b/src/common/engine/namedef.h
@@ -75,8 +75,17 @@ xx(ACS_NamedExecuteWithResult)
 xx(__decorate_internal_int__)
 xx(__decorate_internal_bool__)
 xx(__decorate_internal_float__)
+
+// Per-actor sound channels (for deprecated PlaySoundEx function) Do not separate this block!!!
+xx(Auto)
 xx(Weapon)
+xx(Voice)
 xx(Item)
+xx(Body)
+xx(SoundSlot5)
+xx(SoundSlot6)
+xx(SoundSlot7)
+
 xx(LevelLocals)
 xx(Level)
 
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index b24bf4a5fb..65bb6119f4 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -30,15 +30,6 @@ xx(AddStencil)
 xx(Mana)
 xx(Armor)
 
-// Per-actor sound channels (for deprecated PlaySoundEx function)
-xx(Auto)
-xx(Voice)
-xx(Body)
-xx(SoundSlot5)
-xx(SoundSlot6)
-xx(SoundSlot7)
-
-
 // Hexen sound sequence names
 xx(Platform)
 xx(PlatformMetal)