diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index e3a554ccd77..ef3ea67d02f 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -17,11 +17,10 @@
  *
  * $URL$
  * $Id$
- *
  */
 
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef SWORD2_ANIMATION_H
+#define SWORD2_ANIMATION_H
 
 #include "graphics/animation.h"
 #include "sound/mixer.h"
diff --git a/engines/sword2/console.h b/engines/sword2/console.h
index 95bfbe946df..858149d7cb5 100644
--- a/engines/sword2/console.h
+++ b/engines/sword2/console.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	C_ONSOLE_H
-#define	C_ONSOLE_H
+#ifndef	SWORD2_CONSOLE_H
+#define	SWORD2_CONSOLE_H
 
 #include "common/debugger.h"
 #include "sword2/debug.h"
diff --git a/engines/sword2/controls.h b/engines/sword2/controls.h
index 719489b3aec..688e04752d4 100644
--- a/engines/sword2/controls.h
+++ b/engines/sword2/controls.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	_CONTROL_S
-#define	_CONTROL_S
+#ifndef	SWORD2_CONTROL_H
+#define	SWORD2_CONTROL_H
 
 #include "sword2/defs.h"
 
diff --git a/engines/sword2/debug.h b/engines/sword2/debug.h
index 9b0b40f9ec3..9832c471d0b 100644
--- a/engines/sword2/debug.h
+++ b/engines/sword2/debug.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	D_DEBUG
-#define D_DEBUG
+#ifndef	SWORD2_DEBUG_H
+#define SWORD2_DEBUG_H
 
 // FIXME: I don't know how large this constant used to be
 #define MAX_DEBUG_TEXTS 55
diff --git a/engines/sword2/defs.h b/engines/sword2/defs.h
index 4acb484f348..7fe73a7c3e8 100644
--- a/engines/sword2/defs.h
+++ b/engines/sword2/defs.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	DEFS
-#define	DEFS
+#ifndef	SWORD2_DEFS_H
+#define	SWORD2_DEFS_H
 
 #define	SIZE	0x10000			// 65536 items per section
 #define	NuSIZE	0xffff			// & with this
diff --git a/engines/sword2/header.h b/engines/sword2/header.h
index 9aefa528321..f5cfec6416a 100644
--- a/engines/sword2/header.h
+++ b/engines/sword2/header.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	_HEADER
-#define	_HEADER
+#ifndef	SWORD2_HEADER_H
+#define	SWORD2_HEADER_H
 
 #include "common/stream.h"
 
diff --git a/engines/sword2/icons.h b/engines/sword2/icons.h
index ab5ea578ca6..d47e0b2cf4d 100644
--- a/engines/sword2/icons.h
+++ b/engines/sword2/icons.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	_ICONS
-#define	_ICONS
+#ifndef	SWORD2_ICONS_H
+#define	SWORD2_ICONS_H
 
 #define MENU_MASTER_OBJECT	44
 #define TOTAL_subjects		(375 - 256 + 1)	// the speech subject bar
