diff --git a/sc2/build/msvc6/UrQuanMasters.dsp b/sc2/build/msvc6/UrQuanMasters.dsp
index 3a933b83c..acf932a08 100644
--- a/sc2/build/msvc6/UrQuanMasters.dsp
+++ b/sc2/build/msvc6/UrQuanMasters.dsp
@@ -3118,6 +3118,10 @@ SOURCE=..\..\src\uqm\controls.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\uqm\corecode.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\uqm\credits.c
 # End Source File
 # Begin Source File
diff --git a/sc2/src/uqm/comm/arilou/resinst.h b/sc2/src/uqm/comm/arilou/resinst.h
index ac251f0e2..991ea377a 100644
--- a/sc2/src/uqm/comm/arilou/resinst.h
+++ b/sc2/src/uqm/comm/arilou/resinst.h
@@ -1,5 +1,9 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ARILOU_COLOR_MAP "comm.arilou.colortable"
-#define ARILOU_PMAP_ANIM "comm.arilou.graphics"
-#define ARILOU_FONT "comm.arilou.font"
 #define ARILOU_CONVERSATION_PHRASES "comm.arilou.dialogue"
+#define ARILOU_FONT "comm.arilou.font"
 #define ARILOU_MUSIC "comm.arilou.music"
+#define ARILOU_PMAP_ANIM "comm.arilou.graphics"
diff --git a/sc2/src/uqm/comm/blackur/resinst.h b/sc2/src/uqm/comm/blackur/resinst.h
index d3465b6eb..d0c23132b 100644
--- a/sc2/src/uqm/comm/blackur/resinst.h
+++ b/sc2/src/uqm/comm/blackur/resinst.h
@@ -1,5 +1,9 @@
-#define BLACKURQ_PMAP_ANIM "comm.kohrah.graphics"
-#define BLACKURQ_FONT "comm.kohrah.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define BLACKURQ_COLOR_MAP "comm.kohrah.colortable"
 #define BLACKURQ_CONVERSATION_PHRASES "comm.kohrah.dialogue"
+#define BLACKURQ_FONT "comm.kohrah.font"
 #define BLACKURQ_MUSIC "comm.kohrah.music"
+#define BLACKURQ_PMAP_ANIM "comm.kohrah.graphics"
diff --git a/sc2/src/uqm/comm/chmmr/resinst.h b/sc2/src/uqm/comm/chmmr/resinst.h
index 166bb3bd7..3365c9790 100644
--- a/sc2/src/uqm/comm/chmmr/resinst.h
+++ b/sc2/src/uqm/comm/chmmr/resinst.h
@@ -1,5 +1,9 @@
-#define CHMMR_PMAP_ANIM "comm.chmmr.graphics"
-#define CHMMR_FONT "comm.chmmr.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define CHMMR_COLOR_MAP "comm.chmmr.colortable"
 #define CHMMR_CONVERSATION_PHRASES "comm.chmmr.dialogue"
+#define CHMMR_FONT "comm.chmmr.font"
 #define CHMMR_MUSIC "comm.chmmr.music"
+#define CHMMR_PMAP_ANIM "comm.chmmr.graphics"
diff --git a/sc2/src/uqm/comm/comandr/resinst.h b/sc2/src/uqm/comm/comandr/resinst.h
index e88d71c1c..7798214bf 100644
--- a/sc2/src/uqm/comm/comandr/resinst.h
+++ b/sc2/src/uqm/comm/comandr/resinst.h
@@ -1,8 +1,12 @@
-#define COMMANDER_PMAP_ANIM "comm.commander.graphics"
-#define COMMANDER_FONT "comm.commander.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define COMMANDER_COLOR_MAP "comm.commander.colortable"
 #define COMMANDER_CONVERSATION_PHRASES "comm.commander.dialogue"
-#define STARBASE_CONVERSATION_PHRASES "comm.starbase.dialogue"
+#define COMMANDER_FONT "comm.commander.font"
 #define COMMANDER_LOWPOW_MUSIC "comm.commander.lowpower.music"
 #define COMMANDER_MUSIC "comm.commander.music"
+#define COMMANDER_PMAP_ANIM "comm.commander.graphics"
 #define STARBASE_ALT_MUSIC "comm.starbase.music"
+#define STARBASE_CONVERSATION_PHRASES "comm.starbase.dialogue"
diff --git a/sc2/src/uqm/comm/druuge/resinst.h b/sc2/src/uqm/comm/druuge/resinst.h
index 1db46237c..ca82a22d2 100644
--- a/sc2/src/uqm/comm/druuge/resinst.h
+++ b/sc2/src/uqm/comm/druuge/resinst.h
@@ -1,5 +1,9 @@
-#define DRUUGE_PMAP_ANIM "comm.druuge.graphics"
-#define DRUUGE_FONT "comm.druuge.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define DRUUGE_COLOR_MAP "comm.druuge.colortable"
 #define DRUUGE_CONVERSATION_PHRASES "comm.druuge.dialogue"
+#define DRUUGE_FONT "comm.druuge.font"
 #define DRUUGE_MUSIC "comm.druuge.music"
+#define DRUUGE_PMAP_ANIM "comm.druuge.graphics"
diff --git a/sc2/src/uqm/comm/ilwrath/resinst.h b/sc2/src/uqm/comm/ilwrath/resinst.h
index 2c90b03cd..7063e399d 100644
--- a/sc2/src/uqm/comm/ilwrath/resinst.h
+++ b/sc2/src/uqm/comm/ilwrath/resinst.h
@@ -1,5 +1,9 @@
-#define ILWRATH_PMAP_ANIM "comm.ilwrath.graphics"
-#define ILWRATH_FONT "comm.ilwrath.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ILWRATH_COLOR_MAP "comm.ilwrath.colortable"
 #define ILWRATH_CONVERSATION_PHRASES "comm.ilwrath.dialogue"
+#define ILWRATH_FONT "comm.ilwrath.font"
 #define ILWRATH_MUSIC "comm.ilwrath.music"
+#define ILWRATH_PMAP_ANIM "comm.ilwrath.graphics"
diff --git a/sc2/src/uqm/comm/melnorm/resinst.h b/sc2/src/uqm/comm/melnorm/resinst.h
index 8d0f00dec..cda8d5a22 100644
--- a/sc2/src/uqm/comm/melnorm/resinst.h
+++ b/sc2/src/uqm/comm/melnorm/resinst.h
@@ -1,5 +1,9 @@
-#define MELNORME_PMAP_ANIM "comm.melnorme.graphics"
-#define MELNORME_FONT "comm.melnorme.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define MELNORME_COLOR_MAP "comm.melnorme.colortable"
 #define MELNORME_CONVERSATION_PHRASES "comm.melnorme.dialogue"
+#define MELNORME_FONT "comm.melnorme.font"
 #define MELNORME_MUSIC "comm.melnorme.music"
+#define MELNORME_PMAP_ANIM "comm.melnorme.graphics"
diff --git a/sc2/src/uqm/comm/mycon/resinst.h b/sc2/src/uqm/comm/mycon/resinst.h
index db5591024..65a6a3381 100644
--- a/sc2/src/uqm/comm/mycon/resinst.h
+++ b/sc2/src/uqm/comm/mycon/resinst.h
@@ -1,5 +1,9 @@
-#define MYCON_PMAP_ANIM "comm.mycon.graphics"
-#define MYCON_FONT "comm.mycon.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define MYCON_COLOR_MAP "comm.mycon.colortable"
 #define MYCON_CONVERSATION_PHRASES "comm.mycon.dialogue"
+#define MYCON_FONT "comm.mycon.font"
 #define MYCON_MUSIC "comm.mycon.music"
+#define MYCON_PMAP_ANIM "comm.mycon.graphics"
diff --git a/sc2/src/uqm/comm/orz/resinst.h b/sc2/src/uqm/comm/orz/resinst.h
index da1890d16..a526cefaa 100644
--- a/sc2/src/uqm/comm/orz/resinst.h
+++ b/sc2/src/uqm/comm/orz/resinst.h
@@ -1,5 +1,9 @@
-#define ORZ_PMAP_ANIM "comm.orz.graphics"
-#define ORZ_FONT "comm.orz.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ORZ_COLOR_MAP "comm.orz.colortable"
 #define ORZ_CONVERSATION_PHRASES "comm.orz.dialogue"
+#define ORZ_FONT "comm.orz.font"
 #define ORZ_MUSIC "comm.orz.music"
+#define ORZ_PMAP_ANIM "comm.orz.graphics"
diff --git a/sc2/src/uqm/comm/pkunk/resinst.h b/sc2/src/uqm/comm/pkunk/resinst.h
index 2a45b79b1..8f9ab7a5b 100644
--- a/sc2/src/uqm/comm/pkunk/resinst.h
+++ b/sc2/src/uqm/comm/pkunk/resinst.h
@@ -1,5 +1,9 @@
-#define PKUNK_PMAP_ANIM "comm.pkunk.graphics"
-#define PKUNK_FONT "comm.pkunk.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define PKUNK_COLOR_MAP "comm.pkunk.colortable"
 #define PKUNK_CONVERSATION_PHRASES "comm.pkunk.dialogue"
