Normalized guard #defines

svn-id: r38842

47 files changed, 141 insertions, 149 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
diff --git a/engines/sci/exereader.h b/engines/sci/exereader.h
index 4b724ba057..5349ad3724 100644
--- a/engines/sci/exereader.h
+++ b/engines/sci/exereader.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef EXEREADER_H
-#define EXEREADER_H
+#ifndef SCI_EXEREADER_H
+#define SCI_EXEREADER_H
 
 #include "common/stream.h"
 #include "common/util.h"
@@ -37,4 +37,4 @@ bool getSciVersionFromString(Common::String versionString, int *version, Common:
 
 } // End of namespace Sci
 
-#endif // SCI_H
+#endif // SCI_EXEREADER_H
diff --git a/engines/sci/gfx/gfx_driver.h b/engines/sci/gfx/gfx_driver.h
index 1d0bc09357..3ecdaa80cf 100644
--- a/engines/sci/gfx/gfx_driver.h
+++ b/engines/sci/gfx/gfx_driver.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_GFX_DRIVER_H_
-#define _SCI_GFX_DRIVER_H_
+#ifndef SCI_GFX_GFX_DRIVER_H
+#define SCI_GFX_GFX_DRIVER_H
 
 #include "sci/gfx/gfx_system.h"
 #include "sci/include/uinput.h"
@@ -319,4 +319,4 @@ struct gfx_driver_t { /* Graphics driver */
 
 } // End of namespace Sci
 
-#endif // !_SCI_GFX_DRIVER_H_
+#endif // SCI_GFX_GFX_DRIVER_H
diff --git a/engines/sci/gfx/gfx_operations.h b/engines/sci/gfx/gfx_operations.h
index 253a2fabb3..d3cdedceac 100644
--- a/engines/sci/gfx/gfx_operations.h
+++ b/engines/sci/gfx/gfx_operations.h
@@ -25,8 +25,8 @@
 
 /* Graphical operations, called from the widget state manager */
 
-#ifndef _GFX_OPERATIONS_H_
-#define _GFX_OPERATIONS_H_
+#ifndef SCI_GFX_GFX_OPERATIONS_H
+#define SCI_GFX_GFX_OPERATIONS_H
 
 #include "sci/gfx/gfx_resmgr.h"
 #include "sci/gfx/gfx_tools.h"
@@ -679,4 +679,4 @@ int _gfxop_clip(rect_t *rect, rect_t clipzone);
 
 } // End of namespace Sci
 
-#endif // !_GFX_OPERATIONS_H_
+#endif // SCI_GFX_GFX_OPERATIONS_H
diff --git a/engines/sci/gfx/gfx_options.h b/engines/sci/gfx/gfx_options.h
index aa9d7fbea7..e83298bf1b 100644
--- a/engines/sci/gfx/gfx_options.h
+++ b/engines/sci/gfx/gfx_options.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _GFX_OPTIONS_H_
-#define _GFX_OPTIONS_H_
+#ifndef SCI_GFX_GFX_OPTIONS_H
+#define SCI_GFX_GFX_OPTIONS_H
 
 #include "sci/gfx/gfx_resource.h"
 #include "sci/gfx/gfx_tools.h"
@@ -81,5 +81,4 @@ struct gfx_options_t {
 
 } // End of namespace Sci
 
-#endif // !_GFX_OPTIONS_H_
-
+#endif // SCI_GFX_GFX_OPTIONS_H
diff --git a/engines/sci/gfx/gfx_res_options.h b/engines/sci/gfx/gfx_res_options.h
index f405d88462..7cf4071a10 100644
--- a/engines/sci/gfx/gfx_res_options.h
+++ b/engines/sci/gfx/gfx_res_options.h
@@ -25,8 +25,8 @@
 
 /* Configuration options for per-resource customisations */
 
-#ifndef _GFX_RES_OPTIONS_H_
-#define _GFX_RES_OPTIONS_H_
+#ifndef SCI_GFX_GFX_RES_OPTIONS_H
+#define SCI_GFX_GFX_RES_OPTIONS_H
 
 #include "sci/gfx/gfx_resource.h"
 #include "sci/gfx/gfx_resmgr.h"
