9 files changed, 15 insertions, 14 deletions
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index 9d8ba836..298841be 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -27,11 +27,11 @@
    +----------------------------------------------------------------------+
    */
 
+#include "utils/base64.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "base64.h"
-
 static char base64_table[] =
 {
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 8dbc441f..e7240d12 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -39,7 +39,7 @@ public std::unary_function <std::pair<T1, T2>, void>
     void operator()(std::pair<T1, T2> &pair) { delete pair.second; }
 };
 
-    template<class Cont>
+template<class Cont>
 inline dtor<typename Cont::value_type> make_dtor(Cont const&)
 {
     return dtor<typename Cont::value_type>();
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index 5281d491..55e72555 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -41,4 +41,4 @@
 
 #endif
 
-#endif
+#endif // UTILS_GETTEXT_H
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 5e5df8f8..41701709 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -22,9 +22,9 @@
 #ifndef MUTEX_H
 #define MUTEX_H
 
-#include <SDL_thread.h>
+#include "log.h"
 
-#include "../log.h"
+#include <SDL_thread.h>
 
 /**
  * A mutex provides mutual exclusion of access to certain data that is
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index a40efebc..4f23e01a 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -68,7 +68,8 @@
  * SUCH DAMAGE.
  */
 
-#include "sha256.h"
+#include "utils/sha256.h"
+
 #include <memory.h>
 
 #ifdef HAS_STDINT
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 04a54149..6a88a12e 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "stringutils.h"
+#include "utils/stringutils.h"
 
 #include <algorithm>
 
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index bed4a7c4..d960bc96 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -19,11 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "utils/strprintf.h"
+
 #include <cstdarg>
 #include <cstdio>
 
-#include "strprintf.h"
-
 std::string strprintf(char const *format, ...)
 {
     char buf[256];
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index d5dd54be..7a6f75de 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -19,11 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "xml.h"
+#include "utils/xml.h"
 
-#include "../log.h"
+#include "log.h"
 
-#include "../resources/resourcemanager.h"
+#include "resources/resourcemanager.h"
 
 namespace XML
 {
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 76a63ff4..e7075279 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -93,4 +93,4 @@ namespace XML
 #define for_each_xml_child_node(var, parent) \
     for (xmlNodePtr var = parent->xmlChildrenNode; var; var = var->next)
 
-#endif
+#endif // XML_H