diff --git a/sc2/src/uqm/comm/arilou/strings.h b/sc2/src/uqm/comm/arilou/strings.h
index 807dde081..1f8046840 100644
--- a/sc2/src/uqm/comm/arilou/strings.h
+++ b/sc2/src/uqm/comm/arilou/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef ARILOU_STRINGS_H
+#define ARILOU_STRINGS_H
 
 enum
 {
@@ -120,5 +120,4 @@ enum
 	GOODBYE_ANGRY_SPACE,
 	OUT_TAKES,
 };
-
 #endif /* _STRINGS_H */
diff --git a/sc2/src/uqm/comm/blackur/strings.h b/sc2/src/uqm/comm/blackur/strings.h
index c2510f044..06a935149 100644
--- a/sc2/src/uqm/comm/blackur/strings.h
+++ b/sc2/src/uqm/comm/blackur/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef BLACKUR_STRINGS_H
+#define BLACKUR_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/chmmr/strings.h b/sc2/src/uqm/comm/chmmr/strings.h
index 6fe3ae9a8..0952891c8 100644
--- a/sc2/src/uqm/comm/chmmr/strings.h
+++ b/sc2/src/uqm/comm/chmmr/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef CHMMR_STRINGS_H
+#define CHMMR_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/comandr/strings.h b/sc2/src/uqm/comm/comandr/strings.h
index 9bac00e41..fcc330efc 100644
--- a/sc2/src/uqm/comm/comandr/strings.h
+++ b/sc2/src/uqm/comm/comandr/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef COMANDR_STRINGS_H
+#define COMANDR_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/druuge/strings.h b/sc2/src/uqm/comm/druuge/strings.h
index 346f1f6c2..e9dfde904 100644
--- a/sc2/src/uqm/comm/druuge/strings.h
+++ b/sc2/src/uqm/comm/druuge/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef DRUUGE_STRINGS_H
+#define DRUUGE_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/ilwrath/strings.h b/sc2/src/uqm/comm/ilwrath/strings.h
index 546923bee..9cd4d2638 100644
--- a/sc2/src/uqm/comm/ilwrath/strings.h
+++ b/sc2/src/uqm/comm/ilwrath/strings.h
@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef ILWRATH_STRINGS_H
+#define ILWRATH_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/melnorm/strings.h b/sc2/src/uqm/comm/melnorm/strings.h
index 703ebc628..14ad322a9 100644
--- a/sc2/src/uqm/comm/melnorm/strings.h
+++ b/sc2/src/uqm/comm/melnorm/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef MELNORME_STRINGS_H
+#define MELNORME_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/mycon/strings.h b/sc2/src/uqm/comm/mycon/strings.h
index e25ed849c..8b71dfb32 100644
--- a/sc2/src/uqm/comm/mycon/strings.h
+++ b/sc2/src/uqm/comm/mycon/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef MYCON_STRINGS_H
+#define MYCON_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/orz/strings.h b/sc2/src/uqm/comm/orz/strings.h
index 91c40ff40..7eabebe63 100644
--- a/sc2/src/uqm/comm/orz/strings.h
+++ b/sc2/src/uqm/comm/orz/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef ORZ_STRINGS_H
+#define ORZ_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/pkunk/strings.h b/sc2/src/uqm/comm/pkunk/strings.h
index f814a0191..beb8b8657 100644
--- a/sc2/src/uqm/comm/pkunk/strings.h
+++ b/sc2/src/uqm/comm/pkunk/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef PKUNK_STRINGS_H
+#define PKUNK_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/rebel/strings.h b/sc2/src/uqm/comm/rebel/strings.h
index 370e684ff..c7e0b4ff1 100644
--- a/sc2/src/uqm/comm/rebel/strings.h
+++ b/sc2/src/uqm/comm/rebel/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef REBEL_STRINGS_H
+#define REBEL_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/shofixt/strings.h b/sc2/src/uqm/comm/shofixt/strings.h
index 51413fe4d..b4f165b9a 100644
--- a/sc2/src/uqm/comm/shofixt/strings.h
+++ b/sc2/src/uqm/comm/shofixt/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef SHOFIXT_STRINGS_H
+#define SHOFIXT_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/slyhome/strings.h b/sc2/src/uqm/comm/slyhome/strings.h
index c453ba31d..bedac2741 100644
--- a/sc2/src/uqm/comm/slyhome/strings.h
+++ b/sc2/src/uqm/comm/slyhome/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef SLYHOME_STRINGS_H
+#define SLYHOME_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/slyland/strings.h b/sc2/src/uqm/comm/slyland/strings.h
index 738db8b57..4a1ef1776 100644
--- a/sc2/src/uqm/comm/slyland/strings.h
+++ b/sc2/src/uqm/comm/slyland/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef SLYLAND_STRINGS_H
+#define SLYLAND_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/spahome/strings.h b/sc2/src/uqm/comm/spahome/strings.h
index 1cb562536..6df9560ad 100644
--- a/sc2/src/uqm/comm/spahome/strings.h
+++ b/sc2/src/uqm/comm/spahome/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef SPAHOME_STRINGS_H
+#define SPAHOME_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/spathi/strings.h b/sc2/src/uqm/comm/spathi/strings.h
index cbab78d65..a09ea87d3 100644
--- a/sc2/src/uqm/comm/spathi/strings.h
+++ b/sc2/src/uqm/comm/spathi/strings.h
@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef SPATHI_STRINGS_H
+#define SPATHI_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/starbas/strings.h b/sc2/src/uqm/comm/starbas/strings.h
index 5de7d9758..df123f36e 100644
--- a/sc2/src/uqm/comm/starbas/strings.h
+++ b/sc2/src/uqm/comm/starbas/strings.h
@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef STARBAS_STRINGS_H
+#define STARBAS_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/supox/strings.h b/sc2/src/uqm/comm/supox/strings.h
index d24aa5d50..b3312f7c3 100644
--- a/sc2/src/uqm/comm/supox/strings.h
+++ b/sc2/src/uqm/comm/supox/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef SUPOX_STRINGS_H
+#define SUPOX_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/syreen/strings.h b/sc2/src/uqm/comm/syreen/strings.h
index 2454279d4..b796e3da4 100644
--- a/sc2/src/uqm/comm/syreen/strings.h
+++ b/sc2/src/uqm/comm/syreen/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef SYREEN_STRINGS_H
+#define SYREEN_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/talkpet/strings.h b/sc2/src/uqm/comm/talkpet/strings.h
index a0f5ad771..01b959a37 100644
--- a/sc2/src/uqm/comm/talkpet/strings.h
+++ b/sc2/src/uqm/comm/talkpet/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef TALKPET_STRINGS_H
+#define TALKPET_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/thradd/strings.h b/sc2/src/uqm/comm/thradd/strings.h
index 35f40c0c4..20e470156 100644
--- a/sc2/src/uqm/comm/thradd/strings.h
+++ b/sc2/src/uqm/comm/thradd/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef THRADD_STRINGS_H
+#define THRADD_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/umgah/strings.h b/sc2/src/uqm/comm/umgah/strings.h
index a56ca82e7..f7dcfed23 100644
--- a/sc2/src/uqm/comm/umgah/strings.h
+++ b/sc2/src/uqm/comm/umgah/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef UMGAH_STRINGS_H
+#define UMGAH_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/urquan/strings.h b/sc2/src/uqm/comm/urquan/strings.h
index 193634f09..18ca86c25 100644
--- a/sc2/src/uqm/comm/urquan/strings.h
+++ b/sc2/src/uqm/comm/urquan/strings.h
@@ -14,8 +14,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef URQUAN_STRINGS_H
+#define URQUAN_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/utwig/strings.h b/sc2/src/uqm/comm/utwig/strings.h
index 1a108f5aa..bb6f693aa 100644
--- a/sc2/src/uqm/comm/utwig/strings.h
+++ b/sc2/src/uqm/comm/utwig/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef UTWIG_STRINGS_H
+#define UTWIG_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/vux/strings.h b/sc2/src/uqm/comm/vux/strings.h
index 7aafcf820..5bf58b7bd 100644
--- a/sc2/src/uqm/comm/vux/strings.h
+++ b/sc2/src/uqm/comm/vux/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef VUX_STRINGS_H
+#define VUX_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/yehat/strings.h b/sc2/src/uqm/comm/yehat/strings.h
index 810887f63..9bea2e084 100644
--- a/sc2/src/uqm/comm/yehat/strings.h
+++ b/sc2/src/uqm/comm/yehat/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef YEHAT_STRINGS_H
+#define YEHAT_STRINGS_H
 
 enum
 {
diff --git a/sc2/src/uqm/comm/zoqfot/strings.h b/sc2/src/uqm/comm/zoqfot/strings.h
index a6a0769f7..327808233 100644
--- a/sc2/src/uqm/comm/zoqfot/strings.h
+++ b/sc2/src/uqm/comm/zoqfot/strings.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _STRINGS_H
-#define _STRINGS_H
+#ifndef ZOQFOT_STRINGS_H
+#define ZOQFOT_STRINGS_H
 
 enum
 {