+#define PKUNK_FONT "comm.pkunk.font"
 #define PKUNK_MUSIC "comm.pkunk.music"
+#define PKUNK_PMAP_ANIM "comm.pkunk.graphics"
diff --git a/sc2/src/uqm/comm/shofixt/resinst.h b/sc2/src/uqm/comm/shofixt/resinst.h
index 3fcd62a45..8fe9a871e 100644
--- a/sc2/src/uqm/comm/shofixt/resinst.h
+++ b/sc2/src/uqm/comm/shofixt/resinst.h
@@ -1,5 +1,9 @@
-#define SHOFIXTI_PMAP_ANIM "comm.shofixti.graphics"
-#define SHOFIXTI_FONT "comm.shofixti.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SHOFIXTI_COLOR_MAP "comm.shofixti.colortable"
 #define SHOFIXTI_CONVERSATION_PHRASES "comm.shofixti.dialogue"
+#define SHOFIXTI_FONT "comm.shofixti.font"
 #define SHOFIXTI_MUSIC "comm.shofixti.music"
+#define SHOFIXTI_PMAP_ANIM "comm.shofixti.graphics"
diff --git a/sc2/src/uqm/comm/slyhome/resinst.h b/sc2/src/uqm/comm/slyhome/resinst.h
index 2c12e53c0..1bbf16252 100644
--- a/sc2/src/uqm/comm/slyhome/resinst.h
+++ b/sc2/src/uqm/comm/slyhome/resinst.h
@@ -1,5 +1,9 @@
-#define SLYLANDRO_PMAP_ANIM "comm.slylandro.graphics"
-#define SLYLANDRO_FONT "comm.slylandro.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SLYLANDRO_COLOR_MAP "comm.slylandro.colortable"
 #define SLYLANDRO_CONVERSATION_PHRASES "comm.slylandro.dialogue"
+#define SLYLANDRO_FONT "comm.slylandro.font"
 #define SLYLANDRO_MUSIC "comm.slylandro.music"
+#define SLYLANDRO_PMAP_ANIM "comm.slylandro.graphics"
diff --git a/sc2/src/uqm/comm/slyland/resinst.h b/sc2/src/uqm/comm/slyland/resinst.h
index 162a09eec..d0b9a3608 100644
--- a/sc2/src/uqm/comm/slyland/resinst.h
+++ b/sc2/src/uqm/comm/slyland/resinst.h
@@ -1,5 +1,9 @@
-#define SLYLAND_PMAP_ANIM "comm.probe.graphics"
-#define SLYLAND_FONT "comm.probe.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SLYLAND_COLOR_MAP "comm.probe.colortable"
 #define SLYLAND_CONVERSATION_PHRASES "comm.probe.dialogue"
+#define SLYLAND_FONT "comm.probe.font"
 #define SLYLAND_MUSIC "comm.probe.music"
+#define SLYLAND_PMAP_ANIM "comm.probe.graphics"
diff --git a/sc2/src/uqm/comm/spathi/resinst.h b/sc2/src/uqm/comm/spathi/resinst.h
index a94bb27b5..f83962b81 100644
--- a/sc2/src/uqm/comm/spathi/resinst.h
+++ b/sc2/src/uqm/comm/spathi/resinst.h
@@ -1,10 +1,14 @@
-#define SPATHI_HOME_PMAP_ANIM "comm.safeones.graphics"
-#define SPATHI_PMAP_ANIM "comm.spathi.graphics"
-#define SPATHI_FONT "comm.spathi.font"
-#define SPATHI_COLOR_MAP "comm.spathi.colortable"
-#define SPATHI_CONVERSATION_PHRASES "comm.spathi.dialogue"
-#define SPATHI_HOME_COLOR_MAP "comm.safeones.colortable"
-#define SPATHI_HOME_CONVERSATION_PHRASES "comm.safeones.dialogue"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define FWIFFO_MUSIC "comm.fwiffo.music"
 #define SPAHOME_MUSIC "comm.safeones.music"
+#define SPATHI_COLOR_MAP "comm.spathi.colortable"
+#define SPATHI_CONVERSATION_PHRASES "comm.spathi.dialogue"
+#define SPATHI_FONT "comm.spathi.font"
+#define SPATHI_HOME_COLOR_MAP "comm.safeones.colortable"
+#define SPATHI_HOME_CONVERSATION_PHRASES "comm.safeones.dialogue"
+#define SPATHI_HOME_PMAP_ANIM "comm.safeones.graphics"
 #define SPATHI_MUSIC "comm.spathi.music"
+#define SPATHI_PMAP_ANIM "comm.spathi.graphics"
diff --git a/sc2/src/uqm/comm/supox/resinst.h b/sc2/src/uqm/comm/supox/resinst.h
index e56472523..03459ea90 100644
--- a/sc2/src/uqm/comm/supox/resinst.h
+++ b/sc2/src/uqm/comm/supox/resinst.h
@@ -1,5 +1,9 @@
-#define SUPOX_PMAP_ANIM "comm.supox.graphics"
-#define SUPOX_FONT "comm.supox.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SUPOX_COLOR_MAP "comm.supox.colortable"
 #define SUPOX_CONVERSATION_PHRASES "comm.supox.dialogue"
+#define SUPOX_FONT "comm.supox.font"
 #define SUPOX_MUSIC "comm.supox.music"
+#define SUPOX_PMAP_ANIM "comm.supox.graphics"
diff --git a/sc2/src/uqm/comm/syreen/resinst.h b/sc2/src/uqm/comm/syreen/resinst.h
index 675c0812e..16f7b0bfd 100644
--- a/sc2/src/uqm/comm/syreen/resinst.h
+++ b/sc2/src/uqm/comm/syreen/resinst.h
@@ -1,5 +1,9 @@
-#define SYREEN_PMAP_ANIM "comm.syreen.graphics"
-#define SYREEN_FONT "comm.syreen.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SYREEN_COLOR_MAP "comm.syreen.colortable"
 #define SYREEN_CONVERSATION_PHRASES "comm.syreen.dialogue"
+#define SYREEN_FONT "comm.syreen.font"
 #define SYREEN_MUSIC "comm.syreen.music"
+#define SYREEN_PMAP_ANIM "comm.syreen.graphics"
diff --git a/sc2/src/uqm/comm/talkpet/resinst.h b/sc2/src/uqm/comm/talkpet/resinst.h
index fa3f30243..20398f99d 100644
--- a/sc2/src/uqm/comm/talkpet/resinst.h
+++ b/sc2/src/uqm/comm/talkpet/resinst.h
@@ -1,5 +1,9 @@
-#define TALKING_PET_PMAP_ANIM "comm.talkingpet.graphics"
-#define TALKING_PET_FONT "comm.talkingpet.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define TALKING_PET_COLOR_MAP "comm.talkingpet.colortable"
 #define TALKING_PET_CONVERSATION_PHRASES "comm.talkingpet.dialogue"
+#define TALKING_PET_FONT "comm.talkingpet.font"
 #define TALKING_PET_MUSIC "comm.talkingpet.music"
+#define TALKING_PET_PMAP_ANIM "comm.talkingpet.graphics"
diff --git a/sc2/src/uqm/comm/thradd/resinst.h b/sc2/src/uqm/comm/thradd/resinst.h
index c5fe93b09..977f1753c 100644
--- a/sc2/src/uqm/comm/thradd/resinst.h
+++ b/sc2/src/uqm/comm/thradd/resinst.h
@@ -1,5 +1,9 @@
-#define THRADD_PMAP_ANIM "comm.thraddash.graphics"
-#define THRADD_FONT "comm.thraddash.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define THRADD_COLOR_MAP "comm.thraddash.colortable"
 #define THRADD_CONVERSATION_PHRASES "comm.thraddash.dialogue"
+#define THRADD_FONT "comm.thraddash.font"
 #define THRADD_MUSIC "comm.thraddash.music"
+#define THRADD_PMAP_ANIM "comm.thraddash.graphics"
diff --git a/sc2/src/uqm/comm/umgah/resinst.h b/sc2/src/uqm/comm/umgah/resinst.h
index 6ea768089..7b7479d46 100644
--- a/sc2/src/uqm/comm/umgah/resinst.h
+++ b/sc2/src/uqm/comm/umgah/resinst.h
@@ -1,5 +1,9 @@
-#define UMGAH_PMAP_ANIM "comm.umgah.graphics"
-#define UMGAH_FONT "comm.umgah.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define UMGAH_COLOR_MAP "comm.umgah.colortable"
 #define UMGAH_CONVERSATION_PHRASES "comm.umgah.dialogue"
