More header fixes for that warm and fuzzy feeling of consistency.

svn-id: r25749

21 files changed, 42 insertions, 42 deletions

diff --git a/engines/sky/autoroute.h b/engines/sky/autoroute.h
index 060bc9acb1..b476beeb04 100644
--- a/engines/sky/autoroute.h
+++ b/engines/sky/autoroute.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef AUTOROUTE_H
-#define AUTOROUTE_H
+#ifndef SKY_AUTOROUTE_H
+#define SKY_AUTOROUTE_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/compact.h b/engines/sky/compact.h
index 7f8abbd516..89162254cf 100644
--- a/engines/sky/compact.h
+++ b/engines/sky/compact.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYCOMPACT_H
-#define SKYCOMPACT_H
+#ifndef SKY_COMPACT_H
+#define SKY_COMPACT_H
 
 #include "sky/sky.h"
 #include "sky/struc.h"
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 10cf9adc2a..82fd50ac54 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef CONTROL_H
-#define CONTROL_H
+#ifndef SKY_CONTROL_H
+#define SKY_CONTROL_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/disk.h b/engines/sky/disk.h
index 91d69c49d8..e243dd3d43 100644
--- a/engines/sky/disk.h
+++ b/engines/sky/disk.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYDISK_H
-#define SKYDISK_H
+#ifndef SKY_DISK_H
+#define SKY_DISK_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/grid.h b/engines/sky/grid.h
index 7c2ba557c0..fb51d8555a 100644
--- a/engines/sky/grid.h
+++ b/engines/sky/grid.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYGRID_H
-#define SKYGRID_H
+#ifndef SKY_GRID_H
+#define SKY_GRID_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/intro.h b/engines/sky/intro.h
index 294c907887..85ba744573 100644
--- a/engines/sky/intro.h
+++ b/engines/sky/intro.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef INTRO_H
-#define INTRO_H
+#ifndef SKY_INTRO_H
+#define SKY_INTRO_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/logic.h b/engines/sky/logic.h
index 7d10be6d8c..53752ca88f 100644
--- a/engines/sky/logic.h
+++ b/engines/sky/logic.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYLOGIC_H
-#define SKYLOGIC_H
+#ifndef SKY_LOGIC_H
+#define SKY_LOGIC_H
 
 #include "common/stdafx.h"
 #include "common/util.h"
diff --git a/engines/sky/mouse.h b/engines/sky/mouse.h
index a76b1d387a..ccd2987022 100644
--- a/engines/sky/mouse.h
+++ b/engines/sky/mouse.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYMOUSE_H
-#define SKYMOUSE_H
+#ifndef SKY_MOUSE_H
+#define SKY_MOUSE_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h
index 661f3a20dc..16f8f82b17 100644
--- a/engines/sky/music/adlibchannel.h
+++ b/engines/sky/music/adlibchannel.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ADLIBCHANNEL_H
-#define ADLIBCHANNEL_H
+#ifndef SKY_MUSIC_ADLIBCHANNEL_H
+#define SKY_MUSIC_ADLIBCHANNEL_H
 
 #include "sky/music/musicbase.h"
 #include "sound/fmopl.h"
diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h
index 6b27e0625a..016d43287e 100644
--- a/engines/sky/music/adlibmusic.h
+++ b/engines/sky/music/adlibmusic.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ADLIBMUSIC_H
-#define ADLIBMUSIC_H
+#ifndef SKY_MUSIC_ADLIBMUSIC_H
+#define SKY_MUSIC_ADLIBMUSIC_H
 
 #include "sky/music/musicbase.h"
 #include "sound/audiostream.h"
diff --git a/engines/sky/music/gmchannel.h b/engines/sky/music/gmchannel.h
index 051b5d0648..b62a8f4b6f 100644
--- a/engines/sky/music/gmchannel.h
+++ b/engines/sky/music/gmchannel.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYGMCHANNEL_H
-#define SKYGMCHANNEL_H
+#ifndef SKY_MUSIC_GMCHANNEL_H
+#define SKY_MUSIC_GMCHANNEL_H
 
 #include "sky/music/musicbase.h"
 