@@ -106,4 +106,4 @@ int gfx_get_res_config(gfx_options_t *options, gfx_pixmap_t *pxm);
 
 } // End of namespace Sci
 
-#endif /* !_GFX_RES_OPTIONS_H_ */
+#endif // SCI_GFX_GFX_RES_OPTIONS_H
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h
index 17a15590e3..2bb1e5642d 100644
--- a/engines/sci/gfx/gfx_resmgr.h
+++ b/engines/sci/gfx/gfx_resmgr.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _GFX_RESMGR_H_
-#define _GFX_RESMGR_H_
+#ifndef SCI_GFX_GFX_RESMGR_H
+#define SCI_GFX_GFX_RESMGR_H
 
 // FIXME/TODO: The name "(Graphics) resource manager", and the associated
 // filenames, are misleading. This should be renamed to "Graphics manager"
@@ -335,4 +335,4 @@ int gfxr_interpreter_needs_multicolored_pointers(int version, void *internal);
 
 } // End of namespace Sci
 
-#endif /* !_GFX_RSMGR_H_ */
+#endif // SCI_GFX_GFX_RSMGR_H
diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h
index 1db6dbc948..a081dcf724 100644
--- a/engines/sci/gfx/gfx_resource.h
+++ b/engines/sci/gfx/gfx_resource.h
@@ -25,8 +25,8 @@
 
 /* SCI Resource library */
 
-#ifndef _GFX_RESOURCE_H_
-#define _GFX_RESOURCE_H_
+#ifndef SCI_GFX_GFX_RESOURCE_H
+#define SCI_GFX_GFX_RESOURCE_H
 
 #include "sci/gfx/gfx_system.h"
 #include "sci/gfx/gfx_driver.h"
@@ -407,5 +407,4 @@ static inline int get_int_16(const byte *offset) {
 
 } // End of namespace Sci
 
-#endif /* !_GFX_RESOURCE_H_ */
-
+#endif // SCI_GFX_GFX_RESOURCE_H
diff --git a/engines/sci/gfx/gfx_state_internal.h b/engines/sci/gfx/gfx_state_internal.h
index 8168510d4e..b5be874051 100644
--- a/engines/sci/gfx/gfx_state_internal.h
+++ b/engines/sci/gfx/gfx_state_internal.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _GFX_STATE_INTERNAL_H_
-#define _GFX_STATE_INTERNAL_H_
+#ifndef SCI_GFX_GFX_STATE_INTERNAL_H
+#define SCI_GFX_GFX_STATE_INTERNAL_H
 
 #include "sci/gfx/gfx_tools.h"
 #include "sci/gfx/gfx_options.h"
@@ -236,5 +236,4 @@ struct gfxw_port_t {
 
 } // End of namespace Sci
 
-#endif /* !_GFX_STATE_INTERNAL_H_ */
-
+#endif // SCI_GFX_GFX_STATE_INTERNAL_H
diff --git a/engines/sci/gfx/gfx_system.h b/engines/sci/gfx/gfx_system.h
index efc293caaf..29d4646b34 100644
--- a/engines/sci/gfx/gfx_system.h
+++ b/engines/sci/gfx/gfx_system.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_GFX_SYSTEM_
-#define _SCI_GFX_SYSTEM_
+#ifndef SCI_GFX_GFX_SYSTEM
+#define SCI_GFX_GFX_SYSTEM
 
 #include "common/scummsys.h"
 #include "common/rect.h"
@@ -389,4 +389,4 @@ typedef enum {
 
 } // End of namespace Sci
 
-#endif /* !_SCI_GFX_SYSTEM_ */
+#endif // SCI_GFX_GFX_SYSTEM
diff --git a/engines/sci/gfx/gfx_tools.h b/engines/sci/gfx/gfx_tools.h
index 5e626597a8..958562815b 100644
--- a/engines/sci/gfx/gfx_tools.h
+++ b/engines/sci/gfx/gfx_tools.h
@@ -26,8 +26,8 @@
 /* FreeSCI 0.3.1+ graphics subsystem helper functions */
 
 