+#define UMGAH_FONT "comm.umgah.font"
 #define UMGAH_MUSIC "comm.umgah.music"
+#define UMGAH_PMAP_ANIM "comm.umgah.graphics"
diff --git a/sc2/src/uqm/comm/urquan/resinst.h b/sc2/src/uqm/comm/urquan/resinst.h
index 26f95edcb..5b69860dc 100644
--- a/sc2/src/uqm/comm/urquan/resinst.h
+++ b/sc2/src/uqm/comm/urquan/resinst.h
@@ -1,5 +1,9 @@
-#define URQUAN_PMAP_ANIM "comm.urquan.graphics"
-#define URQUAN_FONT "comm.urquan.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define URQUAN_COLOR_MAP "comm.urquan.colortable"
 #define URQUAN_CONVERSATION_PHRASES "comm.urquan.dialogue"
+#define URQUAN_FONT "comm.urquan.font"
 #define URQUAN_MUSIC "comm.urquan.music"
+#define URQUAN_PMAP_ANIM "comm.urquan.graphics"
diff --git a/sc2/src/uqm/comm/utwig/resinst.h b/sc2/src/uqm/comm/utwig/resinst.h
index 880f46dac..5176ecbab 100644
--- a/sc2/src/uqm/comm/utwig/resinst.h
+++ b/sc2/src/uqm/comm/utwig/resinst.h
@@ -1,6 +1,10 @@
-#define UTWIG_PMAP_ANIM "comm.utwig.graphics"
-#define UTWIG_FONT "comm.utwig.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define UTWIG_COLOR_MAP "comm.utwig.colortable"
 #define UTWIG_CONVERSATION_PHRASES "comm.utwig.dialogue"
+#define UTWIG_FONT "comm.utwig.font"
 #define UTWIG_MUSIC "comm.utwig.music"
+#define UTWIG_PMAP_ANIM "comm.utwig.graphics"
 #define UTWIG_ULTRON_MUSIC "comm.utwig.ultron.music"
diff --git a/sc2/src/uqm/comm/vux/resinst.h b/sc2/src/uqm/comm/vux/resinst.h
index 0cc7dca3e..5004523c1 100644
--- a/sc2/src/uqm/comm/vux/resinst.h
+++ b/sc2/src/uqm/comm/vux/resinst.h
@@ -1,5 +1,9 @@
-#define VUX_PMAP_ANIM "comm.vux.graphics"
-#define VUX_FONT "comm.vux.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define VUX_COLOR_MAP "comm.vux.colortable"
 #define VUX_CONVERSATION_PHRASES "comm.vux.dialogue"
+#define VUX_FONT "comm.vux.font"
 #define VUX_MUSIC "comm.vux.music"
+#define VUX_PMAP_ANIM "comm.vux.graphics"
diff --git a/sc2/src/uqm/comm/yehat/resinst.h b/sc2/src/uqm/comm/yehat/resinst.h
index dc5e66bd6..3b0b20350 100644
--- a/sc2/src/uqm/comm/yehat/resinst.h
+++ b/sc2/src/uqm/comm/yehat/resinst.h
@@ -1,7 +1,11 @@
-#define YEHAT_PMAP_ANIM "comm.yehat.graphics"
-#define YEHAT_FONT "comm.yehat.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define REBEL_CONVERSATION_PHRASES "comm.yehat.rebel.dialogue"
+#define REBEL_MUSIC "comm.yehat.rebel.music"
 #define YEHAT_COLOR_MAP "comm.yehat.colortable"
 #define YEHAT_CONVERSATION_PHRASES "comm.yehat.dialogue"
-#define REBEL_MUSIC "comm.yehat.rebel.music"
+#define YEHAT_FONT "comm.yehat.font"
 #define YEHAT_MUSIC "comm.yehat.music"
+#define YEHAT_PMAP_ANIM "comm.yehat.graphics"
diff --git a/sc2/src/uqm/comm/zoqfot/resinst.h b/sc2/src/uqm/comm/zoqfot/resinst.h
index 3273cf4a5..a9430d906 100644
--- a/sc2/src/uqm/comm/zoqfot/resinst.h
+++ b/sc2/src/uqm/comm/zoqfot/resinst.h
@@ -1,5 +1,9 @@
-#define ZOQFOTPIK_PMAP_ANIM "comm.zoqfotpik.graphics"
-#define ZOQFOTPIK_FONT "comm.zoqfotpik.font"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ZOQFOTPIK_COLOR_MAP "comm.zoqfotpik.colortable"
 #define ZOQFOTPIK_CONVERSATION_PHRASES "comm.zoqfotpik.dialogue"
+#define ZOQFOTPIK_FONT "comm.zoqfotpik.font"
 #define ZOQFOTPIK_MUSIC "comm.zoqfotpik.music"
+#define ZOQFOTPIK_PMAP_ANIM "comm.zoqfotpik.graphics"
diff --git a/sc2/src/uqm/ships/androsyn/icode.h b/sc2/src/uqm/ships/androsyn/icode.h
index 86af2df1d..67f053a15 100644
--- a/sc2/src/uqm/ships/androsyn/icode.h
+++ b/sc2/src/uqm/ships/androsyn/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ANDROSYNTH_CODE "ship.androsynth.code"
diff --git a/sc2/src/uqm/ships/androsyn/resinst.h b/sc2/src/uqm/ships/androsyn/resinst.h
index b8b0cd400..94b4a3f86 100644
--- a/sc2/src/uqm/ships/androsyn/resinst.h
+++ b/sc2/src/uqm/ships/androsyn/resinst.h
@@ -1,17 +1,19 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ANDROSYNTH_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.guardian.large"
 #define ANDROSYNTH_CAPT_MASK_PMAP_ANIM "ship.androsynth.graphics.captain"
 #define ANDROSYNTH_ICON_MASK_PMAP_ANIM "ship.androsynth.icons"
 #define ANDROSYNTH_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.guardian.medium"
 #define ANDROSYNTH_MICON_MASK_PMAP_ANIM "ship.androsynth.meleeicons"
+#define ANDROSYNTH_RACE_STRINGS "ship.androsynth.text"
+#define ANDROSYNTH_SHIP_SOUNDS "ship.androsynth.sounds"
 #define ANDROSYNTH_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.guardian.small"
+#define ANDROSYNTH_VICTORY_SONG "ship.androsynth.ditty"
 #define BLAZER_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.large"
 #define BLAZER_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.medium"
 #define BLAZER_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.small"
 #define BUBBLE_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.large"
 #define BUBBLE_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.medium"
 #define BUBBLE_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.small"
-#define ANDROSYNTH_RACE_STRINGS "ship.androsynth.text"
-#define ANDROSYNTH_SHIP_SOUNDS "ship.androsynth.sounds"
-#define ANDROSYNTH_VICTORY_SONG "ship.androsynth.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/arilou/icode.h b/sc2/src/uqm/ships/arilou/icode.h
index b845d29bb..81d4fff2c 100644
--- a/sc2/src/uqm/ships/arilou/icode.h
+++ b/sc2/src/uqm/ships/arilou/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ARILOU_CODE "ship.arilou.code"
diff --git a/sc2/src/uqm/ships/arilou/resinst.h b/sc2/src/uqm/ships/arilou/resinst.h
index f723b93f0..173e2227f 100644
--- a/sc2/src/uqm/ships/arilou/resinst.h
+++ b/sc2/src/uqm/ships/arilou/resinst.h
@@ -1,14 +1,16 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ARILOU_BIG_MASK_PMAP_ANIM "ship.arilou.graphics.skiff.large"
 #define ARILOU_CAPTAIN_MASK_PMAP_ANIM "ship.arilou.graphics.captain"
 #define ARILOU_ICON_MASK_PMAP_ANIM "ship.arilou.icons"
 #define ARILOU_MED_MASK_PMAP_ANIM "ship.arilou.graphics.skiff.medium"
 #define ARILOU_MICON_MASK_PMAP_ANIM "ship.arilou.meleeicons"
+#define ARILOU_RACE_STRINGS "ship.arilou.text"
+#define ARILOU_SHIP_SOUNDS "ship.arilou.sounds"
 #define ARILOU_SML_MASK_PMAP_ANIM "ship.arilou.graphics.skiff.small"
+#define ARILOU_VICTORY_SONG "ship.arilou.ditty"
 #define WARP_BIG_MASK_PMAP_ANIM "ship.arilou.graphics.warp.large"
 #define WARP_MED_MASK_PMAP_ANIM "ship.arilou.graphics.warp.medium"
 #define WARP_SML_MASK_PMAP_ANIM "ship.arilou.graphics.warp.small"
