2 files changed, 3 insertions, 4 deletions
diff --git a/src/libjin/Common/Singleton.h b/src/libjin/Common/Singleton.hpp
index ff8a9ce..c3ce467 100644
--- a/src/libjin/Common/Singleton.h
+++ b/src/libjin/Common/Singleton.hpp
@@ -21,11 +21,10 @@ namespace jin
     protected:
         Singleton() {};
         virtual ~Singleton() {};
+        static T* _instance;
     private:
         Singleton(const Singleton&);
         Singleton& operator = (const Singleton&);
-
-        static T* _instance;
     };
 
     template<class T> T* Singleton<T>::_instance = nullptr;
@@ -35,4 +34,4 @@ namespace jin
 
 } // jin
 
-#endif
-\ No newline at end of file
+#endif // __JIN_SINGLETON_H
+\ No newline at end of file
diff --git a/src/libjin/Common/Subsystem.h b/src/libjin/Common/Subsystem.hpp
index 8a4ecf6..f4e270b 100644
--- a/src/libjin/Common/Subsystem.h
+++ b/src/libjin/Common/Subsystem.hpp
@@ -1,7 +1,7 @@
 #ifndef __JIN_COMMON_SUBSYSTEM_H
 #define __JIN_COMMON_SUBSYSTEM_H
 
-#include "singleton.h"
+#include "singleton.hpp"
 #include "../utils/macros.h"
 
 namespace jin