12 files changed, 38 insertions, 33 deletions
diff --git a/engines/sci/engine/aatree.h b/engines/sci/engine/aatree.h
index f40c9e0935..dea2ad1c66 100644
--- a/engines/sci/engine/aatree.h
+++ b/engines/sci/engine/aatree.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_AATREE_H
-#define _SCI_AATREE_H
+#ifndef SCI_ENGINE_AATREE_H
+#define SCI_ENGINE_AATREE_H
 
 namespace Sci {
 
@@ -84,4 +84,4 @@ void *aatree_get_data(aatree_t *t);
 
 } // End of namespace Sci
 
-#endif // !_SCI_AATREE_H
+#endif // SCI_ENIGNE_AATREE_H
diff --git a/engines/sci/engine/gc.h b/engines/sci/engine/gc.h
index f255ea6c76..094d4669d9 100644
--- a/engines/sci/engine/gc.h
+++ b/engines/sci/engine/gc.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef GC_H_
-#define GC_H_
+#ifndef SCI_ENGINE_GC_H
+#define SCI_ENGINE_GC_H
 
 #include "common/hashmap.h"
 #include "sci/include/vm_types.h"
@@ -61,4 +61,4 @@ void run_gc(EngineState *s);
 
 } // End of namespace Sci
 
-#endif // !defined(GC_H_)
+#endif // SCI_ENGINE_GC_H
diff --git a/engines/sci/engine/heap.h b/engines/sci/engine/heap.h
index bb8df540fb..f826c6e8a1 100644
--- a/engines/sci/engine/heap.h
+++ b/engines/sci/engine/heap.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_HEAP_H
-#define _SCI_HEAP_H
+#ifndef SCI_ENGINE_HEAP_H
+#define SCI_ENGINE_HEAP_H
 
 #include "sci/tools.h"
 
@@ -112,4 +112,4 @@ void heap_dump_all(heap_t *h);
 
 } // End of namespace Sci
 
-#endif // !_SCI_HEAP_H
+#endif // SCI_ENGINE_HEAP_H
diff --git a/engines/sci/engine/intmap.h b/engines/sci/engine/intmap.h
index fe00fa8621..bb1f610100 100644
--- a/engines/sci/engine/intmap.h
+++ b/engines/sci/engine/intmap.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_INTMAP_H
-#define SCI_INTMAP_H
+#ifndef SCI_ENGINE_INTMAP_H
+#define SCI_ENGINE_INTMAP_H
 
 #include "common/scummsys.h"
 
@@ -92,4 +92,4 @@ public:
 
 } // End of namespace Sci
 
-#endif // SCI_INTMAP_H
+#endif // SCI_ENGINE_INTMAP_H
diff --git a/engines/sci/engine/kdebug.h b/engines/sci/engine/kdebug.h
index db0115ece9..cdd0d28273 100644
--- a/engines/sci/engine/kdebug.h
+++ b/engines/sci/engine/kdebug.h
@@ -25,8 +25,8 @@
 
 /* Kernel debug defines */
 
-#ifndef _SCI_KDEBUG_H_
-#define _SCI_KDEBUG_H_
+#ifndef SCI_ENGINE_KDEBUG_H
+#define SCI_ENGINE_KDEBUG_H
 
 namespace Sci {
 
@@ -109,4 +109,4 @@ extern int sci_debug_flags;
 
 } // End of namespace Sci
 
-#endif
+#endif // SCI_ENGINE_KDEBUG_H
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index e583d1c4cc..68cb1c3b59 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_KERNEL_H_
-#define _SCI_KERNEL_H_
+#ifndef SCI_ENGINE_KERNEL_H
+#define SCI_ENGINE_KERNEL_H
 
 #include "common/scummsys.h"
 #include "common/debug.h"
@@ -337,4 +337,4 @@ extern sci_kernel_function_t kfunct_mappers[];
 
 } // End of namespace Sci
 