diff --git a/engines/sky/music/gmmusic.h b/engines/sky/music/gmmusic.h
index 2623c6b5cd..f0ee444760 100644
--- a/engines/sky/music/gmmusic.h
+++ b/engines/sky/music/gmmusic.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GMMUSIC_H
-#define GMMUSIC_H
+#ifndef SKY_MUSIC_GMMUSIC_H
+#define SKY_MUSIC_GMMUSIC_H
 
 #include "sky/music/musicbase.h"
 
diff --git a/engines/sky/music/mt32music.h b/engines/sky/music/mt32music.h
index a64663a15f..663cf9118a 100644
--- a/engines/sky/music/mt32music.h
+++ b/engines/sky/music/mt32music.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef MT32MUSIC_H
-#define MT32MUSIC_H
+#ifndef SKY_MUSIC_MT32MUSIC_H
+#define SKY_MUSIC_MT32MUSIC_H
 
 #include "sky/music/musicbase.h"
 
diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h
index 108ee259c9..4cab755ac1 100644
--- a/engines/sky/music/musicbase.h
+++ b/engines/sky/music/musicbase.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef MUSICBASE_H
-#define MUSICBASE_H
+#ifndef SKY_MUSIC_MUSICBASE_H
+#define SKY_MUSIC_MUSICBASE_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/rnc_deco.h b/engines/sky/rnc_deco.h
index 1a05d95531..c02e4eab2f 100644
--- a/engines/sky/rnc_deco.h
+++ b/engines/sky/rnc_deco.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef RNC_DECO_H
-#define RNC_DECO_H
+#ifndef SKY_RNC_DECO_H
+#define SKY_RNC_DECO_H
 
 #include "common/stdafx.h"
 
diff --git a/engines/sky/screen.h b/engines/sky/screen.h
index f412d31c4c..872d6cf613 100644
--- a/engines/sky/screen.h
+++ b/engines/sky/screen.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYSCREEN_H
-#define SKYSCREEN_H
+#ifndef SKY_SCREEN_H
+#define SKY_SCREEN_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/sky.h b/engines/sky/sky.h
index c6e1d25dfe..eeb8c3432b 100644
--- a/engines/sky/sky.h
+++ b/engines/sky/sky.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYMAIN_H
-#define SKYMAIN_H
+#ifndef SKY_H
+#define SKY_H
 
 #include "common/stdafx.h"
 #include "engines/engine.h"
diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h
index 4d56999f95..31448fc3d7 100644
--- a/engines/sky/skydefs.h
+++ b/engines/sky/skydefs.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYDEFS_H
-#define SKYDEFS_H
+#ifndef SKY_DEFS_H
+#define SKY_DEFS_H
 
 #include "common/stdafx.h"
 
diff --git a/engines/sky/sound.h b/engines/sky/sound.h
index d621ad873d..b515e0e8a4 100644
--- a/engines/sky/sound.h
+++ b/engines/sky/sound.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYSOUND_H
-#define SKYSOUND_H
+#ifndef SKY_SOUND_H
+#define SKY_SOUND_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
diff --git a/engines/sky/struc.h b/engines/sky/struc.h
index ed451e0122..357b31d1cd 100644
--- a/engines/sky/struc.h
+++ b/engines/sky/struc.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYSTRUC_H
-#define SKYSTRUC_H
+#ifndef SKY_STRUC_H
+#define SKY_STRUC_H
 
 namespace Sky {
 
diff --git a/engines/sky/text.h b/engines/sky/text.h
index b917e22742..ab7e0a1000 100644
--- a/engines/sky/text.h
+++ b/engines/sky/text.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SKYTEXT_H
-#define SKYTEXT_H
+#ifndef SKY_TEXT_H
+#define SKY_TEXT_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"