fix guard header part3.

12 files changed, 34 insertions, 31 deletions

diff --git a/src/utils/base64.h b/src/utils/base64.h
index b0c349277..6ebac7983 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -27,8 +27,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef BASE64_H
-#define BASE64_H
+#ifndef UTILS_BASE64_H
+#define UTILS_BASE64_H
 
 #include "localconsts.h"
 
@@ -37,4 +37,4 @@ extern unsigned char *php3_base64_encode(const unsigned char *,
 extern unsigned char *php3_base64_decode(const unsigned char *,
                                          int, int *) A_WARN_UNUSED;
 
-#endif /* BASE64_H */
+#endif  // UTILS_BASE64_H
diff --git a/src/utils/copynpaste.h b/src/utils/copynpaste.h
index ea827158d..1a6069267 100644
--- a/src/utils/copynpaste.h
+++ b/src/utils/copynpaste.h
@@ -19,6 +19,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef UTILS_COPYNPASTE_H
+#define UTILS_COPYNPASTE_H
+
 #include <string>
 
 #include "localconsts.h"
@@ -35,3 +38,5 @@
 bool retrieveBuffer(std::string& text, size_t& pos) A_WARN_UNUSED;
 
 bool sendBuffer(std::string& text);
+
+#endif  // UTILS_COPYNPASTE_H
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 17eee70ce..d1bdd8777 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -54,4 +54,4 @@ inline void delete_all(Container &c)
     std::for_each(c.begin(), c.end(), make_dtor(c));
 }
 
-#endif
+#endif  // UTILS_DTOR_H
diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h
index 1eb5e1c82..591f2ca95 100644
--- a/src/utils/mkdir.h
+++ b/src/utils/mkdir.h
@@ -19,9 +19,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef M_MKDIR_H
-#define M_MKDIR_H
+#ifndef UTILS_MKDIR_H
+#define UTILS_MKDIR_H
 
 int mkdir_r(const char *const pathname);
 
-#endif
+#endif  // UTILS_MKDIR_H
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 03ecc9fe1..37c889e02 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MUTEX_H
-#define MUTEX_H
+#ifndef UTILS_MUTEX_H
+#define UTILS_MUTEX_H
 
 #include "logger.h"
 
@@ -100,4 +100,4 @@ inline MutexLocker::~MutexLocker()
     mMutex->unlock();
 }
 
-#endif  // MUTEX_H
+#endif  // UTILS_MUTEX_H
diff --git a/src/utils/perfomance.h b/src/utils/perfomance.h
index a70bc42a6..c3a79c722 100644
--- a/src/utils/perfomance.h
+++ b/src/utils/perfomance.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UTILS_PEFOMANCE_H
-#define UTILS_PEFOMANCE_H
+#ifndef UTILS_PERFOMANCE_H
+#define UTILS_PERFOMANCE_H
 
 #ifdef USE_PROFILER
 #include <string>
@@ -73,4 +73,4 @@ namespace Perfomance
 #define FUNC_BLOCK(name, id)
 
 #endif  // USE_PROFILER
-#endif  // UTILS_PEFOMANCE_H
+#endif  // UTILS_PERFOMANCE_H
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index c7d85bd22..fb0285e0a 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -79,6 +79,4 @@ SDL_RWops *PHYSFSRWOPS_openAppend(const char *const fname) A_WARN_UNUSED;
  */
 SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *const handle) A_WARN_UNUSED;
 
-#endif /* include-once blocker */
-
-/* end of physfsrwops.h ... */
+#endif  // UTILS_PHYSFSRWOPS_H
diff --git a/src/utils/physfstools.h b/src/utils/physfstools.h
index 47625ca76..cb64a981b 100644
--- a/src/utils/physfstools.h
+++ b/src/utils/physfstools.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UTILS_PHYSFS_H
-#define UTILS_PHYSFS_H
+#ifndef UTILS_PHYSFSTOOLS_H
+#define UTILS_PHYSFSTOOLS_H
 
 #include <physfs.h>
 
@@ -45,4 +45,4 @@ namespace PhysFs
 
 extern const char *dirSeparator;
 
-#endif  // UTILS_PHYSFS_H
+#endif  // UTILS_PHYSFSTOOLS_H
diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h
index 2ee91e2c3..0506c5c26 100644
--- a/src/utils/specialfolder.h
+++ b/src/utils/specialfolder.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef M_SPECIALFOLDER_H
-#define M_SPECIALFOLDER_H
+#ifndef UTILS_SPECIALFOLDER_H
+#define UTILS_SPECIALFOLDER_H
 
 #ifdef WIN32
 #include <shlobj.h>
@@ -30,4 +30,4 @@
 std::string getSpecialFolderLocation(const int folderId) A_WARN_UNUSED;
 #endif
 
-#endif
+#endif  // UTILS_SPECIALFOLDER_H
diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h
index ab8f77c51..fc313e0c3 100644
--- a/src/utils/stringvector.h
+++ b/src/utils/stringvector.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UTILS_VECTORSTRING_H
-#define UTILS_VECTORSTRING_H
+#ifndef UTILS_STRINGVECTOR_H
+#define UTILS_STRINGVECTOR_H
 
 #include <string>
 #include <vector>
@@ -28,4 +28,4 @@ typedef std::vector<std::string> StringVect;
 typedef StringVect::iterator StringVectIter;
 typedef StringVect::const_iterator StringVectCIter;
 
-#endif
+#endif  // UTILS_STRINGVECTOR_H
diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h
index 8a6f0c1e0..8d890fbd7 100644
--- a/src/utils/translation/translationmanager.h
+++ b/src/utils/translation/translationmanager.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UTILS_TRANSLATION_MANAGER_H
-#define UTILS_TRANSLATION_MANAGER_H
+#ifndef UTILS_TRANSLATION_TRANSLATIONMANAGER_H
+#define UTILS_TRANSLATION_TRANSLATIONMANAGER_H
 
 #include "localconsts.h"
 
@@ -45,4 +45,4 @@ class TranslationManager final
                                   StringVect &lines);
 };
 
-#endif  // UTILS_TRANSLATION_MANAGER_H
+#endif  // UTILS_TRANSLATION_TRANSLATIONMANAGER_H
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 75f671b02..d67747659 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XML_H
-#define XML_H
+#ifndef UTILS_XML_H
+#define UTILS_XML_H
 
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
@@ -144,4 +144,4 @@ namespace XML
 #define for_each_xml_child_node(var, parent) \
     for (XmlNodePtr var = parent->xmlChildrenNode; var; var = var->next)
 
-#endif  // XML_H
+#endif  // UTILS_XML_H