-#define ARILOU_RACE_STRINGS "ship.arilou.text"
-#define ARILOU_SHIP_SOUNDS "ship.arilou.sounds"
-#define ARILOU_VICTORY_SONG "ship.arilou.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/blackurq/icode.h b/sc2/src/uqm/ships/blackurq/icode.h
index afa7c16c5..99c0ca227 100644
--- a/sc2/src/uqm/ships/blackurq/icode.h
+++ b/sc2/src/uqm/ships/blackurq/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define KOHR_AH_CODE "ship.kohrah.code"
diff --git a/sc2/src/uqm/ships/blackurq/resinst.h b/sc2/src/uqm/ships/blackurq/resinst.h
index c185a50ca..840f519d1 100644
--- a/sc2/src/uqm/ships/blackurq/resinst.h
+++ b/sc2/src/uqm/ships/blackurq/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define BUZZSAW_BIG_MASK_PMAP_ANIM "ship.kohrah.graphics.buzzsaw.large"
 #define BUZZSAW_MED_MASK_PMAP_ANIM "ship.kohrah.graphics.buzzsaw.medium"
 #define BUZZSAW_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.buzzsaw.small"
@@ -9,9 +13,7 @@
 #define KOHR_AH_ICON_MASK_PMAP_ANIM "ship.kohrah.icons"
 #define KOHR_AH_MED_MASK_PMAP_ANIM "ship.kohrah.graphics.marauder.medium"
 #define KOHR_AH_MICON_MASK_PMAP_ANIM "ship.kohrah.meleeicons"
-#define KOHR_AH_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.marauder.small"
 #define KOHR_AH_RACE_STRINGS "ship.kohrah.text"
 #define KOHR_AH_SHIP_SOUNDS "ship.kohrah.sounds"
+#define KOHR_AH_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.marauder.small"
 #define KOHR_AH_VICTORY_SONG "ship.kohrah.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/chenjesu/icode.h b/sc2/src/uqm/ships/chenjesu/icode.h
index 1f01274bf..1f4b693ef 100644
--- a/sc2/src/uqm/ships/chenjesu/icode.h
+++ b/sc2/src/uqm/ships/chenjesu/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define CHENJESU_CODE "ship.chenjesu.code"
diff --git a/sc2/src/uqm/ships/chenjesu/resinst.h b/sc2/src/uqm/ships/chenjesu/resinst.h
index 646f2b0ef..966029a53 100644
--- a/sc2/src/uqm/ships/chenjesu/resinst.h
+++ b/sc2/src/uqm/ships/chenjesu/resinst.h
@@ -1,17 +1,19 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define CHENJESU_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.broodhome.large"
 #define CHENJESU_CAPTAIN_MASK_PMAP_ANIM "ship.chenjesu.graphics.captain"
 #define CHENJESU_ICON_MASK_PMAP_ANIM "ship.chenjesu.icons"
 #define CHENJESU_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.broodhome.medium"
 #define CHENJESU_MICON_MASK_PMAP_ANIM "ship.chenjesu.meleeicons"
+#define CHENJESU_RACE_STRINGS "ship.chenjesu.text"
+#define CHENJESU_SHIP_SOUNDS "ship.chenjesu.sounds"
 #define CHENJESU_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.broodhome.small"
+#define CHENJESU_VICTORY_SONG "ship.chenjesu.ditty"
 #define DOGGY_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.large"
 #define DOGGY_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.medium"
 #define DOGGY_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.small"
 #define SPARK_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.large"
 #define SPARK_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.medium"
 #define SPARK_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.small"
-#define CHENJESU_RACE_STRINGS "ship.chenjesu.text"
-#define CHENJESU_SHIP_SOUNDS "ship.chenjesu.sounds"
-#define CHENJESU_VICTORY_SONG "ship.chenjesu.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/chmmr/icode.h b/sc2/src/uqm/ships/chmmr/icode.h
index a2344eef1..0873a155d 100644
--- a/sc2/src/uqm/ships/chmmr/icode.h
+++ b/sc2/src/uqm/ships/chmmr/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define CHMMR_CODE "ship.chmmr.code"
diff --git a/sc2/src/uqm/ships/chmmr/resinst.h b/sc2/src/uqm/ships/chmmr/resinst.h
index 37566d569..a83027370 100644
--- a/sc2/src/uqm/ships/chmmr/resinst.h
+++ b/sc2/src/uqm/ships/chmmr/resinst.h
@@ -1,17 +1,19 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define CHMMR_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.avatar.large"
 #define CHMMR_CAPTAIN_MASK_PMAP_ANIM "ship.chmmr.graphics.captain"
 #define CHMMR_ICON_MASK_PMAP_ANIM "ship.chmmr.icons"
 #define CHMMR_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.avatar.medium"
 #define CHMMR_MICON_MASK_PMAP_ANIM "ship.chmmr.meleeicons"
+#define CHMMR_RACE_STRINGS "ship.chmmr.text"
+#define CHMMR_SHIP_SOUNDS "ship.chmmr.sounds"
 #define CHMMR_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.avatar.small"
+#define CHMMR_VICTORY_SONG "ship.chmmr.ditty"
 #define MUZZLE_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.muzzle.large"
 #define MUZZLE_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.muzzle.medium"
 #define MUZZLE_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.muzzle.small"
 #define SATELLITE_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.satellite.large"
 #define SATELLITE_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.satellite.medium"
 #define SATELLITE_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.satellite.small"
-#define CHMMR_RACE_STRINGS "ship.chmmr.text"
-#define CHMMR_SHIP_SOUNDS "ship.chmmr.sounds"
-#define CHMMR_VICTORY_SONG "ship.chmmr.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/druuge/icode.h b/sc2/src/uqm/ships/druuge/icode.h
index b173fe0fe..859949011 100644
--- a/sc2/src/uqm/ships/druuge/icode.h
+++ b/sc2/src/uqm/ships/druuge/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define DRUUGE_CODE "ship.druuge.code"
diff --git a/sc2/src/uqm/ships/druuge/resinst.h b/sc2/src/uqm/ships/druuge/resinst.h
index 51960103d..2213ad9d8 100644
--- a/sc2/src/uqm/ships/druuge/resinst.h
+++ b/sc2/src/uqm/ships/druuge/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define DRUUGE_BIG_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.large"
 #define DRUUGE_CANNON_BIG_MASK_PMAP_ANIM "ship.druuge.graphics.cannon.large"
 #define DRUUGE_CANNON_MED_MASK_PMAP_ANIM "ship.druuge.graphics.cannon.medium"
@@ -6,9 +10,7 @@
 #define DRUUGE_ICON_MASK_PMAP_ANIM "ship.druuge.icons"
 #define DRUUGE_MED_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.medium"
 #define DRUUGE_MICON_MASK_PMAP_ANIM "ship.druuge.meleeicons"
-#define DRUUGE_SML_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.small"
 #define DRUUGE_RACE_STRINGS "ship.druuge.text"
 #define DRUUGE_SHIP_SOUNDS "ship.druuge.sounds"
+#define DRUUGE_SML_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.small"
 #define DRUUGE_VICTORY_SONG "ship.druuge.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/human/icode.h b/sc2/src/uqm/ships/human/icode.h
index 0700876fa..acfd62ec3 100644
--- a/sc2/src/uqm/ships/human/icode.h
+++ b/sc2/src/uqm/ships/human/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define HUMAN_CODE "ship.earthling.code"
diff --git a/sc2/src/uqm/ships/human/resinst.h b/sc2/src/uqm/ships/human/resinst.h
index b43c29953..3d4022ec1 100644
--- a/sc2/src/uqm/ships/human/resinst.h
+++ b/sc2/src/uqm/ships/human/resinst.h
@@ -1,14 +1,16 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define HUMAN_BIG_MASK_PMAP_ANIM "ship.earthling.graphics.human.large"
 #define HUMAN_CAPTAIN_MASK_PMAP_ANIM "ship.earthling.graphics.captain"
 #define HUMAN_ICON_MASK_PMAP_ANIM "ship.earthling.icons"
 #define HUMAN_MED_MASK_PMAP_ANIM "ship.earthling.graphics.human.medium"
 #define HUMAN_MICON_MASK_PMAP_ANIM "ship.earthling.meleeicons"
+#define HUMAN_RACE_STRINGS "ship.earthling.text"
+#define HUMAN_SHIP_SOUNDS "ship.earthling.sounds"
 #define HUMAN_SML_MASK_PMAP_ANIM "ship.earthling.graphics.human.small"
+#define HUMAN_VICTORY_SONG "ship.earthling.ditty"
 #define SATURN_BIG_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.large"
 #define SATURN_MED_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.medium"
 #define SATURN_SML_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.small"
