diff --git a/src/filesystem.cc b/src/filesystem.cc
index 9895e84..e8d8ce3 100644
--- a/src/filesystem.cc
+++ b/src/filesystem.cc
@@ -1,8 +1,9 @@
-#include "filesystem.h"
-#include "singletons.h"
 #include <fstream>
-#include <sstream>
 #include <iostream>
+#include <sstream>
+
+#include "filesystem.h"
+#include "logging.h"
 
 const size_t buffer_size=131072;
 
diff --git a/src/filesystem.h b/src/filesystem.h
index 955b1be..fd945af 100644
--- a/src/filesystem.h
+++ b/src/filesystem.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <boost/filesystem.hpp>
-#include "gtkmm.h"
+#include <gtkmm.h>
 
 namespace juci {
   class filesystem {
diff --git a/src/juci.cc b/src/juci.cc
index a7d5cb7..6171496 100644
--- a/src/juci.cc
+++ b/src/juci.cc
@@ -1,10 +1,9 @@
 #include "juci.h"
 #include "singletons.h"
-#include <iostream>
 
 using namespace std; //TODO: remove
 
-void init_logging() {
+void app::init_logging() {
   boost::log::add_common_attributes();
   boost::log::add_file_log(boost::log::keywords::file_name = Singleton::log_dir() + "juci.log",
                boost::log::keywords::auto_flush = true);
@@ -69,10 +68,9 @@ void app::on_activate() {
 }
 
 app::app() : Gtk::Application("no.sout.juci", Gio::APPLICATION_NON_UNIQUE | Gio::APPLICATION_HANDLES_COMMAND_LINE) {
-  
+  init_logging();
 }
 
 int main(int argc, char *argv[]) {
-  init_logging();
   return app().run(argc, argv);
 }
diff --git a/src/juci.h b/src/juci.h
index 551a352..e672254 100644
--- a/src/juci.h
+++ b/src/juci.h
@@ -14,6 +14,7 @@ class app : public Gtk::Application {
   std::unique_ptr<Window> window;
   std::vector<boost::filesystem::path> directories;
   std::vector<boost::filesystem::path> files;
+  void init_logging();
 };
 
 #endif // JUCI_JUCI_H_
diff --git a/src/singletons.h b/src/singletons.h
index 968356a..4f6fbab 100644
--- a/src/singletons.h
+++ b/src/singletons.h
@@ -1,17 +1,15 @@
-
 #ifndef JUCI_SINGLETONS_H_
 #define JUCI_SINGLETONS_H_
 
+#include <gtkmm.h>
+
+#include "filesystem.h"
 #include "source.h"
 #include "window.h"
 #include "directories.h"
 #include "terminal.h"
 #include "notebook.h"
 #include "menu.h"
-#include <gtkmm.h>
-#include <string>
-#include "filesystem.h"
-#include <iostream>
 
 class Singleton {
 public:
diff --git a/src/source.h b/src/source.h
index 2b60633..f142d8b 100644
--- a/src/source.h
+++ b/src/source.h
@@ -1,15 +1,15 @@
 #ifndef JUCI_SOURCE_H_
 #define JUCI_SOURCE_H_
+#include <aspell.h>
+#include <boost/property_tree/xml_parser.hpp>
+#include <gtksourceviewmm.h>
+#include <string>
 #include <unordered_map>
 #include <vector>
-#include "gtkmm.h"
-#include <string>
-#include "gtksourceviewmm.h"
+
+#include "selectiondialog.h"
 #include "terminal.h"
 #include "tooltips.h"
-#include "selectiondialog.h"
-#include <aspell.h>
-#include <boost/property_tree/xml_parser.hpp>
 
 namespace Source {
   Glib::RefPtr<Gsv::Language> guess_language(const boost::filesystem::path &file_path);