CGE: Added engine prefix to header file #defines

26 files changed, 50 insertions, 50 deletions

diff --git a/engines/cge/bitmap.h b/engines/cge/bitmap.h
index 846f0149be..4c2b67b8df 100644
--- a/engines/cge/bitmap.h
+++ b/engines/cge/bitmap.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __BITMAP__
-#define __BITMAP__
+#ifndef __CGE_BITMAP__
+#define __CGE_BITMAP__
 
 #include "cge/general.h"
 
diff --git a/engines/cge/bitmaps.h b/engines/cge/bitmaps.h
index 40b1158b21..8569932134 100644
--- a/engines/cge/bitmaps.h
+++ b/engines/cge/bitmaps.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __BITMAPS__
-#define __BITMAPS__
+#ifndef __CGE_BITMAPS__
+#define __CGE_BITMAPS__
 
 #include "cge/vga13h.h"
 
diff --git a/engines/cge/boot.h b/engines/cge/boot.h
index 2dce0d6d16..5c03a626d8 100644
--- a/engines/cge/boot.h
+++ b/engines/cge/boot.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __BOOT__
-#define __BOOT__
+#ifndef __CGE_BOOT__
+#define __CGE_BOOT__
 
 #include "cge/jbw.h"
 
diff --git a/engines/cge/btfile.h b/engines/cge/btfile.h
index ac05c3a7e7..1ac093d897 100644
--- a/engines/cge/btfile.h
+++ b/engines/cge/btfile.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __BTFILE__
-#define __BTFILE__
+#ifndef __CGE_BTFILE__
+#define __CGE_BTFILE__
 
 #include "cge/general.h"
 
diff --git a/engines/cge/cfile.h b/engines/cge/cfile.h
index 376e50ae44..bf90633dd0 100644
--- a/engines/cge/cfile.h
+++ b/engines/cge/cfile.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CFILE__
-#define __CFILE__
+#ifndef __CGE_CFILE__
+#define __CGE_CFILE__
 
 #include "cge/general.h"
 
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index 1b77c05bf0..37d1a91e00 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE__
-#define __CGE__
+#ifndef __CGE_CGE__
+#define __CGE_CGE__
 
 #include "cge/wav.h"
 #include "cge/vga13h.h"