-#define HUMAN_RACE_STRINGS "ship.earthling.text"
-#define HUMAN_SHIP_SOUNDS "ship.earthling.sounds"
-#define HUMAN_VICTORY_SONG "ship.earthling.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/ilwrath/icode.h b/sc2/src/uqm/ships/ilwrath/icode.h
index 275cd9e77..fa78adc05 100644
--- a/sc2/src/uqm/ships/ilwrath/icode.h
+++ b/sc2/src/uqm/ships/ilwrath/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ILWRATH_CODE "ship.ilwrath.code"
diff --git a/sc2/src/uqm/ships/ilwrath/resinst.h b/sc2/src/uqm/ships/ilwrath/resinst.h
index ae9f8f8b0..46cb53a1d 100644
--- a/sc2/src/uqm/ships/ilwrath/resinst.h
+++ b/sc2/src/uqm/ships/ilwrath/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define FIRE_BIG_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.large"
 #define FIRE_MED_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.medium"
 #define FIRE_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.small"
@@ -6,9 +10,7 @@
 #define ILWRATH_ICON_MASK_PMAP_ANIM "ship.ilwrath.icons"
 #define ILWRATH_MED_MASK_PMAP_ANIM "ship.ilwrath.graphics.avenger.medium"
 #define ILWRATH_MICON_MASK_PMAP_ANIM "ship.ilwrath.meleeicons"
-#define ILWRATH_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.avenger.small"
 #define ILWRATH_RACE_STRINGS "ship.ilwrath.text"
 #define ILWRATH_SHIP_SOUNDS "ship.ilwrath.sounds"
+#define ILWRATH_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.avenger.small"
 #define ILWRATH_VICTORY_SONG "ship.ilwrath.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/lastbat/icode.h b/sc2/src/uqm/ships/lastbat/icode.h
index d0b2e5c6c..087c891b6 100644
--- a/sc2/src/uqm/ships/lastbat/icode.h
+++ b/sc2/src/uqm/ships/lastbat/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SAMATRA_CODE "ship.samatra.code"
diff --git a/sc2/src/uqm/ships/lastbat/resinst.h b/sc2/src/uqm/ships/lastbat/resinst.h
index 389c637f4..779c00a04 100644
--- a/sc2/src/uqm/ships/lastbat/resinst.h
+++ b/sc2/src/uqm/ships/lastbat/resinst.h
@@ -1,14 +1,16 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define GENERATOR_BIG_MASK_ANIM "ship.samatra.graphics.generator.large"
 #define GENERATOR_MED_MASK_PMAP_ANIM "ship.samatra.graphics.generator.medium"
 #define GENERATOR_SML_MASK_PMAP_ANIM "ship.samatra.graphics.generator.small"
 #define SAMATRA_BIG_MASK_ANIM "ship.samatra.graphics.samatra.large"
 #define SAMATRA_CAPTAIN_MASK_PMAP_ANIM "ship.samatra.graphics.captain"
 #define SAMATRA_MED_MASK_PMAP_ANIM "ship.samatra.graphics.samatra.medium"
+#define SAMATRA_SHIP_SOUNDS "ship.samatra.sounds"
 #define SAMATRA_SML_MASK_PMAP_ANIM "ship.samatra.graphics.samatra.small"
+#define SAMATRA_VICTORY_SONG "ship.samatra.ditty"
 #define SENTINEL_BIG_MASK_ANIM "ship.samatra.graphics.sentinel.large"
 #define SENTINEL_MED_MASK_PMAP_ANIM "ship.samatra.graphics.sentinel.medium"
 #define SENTINEL_SML_MASK_PMAP_ANIM "ship.samatra.graphics.sentinel.small"
-#define SAMATRA_SHIP_SOUNDS "ship.samatra.sounds"
-#define SAMATRA_VICTORY_SONG "ship.samatra.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/melnorme/icode.h b/sc2/src/uqm/ships/melnorme/icode.h
index 53b39c09a..d9dd355f5 100644
--- a/sc2/src/uqm/ships/melnorme/icode.h
+++ b/sc2/src/uqm/ships/melnorme/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define MELNORME_CODE "ship.melnorme.code"
diff --git a/sc2/src/uqm/ships/melnorme/resinst.h b/sc2/src/uqm/ships/melnorme/resinst.h
index a42872f4c..01b93df64 100644
--- a/sc2/src/uqm/ships/melnorme/resinst.h
+++ b/sc2/src/uqm/ships/melnorme/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define CONFUSE_BIG_MASK_PMAP_ANIM "ship.melnorme.graphics.confuse.large"
 #define CONFUSE_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.confuse.medium"
 #define CONFUSE_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.confuse.small"
@@ -6,12 +10,10 @@
 #define MELNORME_ICON_MASK_PMAP_ANIM "ship.melnorme.icons"
 #define MELNORME_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.trader.medium"
 #define MELNORME_MICON_MASK_PMAP_ANIM "ship.melnorme.meleeicons"
+#define MELNORME_RACE_STRINGS "ship.melnorme.text"
+#define MELNORME_SHIP_SOUNDS "ship.melnorme.sounds"
 #define MELNORME_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.trader.small"
+#define MELNORME_VICTORY_SONG "ship.melnorme.ditty"
 #define PUMPUP_BIG_MASK_PMAP_ANIM "ship.melnorme.graphics.pumpup.large"
 #define PUMPUP_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.pumpup.medium"
 #define PUMPUP_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.pumpup.small"
-#define MELNORME_RACE_STRINGS "ship.melnorme.text"
-#define MELNORME_SHIP_SOUNDS "ship.melnorme.sounds"
-#define MELNORME_VICTORY_SONG "ship.melnorme.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/mmrnmhrm/icode.h b/sc2/src/uqm/ships/mmrnmhrm/icode.h
index 7a9457c9a..ba3f593b5 100644
--- a/sc2/src/uqm/ships/mmrnmhrm/icode.h
+++ b/sc2/src/uqm/ships/mmrnmhrm/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define MMRNMHRM_CODE "ship.mmrnmhrm.code"
diff --git a/sc2/src/uqm/ships/mmrnmhrm/resinst.h b/sc2/src/uqm/ships/mmrnmhrm/resinst.h
index 154535b09..f44285f64 100644
--- a/sc2/src/uqm/ships/mmrnmhrm/resinst.h
+++ b/sc2/src/uqm/ships/mmrnmhrm/resinst.h
@@ -1,17 +1,19 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define MMRNMHRM_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.xform.large"
 #define MMRNMHRM_CAPTAIN_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.captain"
 #define MMRNMHRM_ICON_MASK_PMAP_ANIM "ship.mmrnmhrm.icons"
 #define MMRNMHRM_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.xform.medium"
 #define MMRNMHRM_MICON_MASK_PMAP_ANIM "ship.mmrnmhrm.meleeicons"
+#define MMRNMHRM_RACE_STRINGS "ship.mmrnmhrm.text"
+#define MMRNMHRM_SHIP_SOUNDS "ship.mmrnmhrm.sounds"
 #define MMRNMHRM_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.xform.small"
+#define MMRNMHRM_VICTORY_SONG "ship.mmrnmhrm.ditty"
 #define TORP_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torpedo.large"
 #define TORP_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torpedo.medium"
 #define TORP_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torpedo.small"
 #define YWING_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.large"
 #define YWING_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.medium"
 #define YWING_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.small"
-#define MMRNMHRM_RACE_STRINGS "ship.mmrnmhrm.text"
-#define MMRNMHRM_SHIP_SOUNDS "ship.mmrnmhrm.sounds"
-#define MMRNMHRM_VICTORY_SONG "ship.mmrnmhrm.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/mycon/icode.h b/sc2/src/uqm/ships/mycon/icode.h
index 067afbc03..b3caa5819 100644
--- a/sc2/src/uqm/ships/mycon/icode.h
+++ b/sc2/src/uqm/ships/mycon/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define MYCON_CODE "ship.mycon.code"
diff --git a/sc2/src/uqm/ships/mycon/resinst.h b/sc2/src/uqm/ships/mycon/resinst.h
index 4a74e4449..38908a2ba 100644
--- a/sc2/src/uqm/ships/mycon/resinst.h
+++ b/sc2/src/uqm/ships/mycon/resinst.h
@@ -1,14 +1,16 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define MYCON_BIG_MASK_PMAP_ANIM "ship.mycon.graphics.podship.large"
 #define MYCON_CAPTAIN_MASK_PMAP_ANIM "ship.mycon.graphics.captain"
 #define MYCON_ICON_MASK_PMAP_ANIM "ship.mycon.icons"
 #define MYCON_MED_MASK_PMAP_ANIM "ship.mycon.graphics.podship.medium"
 #define MYCON_MICON_MASK_PMAP_ANIM "ship.mycon.meleeicons"
+#define MYCON_RACE_STRINGS "ship.mycon.text"
+#define MYCON_SHIP_SOUNDS "ship.mycon.sounds"
 #define MYCON_SML_MASK_PMAP_ANIM "ship.mycon.graphics.podship.small"
