Last batch of header consistency fixes. At least for the game engines.

svn-id: r25751

19 files changed, 38 insertions, 38 deletions

diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 589a625780..39639a84f7 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef SWORD1_ANIMATION_H
+#define SWORD1_ANIMATION_H
 
 #include "graphics/dxa_player.h"
 #include "graphics/mpeg_player.h"
diff --git a/engines/sword1/collision.h b/engines/sword1/collision.h
index 0795298ec6..e6b0bea43e 100644
--- a/engines/sword1/collision.h
+++ b/engines/sword1/collision.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSCOLLISION_H
-#define BSCOLLISION_H
+#ifndef SWORD1_COLLISION_H
+#define SWORD1_COLLISION_H
 
 /*#include "objectman.h"
 
diff --git a/engines/sword1/control.h b/engines/sword1/control.h
index 912ccf8f72..686783012a 100644
--- a/engines/sword1/control.h
+++ b/engines/sword1/control.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSCONTROL_H
-#define BSCONTROL_H
+#ifndef SWORD1_CONTROL_H
+#define SWORD1_CONTROL_H
 
 #include "common/scummsys.h"
 #include "sword1/sworddefs.h"
diff --git a/engines/sword1/credits.h b/engines/sword1/credits.h
index a964744f22..5a60cc320d 100644
--- a/engines/sword1/credits.h
+++ b/engines/sword1/credits.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BS1CREDITS_H
-#define BS1CREDITS_H
+#ifndef SWORD1_CREDITS_H
+#define SWORD1_CREDITS_H
 
 #include "common/util.h"
 
diff --git a/engines/sword1/debug.h b/engines/sword1/debug.h
index 36ddf26973..8992a3bcfe 100644
--- a/engines/sword1/debug.h
+++ b/engines/sword1/debug.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSDEBUG_H
-#define BSDEBUG_H
+#ifndef SWORD1_DEBUG_H
+#define SWORD1_DEBUG_H
 
 #include "common/scummsys.h"
 
diff --git a/engines/sword1/eventman.h b/engines/sword1/eventman.h
index c04b12e711..b234a7afa4 100644
--- a/engines/sword1/eventman.h
+++ b/engines/sword1/eventman.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSEVENTMAN_H
-#define BSEVENTMAN_H
+#ifndef SWORD1_EVENTMAN_H
+#define SWORD1_EVENTMAN_H
 
 #include "sword1/object.h"
 
diff --git a/engines/sword1/logic.h b/engines/sword1/logic.h
index 8d1815305c..4e8267a184 100644
--- a/engines/sword1/logic.h
+++ b/engines/sword1/logic.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSLOGIC_H
-#define BSLOGIC_H
+#ifndef SWORD1_LOGIC_H
+#define SWORD1_LOGIC_H
 // combination of logic.c and scr_int.c
 
 #include "sword1/sworddefs.h"
diff --git a/engines/sword1/memman.h b/engines/sword1/memman.h
index 1a9659a8d7..e4083301f8 100644
--- a/engines/sword1/memman.h
+++ b/engines/sword1/memman.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef MEMMAN_H
-#define MEMMAN_H
+#ifndef SWORD1_MEMMAN_H
+#define SWORD1_MEMMAN_H
 
 #include "common/scummsys.h"
 
diff --git a/engines/sword1/menu.h b/engines/sword1/menu.h
index 134ad9ab30..410067a70b 100644
--- a/engines/sword1/menu.h
+++ b/engines/sword1/menu.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSMENU_H
-#define BSMENU_H
+#ifndef SWORD1_MENU_H
+#define SWORD1_MENU_H
 
 #include "sword1/sworddefs.h"
 #include "sword1/object.h"
diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h
index 9c4216a5a0..f69309020e 100644
--- a/engines/sword1/mouse.h
+++ b/engines/sword1/mouse.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSMOUSE_H
-#define BSMOUSE_H
+#ifndef SWORD1_MOUSE_H
+#define SWORD1_MOUSE_H
 
 #include "common/scummsys.h"
 #include "sword1/sworddefs.h"
diff --git a/engines/sword1/music.h b/engines/sword1/music.h
index 28ca933326..606c3d3004 100644
--- a/engines/sword1/music.h
+++ b/engines/sword1/music.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSMUSIC_H
-#define BSMUSIC_H
+#ifndef SWORD1_MUSIC_H
+#define SWORD1_MUSIC_H
 
 #include "common/scummsys.h"
 #include "common/mutex.h"
diff --git a/engines/sword1/objectman.h b/engines/sword1/objectman.h
index 398d7d85a4..e797ffb734 100644
--- a/engines/sword1/objectman.h
+++ b/engines/sword1/objectman.h
@@ -22,8 +22,8 @@
 
 // this is the object manager. our equivalent to protocol.c and coredata.c
 
-#ifndef OBJECTMAN_H
-#define OBJECTMAN_H
+#ifndef SWORD1_OBJECTMAN_H
+#define SWORD1_OBJECTMAN_H
 
 #include "sword1/resman.h"
 #include "sword1/sworddefs.h"
diff --git a/engines/sword1/resman.h b/engines/sword1/resman.h
index 05cc54f92f..83da34ce10 100644
--- a/engines/sword1/resman.h
+++ b/engines/sword1/resman.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef RESMAN_H
-#define RESMAN_H
+#ifndef SWORD1_RESMAN_H
+#define SWORD1_RESMAN_H
 
 #include "sword1/memman.h"
 #include "common/file.h"
diff --git a/engines/sword1/screen.h b/engines/sword1/screen.h
index 44b22bd2cd..c72b8db1e1 100644
--- a/engines/sword1/screen.h
+++ b/engines/sword1/screen.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSSCREEN_H
-#define BSSCREEN_H
+#ifndef SWORD1_SCREEN_H
+#define SWORD1_SCREEN_H
 
 #include "sword1/sworddefs.h"
 
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h
index 10fed8b33c..ddd0f017f3 100644
--- a/engines/sword1/sound.h
+++ b/engines/sword1/sound.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSSOUND_H
-#define BSSOUND_H
+#ifndef SWORD1_SOUND_H
+#define SWORD1_SOUND_H
 
 #include "sword1/object.h"
 #include "sword1/sworddefs.h"
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index 0052c576ec..75bae573e6 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSSWORD1_H
-#define BSSWORD1_H
+#ifndef SWORD1_H
+#define SWORD1_H
 
 #include "engines/engine.h"
 #include "common/util.h"
diff --git a/engines/sword1/sworddefs.h b/engines/sword1/sworddefs.h
index 3f3b5765da..af85a45f23 100644
--- a/engines/sword1/sworddefs.h
+++ b/engines/sword1/sworddefs.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SWORDDEFS_H
-#define SWORDDEFS_H
+#ifndef SWORD1_SWORDDEFS_H
+#define SWORD1_SWORDDEFS_H
 
 #include "common/scummsys.h"
 
diff --git a/engines/sword1/swordres.h b/engines/sword1/swordres.h
index dca5330350..5c11fae88b 100644
--- a/engines/sword1/swordres.h
+++ b/engines/sword1/swordres.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SWORDRES_H
-#define SWORDRES_H
+#ifndef SWORD1_SWORDRES_H
+#define SWORD1_SWORDRES_H
 
 namespace Sword1 {
 
diff --git a/engines/sword1/text.h b/engines/sword1/text.h
index 34b106518a..c5d10fbf0c 100644
--- a/engines/sword1/text.h
+++ b/engines/sword1/text.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BSTEXT_H
-#define BSTEXT_H
+#ifndef SWORD1_TEXT_H
+#define SWORD1_TEXT_H
 
 #include "sword1/object.h"
 #include "sword1/sworddefs.h"