diff --git a/include/mapnik/datasource_cache.hpp b/include/mapnik/datasource_cache.hpp
index 38a5ad918..e6adeb410 100644
--- a/include/mapnik/datasource_cache.hpp
+++ b/include/mapnik/datasource_cache.hpp
@@ -45,6 +45,7 @@ class MAPNIK_DECL datasource_cache : public singleton_cxx11<datasource_cache>,
                                      private util::noncopyable
 {
     friend class singleton_cxx11<datasource_cache>;
+
   public:
     bool plugin_registered(const std::string& plugin_name) const;
     std::vector<std::string> plugin_names() const;
diff --git a/include/mapnik/util/singleton.hpp b/include/mapnik/util/singleton.hpp
index 7e920c8e1..89f880286 100644
--- a/include/mapnik/util/singleton.hpp
+++ b/include/mapnik/util/singleton.hpp
@@ -65,19 +65,19 @@ class CreateStatic
 template<typename T>
 class singleton_cxx11
 {
-public:
+  public:
     static T& instance()
     {
         static T instance;
         return instance;
     }
-protected:
+
+  protected:
 #ifdef MAPNIK_THREADSAFE
     static std::mutex mutex_;
 #endif
 };
 
-
 #ifdef __GNUC__
 template<typename T, template<typename U> class CreatePolicy = CreateStatic>
 class MAPNIK_DECL singleton