-#endif /* _SCI_KERNEL_H_ */
+#endif // SCI_ENGIENE_KERNEL_H
diff --git a/engines/sci/engine/kernel_types.h b/engines/sci/engine/kernel_types.h
index 473d6afe09..576ba37d3a 100644
--- a/engines/sci/engine/kernel_types.h
+++ b/engines/sci/engine/kernel_types.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _FREESCI_KERNEL_TYPES_H_
-#define _FREESCI_KERNEL_TYPES_H_
+#ifndef SCI_ENGINE_KERNEL_TYPES_H
+#define SCI_ENGINE_KERNEL_TYPES_H
 
 #include "sci/include/vm_types.h"
 
@@ -91,4 +91,4 @@ const char *kernel_argtype_description(int type);
 
 } // End of namespace Sci
 
-#endif // ! _FREESCI_KERNEL_TYPES_H_
+#endif // SCI_ENGIENE_KERNEL_TYPES_H
diff --git a/engines/sci/engine/message.h b/engines/sci/engine/message.h
index 759b0f4b75..f63575f5ab 100644
--- a/engines/sci/engine/message.h
+++ b/engines/sci/engine/message.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_ENGINE_MESSAGE_H
+#define SCI_ENGINE_MESSAGE_H
+
 #include "sci/include/sciresource.h"
 
 namespace Sci {
@@ -77,3 +80,5 @@ int message_state_load_res(message_state_t *state, int module);
 void message_state_initialize(ResourceManager *resmgr, message_state_t *state);
 
 } // End of namespace Sci
+
+#endif // SCI_ENGINE_MESSAGE_H
diff --git a/engines/sci/engine/sci_graphics.h b/engines/sci/engine/sci_graphics.h
index 89f719d63b..988a858832 100644
--- a/engines/sci/engine/sci_graphics.h
+++ b/engines/sci/engine/sci_graphics.h
@@ -25,8 +25,8 @@
 
 // SCI constants and definitions
 
-#ifndef _SCI_GRAPHICS_H_
-#define _SCI_GRAPHICS_H_
+#ifndef SCI_ENGIEN_SCI_GRAPHICS_H
+#define SCI_ENGINE_SCI_GRAPHICS_H
 
 namespace Sci {
 
@@ -42,4 +42,4 @@ namespace Sci {
 
 } // End of namespace Sci
 
-#endif // !_SCI_GRAPHICS_H_
+#endif // SCI_ENGINE_SCI_GRAPHICS_H
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index f77e6ebb77..48ef925af1 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_SEG_MANAGER_H
-#define _SCI_SEG_MANAGER_H
+#ifndef SCI_ENGINE_SEG_MANAGER_H
+#define SCI_ENGINE_SEG_MANAGER_H
 
 #include "sci/engine/vm.h"
 
@@ -500,4 +500,4 @@ private:
 
 } // End of namespace Sci
 
-#endif
+#endif // SCI_ENGINE_SEG_MANAGER
diff --git a/engines/sci/engine/sys_strings.h b/engines/sci/engine/sys_strings.h
index 2d89a263d8..3e7360c5cd 100644
--- a/engines/sci/engine/sys_strings.h
+++ b/engines/sci/engine/sys_strings.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_SYS_STRINGS_H
-#define SCI_SYS_STRINGS_H
+#ifndef SCI_ENGINE_SYS_STRINGS_H
+#define SCI_ENGINE_SYS_STRINGS_H
 
 namespace Sci {
 
@@ -77,4 +77,4 @@ void sys_string_free_all(sys_strings_t *strings);
 
 } // End of namespace Sci
 
-#endif // SCI_SYS_STRINGS_H
+#endif // SCI_ENGINE_SYS_STRINGS_H
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index a2a3124005..586d40d284 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_VM_H
-#define _SCI_VM_H
+#ifndef SCI_ENGINE_VM_H
+#define SCI_ENGINE_VM_H
 
 /* VM and kernel declarations */
 
@@ -800,4 +800,4 @@ object_t *obj_get(EngineState *s, reg_t offset);
 
 } // End of namespace Sci
 
-#endif /* !_SCI_VM_H */
+#endif // SCI_ENGINE_VM_H