-#ifndef _GFX_TOOLS_H_
-#define _GFX_TOOLS_H_
+#ifndef SCI_GFX_GFX_TOOLS_H
+#define SCI_GFX_GFX_TOOLS_H
 
 #include "sci/gfx/gfx_system.h"
 #include "sci/gfx/gfx_driver.h"
@@ -239,4 +239,4 @@ gfx_pixmap_t *gfx_pixmap_scale_index_data(gfx_pixmap_t *pixmap, gfx_mode_t *mode
 
 } // End of namespace Sci
 
-#endif /* !_GFX_TOOLS_H_ */
+#endif // SCI_GFX_GFX_TOOLS_H
diff --git a/engines/sci/gfx/gfx_widgets.h b/engines/sci/gfx/gfx_widgets.h
index ec2fc1612d..b64cb364f6 100644
--- a/engines/sci/gfx/gfx_widgets.h
+++ b/engines/sci/gfx/gfx_widgets.h
@@ -25,8 +25,8 @@
 
 /* Graphical state management */
 
-#ifndef _GFX_WIDGETS_H_
-#define _GFX_WIDGETS_H_
+#ifndef SCI_GFX_GFX_WIDGETS_H
+#define SCI_GFX_GFX_WIDGETS_H
 
 #include "sci/gfx/gfx_state_internal.h"
 
@@ -516,4 +516,4 @@ void gfxw_widget_kill_chrono(gfxw_visual_t *visual, int window);
 
 } // End of namespace Sci
 
-#endif /* !_GFX_WIDGETS_H_ */
+#endif // SCI_GFX_GFX_WIDGETS_H
diff --git a/engines/sci/gfx/menubar.h b/engines/sci/gfx/menubar.h
index 7b163532f7..c262cd5bbf 100644
--- a/engines/sci/gfx/menubar.h
+++ b/engines/sci/gfx/menubar.h
@@ -25,8 +25,8 @@
 
 /* Header for SCI0 menu bar management */
 
-#ifndef _SCI_MENUBAR_H_
-#define _SCI_MENUBAR_H_
+#ifndef SCI_GFX_SCI_MENUBAR_H
+#define SCI_GFX_SCI_MENUBAR_H
 
 #include "sci/include/vm_types.h"
 #include "sci/gfx/gfx_operations.h"
@@ -211,5 +211,4 @@ int menubar_match_key(menu_item_t *item, int message, int modifiers);
 
 } // End of namespace Sci
 
-#endif /* !_SCI_MENUBAR_H_ */
-
+#endif // SCI_GFX_SCI_MENUBAR_H
diff --git a/engines/sci/gfx/sbtree.h b/engines/sci/gfx/sbtree.h
index 4b02eb1e54..f3c77cf932 100644
--- a/engines/sci/gfx/sbtree.h
+++ b/engines/sci/gfx/sbtree.h
@@ -29,8 +29,8 @@
 ** of resizing after being initialized.
 */
 
-#ifndef _SBTREE_H_
-#define _SBTREE_H_
+#ifndef SCI_GFX_GFX_SBTREE_H
+#define SCI_GFX_GFX_SBTREE_H
 
 #ifdef SBTREE_DEBUG
 #  include <stdio.h>
@@ -102,9 +102,4 @@ void sbtree_foreach(sbtree_t *tree, void *args, void *(*operation)(sbtree_t *, c
 
 } // End of namespace Sci
 
-#endif /* !_SBTREE_H_ */
-
-
-
-
-
+#endif // SCI_GFX_GFX_SBTREE_H
diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h
index 46a17142cf..e1e8b6700b 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/include/engine.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_ENGINE_H
-#define _SCI_ENGINE_H
+#ifndef SCI_INCLUDE_ENGINE_H
+#define SCI_INCLUDE_ENGINE_H
 
 #include "common/scummsys.h"
 #include "common/array.h"
@@ -307,4 +307,4 @@ static inline reg_t not_register(EngineState *s, reg_t r) {
 
 } // End of namespace Sci
 
-#endif // !_SCI_ENGINE_H
+#endif // SCI_INCLUDE_ENGINE_H
diff --git a/engines/sci/include/heapmgr.h b/engines/sci/include/heapmgr.h
index eb42b16acf..074dfc695e 100644
--- a/engines/sci/include/heapmgr.h
+++ b/engines/sci/include/heapmgr.h
@@ -25,8 +25,8 @@
 
 /* Heap-like managed structure */
 
-#ifndef _FREESCI_HEAPMGR_H_
-#define _FREESCI_HEAPMGR_H_
+#ifndef SCI_INCLUDE_HEAPMGR_H
+#define SCI_INCLUDE_HEAPMGR_H
 
 #include "sci/tools.h"
 #include "sci/sci_memory.h"
@@ -110,4 +110,4 @@ int	alloc_##ENTRY##_entry(ENTRY##_table_t *table) {										\
 
 } // End of namespace Sci
 