diff --git a/engines/cge/config.h b/engines/cge/config.h
index 0f279ab047..4a1e5927e5 100644
--- a/engines/cge/config.h
+++ b/engines/cge/config.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CONFIG__
-#define __CONFIG__
+#ifndef __CGE_CONFIG__
+#define __CGE_CONFIG__
 
 namespace CGE {
 
diff --git a/engines/cge/events.h b/engines/cge/events.h
index be4b15e133..518c8c8bd1 100644
--- a/engines/cge/events.h
+++ b/engines/cge/events.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_EVENTS__
-#define __CGE_EVENTS__
+#ifndef __CGE_CGE_EVENTS__
+#define __CGE_CGE_EVENTS__
 
 #include "cge/game.h"
 #include "cge/talk.h"
diff --git a/engines/cge/game.cpp b/engines/cge/game.cpp
index be93709f17..72233f746a 100644
--- a/engines/cge/game.cpp
+++ b/engines/cge/game.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "cge/game.h"
-#include "cge/mouse.h"
+#include "cge/events.h"
 #include <stdlib.h>
 
 namespace CGE {
diff --git a/engines/cge/game.h b/engines/cge/game.h
index 3f86c97081..b26fc0d165 100644
--- a/engines/cge/game.h
+++ b/engines/cge/game.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __GAME__
-#define __GAME__
+#ifndef __CGE_GAME__
+#define __CGE_GAME__
 
 #include "cge/vga13h.h"
 #include "cge/bitmaps.h"
diff --git a/engines/cge/general.h b/engines/cge/general.h
index cff00fb7f3..fae47eed42 100644
--- a/engines/cge/general.h
+++ b/engines/cge/general.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __GENERAL__
-#define __GENERAL__
+#ifndef __CGE_GENERAL__
+#define __CGE_GENERAL__
 
 #include "common/system.h"
 #include "common/file.h"
diff --git a/engines/cge/gettext.h b/engines/cge/gettext.h
index 059d84be41..f743d0c66c 100644
--- a/engines/cge/gettext.h
+++ b/engines/cge/gettext.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __GETTEXT__
-#define __GETTEXT__
+#ifndef __CGE_GETTEXT__
+#define __CGE_GETTEXT__
 
 #include "cge/general.h"
 #include "cge/talk.h"
diff --git a/engines/cge/ident.h b/engines/cge/ident.h
index afdb86d785..953f8a579d 100644
--- a/engines/cge/ident.h
+++ b/engines/cge/ident.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __IDENT__
-#define __IDENT__
+#ifndef __CGE_IDENT__
+#define __CGE_IDENT__
 
 namespace CGE {
 
diff --git a/engines/cge/jbw.h b/engines/cge/jbw.h
index 359df8a216..93cdb75a4b 100644
--- a/engines/cge/jbw.h
+++ b/engines/cge/jbw.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __JBW__
-#define __JBW__
+#ifndef __CGE_JBW__
+#define __CGE_JBW__
 
 #include "common/scummsys.h"
 
diff --git a/engines/cge/mixer.h b/engines/cge/mixer.h
index a86e65d3d1..8ded075514 100644
--- a/engines/cge/mixer.h
+++ b/engines/cge/mixer.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __MIXER__
-#define __MIXER__
+#ifndef __CGE_MIXER__
+#define __CGE_MIXER__
 
 #include "cge/vga13h.h"
 
diff --git a/engines/cge/snail.h b/engines/cge/snail.h
index 3221f5c02e..54a24ac1a9 100644
--- a/engines/cge/snail.h
+++ b/engines/cge/snail.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __SNAIL__
-#define __SNAIL__
+#ifndef __CGE_SNAIL__
+#define __CGE_SNAIL__
 
 #include "cge/jbw.h"
 #include "cge/cge.h"
diff --git a/engines/cge/snddrv.h b/engines/cge/snddrv.h
index 2de9014034..4cdac383be 100644
--- a/engines/cge/snddrv.h
+++ b/engines/cge/snddrv.h
@@ -34,8 +34,8 @@
 // *  Ver 1.40: 11-Mar-95                               *
 // ******************************************************
 
-#ifndef __SNDDRV__
-#define __SNDDRV__
+#ifndef __CGE_SNDDRV__
+#define __CGE_SNDDRV__
 
 namespace CGE {
 
diff --git a/engines/cge/sound.h b/engines/cge/sound.h
index b617891268..743fba0bb6 100644
--- a/engines/cge/sound.h
+++ b/engines/cge/sound.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __SOUND__
-#define __SOUND__
+#ifndef __CGE_SOUND__
+#define __CGE_SOUND__
 
 #include "cge/wav.h"
 #include "cge/snddrv.h"
diff --git a/engines/cge/startup.h b/engines/cge/startup.h
index 5bfa9876d6..a1e44cc4af 100644
--- a/engines/cge/startup.h
+++ b/engines/cge/startup.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __STARTUP__
-#define __STARTUP__
+#ifndef __CGE_STARTUP__
+#define __CGE_STARTUP__
 
 
 #include "cge/general.h"
diff --git a/engines/cge/talk.cpp b/engines/cge/talk.cpp
index ce6490cccf..0abff7752c 100644
--- a/engines/cge/talk.cpp
+++ b/engines/cge/talk.cpp
@@ -29,7 +29,7 @@
 #include "cge/talk.h"
 #include "cge/vol.h"
 #include "cge/game.h"
-#include "cge/mouse.h"
+#include "cge/events.h"
 
 namespace CGE {
 
diff --git a/engines/cge/talk.h b/engines/cge/talk.h
index 60f7f213d4..e5e32998cb 100644
--- a/engines/cge/talk.h
+++ b/engines/cge/talk.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __TALK__
-#define __TALK__
+#ifndef __CGE_TALK__
+#define __CGE_TALK__
 
 #include "cge/vga13h.h"
 #include "cge/general.h"
diff --git a/engines/cge/text.h b/engines/cge/text.h
index 874a640ad0..5232084738 100644
--- a/engines/cge/text.h
+++ b/engines/cge/text.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __TEXT__
-#define __TEXT__
+#ifndef __CGE_TEXT__
+#define __CGE_TEXT__
 
 #include "cge/talk.h"
 #include "cge/jbw.h"
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index a22dd9d57a..152f608c56 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __VGA13H__
-#define __VGA13H__
+#ifndef __CGE_VGA13H__
+#define __CGE_VGA13H__
 
 #include "graphics/surface.h"
 #include "cge/general.h"
diff --git a/engines/cge/vmenu.h b/engines/cge/vmenu.h
index 3c38576a40..2bb3cef88d 100644
--- a/engines/cge/vmenu.h
+++ b/engines/cge/vmenu.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __VMENU__
-#define __VMENU__
+#ifndef __CGE_VMENU__
+#define __CGE_VMENU__
 
 #include "cge/talk.h"
 
diff --git a/engines/cge/vol.h b/engines/cge/vol.h
index c2e676130e..1e0b363ca5 100644
--- a/engines/cge/vol.h
+++ b/engines/cge/vol.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __VOL__
-#define __VOL__
+#ifndef __CGE_VOL__
+#define __CGE_VOL__
 
 #include "cge/btfile.h"
 #include "cge/cfile.h"
diff --git a/engines/cge/wav.h b/engines/cge/wav.h
index 980c7672c3..57187f7b87 100644
--- a/engines/cge/wav.h
+++ b/engines/cge/wav.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __WAV__
-#define __WAV__
+#ifndef __CGE_WAV__
+#define __CGE_WAV__
 
 #include "cge/general.h"
 #include <string.h>