diff --git a/engines/sword2/interpreter.h b/engines/sword2/interpreter.h
index 365f818a984..15a58331c7c 100644
--- a/engines/sword2/interpreter.h
+++ b/engines/sword2/interpreter.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef _INTERPRETER
-#define _INTERPRETER
+#ifndef SWORD2_INTERPRETER_H
+#define SWORD2_INTERPRETER_H
 
 namespace Sword2 {
 
diff --git a/engines/sword2/logic.h b/engines/sword2/logic.h
index 9e264f603c8..c12ca735477 100644
--- a/engines/sword2/logic.h
+++ b/engines/sword2/logic.h
@@ -21,8 +21,8 @@
 
 // logic management
 
-#ifndef _LOGIC
-#define _LOGIC
+#ifndef SWORD2_LOGIC_H
+#define SWORD2_LOGIC_H
 
 #include "sword2/memory.h"
 
diff --git a/engines/sword2/maketext.h b/engines/sword2/maketext.h
index 364a412857d..53e66c6b7b1 100644
--- a/engines/sword2/maketext.h
+++ b/engines/sword2/maketext.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef _MAKETEXT_H
-#define _MAKETEXT_H
+#ifndef SWORD2_MAKETEXT_H
+#define SWORD2_MAKETEXT_H
 
 #include "sword2/debug.h"
 
diff --git a/engines/sword2/memory.h b/engines/sword2/memory.h
index 3154842cd90..9dee857fbeb 100644
--- a/engines/sword2/memory.h
+++ b/engines/sword2/memory.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	MEMORY_H
-#define	MEMORY_H
+#ifndef	SWORD2_MEMORY_H
+#define	SWORD2_MEMORY_H
 
 #define MAX_MEMORY_BLOCKS 999
 
diff --git a/engines/sword2/mouse.h b/engines/sword2/mouse.h
index bed5e032bae..18b8c41dd52 100644
--- a/engines/sword2/mouse.h
+++ b/engines/sword2/mouse.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef MOUSE_H
-#define MOUSE_H
+#ifndef SWORD2_MOUSE_H
+#define SWORD2_MOUSE_H
 
 #define	MAX_SUBJECT_LIST 30	// is that enough?
 
diff --git a/engines/sword2/object.h b/engines/sword2/object.h
index 1fd434f8a0b..7d82bbcdecd 100644
--- a/engines/sword2/object.h
+++ b/engines/sword2/object.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	_SCRIPT_STRUCTURES
-#define	_SCRIPT_STRUCTURES
+#ifndef	SWORD2_OBJECT_H
+#define	SWORD2_OBJECT_H
 
 #include "common/stream.h"
 
diff --git a/engines/sword2/resman.h b/engines/sword2/resman.h
index 18b5cb87658..a83272ec140 100644
--- a/engines/sword2/resman.h
+++ b/engines/sword2/resman.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	RESMAN_H
-#define	RESMAN_H
+#ifndef	SWORD2_RESMAN_H
+#define	SWORD2_RESMAN_H
 
 namespace Common {
 	class File;
diff --git a/engines/sword2/router.h b/engines/sword2/router.h
index 45efd046bd6..3b2fabf3fd9 100644
--- a/engines/sword2/router.h
+++ b/engines/sword2/router.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef _ROUTER_H
-#define _ROUTER_H
+#ifndef SWORD2_ROUTER_H
+#define SWORD2_ROUTER_H
 
 // This used to be a variable, but it was never set. Actually, it wasn't even
 // initialised!
diff --git a/engines/sword2/saveload.h b/engines/sword2/saveload.h
index 9463f3fd4a8..195843dcf20 100644
--- a/engines/sword2/saveload.h
+++ b/engines/sword2/saveload.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	SAVE_REST_H
-#define	SAVE_REST_H
+#ifndef	SWORD2_SAVELOAD_H
+#define	SWORD2_SAVELOAD_H
 
 namespace Sword2 {
 
diff --git a/engines/sword2/screen.h b/engines/sword2/screen.h
index 209f5423aa7..1a393e53a45 100644
--- a/engines/sword2/screen.h
+++ b/engines/sword2/screen.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	_BUILD_DISPLAY
-#define	_BUILD_DISPLAY
+#ifndef	SWORD2_SCREEN_H
+#define	SWORD2_SCREEN_H
 
 #include "common/rect.h"
 #include "common/stream.h"
diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h
index 7390a60bbc8..1e8629b0626 100644
--- a/engines/sword2/sound.h
+++ b/engines/sword2/sound.h
@@ -29,8 +29,8 @@
  *
  ****************************************************************************/
 
-#ifndef SOUND_H
-#define SOUND_H
+#ifndef SWORD2_SOUND_H
+#define SWORD2_SOUND_H
 
 #include "common/file.h"
 #include "sound/audiostream.h"
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index c7b844bffe5..2fb3eff298c 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef	_SWORD2
-#define	_SWORD2
+#ifndef	SWORD2_H
+#define	SWORD2_H
 
 // Enable this to make it possible to clear the mouse cursor luggage by
 // right-clicking. The original didn't do this, but it feels natural to me.