-#endif /* !_FREESCI_HEAPMGR_H_ */
+#endif // SCI_INCLUDE_HEAPMGR_H
diff --git a/engines/sci/include/sci_midi.h b/engines/sci/include/sci_midi.h
index 372a06a201..6996cd29b3 100644
--- a/engines/sci/include/sci_midi.h
+++ b/engines/sci/include/sci_midi.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCI_MIDI_H_
-#define _SCI_MIDI_H_
+#ifndef SCI_INCLUDE_MIDI_H
+#define SCI_INCLUDE_MIDI_H
 
 namespace Sci {
 
@@ -52,4 +52,4 @@ namespace Sci {
 
 } // End of namespace Sci
 
-#endif /* !defined(_SCI_MIDI_H_) */
+#endif // SCI_INCLUDE_MIDI_H
diff --git a/engines/sci/include/sci_widgets.h b/engines/sci/include/sci_widgets.h
index 4fefd43d70..ea7199dcc1 100644
--- a/engines/sci/include/sci_widgets.h
+++ b/engines/sci/include/sci_widgets.h
@@ -25,8 +25,8 @@
 
 /* SCI-specific widget handling */
 
-#ifndef _SCI_WIDGETS_H_
-#define _SCI_WIDGETS_H_
+#ifndef SCI_INCLUDE_SCI_WIDGETS_H
+#define SCI_INCLUDE_SCI_WIDGETS_H
 
 #include "sci/include/engine.h"
 
@@ -202,5 +202,4 @@ sciw_select_item(EngineState *s, gfxw_port_t *menu_port, menu_t *menu, int selec
 
 } // End of namespace Sci
 
-#endif /* _!SCI_WIDGETS_H_ */
-
+#endif // SCI_INCLUDE_SCI_WIDGETS_H
diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h
index 79d36f8b3a..f7efc4c50c 100644
--- a/engines/sci/include/sciresource.h
+++ b/engines/sci/include/sciresource.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SCIRESOURCE_H_
-#define _SCIRESOURCE_H_
+#ifndef SCI_INCLUDE_SCIRESOURCE_H
+#define SCI_INCLUDE_SCIRESOURCE_H
 
 #include "common/str.h"
 
@@ -420,7 +420,4 @@ void _scir_add_altsource(resource_t *res, ResourceSource *source, unsigned int f
 
 } // End of namespace Sci
 
-#endif
-
-
-
+#endif // SCI_INCLUDE_SCIRESOURCE_H
diff --git a/engines/sci/include/script.h b/engines/sci/include/script.h
index 5871eea67c..1c03507a4d 100644
--- a/engines/sci/include/script.h
+++ b/engines/sci/include/script.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCRIPT_H
-#define SCRIPT_H
+#ifndef SCI_INCLUDE_SCRIPT_H
+#define SCI_INCLUDE_SCRIPT_H
 
 #include "sci/include/sciresource.h"
 
@@ -221,4 +221,4 @@ void script_free_breakpoints(EngineState *s);
 
 } // End of namespace Sci
 
-#endif
+#endif // SCI_INCLUDE_SCRIPT_H
diff --git a/engines/sci/include/uinput.h b/engines/sci/include/uinput.h
index 7e830b410d..16339a113f 100644
--- a/engines/sci/include/uinput.h
+++ b/engines/sci/include/uinput.h
@@ -25,8 +25,8 @@
 
 /* unified input header file */
 
