10 files changed, 30 insertions, 34 deletions
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