+#define MYCON_VICTORY_SONG "ship.mycon.ditty"
 #define PLASMA_BIG_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.large"
 #define PLASMA_MED_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.medium"
 #define PLASMA_SML_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.small"
-#define MYCON_RACE_STRINGS "ship.mycon.text"
-#define MYCON_SHIP_SOUNDS "ship.mycon.sounds"
-#define MYCON_VICTORY_SONG "ship.mycon.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/orz/icode.h b/sc2/src/uqm/ships/orz/icode.h
index 0d3349081..bb45c4e35 100644
--- a/sc2/src/uqm/ships/orz/icode.h
+++ b/sc2/src/uqm/ships/orz/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ORZ_CODE "ship.orz.code"
diff --git a/sc2/src/uqm/ships/orz/resinst.h b/sc2/src/uqm/ships/orz/resinst.h
index 4a43a858d..4af5264dc 100644
--- a/sc2/src/uqm/ships/orz/resinst.h
+++ b/sc2/src/uqm/ships/orz/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define HOWITZER_BIG_MASK_PMAP_ANIM "ship.orz.graphics.howitzer.large"
 #define HOWITZER_MED_MASK_PMAP_ANIM "ship.orz.graphics.howitzer.medium"
 #define HOWITZER_SML_MASK_PMAP_ANIM "ship.orz.graphics.howitzer.small"
@@ -6,12 +10,10 @@
 #define ORZ_ICON_MASK_PMAP_ANIM "ship.orz.icons"
 #define ORZ_MED_MASK_PMAP_ANIM "ship.orz.graphics.nemesis.medium"
 #define ORZ_MICON_MASK_PMAP_ANIM "ship.orz.meleeicons"
+#define ORZ_RACE_STRINGS "ship.orz.text"
+#define ORZ_SHIP_SOUNDS "ship.orz.sounds"
 #define ORZ_SML_MASK_PMAP_ANIM "ship.orz.graphics.nemesis.small"
+#define ORZ_VICTORY_SONG "ship.orz.ditty"
 #define TURRET_BIG_MASK_PMAP_ANIM "ship.orz.graphics.turret.large"
 #define TURRET_MED_MASK_PMAP_ANIM "ship.orz.graphics.turret.medium"
 #define TURRET_SML_MASK_PMAP_ANIM "ship.orz.graphics.turret.small"
-#define ORZ_RACE_STRINGS "ship.orz.text"
-#define ORZ_SHIP_SOUNDS "ship.orz.sounds"
-#define ORZ_VICTORY_SONG "ship.orz.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/pkunk/icode.h b/sc2/src/uqm/ships/pkunk/icode.h
index 2893b749b..4d0d4e51f 100644
--- a/sc2/src/uqm/ships/pkunk/icode.h
+++ b/sc2/src/uqm/ships/pkunk/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define PKUNK_CODE "ship.pkunk.code"
diff --git a/sc2/src/uqm/ships/pkunk/resinst.h b/sc2/src/uqm/ships/pkunk/resinst.h
index 5b1384254..9c1168e19 100644
--- a/sc2/src/uqm/ships/pkunk/resinst.h
+++ b/sc2/src/uqm/ships/pkunk/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define BUG_BIG_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.large"
 #define BUG_MED_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.medium"
 #define BUG_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.small"
@@ -6,9 +10,7 @@
 #define PKUNK_ICON_MASK_PMAP_ANIM "ship.pkunk.icons"
 #define PKUNK_MED_MASK_PMAP_ANIM "ship.pkunk.graphics.fury.medium"
 #define PKUNK_MICON_MASK_PMAP_ANIM "ship.pkunk.meleeicons"
-#define PKUNK_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.fury.small"
 #define PKUNK_RACE_STRINGS "ship.pkunk.text"
 #define PKUNK_SHIP_SOUNDS "ship.pkunk.sounds"
+#define PKUNK_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.fury.small"
 #define PKUNK_VICTORY_SONG "ship.pkunk.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/probe/icode.h b/sc2/src/uqm/ships/probe/icode.h
index 7d03794d8..badab2a2e 100644
--- a/sc2/src/uqm/ships/probe/icode.h
+++ b/sc2/src/uqm/ships/probe/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define URQUAN_DRONE_CODE "ship.drone.code"
diff --git a/sc2/src/uqm/ships/probe/resinst.h b/sc2/src/uqm/ships/probe/resinst.h
index 4e2620f2b..5365c6d56 100644
--- a/sc2/src/uqm/ships/probe/resinst.h
+++ b/sc2/src/uqm/ships/probe/resinst.h
@@ -1,3 +1,5 @@
-#define URQUAN_DRONE_MICON_MASK_PMAP_ANIM "ship.drone.meleeicons"
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
 
-#include "icode.h"
+#define URQUAN_DRONE_MICON_MASK_PMAP_ANIM "ship.drone.meleeicons"
diff --git a/sc2/src/uqm/ships/shofixti/icode.h b/sc2/src/uqm/ships/shofixti/icode.h
index 8741de9c4..4afe8d350 100644
--- a/sc2/src/uqm/ships/shofixti/icode.h
+++ b/sc2/src/uqm/ships/shofixti/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SHOFIXTI_CODE "ship.shofixti.code"
diff --git a/sc2/src/uqm/ships/shofixti/resinst.h b/sc2/src/uqm/ships/shofixti/resinst.h
index 5b8e5bc86..bd95cb25c 100644
--- a/sc2/src/uqm/ships/shofixti/resinst.h
+++ b/sc2/src/uqm/ships/shofixti/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define DART_BIG_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.large"
 #define DART_MED_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.medium"
 #define DART_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.small"
@@ -13,9 +17,7 @@
 #define SHOFIXTI_ICON_MASK_PMAP_ANIM "ship.shofixti.icons"
 #define SHOFIXTI_MED_MASK_PMAP_ANIM "ship.shofixti.graphics.scout.medium"
 #define SHOFIXTI_MICON_MASK_PMAP_ANIM "ship.shofixti.meleeicons"
-#define SHOFIXTI_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.scout.small"
 #define SHOFIXTI_RACE_STRINGS "ship.shofixti.text"
 #define SHOFIXTI_SHIP_SOUNDS "ship.shofixti.sounds"
+#define SHOFIXTI_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.scout.small"
 #define SHOFIXTI_VICTORY_SONG "ship.shofixti.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/sis_ship/icode.h b/sc2/src/uqm/ships/sis_ship/icode.h
index 8c2426283..3d5744955 100644
--- a/sc2/src/uqm/ships/sis_ship/icode.h
+++ b/sc2/src/uqm/ships/sis_ship/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SIS_CODE "ship.flagship.code"
diff --git a/sc2/src/uqm/ships/sis_ship/resinst.h b/sc2/src/uqm/ships/sis_ship/resinst.h
index ac97bfe4c..cf8d074ec 100644
--- a/sc2/src/uqm/ships/sis_ship/resinst.h
+++ b/sc2/src/uqm/ships/sis_ship/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define BLASTER_BIG_MASK_PMAP_ANIM "ship.flagship.graphics.blaster.large"
 #define BLASTER_MED_MASK_PMAP_ANIM "ship.flagship.graphics.blaster.medium"
 #define BLASTER_SML_MASK_PMAP_ANIM "ship.flagship.graphics.blaster.small"
@@ -6,8 +10,6 @@
 #define SIS_HYPER_MASK_PMAP_ANIM "ship.flagship.graphics.hyperspace"
 #define SIS_ICON_MASK_PMAP_ANIM "ship.flagship.icons"
 #define SIS_MED_MASK_PMAP_ANIM "ship.flagship.graphics.flagship.medium"
-#define SIS_SML_MASK_PMAP_ANIM "ship.flagship.graphics.flagship.small"
 #define SIS_SHIP_SOUNDS "ship.flagship.sounds"
+#define SIS_SML_MASK_PMAP_ANIM "ship.flagship.graphics.flagship.small"
 #define SIS_VICTORY_SONG "ship.flagship.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/slylandr/icode.h b/sc2/src/uqm/ships/slylandr/icode.h
index 9465d3481..9897234b5 100644
--- a/sc2/src/uqm/ships/slylandr/icode.h
+++ b/sc2/src/uqm/ships/slylandr/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SLYLANDRO_CODE "ship.slylandro.code"
diff --git a/sc2/src/uqm/ships/slylandr/resinst.h b/sc2/src/uqm/ships/slylandr/resinst.h
index d7861c925..00df8338b 100644
--- a/sc2/src/uqm/ships/slylandr/resinst.h
+++ b/sc2/src/uqm/ships/slylandr/resinst.h
@@ -1,11 +1,13 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SLYLANDRO_BIG_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.large"
 #define SLYLANDRO_CAPTAIN_MASK_PMAP_ANIM "ship.slylandro.graphics.captain"
 #define SLYLANDRO_ICON_MASK_PMAP_ANIM "ship.slylandro.icons"
 #define SLYLANDRO_MED_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.medium"
 #define SLYLANDRO_MICON_MASK_PMAP_ANIM "ship.slylandro.meleeicons"