-#ifndef _SCI_UINPUT_H
-#define _SCI_UINPUT_H
+#ifndef SCI_INCLUDE_UINPUT_H
+#define SCI_INCLUDE_UINPUT_H
 
 
 namespace Sci {
@@ -124,4 +124,4 @@ struct sci_event_t {
 
 } // End of namespace Sci
 
-#endif /* _SCI_UINPUT_H */
+#endif // SCI_INCLUDE_UINPUT_H
diff --git a/engines/sci/include/versions.h b/engines/sci/include/versions.h
index 2fdf61ac7a..716135577e 100644
--- a/engines/sci/include/versions.h
+++ b/engines/sci/include/versions.h
@@ -25,8 +25,8 @@
 
 /* Versions management */
 
-#ifndef _SCI_VERSIONS_H_
-#define _SCI_VERSIONS_H_
+#ifndef SCI_INCLUDE_VERSIONS_H
+#define SCI_INCLUDE_VERSIONS_H
 
 namespace Sci {
 
@@ -144,4 +144,4 @@ int version_parse(const char *vn, sci_version_t *result);
 
 } // End of namespace Sci
 
-#endif /* !_SCI_VERSIONS_H_ */
+#endif // SCI_INCLUDE_VERSIONS_H
diff --git a/engines/sci/include/vm_types.h b/engines/sci/include/vm_types.h
index 8ffb0b19be..60de6a3108 100644
--- a/engines/sci/include/vm_types.h
+++ b/engines/sci/include/vm_types.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_VM_TYPES_H
-#define SCI_VM_TYPES_H
+#ifndef SCI_INCLUDE_VM_TYPES_H
+#define SCI_INCLUDE_VM_TYPES_H
 
 #include "common/scummsys.h"
 
@@ -61,4 +61,4 @@ extern reg_t NULL_REG;
 
 } // End of namespace Sci
 
-#endif // SCI_VM_TYPES_H
+#endif // SCI_INCLUDE_VM_TYPES_H
diff --git a/engines/sci/include/vocabulary.h b/engines/sci/include/vocabulary.h
index aac00f5319..441d0426e5 100644
--- a/engines/sci/include/vocabulary.h
+++ b/engines/sci/include/vocabulary.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_VOCABULARY_H
-#define SCI_VOCABULARY_H
+#ifndef SCI_INCLUDE_VOCABULARY_H
+#define SCI_INCLUDE_VOCABULARY_H
 
 #include "sci/include/versions.h"
 #include "sci/include/sciresource.h"
@@ -395,4 +395,4 @@ void vocab_gnf_dump(parse_tree_branch_t *branches, int branches_nr);
 
 } // End of namespace Sci
 
-#endif
+#endif // SCI_INCLUDE_VOCABULARY_H
diff --git a/engines/sci/sci_memory.h b/engines/sci/sci_memory.h
index 9f47e9aa15..49b75e1685 100644
--- a/engines/sci/sci_memory.h
+++ b/engines/sci/sci_memory.h
@@ -40,8 +40,8 @@
  **/
 
 
-#ifndef _SCI_MEMORY_H
-#define _SCI_MEMORY_H
+#ifndef SCI_SCI_MEMORY_H
+#define SCI_SCI_MEMORY_H
 
 #include "common/scummsys.h"
 
@@ -138,4 +138,4 @@ extern void *sci_refcount_memdup(void *data, size_t len);
 
 } // End of namespace Sci
 
-#endif	/* _SCI_MEMORY_H */
+#endif	// SCI_SCI_MEMORY_H
diff --git a/engines/sci/scicore/sciconsole.h b/engines/sci/scicore/sciconsole.h
index 92c80601be..8aae95ce76 100644
--- a/engines/sci/scicore/sciconsole.h
+++ b/engines/sci/scicore/sciconsole.h
@@ -29,8 +29,8 @@
 ** possible exception of the mouse pointer).
 */
 
-#ifndef _SCI_CONSOLE_H_
-#define _SCI_CONSOLE_H_
+#ifndef SCI_SCICORE_SCICONSOLE_H
+#define SCI_SCICORE_SCICONSOLE_H
 
 #include "common/scummsys.h"
 
@@ -227,4 +227,4 @@ void close_console_file();
 
 } // End of namespace Sci
 
