diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a79cfe7..e3dab84 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,8 +37,8 @@ set(source_files juci.h
     selectiondialog.cc
     config.h
     config.cc
-    sourcefile.h
-    sourcefile.cc
+    filesystem.h
+    filesystem.cc
     window.cc
     window.h
     dialogs.h
diff --git a/src/cmake.cc b/src/cmake.cc
index 76b4aa0..37773a7 100644
--- a/src/cmake.cc
+++ b/src/cmake.cc
@@ -1,7 +1,6 @@
 #include "cmake.h"
-#include "sourcefile.h"
-#include <regex>
 #include "singletons.h"
+#include <regex>
 
 #include <iostream> //TODO: remove
 using namespace std; //TODO: remove
diff --git a/src/config.cc b/src/config.cc
index 6b98535..1d476ea 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -3,8 +3,6 @@
 #include "logging.h"
 #include <exception>
 #include "files.h"
-#include "sourcefile.h"
-#include "singletons.h"
 #include <iostream>
 
 using namespace std; //TODO: remove
diff --git a/src/directories.cc b/src/directories.cc
index 0a269cc..f8303b3 100644
--- a/src/directories.cc
+++ b/src/directories.cc
@@ -1,7 +1,6 @@
+#include "singletons.h"
 #include "directories.h"
-#include "sourcefile.h"
 #include "logging.h"
-#include "singletons.h"
 #include <algorithm>
 #include <unordered_set>
 
diff --git a/src/sourcefile.cc b/src/filesystem.cc
similarity index 98%
rename from src/sourcefile.cc
rename to src/filesystem.cc
index 5f41c2c..bbf6baf 100644
--- a/src/sourcefile.cc
+++ b/src/filesystem.cc
@@ -1,7 +1,8 @@
-#include "sourcefile.h"
+#include "filesystem.h"
 #include "singletons.h"
 #include <fstream>
 #include <sstream>
+#include <iostream>
 
 const size_t buffer_size=131072;
 
diff --git a/src/sourcefile.h b/src/filesystem.h
similarity index 100%
rename from src/sourcefile.h
rename to src/filesystem.h
diff --git a/src/notebook.cc b/src/notebook.cc
index 4cf8d7d..14834c7 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -1,7 +1,6 @@
+#include "singletons.h"
 #include "notebook.h"
 #include "logging.h"
-#include "sourcefile.h"
-#include "singletons.h"
 #include <fstream>
 #include <regex>
 #include "cmake.h"
diff --git a/src/singletons.h b/src/singletons.h
index 9d96ec9..de53031 100644
--- a/src/singletons.h
+++ b/src/singletons.h
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include <gtkmm.h>
 #include <string>
-#include "sourcefile.h"
+#include "filesystem.h"
 
 class Singleton {
 public:
diff --git a/src/source.cc b/src/source.cc
index 154232f..c0c1511 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -1,9 +1,8 @@
+#include "singletons.h"
 #include "source.h"
-#include "sourcefile.h"
 #include <boost/property_tree/json_parser.hpp>
 #include "logging.h"
 #include <algorithm>
-#include "singletons.h"
 #include <gtksourceview/gtksource.h>
 #include <iostream>
 
diff --git a/src/window.cc b/src/window.cc
index 142a8c1..d5d3d20 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -1,7 +1,6 @@
 #include "window.h"
 #include "logging.h"
 #include "singletons.h"
-#include "sourcefile.h"
 #include "config.h"
 //#include "api.h"
 #include "dialogs.h"