-#define SLYLANDRO_SML_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.small"
 #define SLYLANDRO_RACE_STRINGS "ship.slylandro.text"
 #define SLYLANDRO_SHIP_SOUNDS "ship.slylandro.sounds"
+#define SLYLANDRO_SML_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.small"
 #define SLYLANDRO_VICTORY_SONG "ship.slylandro.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/spathi/icode.h b/sc2/src/uqm/ships/spathi/icode.h
index f34800f90..aa5f6ef27 100644
--- a/sc2/src/uqm/ships/spathi/icode.h
+++ b/sc2/src/uqm/ships/spathi/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SPATHI_CODE "ship.spathi.code"
diff --git a/sc2/src/uqm/ships/spathi/resinst.h b/sc2/src/uqm/ships/spathi/resinst.h
index 5a6bbb42a..1d4ecf6ee 100644
--- a/sc2/src/uqm/ships/spathi/resinst.h
+++ b/sc2/src/uqm/ships/spathi/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define DISCRIM_BIG_MASK_PMAP_ANIM "ship.spathi.graphics.butt.large"
 #define DISCRIM_MED_MASK_PMAP_ANIM "ship.spathi.graphics.butt.medium"
 #define DISCRIM_SML_MASK_PMAP_ANIM "ship.spathi.graphics.butt.small"
@@ -9,9 +13,7 @@
 #define SPATHI_ICON_MASK_PMAP_ANIM "ship.spathi.icons"
 #define SPATHI_MED_MASK_PMAP_ANIM "ship.spathi.graphics.eluder.medium"
 #define SPATHI_MICON_MASK_PMAP_ANIM "ship.spathi.meleeicons"
-#define SPATHI_SML_MASK_PMAP_ANIM "ship.spathi.graphics.eluder.small"
 #define SPATHI_RACE_STRINGS "ship.spathi.text"
 #define SPATHI_SHIP_SOUNDS "ship.spathi.sounds"
+#define SPATHI_SML_MASK_PMAP_ANIM "ship.spathi.graphics.eluder.small"
 #define SPATHI_VICTORY_SONG "ship.spathi.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/supox/icode.h b/sc2/src/uqm/ships/supox/icode.h
index cd87276b2..d2f82f95f 100644
--- a/sc2/src/uqm/ships/supox/icode.h
+++ b/sc2/src/uqm/ships/supox/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SUPOX_CODE "ship.supox.code"
diff --git a/sc2/src/uqm/ships/supox/resinst.h b/sc2/src/uqm/ships/supox/resinst.h
index e8e00a719..8984c6c91 100644
--- a/sc2/src/uqm/ships/supox/resinst.h
+++ b/sc2/src/uqm/ships/supox/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define GOB_BIG_MASK_PMAP_ANIM "ship.supox.graphics.glob.large"
 #define GOB_MED_MASK_PMAP_ANIM "ship.supox.graphics.glob.medium"
 #define GOB_SML_MASK_PMAP_ANIM "ship.supox.graphics.glob.small"
@@ -6,9 +10,7 @@
 #define SUPOX_ICON_MASK_PMAP_ANIM "ship.supox.icons"
 #define SUPOX_MED_MASK_PMAP_ANIM "ship.supox.graphics.blade.medium"
 #define SUPOX_MICON_MASK_PMAP_ANIM "ship.supox.meleeicons"
-#define SUPOX_SML_MASK_PMAP_ANIM "ship.supox.graphics.blade.small"
 #define SUPOX_RACE_STRINGS "ship.supox.text"
 #define SUPOX_SHIP_SOUNDS "ship.supox.sounds"
+#define SUPOX_SML_MASK_PMAP_ANIM "ship.supox.graphics.blade.small"
 #define SUPOX_VICTORY_SONG "ship.supox.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/syreen/icode.h b/sc2/src/uqm/ships/syreen/icode.h
index ce0635a58..66f3ca4c8 100644
--- a/sc2/src/uqm/ships/syreen/icode.h
+++ b/sc2/src/uqm/ships/syreen/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SYREEN_CODE "ship.syreen.code"
diff --git a/sc2/src/uqm/ships/syreen/resinst.h b/sc2/src/uqm/ships/syreen/resinst.h
index dba48d7d6..7a7cc2430 100644
--- a/sc2/src/uqm/ships/syreen/resinst.h
+++ b/sc2/src/uqm/ships/syreen/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define DAGGER_BIG_MASK_PMAP_ANIM "ship.syreen.graphics.dagger.large"
 #define DAGGER_MED_MASK_PMAP_ANIM "ship.syreen.graphics.dagger.medium"
 #define DAGGER_SML_MASK_PMAP_ANIM "ship.syreen.graphics.dagger.small"
@@ -6,9 +10,7 @@
 #define SYREEN_ICON_MASK_PMAP_ANIM "ship.syreen.icons"
 #define SYREEN_MED_MASK_PMAP_ANIM "ship.syreen.graphics.penetrator.medium"
 #define SYREEN_MICON_MASK_PMAP_ANIM "ship.syreen.meleeicons"
-#define SYREEN_SML_MASK_PMAP_ANIM "ship.syreen.graphics.penetrator.small"
 #define SYREEN_RACE_STRINGS "ship.syreen.text"
 #define SYREEN_SHIP_SOUNDS "ship.syreen.sounds"
+#define SYREEN_SML_MASK_PMAP_ANIM "ship.syreen.graphics.penetrator.small"
 #define SYREEN_VICTORY_SONG "ship.syreen.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/thradd/icode.h b/sc2/src/uqm/ships/thradd/icode.h
index 32046157d..070353a48 100644
--- a/sc2/src/uqm/ships/thradd/icode.h
+++ b/sc2/src/uqm/ships/thradd/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define THRADDASH_CODE "ship.thraddash.code"
diff --git a/sc2/src/uqm/ships/thradd/resinst.h b/sc2/src/uqm/ships/thradd/resinst.h
index ef49cd8e0..191d263ec 100644
--- a/sc2/src/uqm/ships/thradd/resinst.h
+++ b/sc2/src/uqm/ships/thradd/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define HORN_BIG_MASK_PMAP_ANIM "ship.thraddash.graphics.horn.large"
 #define HORN_MED_MASK_PMAP_ANIM "ship.thraddash.graphics.horn.medium"
 #define HORN_SML_MASK_PMAP_ANIM "ship.thraddash.graphics.horn.small"
@@ -9,9 +13,7 @@
 #define THRADDASH_ICON_MASK_PMAP_ANIM "ship.thraddash.icons"
 #define THRADDASH_MED_MASK_PMAP_ANIM "ship.thraddash.graphics.torch.medium"
 #define THRADDASH_MICON_MASK_PMAP_ANIM "ship.thraddash.meleeicons"
-#define THRADDASH_SML_MASK_PMAP_ANIM "ship.thraddash.graphics.torch.small"
 #define THRADDASH_RACE_STRINGS "ship.thraddash.text"
 #define THRADDASH_SHIP_SOUNDS "ship.thraddash.sounds"
+#define THRADDASH_SML_MASK_PMAP_ANIM "ship.thraddash.graphics.torch.small"
 #define THRADDASH_VICTORY_SONG "ship.thraddash.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/umgah/icode.h b/sc2/src/uqm/ships/umgah/icode.h
index c1dce3a7f..103f5d28f 100644
--- a/sc2/src/uqm/ships/umgah/icode.h
+++ b/sc2/src/uqm/ships/umgah/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define UMGAH_CODE "ship.umgah.code"
diff --git a/sc2/src/uqm/ships/umgah/resinst.h b/sc2/src/uqm/ships/umgah/resinst.h
index 333ffc0fa..4df4b07d0 100644
--- a/sc2/src/uqm/ships/umgah/resinst.h
+++ b/sc2/src/uqm/ships/umgah/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define CONE_BIG_MASK_ANIM "ship.umgah.graphics.cone.large"
 #define CONE_MED_MASK_ANIM "ship.umgah.graphics.cone.medium"
 #define CONE_SML_MASK_ANIM "ship.umgah.graphics.cone.small"
@@ -7,9 +11,7 @@
 #define UMGAH_ICON_MASK_PMAP_ANIM "ship.umgah.icons"
 #define UMGAH_MED_MASK_PMAP_ANIM "ship.umgah.graphics.drone.medium"
 #define UMGAH_MICON_MASK_PMAP_ANIM "ship.umgah.meleeicons"
-#define UMGAH_SML_MASK_PMAP_ANIM "ship.umgah.graphics.drone.small"
 #define UMGAH_RACE_STRINGS "ship.umgah.text"
 #define UMGAH_SHIP_SOUNDS "ship.umgah.sounds"