-#endif /* _SCI_CONSOLE_H_ */
+#endif // SCI_SCICORE_SCICONSOLE_H
diff --git a/engines/sci/sfx/sfx_core.h b/engines/sci/sfx/sfx_core.h
index 7ac02d6cfc..36fb1c24c1 100644
--- a/engines/sci/sfx/sfx_core.h
+++ b/engines/sci/sfx/sfx_core.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SFX_CORE_H_
-#define _SFX_CORE_H_
+#ifndef SCI_SFX_SFX_CORE_H
+#define SCI_SFX_SFX_CORE_H
 
 #include "common/scummsys.h"
 
@@ -37,4 +37,4 @@ namespace Sci {
 
 } // End of namespace Sci
 
-#endif /* !defined(_SFX_CORE_H_) */
+#endif // SCI_SFX_SFX_CORE_H
diff --git a/engines/sci/sfx/sfx_engine.h b/engines/sci/sfx/sfx_engine.h
index 20447c69c8..059cf370c7 100644
--- a/engines/sci/sfx/sfx_engine.h
+++ b/engines/sci/sfx/sfx_engine.h
@@ -24,8 +24,8 @@
  */
 
 /* Sound engine */
-#ifndef _SFX_ENGINE_H_
-#define _SFX_ENGINE_H_
+#ifndef SCI_SFX_SFX_ENGINE_H
+#define SCI_SFX_SFX_ENGINE_H
 
 #include "sci/sfx/sfx_core.h"
 #include "sci/sfx/sfx_songlib.h"
@@ -163,4 +163,4 @@ void sfx_song_set_fade(sfx_state_t *self, song_handle_t handle, fade_params_t *f
 
 } // End of namespace Sci
 
-#endif /* !defined(_SFX_ENGINE_H_) */
+#endif // SCI_SFX_SFX_ENGINE_H
diff --git a/engines/sci/sfx/sfx_iterator.h b/engines/sci/sfx/sfx_iterator.h
index 4ddef7f111..2efe91a1f0 100644
--- a/engines/sci/sfx/sfx_iterator.h
+++ b/engines/sci/sfx/sfx_iterator.h
@@ -25,8 +25,8 @@
 
 /* Song iterator declarations */
 
-#ifndef _SCI_SFX_ITERATOR_H_
-#define _SCI_SFX_ITERATOR_H_
+#ifndef SCI_SFX_SFX_ITERATOR_H
+#define SCI_SFX_SFX_ITERATOR_H
 
 #include "sci/sfx/sfx_pcm.h"
 
@@ -345,4 +345,4 @@ int sfx_play_iterator_pcm(song_iterator_t *it, unsigned long handle);
 
 } // End of namespace Sci
 
-#endif
+#endif // SCI_SFX_SFX_ITERATOR_H
diff --git a/engines/sci/sfx/sfx_iterator_internal.h b/engines/sci/sfx/sfx_iterator_internal.h
index 1898b34ca1..c0b59a7822 100644
--- a/engines/sci/sfx/sfx_iterator_internal.h
+++ b/engines/sci/sfx/sfx_iterator_internal.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SFX_ITERATOR_INTERNAL_
-#define _SFX_ITERATOR_INTERNAL_
+#ifndef SCI_SFX_SFX_ITERATOR_INTERNAL
+#define SCI_SFX_SFX_ITERATOR_INTERNAL
 
 #include "sci/sfx/sfx_iterator.h"
 #include "sci/include/sci_midi.h"
@@ -231,4 +231,4 @@ sfx_pcm_feed_t *sfx_iterator_make_feed(byte *base_data, int offset,
 
 } // End of namespace Sci
 
-#endif /* !defined(_SFX_ITERATOR_INTERNAL_ */
+#endif // SCI_SFX_SFX_ITERATOR_INTERNAL
diff --git a/engines/sci/sfx/sfx_pcm.h b/engines/sci/sfx/sfx_pcm.h
index e40641d187..598c99f5b5 100644
--- a/engines/sci/sfx/sfx_pcm.h
+++ b/engines/sci/sfx/sfx_pcm.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SFX_PCM_H_
-#define _SFX_PCM_H_
+#ifndef SCI_SFX_SFX_PCM_H
+#define SCI_SFX_SFX_PCM_H
 
 #include "sci/sfx/sfx_core.h"
 #include "sci/sfx/sfx_timer.h"
