diff --git a/src/main.cpp b/src/main.cpp
index bb45b2abfeb17a6dff69df9fa0fe7b2e5a31ce9d..3698e154ce0146ebd9e1d4d5b2ef86652df3aae8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -48,8 +48,8 @@ main (int argc, char **argv) {
 			     Qt::WDestructiveClose |
 			     Qt::WStyle_Customize |
 			     Qt::WStyle_NoBorder);
-  Manager::instance().init();		
   Manager::instance().setGui(GUI);
+  Manager::instance().init();		
 		
   a.setMainWidget((QtGUIMainWindow*)GUI);
   return a.exec();
diff --git a/utilspp/singleton_holder.hpp b/utilspp/singleton_holder.hpp
index 2d87ceeba32651b9fb7e66e92dade6c83811c6f3..730e4cee18cddd750c12f31fc90f59487d5282b3 100644
--- a/utilspp/singleton_holder.hpp
+++ b/utilspp/singleton_holder.hpp
@@ -28,7 +28,6 @@
 
 #include "creation_using_new.hpp"
 #include "lifetime_default.hpp"
-#include "lifetime_with_longevity.hpp"
 #include "threading_single.hpp"
 
 namespace utilspp