3 files changed, 9 insertions, 7 deletions
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 0b71fa50..8dbc441f 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -51,5 +51,4 @@ inline void delete_all(Container &c)
     std::for_each(c.begin(), c.end(), make_dtor(c));
 }
 
-
 #endif
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 24058558..d5dd54be 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -28,7 +28,7 @@
 namespace XML
 {
     Document::Document(const std::string &filename):
-        mDoc(NULL)
+        mDoc(0)
     {
         int size;
         ResourceManager *resman = ResourceManager::getInstance();
@@ -87,7 +87,8 @@ namespace XML
         return ret;
     }
 
-    std::string getProperty(xmlNodePtr node, const char *name, const std::string &def)
+    std::string getProperty(xmlNodePtr node, const char *name,
+                            const std::string &def)
     {
         xmlChar *prop = xmlGetProp(node, BAD_CAST name);
         if (prop) {
@@ -107,4 +108,5 @@ namespace XML
 
         return NULL;
     }
-}
+
+} // namespace XML
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 2e08dd50..76a63ff4 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -22,10 +22,10 @@
 #ifndef XML_H
 #define XML_H
 
-#include <string>
-
 #include <libxml/tree.h>
 
+#include <string>
+
 /**
  * XML helper functions.
  */
@@ -81,7 +81,8 @@ namespace XML
     /**
      * Gets a string property from an xmlNodePtr.
      */
-    std::string getProperty(xmlNodePtr node, const char *name, const std::string &def);
+    std::string getProperty(xmlNodePtr node, const char *name,
+                            const std::string &def);
 
     /**
      * Finds the first child node with the given name