@@ -180,4 +180,4 @@ int sfx_pcm_available();
 
 } // End of namespace Sci
 
-#endif /* !defined(_SFX_PCM_H_) */
+#endif // SCI_SFX_SFX_PCM_H
diff --git a/engines/sci/sfx/sfx_player.h b/engines/sci/sfx/sfx_player.h
index 9e6247b5c3..68a915c3a0 100644
--- a/engines/sci/sfx/sfx_player.h
+++ b/engines/sci/sfx/sfx_player.h
@@ -25,8 +25,8 @@
 
 /* song player structure */
 
-#ifndef _SFX_PLAYER_H
-#define _SFX_PLAYER_H
+#ifndef SCI_SFX_SFX_PLAYER_H
+#define SCI_SFX_SFX_PLAYER_H
 
 #include "sci/sfx/sfx_engine.h"
 #include "sci/sfx/sfx_iterator.h"
@@ -151,4 +151,4 @@ song_iterator_t *sfx_iterator_combine(song_iterator_t *it1, song_iterator_t *it2
 
 } // End of namespace Sci
 
-#endif /* !_SFX_PLAYER_H */
+#endif // SCI_SFX_SFX_PLAYER_H
diff --git a/engines/sci/sfx/sfx_songlib.h b/engines/sci/sfx/sfx_songlib.h
index bf68697d0b..f390b3828d 100644
--- a/engines/sci/sfx/sfx_songlib.h
+++ b/engines/sci/sfx/sfx_songlib.h
@@ -25,8 +25,8 @@
 
 /* Song library */
 
-#ifndef _SCI_SFX_SONGLIB_H_
-#define _SCI_SFX_SONGLIB_H_
+#ifndef SCI_SFX_SFX_SONGLIB_H
+#define SCI_SFX_SFX_SONGLIB_H
 
 #include "common/scummsys.h"
 
@@ -187,4 +187,4 @@ void song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle,
 
 } // End of namespace Sci
 
-#endif /* !_SCI_SOUND_SERVER_H_ */
+#endif // SCI_SSFX_SFX_SONGLIB_H
diff --git a/engines/sci/sfx/sfx_time.h b/engines/sci/sfx/sfx_time.h
index ebb6824e1d..512dc70cd1 100644
--- a/engines/sci/sfx/sfx_time.h
+++ b/engines/sci/sfx/sfx_time.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _SFX_TIME_H_
-#define _SFX_TIME_H_
+#ifndef SCI_SFX_SFX_TIME_H
+#define SCI_SFX_SFX_TIME_H
 
 namespace Sci {
 
@@ -82,4 +82,4 @@ void sfx_timestamp_gettime(sfx_timestamp_t *timestamp, long *secs, long *usecs);
 
 } // End of namespace Sci
 
-#endif /* !defined(_SFX_TIME_H_) */
+#endif // SCI_SFX_SFX_TIME_H
diff --git a/engines/sci/sfx/sfx_timer.h b/engines/sci/sfx/sfx_timer.h
index 19971124e6..ffeb208a8f 100644
--- a/engines/sci/sfx/sfx_timer.h
+++ b/engines/sci/sfx/sfx_timer.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _FREESCI_SFX_TIMER_H_
-#define _FREESCI_SFX_TIMER_H_
+#ifndef SCI_SFX_SFX_TIMER_H
+#define SCI_SFX_SFX_TIMER_H
 
 #include "sci/sfx/sfx_core.h"
 
@@ -53,4 +53,4 @@ struct sfx_timer_t {
 
 } // End of namespace Sci
 
-#endif /* !_FREESCI_SFX_TIMER_H_ */
+#endif // SCI_SFX_SFX_TIMER_H
diff --git a/engines/sci/tools.h b/engines/sci/tools.h
index 4c9e7c5fb2..4bc0330bd2 100644
--- a/engines/sci/tools.h
+++ b/engines/sci/tools.h
@@ -104,4 +104,4 @@ int sci_ffs(int bits);
 
 } // End of namespace Sci
 
-#endif
+#endif // SCI_TOOLS_H