+#define UMGAH_SML_MASK_PMAP_ANIM "ship.umgah.graphics.drone.small"
 #define UMGAH_VICTORY_SONG "ship.umgah.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/urquan/icode.h b/sc2/src/uqm/ships/urquan/icode.h
index 7a17467b5..b26e84a09 100644
--- a/sc2/src/uqm/ships/urquan/icode.h
+++ b/sc2/src/uqm/ships/urquan/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define URQUAN_CODE "ship.urquan.code"
diff --git a/sc2/src/uqm/ships/urquan/resinst.h b/sc2/src/uqm/ships/urquan/resinst.h
index 1c9b36d42..a7b9ecdbb 100644
--- a/sc2/src/uqm/ships/urquan/resinst.h
+++ b/sc2/src/uqm/ships/urquan/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define FIGHTER_BIG_MASK_PMAP_ANIM "ship.urquan.graphics.fighter.large"
 #define FIGHTER_MED_MASK_PMAP_ANIM "ship.urquan.graphics.fighter.medium"
 #define FIGHTER_SML_MASK_PMAP_ANIM "ship.urquan.graphics.fighter.small"
@@ -9,9 +13,7 @@
 #define URQUAN_ICON_MASK_PMAP_ANIM "ship.urquan.icons"
 #define URQUAN_MED_MASK_PMAP_ANIM "ship.urquan.graphics.dreadnought.medium"
 #define URQUAN_MICON_MASK_PMAP_ANIM "ship.urquan.meleeicons"
-#define URQUAN_SML_MASK_PMAP_ANIM "ship.urquan.graphics.dreadnought.small"
 #define URQUAN_RACE_STRINGS "ship.urquan.text"
 #define URQUAN_SHIP_SOUNDS "ship.urquan.sounds"
+#define URQUAN_SML_MASK_PMAP_ANIM "ship.urquan.graphics.dreadnought.small"
 #define URQUAN_VICTORY_SONG "ship.urquan.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/utwig/icode.h b/sc2/src/uqm/ships/utwig/icode.h
index 4d46c551b..4762b8905 100644
--- a/sc2/src/uqm/ships/utwig/icode.h
+++ b/sc2/src/uqm/ships/utwig/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define UTWIG_CODE "ship.utwig.code"
diff --git a/sc2/src/uqm/ships/utwig/resinst.h b/sc2/src/uqm/ships/utwig/resinst.h
index 1fbd4451b..384862ec1 100644
--- a/sc2/src/uqm/ships/utwig/resinst.h
+++ b/sc2/src/uqm/ships/utwig/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define LANCE_BIG_MASK_PMAP_ANIM "ship.utwig.graphics.lance.large"
 #define LANCE_MED_MASK_PMAP_ANIM "ship.utwig.graphics.lance.medium"
 #define LANCE_SML_MASK_PMAP_ANIM "ship.utwig.graphics.lance.small"
@@ -6,9 +10,7 @@
 #define UTWIG_ICON_MASK_PMAP_ANIM "ship.utwig.icons"
 #define UTWIG_MED_MASK_PMAP_ANIM "ship.utwig.graphics.jugger.medium"
 #define UTWIG_MICON_MASK_PMAP_ANIM "ship.utwig.meleeicons"
-#define UTWIG_SML_MASK_PMAP_ANIM "ship.utwig.graphics.jugger.small"
 #define UTWIG_RACE_STRINGS "ship.utwig.text"
 #define UTWIG_SHIP_SOUNDS "ship.utwig.sounds"
+#define UTWIG_SML_MASK_PMAP_ANIM "ship.utwig.graphics.jugger.small"
 #define UTWIG_VICTORY_SONG "ship.utwig.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/vux/icode.h b/sc2/src/uqm/ships/vux/icode.h
index 78f42e1b5..0bd37d7d8 100644
--- a/sc2/src/uqm/ships/vux/icode.h
+++ b/sc2/src/uqm/ships/vux/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define VUX_CODE "ship.vux.code"
diff --git a/sc2/src/uqm/ships/vux/resinst.h b/sc2/src/uqm/ships/vux/resinst.h
index f4d718081..c3e04bf08 100644
--- a/sc2/src/uqm/ships/vux/resinst.h
+++ b/sc2/src/uqm/ships/vux/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define LIMPETS_BIG_MASK_PMAP_ANIM "ship.vux.graphics.limpets.large"
 #define LIMPETS_MED_MASK_PMAP_ANIM "ship.vux.graphics.limpets.medium"
 #define LIMPETS_SML_MASK_PMAP_ANIM "ship.vux.graphics.limpets.small"
@@ -7,9 +11,7 @@
 #define VUX_ICON_MASK_PMAP_ANIM "ship.vux.icons"
 #define VUX_MED_MASK_PMAP_ANIM "ship.vux.graphics.intruder.medium"
 #define VUX_MICON_MASK_PMAP_ANIM "ship.vux.meleeicons"
-#define VUX_SML_MASK_PMAP_ANIM "ship.vux.graphics.intruder.small"
 #define VUX_RACE_STRINGS "ship.vux.text"
 #define VUX_SHIP_SOUNDS "ship.vux.sounds"
+#define VUX_SML_MASK_PMAP_ANIM "ship.vux.graphics.intruder.small"
 #define VUX_VICTORY_SONG "ship.vux.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/yehat/icode.h b/sc2/src/uqm/ships/yehat/icode.h
index 26a732dab..81cac0eb5 100644
--- a/sc2/src/uqm/ships/yehat/icode.h
+++ b/sc2/src/uqm/ships/yehat/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define YEHAT_CODE "ship.yehat.code"
diff --git a/sc2/src/uqm/ships/yehat/resinst.h b/sc2/src/uqm/ships/yehat/resinst.h
index 742bb7ef3..ad325a559 100644
--- a/sc2/src/uqm/ships/yehat/resinst.h
+++ b/sc2/src/uqm/ships/yehat/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SHIELD_BIG_MASK_ANIM "ship.yehat.graphics.shield.large"
 #define SHIELD_MED_MASK_ANIM "ship.yehat.graphics.shield.medium"
 #define SHIELD_SML_MASK_ANIM "ship.yehat.graphics.shield.small"
@@ -9,9 +13,7 @@
 #define YEHAT_ICON_MASK_PMAP_ANIM "ship.yehat.icons"
 #define YEHAT_MED_MASK_PMAP_ANIM "ship.yehat.graphics.terminator.medium"
 #define YEHAT_MICON_MASK_PMAP_ANIM "ship.yehat.meleeicons"
-#define YEHAT_SML_MASK_PMAP_ANIM "ship.yehat.graphics.terminator.small"
 #define YEHAT_RACE_STRINGS "ship.yehat.text"
 #define YEHAT_SHIP_SOUNDS "ship.yehat.sounds"
+#define YEHAT_SML_MASK_PMAP_ANIM "ship.yehat.graphics.terminator.small"
 #define YEHAT_VICTORY_SONG "ship.yehat.ditty"
-
-#include "icode.h"
diff --git a/sc2/src/uqm/ships/zoqfot/icode.h b/sc2/src/uqm/ships/zoqfot/icode.h
index 58379feac..0fe635fe0 100644
--- a/sc2/src/uqm/ships/zoqfot/icode.h
+++ b/sc2/src/uqm/ships/zoqfot/icode.h
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define ZOQFOTPIK_CODE "ship.zoqfotpik.code"
diff --git a/sc2/src/uqm/ships/zoqfot/resinst.h b/sc2/src/uqm/ships/zoqfot/resinst.h
index 76d022789..5939142ac 100644
--- a/sc2/src/uqm/ships/zoqfot/resinst.h
+++ b/sc2/src/uqm/ships/zoqfot/resinst.h
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+   should not be edited directly.  Modify the master resource list
+   instead and regenerate. */
+
 #define SPIT_BIG_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.spit.large"
 #define SPIT_MED_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.spit.medium"
 #define SPIT_SML_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.spit.small"
@@ -9,9 +13,7 @@
 #define ZOQFOTPIK_ICON_MASK_PMAP_ANIM "ship.zoqfotpik.icons"
 #define ZOQFOTPIK_MED_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.stinger.medium"
 #define ZOQFOTPIK_MICON_MASK_PMAP_ANIM "ship.zoqfotpik.meleeicons"
-#define ZOQFOTPIK_SML_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.stinger.small"
 #define ZOQFOTPIK_RACE_STRINGS "ship.zoqfotpik.text"
 #define ZOQFOTPIK_SHIP_SOUNDS "ship.zoqfotpik.sounds"
+#define ZOQFOTPIK_SML_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.stinger.small"
 #define ZOQFOTPIK_VICTORY_SONG "ship.zoqfotpik.ditty"
-
-#include "icode.h"