diff --git a/src/app/main.cpp b/src/app/main.cpp
index a7f1f117..78dbb9fe 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -15,9 +15,7 @@
 #include "qt/QtCoreApplication.h"
 #include "qt/utility/utilityQt.h"
 #include "qt/view/QtViewFactory.h"
-#include "qt/window/QtMainWindow.h"
 #include "settings/ApplicationSettings.h"
-#include "utility/AppPath.h"
 #include "utility/commandline/CommandLineParser.h"
 #include "utility/logging/ConsoleLogger.h"
 #include "utility/logging/FileLogger.h"
@@ -29,7 +27,6 @@
 #include "utility/ResourcePaths.h"
 #include "utility/ScopedFunctor.h"
 #include "utility/UserPaths.h"
-#include "utility/utilityApp.h"
 #include "utility/utilityPathDetection.h"
 #include "utility/Version.h"
 #include "version.h"
diff --git a/src/indexer/main.cpp b/src/indexer/main.cpp
index da2443b0..23f298f7 100644
--- a/src/indexer/main.cpp
+++ b/src/indexer/main.cpp
@@ -1,18 +1,18 @@
 #include "includes.h"
 
-#include "utility/AppPath.h"
-#include "utility/logging/ConsoleLogger.h"
-#include "utility/logging/FileLogger.h"
-#include "utility/logging/logging.h"
-#include "utility/logging/LogManager.h"
+#include <QCoreApplication>
 
 #include "data/indexer/IndexerFactory.h"
 #include "data/indexer/IndexerFactoryModuleJava.h"
 #include "data/indexer/IndexerFactoryModuleCxxCdb.h"
 #include "data/indexer/IndexerFactoryModuleCxxManual.h"
 #include "data/indexer/interprocess/InterprocessIndexer.h"
-#include "qt/QtCoreApplication.h"
 #include "settings/ApplicationSettings.h"
+#include "utility/AppPath.h"
+#include "utility/logging/ConsoleLogger.h"
+#include "utility/logging/FileLogger.h"
+#include "utility/logging/logging.h"
+#include "utility/logging/LogManager.h"
 
 void setupLogging(const std::string logFilePath)
 {
diff --git a/src/lib/LicenseChecker.cpp b/src/lib/LicenseChecker.cpp
index 55286a40..f9608c11 100644
--- a/src/lib/LicenseChecker.cpp
+++ b/src/lib/LicenseChecker.cpp
@@ -1,8 +1,8 @@
 #include "LicenseChecker.h"
 
 #include "utility/AppPath.h"
+#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageForceEnterLicense.h"
-#include "utility/messaging/type/MessageStatus.h"
 
 #include "License.h"
 #include "PublicKey.h"
diff --git a/src/lib/component/ComponentFactory.cpp b/src/lib/component/ComponentFactory.cpp
index ba20e4c7..7f10028c 100644
--- a/src/lib/component/ComponentFactory.cpp
+++ b/src/lib/component/ComponentFactory.cpp
@@ -15,7 +15,6 @@
 #include "component/view/BookmarkView.h"
 #include "component/view/CodeView.h"
 #include "component/view/ErrorView.h"
-#include "component/view/GraphView.h"
 #include "component/view/LogView.h"
 #include "component/view/RefreshView.h"
 #include "component/view/SearchView.h"
diff --git a/src/lib/component/ComponentManager.cpp b/src/lib/component/ComponentManager.cpp
index ea243f21..081c5b4d 100644
--- a/src/lib/component/ComponentManager.cpp
+++ b/src/lib/component/ComponentManager.cpp
@@ -3,15 +3,9 @@
 #include "component/controller/NetworkFactory.h"
 
 #include "component/controller/Controller.h"
-#include "component/view/CodeView.h"
 #include "component/view/CompositeView.h"
 #include "component/view/DialogView.h"
-#include "component/view/GraphView.h"
-#include "component/view/LogView.h"
-#include "component/view/RefreshView.h"
-#include "component/view/SearchView.h"
 #include "component/view/TabbedView.h"
-#include "component/view/UndoRedoView.h"
 #include "component/view/ViewFactory.h"
 
 std::shared_ptr<ComponentManager> ComponentManager::create(ViewFactory* viewFactory, StorageAccess* storageAccess)
diff --git a/src/lib/component/controller/BookmarkController.cpp b/src/lib/component/controller/BookmarkController.cpp
index f5e224c5..f5a598d2 100644
--- a/src/lib/component/controller/BookmarkController.cpp
+++ b/src/lib/component/controller/BookmarkController.cpp
@@ -7,7 +7,6 @@
 
 #include "utility/messaging/type/MessageActivateEdge.h"
 #include "utility/messaging/type/MessageActivateNodes.h"
-#include "utility/Cache.h"
 
 #include "utility/logging/logging.h"
 #include "utility/utilityString.h"
diff --git a/src/lib/component/controller/BookmarkController.h b/src/lib/component/controller/BookmarkController.h
index 08f9cec3..503d2fd5 100644
--- a/src/lib/component/controller/BookmarkController.h
+++ b/src/lib/component/controller/BookmarkController.h
@@ -4,13 +4,10 @@
 #include "data/bookmark/Bookmark.h"
 #include "data/bookmark/NodeBookmark.h"
 #include "data/bookmark/EdgeBookmark.h"
-#include "data/name/NameHierarchy.h"
-#include "data/StorageTypes.h"
 
 #include "utility/messaging/MessageListener.h"
 #include "utility/messaging/type/MessageActivateAll.h"
 #include "utility/messaging/type/MessageActivateBookmark.h"
-#include "utility/messaging/type/MessageActivateEdge.h"
 #include "utility/messaging/type/MessageActivateTokens.h"
 #include "utility/messaging/type/MessageCreateBookmark.h"
 #include "utility/messaging/type/MessageCreateBookmarkCategory.h"
diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp
index ac1f7832..792feb1b 100644
--- a/src/lib/component/controller/CodeController.cpp
+++ b/src/lib/component/controller/CodeController.cpp
@@ -6,7 +6,7 @@
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/text/TextAccess.h"
 #include "utility/tracing.h"
-#include "utility/utility.h"
+#include "utility/logging/logging.h"
 #include "utility/utilityString.h"
 
 #include "data/access/StorageAccess.h"
diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp
index 83c3621b..072e947a 100644
--- a/src/lib/component/controller/GraphController.cpp
+++ b/src/lib/component/controller/GraphController.cpp
@@ -14,9 +14,9 @@
 #include "component/view/GraphView.h"
 #include "component/view/GraphViewStyle.h"
 #include "data/access/StorageAccess.h"
-#include "data/parser/AccessKind.h"
+#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/graph/Graph.h"
-#include "Application.h"
+#include "data/parser/AccessKind.h"
 
 GraphController::GraphController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)
diff --git a/src/lib/component/controller/GraphController.h b/src/lib/component/controller/GraphController.h
index f0486cf4..6d637233 100644
--- a/src/lib/component/controller/GraphController.h
+++ b/src/lib/component/controller/GraphController.h
@@ -26,8 +26,6 @@
 #include "component/controller/helper/DummyNode.h"
 #include "component/view/GraphView.h"
 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
-#include "data/graph/token_component/TokenComponentAggregation.h"
 
 class Graph;
 class StorageAccess;
diff --git a/src/lib/component/controller/IDECommunicationController.cpp b/src/lib/component/controller/IDECommunicationController.cpp
index edd6278f..3608bb6b 100644
--- a/src/lib/component/controller/IDECommunicationController.cpp
+++ b/src/lib/component/controller/IDECommunicationController.cpp
@@ -1,6 +1,7 @@
 #include "IDECommunicationController.h"
 
 #include "utility/file/FileSystem.h"
+#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageActivateSourceLocations.h"
 #include "utility/messaging/type/MessageActivateWindow.h"
 #include "utility/messaging/type/MessageDispatchWhenLicenseValid.h"
@@ -11,7 +12,6 @@
 
 #include "data/access/StorageAccess.h"
 #include "data/location/SourceLocationFile.h"
-#include "settings/ApplicationSettings.h"
 
 IDECommunicationController::IDECommunicationController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)
diff --git a/src/lib/component/controller/LogController.cpp b/src/lib/component/controller/LogController.cpp
index a7c71704..2ec99a29 100644
--- a/src/lib/component/controller/LogController.cpp
+++ b/src/lib/component/controller/LogController.cpp
@@ -1,7 +1,5 @@
 #include "component/controller/LogController.h"
 
-#include "data/access/StorageAccess.h"
-#include "utility/logging/LogManager.h"
 #include "settings/ApplicationSettings.h"
 
 LogController::LogController()
diff --git a/src/lib/component/controller/SearchController.cpp b/src/lib/component/controller/SearchController.cpp
index 3a78b45f..966da252 100644
--- a/src/lib/component/controller/SearchController.cpp
+++ b/src/lib/component/controller/SearchController.cpp
@@ -2,6 +2,7 @@
 
 #include "component/view/SearchView.h"
 #include "data/access/StorageAccess.h"
+#include "utility/logging/logging.h"
 #include "utility/tracing.h"
 
 SearchController::SearchController(StorageAccess* storageAccess)
diff --git a/src/lib/component/controller/StatusBarController.cpp b/src/lib/component/controller/StatusBarController.cpp
index e57cea87..07137bdb 100644
--- a/src/lib/component/controller/StatusBarController.cpp
+++ b/src/lib/component/controller/StatusBarController.cpp
@@ -3,7 +3,6 @@
 #include "component/view/StatusBarView.h"
 #include "data/access/StorageAccess.h"
 #include "utility/logging/logging.h"
-#include "utility/utilityString.h"
 
 StatusBarController::StatusBarController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)
diff --git a/src/lib/component/controller/UndoRedoController.cpp b/src/lib/component/controller/UndoRedoController.cpp
index 07e9696e..8a41d1a3 100644
--- a/src/lib/component/controller/UndoRedoController.cpp
+++ b/src/lib/component/controller/UndoRedoController.cpp
@@ -1,9 +1,7 @@
 #include "component/controller/UndoRedoController.h"
 
-#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageFlushUpdates.h"
 #include "utility/messaging/type/MessageSearch.h"
-#include "utility/utility.h"
 
 #include "Application.h"
 #include "component/view/UndoRedoView.h"
diff --git a/src/lib/component/controller/helper/BucketLayouter.h b/src/lib/component/controller/helper/BucketLayouter.h
index 5bf19792..e9d312a6 100644
--- a/src/lib/component/controller/helper/BucketLayouter.h
+++ b/src/lib/component/controller/helper/BucketLayouter.h
@@ -7,7 +7,6 @@
 #include "utility/types.h"
 
 #include "component/controller/helper/DummyNode.h"
-#include "data/graph/Edge.h"
 
 struct DummyEdge;
 
diff --git a/src/lib/component/controller/helper/DummyNode.h b/src/lib/component/controller/helper/DummyNode.h
index 5975dca8..d003016a 100644
--- a/src/lib/component/controller/helper/DummyNode.h
+++ b/src/lib/component/controller/helper/DummyNode.h
@@ -7,8 +7,8 @@
 #include "utility/utilityString.h"
 
 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/name/NameHierarchy.h"
+#include "data/parser/AccessKind.h"
 
 // temporary data structure for (visual) graph creation process
 struct DummyNode
diff --git a/src/lib/component/view/CodeView.cpp b/src/lib/component/view/CodeView.cpp
index 467d6372..f3d8128a 100644
--- a/src/lib/component/view/CodeView.cpp
+++ b/src/lib/component/view/CodeView.cpp
@@ -1,7 +1,6 @@
 #include "component/view/CodeView.h"
 
 #include "component/controller/CodeController.h"
-#include "utility/file/FileSystem.h"
 
 CodeView::CodeView(ViewLayout* viewLayout)
 	: View(viewLayout)
diff --git a/src/lib/component/view/GraphViewStyle.h b/src/lib/component/view/GraphViewStyle.h
index 0157aabd..d7abf04f 100644
--- a/src/lib/component/view/GraphViewStyle.h
+++ b/src/lib/component/view/GraphViewStyle.h
@@ -7,7 +7,7 @@
 #include "utility/math/Vector2.h"
 
 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
+#include "data/parser/AccessKind.h"
 
 class GraphViewStyleImpl;
 
diff --git a/src/lib/component/view/StatusView.h b/src/lib/component/view/StatusView.h
index 388bf625..318980c2 100644
--- a/src/lib/component/view/StatusView.h
+++ b/src/lib/component/view/StatusView.h
@@ -1,12 +1,10 @@
 #ifndef STATUS_VIEW_H
 #define STATUS_VIEW_H
 
+#include <vector>
+
 #include "component/view/View.h"
-
 #include "utility/Status.h"
-#include "utility/logging/LogMessage.h"
-#include "utility/logging/Logger.h"
-
 
 class StatusView
 	: public View
diff --git a/src/lib/data/IntermediateStorage.cpp b/src/lib/data/IntermediateStorage.cpp
index 8c694fb2..940cb806 100644
--- a/src/lib/data/IntermediateStorage.cpp
+++ b/src/lib/data/IntermediateStorage.cpp
@@ -2,9 +2,6 @@
 
 #include <set>
 
-#include "data/graph/Edge.h"
-#include "utility/logging/logging.h"
-
 IntermediateStorage::IntermediateStorage()
 	: m_nextId(1)
 {
diff --git a/src/lib/data/PersistentStorage.cpp b/src/lib/data/PersistentStorage.cpp
index 3c821118..2e132db2 100644
--- a/src/lib/data/PersistentStorage.cpp
+++ b/src/lib/data/PersistentStorage.cpp
@@ -6,7 +6,6 @@
 #include "utility/Cache.h"
 #include "utility/file/FileInfo.h"
 #include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageNewErrors.h"
 #include "utility/messaging/type/MessageStatus.h"
@@ -14,16 +13,15 @@
 #include "utility/TimePoint.h"
 #include "utility/tracing.h"
 #include "utility/utility.h"
-#include "utility/utilityString.h"
-#include "utility/Version.h"
-#include "utility/utilityString.h"
 
+#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/graph/token_component/TokenComponentAggregation.h"
 #include "data/graph/token_component/TokenComponentFilePath.h"
 #include "data/graph/token_component/TokenComponentSignature.h"
 #include "data/graph/Graph.h"
 #include "data/location/SourceLocationCollection.h"
 #include "data/location/SourceLocationFile.h"
+#include "data/parser/AccessKind.h"
 #include "data/parser/ParseLocation.h"
 
 PersistentStorage::PersistentStorage(const FilePath& dbPath, const FilePath& bookmarkPath)
diff --git a/src/lib/data/PersistentStorage.h b/src/lib/data/PersistentStorage.h
index f3f3f285..71441270 100644
--- a/src/lib/data/PersistentStorage.h
+++ b/src/lib/data/PersistentStorage.h
@@ -6,17 +6,12 @@
 
 #include "data/access/StorageAccess.h"
 #include "data/fulltextsearch/FullTextSearchIndex.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
-#include "data/parser/ParserClient.h"
-#include "data/parser/ParseLocation.h"
 #include "data/search/SearchIndex.h"
 #include "data/HierarchyCache.h"
 #include "data/SqliteIndexStorage.h"
 #include "data/SqliteBookmarkStorage.h"
 #include "data/Storage.h"
 
-#include "data/parser/ParserClientImpl.h"
-
 class PersistentStorage
 	: public Storage
 	, public StorageAccess
diff --git a/src/lib/data/SqliteBookmarkStorage.cpp b/src/lib/data/SqliteBookmarkStorage.cpp
index 94da3696..5bfe1d0e 100644
--- a/src/lib/data/SqliteBookmarkStorage.cpp
+++ b/src/lib/data/SqliteBookmarkStorage.cpp
@@ -1,8 +1,6 @@
 #include "SqliteBookmarkStorage.h"
 
 #include "utility/logging/logging.h"
-#include "utility/utility.h"
-#include "utility/utilityString.h"
 #include "data/SqliteStorageMigrationLambda.h"
 #include "data/SqliteStorageMigrator.h"
 
diff --git a/src/lib/data/SqliteBookmarkStorage.h b/src/lib/data/SqliteBookmarkStorage.h
index 8a497a74..072dc087 100644
--- a/src/lib/data/SqliteBookmarkStorage.h
+++ b/src/lib/data/SqliteBookmarkStorage.h
@@ -1,11 +1,6 @@
 #ifndef SQLITE_BOOKMARK_STORAGE_H
 #define SQLITE_BOOKMARK_STORAGE_H
 
-#include "sqlite/CppSQLite3.h"
-
-#include "data/bookmark/BookmarkCategory.h"
-#include "data/bookmark/EdgeBookmark.h"
-#include "data/bookmark/NodeBookmark.h"
 #include "data/SqliteStorage.h"
 #include "data/StorageTypes.h"
 #include "utility/types.h"
diff --git a/src/lib/data/SqliteIndexStorage.cpp b/src/lib/data/SqliteIndexStorage.cpp
index 14222d13..6e2dae5a 100644
--- a/src/lib/data/SqliteIndexStorage.cpp
+++ b/src/lib/data/SqliteIndexStorage.cpp
@@ -2,11 +2,8 @@
 
 #include <unordered_map>
 
-#include "data/graph/Node.h"
-#include "data/parser/ParseLocation.h"
 #include "utility/logging/logging.h"
 #include "utility/text/TextAccess.h"
-#include "utility/Version.h"
 
 const size_t SqliteIndexStorage::s_storageVersion = 12;
 
diff --git a/src/lib/data/SqliteIndexStorage.h b/src/lib/data/SqliteIndexStorage.h
index 6744280e..e15d65c3 100644
--- a/src/lib/data/SqliteIndexStorage.h
+++ b/src/lib/data/SqliteIndexStorage.h
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "data/location/SourceLocationFile.h"
-#include "data/name/NameHierarchy.h"
 #include "data/SqliteDatabaseIndex.h"
 #include "data/SqliteStorage.h"
 #include "data/StorageTypes.h"
diff --git a/src/lib/data/SqliteStorage.h b/src/lib/data/SqliteStorage.h
index 7a6a8af5..b436a112 100644
--- a/src/lib/data/SqliteStorage.h
+++ b/src/lib/data/SqliteStorage.h
@@ -5,7 +5,6 @@
 
 #include "data/SqliteDatabaseIndex.h"
 #include "utility/file/FilePath.h"
-#include "utility/Version.h"
 
 class SqliteStorageMigration;
 class TimePoint;
diff --git a/src/lib/data/SqliteStorageMigration.cpp b/src/lib/data/SqliteStorageMigration.cpp
index b3f4f679..9f433917 100644
--- a/src/lib/data/SqliteStorageMigration.cpp
+++ b/src/lib/data/SqliteStorageMigration.cpp
@@ -1,7 +1,5 @@
 #include "data/SqliteStorageMigration.h"
 
-#include "settings/Settings.h"
-
 SqliteStorageMigration::~SqliteStorageMigration()
 {
 }
diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp
index 0df2fae7..e10bd96c 100644
--- a/src/lib/data/Storage.cpp
+++ b/src/lib/data/Storage.cpp
@@ -2,9 +2,7 @@
 
 #include <unordered_map>
 
-#include "data/graph/Edge.h"
 #include "data/StorageTypes.h"
-#include "utility/logging/logging.h"
 #include "utility/tracing.h"
 
 Storage::Storage()
diff --git a/src/lib/data/Storage.h b/src/lib/data/Storage.h
index 6658e971..0cc5b349 100644
--- a/src/lib/data/Storage.h
+++ b/src/lib/data/Storage.h
@@ -5,7 +5,6 @@
 #include <mutex>
 #include <string>
 
-#include "data/name/NameHierarchy.h"
 #include "data/StorageTypes.h"
 #include "utility/types.h"
 
diff --git a/src/lib/data/TaskFinishParsing.cpp b/src/lib/data/TaskFinishParsing.cpp
index b1d5c9b7..48c6d359 100644
--- a/src/lib/data/TaskFinishParsing.cpp
+++ b/src/lib/data/TaskFinishParsing.cpp
@@ -2,7 +2,6 @@
 
 #include "component/view/DialogView.h"
 #include "data/PersistentStorage.h"
-#include "utility/file/FileRegister.h"
 #include "utility/messaging/type/MessageFinishedParsing.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/scheduling/Blackboard.h"
diff --git a/src/lib/data/access/StorageAccess.h b/src/lib/data/access/StorageAccess.h
index 57d892cb..20923731 100644
--- a/src/lib/data/access/StorageAccess.h
+++ b/src/lib/data/access/StorageAccess.h
@@ -7,7 +7,6 @@
 
 #include "utility/types.h"
 
-#include "data/bookmark/Bookmark.h"
 #include "data/bookmark/BookmarkCategory.h"
 #include "data/bookmark/EdgeBookmark.h"
 #include "data/bookmark/NodeBookmark.h"
diff --git a/src/lib/data/access/StorageAccessProxy.cpp b/src/lib/data/access/StorageAccessProxy.cpp
index ea3d487e..4532f842 100644
--- a/src/lib/data/access/StorageAccessProxy.cpp
+++ b/src/lib/data/access/StorageAccessProxy.cpp
@@ -8,7 +8,6 @@
 #include "utility/file/FilePath.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageShowErrors.h"
-#include "utility/TimePoint.h"
 
 StorageAccessProxy::StorageAccessProxy()
 	: m_subject(nullptr)
diff --git a/src/lib/data/bookmark/EdgeBookmark.h b/src/lib/data/bookmark/EdgeBookmark.h
index b98c96f6..546cde41 100644
--- a/src/lib/data/bookmark/EdgeBookmark.h
+++ b/src/lib/data/bookmark/EdgeBookmark.h
@@ -2,7 +2,6 @@
 #define EDGE_BOOKMARK_H
 
 #include "Bookmark.h"
-#include "data/graph/Edge.h"
 
 class EdgeBookmark
 	: public Bookmark
diff --git a/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp b/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp
index 31fb9ccf..03d49fa1 100644
--- a/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp
+++ b/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp
@@ -3,7 +3,6 @@
 
 #include "utility/logging/logging.h"
 #include "utility/tracing.h"
-#include "utility/utility.h"
 
 void FullTextSearchIndex::addFile(Id fileId, const std::string& file)
 {
diff --git a/src/lib/data/graph/Edge.cpp b/src/lib/data/graph/Edge.cpp
index f72b1b75..88de48ea 100644
--- a/src/lib/data/graph/Edge.cpp
+++ b/src/lib/data/graph/Edge.cpp
@@ -4,7 +4,6 @@
 
 #include "data/graph/Node.h"
 #include "data/graph/token_component/TokenComponentAggregation.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
 #include "utility/logging/logging.h"
 #include "utility/utilityString.h"
 
diff --git a/src/lib/data/indexer/IndexerFactory.cpp b/src/lib/data/indexer/IndexerFactory.cpp
index 21bd832f..5910a8ab 100644
--- a/src/lib/data/indexer/IndexerFactory.cpp
+++ b/src/lib/data/indexer/IndexerFactory.cpp
@@ -1,6 +1,5 @@
 #include "data/indexer/IndexerFactory.h"
 
-#include "data/indexer/IndexerBase.h"
 #include "data/indexer/IndexerComposite.h"
 #include "IndexerFactoryModule.h"
 
diff --git a/src/lib/data/indexer/IndexerFactory.h b/src/lib/data/indexer/IndexerFactory.h
index a0b96a81..d81eb6a0 100644
--- a/src/lib/data/indexer/IndexerFactory.h
+++ b/src/lib/data/indexer/IndexerFactory.h
@@ -4,8 +4,6 @@
 #include <memory>
 #include <vector>
 
-#include "settings/LanguageType.h"
-
 class IndexerBase;
 class IndexerComposite;
 class IndexerFactoryModule;
diff --git a/src/lib/data/indexer/IndexerFactoryModule.h b/src/lib/data/indexer/IndexerFactoryModule.h
index a6b2c85f..28cc04a1 100644
--- a/src/lib/data/indexer/IndexerFactoryModule.h
+++ b/src/lib/data/indexer/IndexerFactoryModule.h
@@ -3,8 +3,6 @@
 
 #include <memory>
 
-#include "settings/LanguageType.h"
-
 class IndexerBase;
 
 class IndexerFactoryModule
diff --git a/src/lib/data/indexer/TaskBuildIndex.cpp b/src/lib/data/indexer/TaskBuildIndex.cpp
index 5babf423..dac8ee6c 100644
--- a/src/lib/data/indexer/TaskBuildIndex.cpp
+++ b/src/lib/data/indexer/TaskBuildIndex.cpp
@@ -1,7 +1,6 @@
 #include "data/indexer/TaskBuildIndex.h"
 
 #include "utility/AppPath.h"
-#include "utility/file/FileRegister.h"
 #include "utility/file/FileRegisterStateData.h"
 #include "utility/logging/FileLogger.h"
 #include "utility/scheduling/Blackboard.h"
@@ -10,12 +9,9 @@
 
 #include "Application.h"
 #include "component/view/DialogView.h"
-#include "data/indexer/IndexerFactory.h"
 #include "data/indexer/IndexerCommandList.h"
-#include "data/indexer/IndexerComposite.h"
 #include "data/indexer/interprocess/InterprocessIndexer.h"
 #include "data/StorageProvider.h"
-#include "settings/ApplicationSettings.h"
 
 #if _WIN32
 const std::string TaskBuildIndex::s_processName("sourcetrail_indexer.exe");
diff --git a/src/lib/data/indexer/TaskBuildIndex.h b/src/lib/data/indexer/TaskBuildIndex.h
index db52e1fc..b2936cf7 100644
--- a/src/lib/data/indexer/TaskBuildIndex.h
+++ b/src/lib/data/indexer/TaskBuildIndex.h
@@ -9,7 +9,6 @@
 #include "data/indexer/interprocess/InterprocessIndexerCommandManager.h"
 #include "data/indexer/interprocess/InterprocessIndexingStatusManager.h"
 #include "data/indexer/interprocess/InterprocessIntermediateStorageManager.h"
-#include "data/parser/Parser.h"
 
 class DialogView;
 class FileRegisterStateData;
diff --git a/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp b/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp
index ec0aceaa..9a486652 100644
--- a/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp
+++ b/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp
@@ -4,8 +4,8 @@
 #include "utility/file/FileRegisterStateData.h"
 #include "utility/logging/logging.h"
 
-#include "data/indexer/IndexerComposite.h"
 #include "data/indexer/IndexerCommand.h"
+#include "data/indexer/IndexerComposite.h"
 #include "data/indexer/IndexerFactory.h"
 
 InterprocessIndexer::InterprocessIndexer(const std::string& uuid, Id processId)
diff --git a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp
index 0d0ad701..feb0e39e 100644
--- a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp
+++ b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp
@@ -1,5 +1,6 @@
 #include "InterprocessIntermediateStorageManager.h"
 
+#include "data/indexer/interprocess/shared_types/SharedIntermediateStorage.h"
 #include "data/IntermediateStorage.h"
 #include "utility/logging/logging.h"
 
diff --git a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h
index 7d723f7a..d817c438 100644
--- a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h
+++ b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h
@@ -2,7 +2,6 @@
 #define INTERPROCESS_INTERMEDIATE_STORAGE_MANAGER_H
 
 #include "BaseInterprocessDataManager.h"
-#include "shared_types/SharedIntermediateStorage.h"
 
 class IntermediateStorage;
 
diff --git a/src/lib/data/parser/ParserClient.cpp b/src/lib/data/parser/ParserClient.cpp
index ffffffcd..5336841d 100644
--- a/src/lib/data/parser/ParserClient.cpp
+++ b/src/lib/data/parser/ParserClient.cpp
@@ -3,7 +3,6 @@
 #include <sstream>
 
 #include "data/parser/ParseLocation.h"
-#include "utility/utilityString.h"
 
 std::string ParserClient::addAccessPrefix(const std::string& str, AccessKind access)
 {
diff --git a/src/lib/data/parser/ParserClientImpl.cpp b/src/lib/data/parser/ParserClientImpl.cpp
index 57208cac..fd05d430 100644
--- a/src/lib/data/parser/ParserClientImpl.cpp
+++ b/src/lib/data/parser/ParserClientImpl.cpp
@@ -5,7 +5,6 @@
 #include "data/location/LocationType.h"
 #include "data/parser/ParseLocation.h"
 #include "utility/logging/logging.h"
-#include "utility/utility.h"
 
 ParserClientImpl::ParserClientImpl()
 {
diff --git a/src/lib/data/parser/ParserClientImpl.h b/src/lib/data/parser/ParserClientImpl.h
index 48a8c1f7..3b9cf279 100644
--- a/src/lib/data/parser/ParserClientImpl.h
+++ b/src/lib/data/parser/ParserClientImpl.h
@@ -5,7 +5,6 @@
 
 #include "data/DefinitionKind.h"
 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/IntermediateStorage.h"
 #include "data/parser/ParserClient.h"
 
diff --git a/src/lib/data/parser/TaskParseWrapper.h b/src/lib/data/parser/TaskParseWrapper.h
index 9815c21a..7f14446e 100644
--- a/src/lib/data/parser/TaskParseWrapper.h
+++ b/src/lib/data/parser/TaskParseWrapper.h
@@ -3,8 +3,6 @@
 
 #include <memory>
 
-#include "data/parser/Parser.h"
-#include "data/parser/ParserClientImpl.h"
 #include "utility/scheduling/Task.h"
 #include "utility/scheduling/TaskRunner.h"
 #include "utility/scheduling/TaskDecorator.h"
diff --git a/src/lib/project/Project.cpp b/src/lib/project/Project.cpp
index 5ce585f3..fc387cfb 100644
--- a/src/lib/project/Project.cpp
+++ b/src/lib/project/Project.cpp
@@ -38,7 +38,6 @@
 #include "utility/utility.h"
 #include "utility/utilityApp.h"
 #include "utility/utilityString.h"
-#include "utility/Version.h"
 
 Project::Project(std::shared_ptr<ProjectSettings> settings, StorageAccessProxy* storageAccessProxy)
 	: m_settings(settings)
diff --git a/src/lib/project/SourceGroupFactory.h b/src/lib/project/SourceGroupFactory.h
index 463f8755..231d5647 100644
--- a/src/lib/project/SourceGroupFactory.h
+++ b/src/lib/project/SourceGroupFactory.h
@@ -4,8 +4,6 @@
 #include <memory>
 #include <vector>
 
-#include "settings/SourceGroupType.h"
-
 class SourceGroup;
 class SourceGroupSettings;
 class SourceGroupFactoryModule;
diff --git a/src/lib/settings/ProjectSettings.cpp b/src/lib/settings/ProjectSettings.cpp
index 8f56a136..1e9782e6 100644
--- a/src/lib/settings/ProjectSettings.cpp
+++ b/src/lib/settings/ProjectSettings.cpp
@@ -5,7 +5,6 @@
 #include "settings/migration/SettingsMigrationMoveKey.h"
 #include "settings/SourceGroupSettingsCxx.h"
 #include "settings/SourceGroupSettingsJava.h"
-#include "utility/utility.h"
 #include "utility/utilityString.h"
 #include "utility/utilityUuid.h"
 
diff --git a/src/lib/settings/Settings.cpp b/src/lib/settings/Settings.cpp
index 0cc5250b..c804d87a 100644
--- a/src/lib/settings/Settings.cpp
+++ b/src/lib/settings/Settings.cpp
@@ -1,9 +1,7 @@
 #include "settings/Settings.h"
 
-#include "utility/file/FileSystem.h"
 #include "utility/logging/logging.h"
 #include "utility/text/TextAccess.h"
-#include "utility/utilityString.h"
 #include "utility/utility.h"
 
 Settings::Settings(const Settings& other)
diff --git a/src/lib/settings/SourceGroupSettings.h b/src/lib/settings/SourceGroupSettings.h
index e5c9be91..59ccb26a 100644
--- a/src/lib/settings/SourceGroupSettings.h
+++ b/src/lib/settings/SourceGroupSettings.h
@@ -4,7 +4,6 @@
 #include <memory>
 #include <vector>
 
-#include "settings/LanguageType.h"
 #include "settings/ProjectSettings.h"
 #include "settings/SourceGroupType.h"
 
diff --git a/src/lib/utility/commandline/CommandLineParser.cpp b/src/lib/utility/commandline/CommandLineParser.cpp
index b1a3019f..8cc24ac5 100644
--- a/src/lib/utility/commandline/CommandLineParser.cpp
+++ b/src/lib/utility/commandline/CommandLineParser.cpp
@@ -1,11 +1,11 @@
 #include "utility/commandline/CommandLineParser.h"
 
+#include <iostream>
+
 #include "boost/program_options.hpp"
 
 #include "utility/ConfigManager.h"
-#include "utility/file/FileSystem.h"
 #include "utility/messaging/type/MessageLoadProject.h"
-#include "utility/messaging/type/MessageStatus.h"
 #include "utility/text/TextAccess.h"
 #include "utility/utilityString.h"
 #include "License.h"
diff --git a/src/lib/utility/commandline/CommandLineParser.h b/src/lib/utility/commandline/CommandLineParser.h
index c86bc679..a8301b56 100644
--- a/src/lib/utility/commandline/CommandLineParser.h
+++ b/src/lib/utility/commandline/CommandLineParser.h
@@ -2,7 +2,6 @@
 #define COMMANDLINEPARSER_H
 
 #include <string>
-#include "Application.h"
 #include "License.h"
 #include "utility/file/FilePath.h"
 
diff --git a/src/lib/utility/file/FileManager.cpp b/src/lib/utility/file/FileManager.cpp
index 2734a7a6..393ed850 100644
--- a/src/lib/utility/file/FileManager.cpp
+++ b/src/lib/utility/file/FileManager.cpp
@@ -3,7 +3,7 @@
 #include <set>
 
 #include "utility/file/FileSystem.h"
-#include "utility/utility.h"
+#include "utility/file/FilePath.h"
 
 FileManager::FileManager()
 {
diff --git a/src/lib/utility/file/FileManager.h b/src/lib/utility/file/FileManager.h
index f1673ff8..e47d5107 100644
--- a/src/lib/utility/file/FileManager.h
+++ b/src/lib/utility/file/FileManager.h
@@ -3,9 +3,10 @@
 
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
-#include "utility/file/FileInfo.h"
+class FilePath;
 
 class FileManager
 {
diff --git a/src/lib/utility/logging/LogManager.cpp b/src/lib/utility/logging/LogManager.cpp
index 94c45228..d224b74b 100644
--- a/src/lib/utility/logging/LogManager.cpp
+++ b/src/lib/utility/logging/LogManager.cpp
@@ -2,7 +2,6 @@
 
 #include <algorithm>
 
-#include "utility/logging/LogMessage.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/Version.h"
diff --git a/src/lib/utility/messaging/MessageListener.h b/src/lib/utility/messaging/MessageListener.h
index dff0f2a0..0c2aa6b6 100644
--- a/src/lib/utility/messaging/MessageListener.h
+++ b/src/lib/utility/messaging/MessageListener.h
@@ -3,7 +3,6 @@
 
 #include <string>
 
-#include "utility/logging/logging.h"
 #include "utility/messaging/MessageBase.h"
 #include "utility/messaging/MessageListenerBase.h"
 #include "utility/messaging/MessageQueue.h"
diff --git a/src/lib/utility/messaging/type/MessageChangeFileView.h b/src/lib/utility/messaging/type/MessageChangeFileView.h
index e14a5882..da1ddf55 100644
--- a/src/lib/utility/messaging/type/MessageChangeFileView.h
+++ b/src/lib/utility/messaging/type/MessageChangeFileView.h
@@ -3,7 +3,6 @@
 
 #include "utility/file/FilePath.h"
 #include "utility/messaging/Message.h"
-#include "utility/types.h"
 
 class MessageChangeFileView
 	: public Message<MessageChangeFileView>
diff --git a/src/lib/utility/messaging/type/MessageFind.h b/src/lib/utility/messaging/type/MessageFind.h
index 3a542415..4be972d0 100644
--- a/src/lib/utility/messaging/type/MessageFind.h
+++ b/src/lib/utility/messaging/type/MessageFind.h
@@ -2,7 +2,6 @@
 #define MESSAGE_FIND_H
 
 #include "utility/messaging/Message.h"
-#include "utility/types.h"
 
 class MessageFind
 	: public Message<MessageFind>
diff --git a/src/lib/utility/messaging/type/MessageSearch.h b/src/lib/utility/messaging/type/MessageSearch.h
index fa0e7795..b2245599 100644
--- a/src/lib/utility/messaging/type/MessageSearch.h
+++ b/src/lib/utility/messaging/type/MessageSearch.h
@@ -2,7 +2,6 @@
 #define MESSAGE_SEARCH_H
 
 #include "utility/messaging/Message.h"
-#include "utility/utilityString.h"
 
 #include "data/search/SearchMatch.h"
 
diff --git a/src/lib/utility/messaging/type/MessageSearchAutocomplete.h b/src/lib/utility/messaging/type/MessageSearchAutocomplete.h
index df3b322c..fe5527a2 100644
--- a/src/lib/utility/messaging/type/MessageSearchAutocomplete.h
+++ b/src/lib/utility/messaging/type/MessageSearchAutocomplete.h
@@ -2,7 +2,6 @@
 #define MESSAGE_SEARCH_AUTOCOMPLETE_H
 
 #include "utility/messaging/Message.h"
-#include "utility/types.h"
 
 class MessageSearchAutocomplete: public Message<MessageSearchAutocomplete>
 {
diff --git a/src/lib/utility/messaging/type/MessageSearchFullText.h b/src/lib/utility/messaging/type/MessageSearchFullText.h
index c2bbe481..295d9ab4 100644
--- a/src/lib/utility/messaging/type/MessageSearchFullText.h
+++ b/src/lib/utility/messaging/type/MessageSearchFullText.h
@@ -2,7 +2,6 @@
 #define MESSAGE_SEARCH_FULLTEXT_H
 
 #include "utility/messaging/Message.h"
-#include "utility/types.h"
 
 class MessageSearchFullText: public Message<MessageSearchFullText>
 {
diff --git a/src/lib/utility/messaging/type/MessageStatusFilterChanged.h b/src/lib/utility/messaging/type/MessageStatusFilterChanged.h
index 3dbdbbb8..47038f62 100644
--- a/src/lib/utility/messaging/type/MessageStatusFilterChanged.h
+++ b/src/lib/utility/messaging/type/MessageStatusFilterChanged.h
@@ -2,7 +2,6 @@
 #define MESSAGE_STATUS_FILTER_CHANGED_H
 
 #include "utility/messaging/Message.h"
-#include "utility/logging/Logger.h"
 #include "utility/Status.h"
 
 class MessageStatusFilterChanged
diff --git a/src/lib/utility/messaging/type/MessageToUndoRedoPosition.h b/src/lib/utility/messaging/type/MessageToUndoRedoPosition.h
index b269372f..1e3db364 100644
--- a/src/lib/utility/messaging/type/MessageToUndoRedoPosition.h
+++ b/src/lib/utility/messaging/type/MessageToUndoRedoPosition.h
@@ -2,7 +2,6 @@
 #define MESSAGE_TO_UNDO_REDO_POSITION_H
 
 #include "utility/messaging/Message.h"
-#include "utility/types.h"
 
 class MessageToUndoRedoPosition
 	: public Message<MessageToUndoRedoPosition>
diff --git a/src/lib/utility/scheduling/Task.cpp b/src/lib/utility/scheduling/Task.cpp
index 236ec262..b08541fc 100644
--- a/src/lib/utility/scheduling/Task.cpp
+++ b/src/lib/utility/scheduling/Task.cpp
@@ -1,6 +1,5 @@
 #include "utility/scheduling/Task.h"
 
-#include "utility/logging/logging.h"
 #include "utility/scheduling/TaskScheduler.h"
 
 void Task::dispatch(std::shared_ptr<Task> task)
diff --git a/src/lib/utility/scheduling/TaskScheduler.cpp b/src/lib/utility/scheduling/TaskScheduler.cpp
index b6d5079b..6b7cb335 100644
--- a/src/lib/utility/scheduling/TaskScheduler.cpp
+++ b/src/lib/utility/scheduling/TaskScheduler.cpp
@@ -4,7 +4,6 @@
 #include <thread>
 
 #include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageStatus.h"
 #include "utility/scheduling/Blackboard.h"
 #include "utility/ScopedFunctor.h"
 
diff --git a/src/lib/utility/scheduling/TaskScheduler.h b/src/lib/utility/scheduling/TaskScheduler.h
index 0d7ceb04..6976d6c7 100644
--- a/src/lib/utility/scheduling/TaskScheduler.h
+++ b/src/lib/utility/scheduling/TaskScheduler.h
@@ -5,8 +5,6 @@
 #include <mutex>
 #include <deque>
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageInterruptTasks.h"
 #include "utility/scheduling/Task.h"
 #include "utility/scheduling/TaskRunner.h"
 
diff --git a/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp b/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp
index a0a33753..061f1ada 100644
--- a/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp
+++ b/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp
@@ -1,6 +1,7 @@
 #include "data/parser/cxx/ASTActionFactory.h"
 
 #include "clang/Frontend/FrontendActions.h"
+#include "data/parser/cxx/ASTAction.h"
 
 ASTActionFactory::ASTActionFactory(
 	std::shared_ptr<ParserClient> client,
diff --git a/src/lib_cxx/data/parser/cxx/ASTActionFactory.h b/src/lib_cxx/data/parser/cxx/ASTActionFactory.h
index ece9fb41..55a1a1eb 100644
--- a/src/lib_cxx/data/parser/cxx/ASTActionFactory.h
+++ b/src/lib_cxx/data/parser/cxx/ASTActionFactory.h
@@ -3,10 +3,11 @@
 
 #include "clang/Tooling/Tooling.h"
 
-#include "data/parser/cxx/ASTAction.h"
 #include "data/parser/cxx/cxxCacheTypes.h"
 #include "utility/file/FileRegister.h"
 
+class ParserClient;
+
 class ASTActionFactory
 	: public clang::tooling::FrontendActionFactory
 {
diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp
index d1037869..a6f6ae53 100644
--- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp
+++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp
@@ -1,7 +1,5 @@
 #include "data/parser/cxx/CxxAstVisitorComponentContext.h"
 
-#include "utility/ScopedFunctor.h"
-
 CxxAstVisitorComponentContext::CxxAstVisitorComponentContext(CxxAstVisitor* astVisitor)
 	: CxxAstVisitorComponent(astVisitor)
 {
diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h
index 6fcb84bd..df18046f 100644
--- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h
+++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h
@@ -2,7 +2,6 @@
 #define CXX_AST_VISITOR_COMPONENT_IMPLICIT_CODE_H
 
 #include "data/parser/cxx/CxxAstVisitorComponent.h"
-#include "data/parser/cxx/CxxContext.h"
 
 // This CxxAstVisitorComponent is responsible for deciding if the AstVisitor should visit implicit code in the current context.
 class CxxAstVisitorComponentImplicitCode: public CxxAstVisitorComponent
diff --git a/src/lib_cxx/data/parser/cxx/CxxParser.cpp b/src/lib_cxx/data/parser/cxx/CxxParser.cpp
index 763f1da4..c44f759b 100644
--- a/src/lib_cxx/data/parser/cxx/CxxParser.cpp
+++ b/src/lib_cxx/data/parser/cxx/CxxParser.cpp
@@ -6,14 +6,12 @@
 #include "utility/file/FileRegister.h"
 #include "utility/logging/logging.h"
 #include "utility/text/TextAccess.h"
-#include "utility/tracing.h"
 
 #include "data/indexer/IndexerCommandCxxCdb.h"
 #include "data/indexer/IndexerCommandCxxManual.h"
 #include "data/parser/cxx/ASTActionFactory.h"
 #include "data/parser/cxx/CxxCompilationDatabaseSingle.h"
 #include "data/parser/cxx/CxxDiagnosticConsumer.h"
-#include "settings/LanguageType.h"
 
 namespace
 {
diff --git a/src/lib_cxx/data/parser/cxx/CxxParser.h b/src/lib_cxx/data/parser/cxx/CxxParser.h
index 871dc07e..d96990da 100644
--- a/src/lib_cxx/data/parser/cxx/CxxParser.h
+++ b/src/lib_cxx/data/parser/cxx/CxxParser.h
@@ -2,7 +2,6 @@
 #define CXX_PARSER_H
 
 #include "data/parser/cxx/cxxCacheTypes.h"
-#include "data/parser/cxx/CxxCompilationDatabaseSingle.h"
 #include "data/parser/Parser.h"
 
 class CxxDiagnosticConsumer;
@@ -12,6 +11,8 @@ class IndexerCommandCxxCdb;
 class IndexerCommandCxxManual;
 class TaskParseCxx;
 
+namespace clang { namespace tooling { class FixedCompilationDatabase;  } }
+
 class CxxParser: public Parser
 {
 public:
diff --git a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h
index 00d4abaa..72070be0 100644
--- a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h
+++ b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h
@@ -7,7 +7,6 @@
 
 #include "data/name/NameHierarchy.h"
 #include "data/parser/cxx/name/CxxName.h"
-#include "data/parser/cxx/name/CxxDeclName.h"
 #include "data/parser/cxx/name/CxxQualifierFlags.h"
 
 class CxxTypeName: public CxxName
diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
index 3192167b..c974ef15 100644
--- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
+++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
@@ -8,7 +8,6 @@
 #include "data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h"
 #include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h"
 #include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
 #include "utility/ScopedSwitcher.h"
 
 CxxDeclNameResolver::CxxDeclNameResolver()
diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h
index a063bed7..43df077e 100644
--- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h
+++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h
@@ -1,7 +1,6 @@
 #ifndef CXX_DECL_NAME_RESOLVER_H
 #define CXX_DECL_NAME_RESOLVER_H
 
-#include "data/name/NameHierarchy.h"
 #include "data/parser/cxx/name/CxxDeclName.h"
 #include "data/parser/cxx/name_resolver/CxxNameResolver.h"
 
diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h
index fe77cfd7..c832ffd0 100644
--- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h
+++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h
@@ -3,9 +3,10 @@
 
 #include <memory>
 
-#include "data/parser/cxx/name/CxxDeclName.h"
 #include "data/parser/cxx/name_resolver/CxxNameResolver.h"
 
+class CxxName;
+
 class CxxSpecifierNameResolver: public CxxNameResolver
 {
 public:
diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp
index 5e7b37a0..4489cb06 100644
--- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp
+++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp
@@ -4,7 +4,6 @@
 #include <clang/AST/DeclTemplate.h>
 
 #include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h"
-#include "utility/logging/logging.h"
 
 CxxTemplateArgumentNameResolver::CxxTemplateArgumentNameResolver()
 	: CxxNameResolver(std::vector<const clang::Decl*>())
diff --git a/src/lib_cxx/project/SourceGroupCxx.cpp b/src/lib_cxx/project/SourceGroupCxx.cpp
index 26ddad5b..5870193f 100644
--- a/src/lib_cxx/project/SourceGroupCxx.cpp
+++ b/src/lib_cxx/project/SourceGroupCxx.cpp
@@ -7,7 +7,7 @@
 #include "data/indexer/IndexerCommandCxxManual.h"
 #include "data/indexer/IndexerCommandCxxCdb.h"
 #include "settings/ApplicationSettings.h"
-#include "utility/file/FileRegister.h"
+#include "utility/file/FileManager.h"
 #include "utility/file/FileSystem.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/utility.h"
diff --git a/src/lib_cxx/project/SourceGroupCxx.h b/src/lib_cxx/project/SourceGroupCxx.h
index 4fb63216..8b7ad778 100644
--- a/src/lib_cxx/project/SourceGroupCxx.h
+++ b/src/lib_cxx/project/SourceGroupCxx.h
@@ -6,7 +6,6 @@
 
 #include "project/SourceGroup.h"
 #include "settings/SourceGroupSettingsCxx.h"
-#include "utility/file/FileManager.h"
 
 class SourceGroupCxx: public SourceGroup
 {
diff --git a/src/lib_gui/qt/QtApplication.cpp b/src/lib_gui/qt/QtApplication.cpp
index 1568b27d..526c5037 100644
--- a/src/lib_gui/qt/QtApplication.cpp
+++ b/src/lib_gui/qt/QtApplication.cpp
@@ -6,7 +6,6 @@
 #include "utility/messaging/type/MessageLoadProject.h"
 #include "utility/logging/LogManager.h"
 #include "component/controller/LogController.h"
-#include "settings/ApplicationSettings.h"
 
 QtApplication::QtApplication(int& argc, char** argv)
 	: QApplication(argc, argv)
diff --git a/src/lib_gui/qt/element/QtBookmark.cpp b/src/lib_gui/qt/element/QtBookmark.cpp
index 4e3f3c51..d14dcf49 100644
--- a/src/lib_gui/qt/element/QtBookmark.cpp
+++ b/src/lib_gui/qt/element/QtBookmark.cpp
@@ -11,7 +11,6 @@
 #include "utility/messaging/type/MessageDisplayBookmarkEditor.h"
 #include "utility/ResourcePaths.h"
 
-#include "qt/window/QtBookmarkCreator.h"
 #include "qt/utility/utilityQt.h"
 
 QtBookmark::QtBookmark()
diff --git a/src/lib_gui/qt/element/QtCodeFileList.cpp b/src/lib_gui/qt/element/QtCodeFileList.cpp
index 2e34b6ea..2113d145 100644
--- a/src/lib_gui/qt/element/QtCodeFileList.cpp
+++ b/src/lib_gui/qt/element/QtCodeFileList.cpp
@@ -4,7 +4,6 @@
 #include <QVBoxLayout>
 
 #include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"
 
 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeFile.h"
diff --git a/src/lib_gui/qt/element/QtCodeFileSingle.cpp b/src/lib_gui/qt/element/QtCodeFileSingle.cpp
index 4eebea97..625428d5 100644
--- a/src/lib_gui/qt/element/QtCodeFileSingle.cpp
+++ b/src/lib_gui/qt/element/QtCodeFileSingle.cpp
@@ -9,14 +9,12 @@
 #include "utility/file/FilePath.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageChangeFileView.h"
-#include "utility/ResourcePaths.h"
 
 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeArea.h"
 #include "qt/element/QtCodeFileTitleButton.h"
 #include "qt/element/QtCodeNavigator.h"
 #include "qt/utility/utilityQt.h"
-#include "settings/ColorScheme.h"
 
 QtCodeFileSingle::QtCodeFileSingle(QtCodeNavigator* navigator, QWidget* parent)
 	: m_navigator(navigator)
diff --git a/src/lib_gui/qt/element/QtCodeNavigateable.h b/src/lib_gui/qt/element/QtCodeNavigateable.h
index cc954a7c..097cf37b 100644
--- a/src/lib_gui/qt/element/QtCodeNavigateable.h
+++ b/src/lib_gui/qt/element/QtCodeNavigateable.h
@@ -3,7 +3,6 @@
 
 #include <set>
 
-#include "utility/TimePoint.h"
 #include "utility/types.h"
 
 #include "component/view/helper/CodeSnippetParams.h"
diff --git a/src/lib_gui/qt/element/QtCodeNavigator.cpp b/src/lib_gui/qt/element/QtCodeNavigator.cpp
index 0c7dce69..a87b22e1 100644
--- a/src/lib_gui/qt/element/QtCodeNavigator.cpp
+++ b/src/lib_gui/qt/element/QtCodeNavigator.cpp
@@ -17,7 +17,6 @@
 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeFile.h"
 #include "qt/element/QtCodeSnippet.h"
-#include "qt/utility/QtDeviceScaledPixmap.h"
 #include "qt/utility/utilityQt.h"
 #include "settings/ApplicationSettings.h"
 
diff --git a/src/lib_gui/qt/element/QtCodeSnippet.cpp b/src/lib_gui/qt/element/QtCodeSnippet.cpp
index c9bf94e6..ce94e280 100644
--- a/src/lib_gui/qt/element/QtCodeSnippet.cpp
+++ b/src/lib_gui/qt/element/QtCodeSnippet.cpp
@@ -5,7 +5,6 @@
 #include <QPushButton>
 
 #include "utility/messaging/type/MessageShowScope.h"
-#include "utility/text/TextAccess.h"
 
 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeNavigator.h"
diff --git a/src/lib_gui/qt/element/QtFontPicker.cpp b/src/lib_gui/qt/element/QtFontPicker.cpp
index cad023ca..70234b3d 100644
--- a/src/lib_gui/qt/element/QtFontPicker.cpp
+++ b/src/lib_gui/qt/element/QtFontPicker.cpp
@@ -4,9 +4,6 @@
 #include <QPainter>
 #include <QFontComboBox>
 
-#include "qt/element/QtLineEdit.h"
-
-
 QtFontPicker::QtFontPicker(QWidget *parent)
 	: QWidget(parent)
 {
diff --git a/src/lib_gui/qt/element/QtSmartSearchBox.cpp b/src/lib_gui/qt/element/QtSmartSearchBox.cpp
index 0ecb5ab6..3e0d842d 100644
--- a/src/lib_gui/qt/element/QtSmartSearchBox.cpp
+++ b/src/lib_gui/qt/element/QtSmartSearchBox.cpp
@@ -6,11 +6,9 @@
 #include <QClipboard>
 #include <QKeyEvent>
 
-#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageSearch.h"
 #include "utility/messaging/type/MessageSearchFullText.h"
 #include "utility/messaging/type/MessageSearchAutocomplete.h"
-#include "utility/text/TextAccess.h"
 #include "utility/utility.h"
 #include "utility/utilityString.h"
 
diff --git a/src/lib_gui/qt/network/QtIDECommunicationController.cpp b/src/lib_gui/qt/network/QtIDECommunicationController.cpp
index 74b46af8..7fafe391 100644
--- a/src/lib_gui/qt/network/QtIDECommunicationController.cpp
+++ b/src/lib_gui/qt/network/QtIDECommunicationController.cpp
@@ -2,6 +2,8 @@
 
 #include <functional>
 
+#include "settings/ApplicationSettings.h"
+
 QtIDECommunicationController::QtIDECommunicationController(QObject* parent, StorageAccess* storageAccess)
 	: IDECommunicationController(storageAccess)
 	, m_tcpWrapper(parent)
diff --git a/src/lib_gui/qt/network/QtIDECommunicationController.h b/src/lib_gui/qt/network/QtIDECommunicationController.h
index f36a6f7a..f5be08ed 100644
--- a/src/lib_gui/qt/network/QtIDECommunicationController.h
+++ b/src/lib_gui/qt/network/QtIDECommunicationController.h
@@ -7,7 +7,6 @@
 
 #include "component/controller/IDECommunicationController.h"
 #include "qt/utility/QtThreadedFunctor.h"
-#include "settings/ApplicationSettings.h"
 
 class StorageAccess;
 
diff --git a/src/lib_gui/qt/utility/QtContextMenu.cpp b/src/lib_gui/qt/utility/QtContextMenu.cpp
index 78c9e350..040debea 100644
--- a/src/lib_gui/qt/utility/QtContextMenu.cpp
+++ b/src/lib_gui/qt/utility/QtContextMenu.cpp
@@ -6,6 +6,7 @@
 #include <QDesktopServices>
 #include <QUrl>
 
+#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageRedo.h"
 #include "utility/messaging/type/MessageUndo.h"
 
diff --git a/src/lib_gui/qt/utility/QtContextMenu.h b/src/lib_gui/qt/utility/QtContextMenu.h
index 0ab2d1fb..f5170a7a 100644
--- a/src/lib_gui/qt/utility/QtContextMenu.h
+++ b/src/lib_gui/qt/utility/QtContextMenu.h
@@ -7,7 +7,6 @@
 #include <QObject>
 
 #include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
 
 class QtContextMenu
 	: public QObject
diff --git a/src/lib_gui/qt/view/QtBookmarkView.cpp b/src/lib_gui/qt/view/QtBookmarkView.cpp
index 96ed662e..72fbfd02 100644
--- a/src/lib_gui/qt/view/QtBookmarkView.cpp
+++ b/src/lib_gui/qt/view/QtBookmarkView.cpp
@@ -5,8 +5,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 
-#include "data/bookmark/EdgeBookmark.h"
-
 #include "qt/utility/utilityQt.h"
 #include "qt/view/QtViewWidgetWrapper.h"
 #include "qt/window/QtBookmarkCreator.h"
@@ -18,7 +16,6 @@
 #include "utility/ResourcePaths.h"
 
 #include "settings/ApplicationSettings.h"
-#include "settings/ColorScheme.h"
 
 QtBookmarkView::QtBookmarkView(ViewLayout* viewLayout)
 	: BookmarkView(viewLayout)
diff --git a/src/lib_gui/qt/view/QtCodeView.cpp b/src/lib_gui/qt/view/QtCodeView.cpp
index 1b13d58c..82ce995d 100644
--- a/src/lib_gui/qt/view/QtCodeView.cpp
+++ b/src/lib_gui/qt/view/QtCodeView.cpp
@@ -1,6 +1,5 @@
 #include "qt/view/QtCodeView.h"
 
-#include "utility/file/FileSystem.h"
 #include "utility/ResourcePaths.h"
 #include "qt/utility/utilityQt.h"
 
diff --git a/src/lib_gui/qt/view/QtErrorView.cpp b/src/lib_gui/qt/view/QtErrorView.cpp
index b3c7b448..ed1fee15 100644
--- a/src/lib_gui/qt/view/QtErrorView.cpp
+++ b/src/lib_gui/qt/view/QtErrorView.cpp
@@ -13,7 +13,6 @@
 
 #include "qt/utility/utilityQt.h"
 #include "qt/element/QtTable.h"
-#include "settings/ApplicationSettings.h"
 #include "settings/ColorScheme.h"
 #include "utility/messaging/type/MessageErrorFilterChanged.h"
 #include "utility/messaging/type/MessageShowErrors.h"
diff --git a/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp b/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp
index 9d8dad40..7f37a7f5 100644
--- a/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp
+++ b/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp
@@ -3,6 +3,8 @@
 #include <QFontMetrics>
 #include <QSysInfo>
 
+#include "qt/view/graphElements/QtGraphNode.h"
+
 QtGraphViewStyleImpl::~QtGraphViewStyleImpl()
 {
 }
diff --git a/src/lib_gui/qt/view/QtGraphViewStyleImpl.h b/src/lib_gui/qt/view/QtGraphViewStyleImpl.h
index 7de99487..71788d12 100644
--- a/src/lib_gui/qt/view/QtGraphViewStyleImpl.h
+++ b/src/lib_gui/qt/view/QtGraphViewStyleImpl.h
@@ -2,7 +2,6 @@
 #define QT_GRAPH_VIEW_STYLE_IMPL_H
 
 #include "component/view/GraphViewStyleImpl.h"
-#include "qt/view/graphElements/QtGraphNode.h"
 
 class QtGraphViewStyleImpl
 	: public GraphViewStyleImpl
diff --git a/src/lib_gui/qt/view/QtStatusBarView.cpp b/src/lib_gui/qt/view/QtStatusBarView.cpp
index f90ca59c..16b65ad7 100644
--- a/src/lib_gui/qt/view/QtStatusBarView.cpp
+++ b/src/lib_gui/qt/view/QtStatusBarView.cpp
@@ -3,7 +3,6 @@
 #include <QStatusBar>
 
 #include "qt/view/QtMainView.h"
-#include "qt/view/QtViewWidgetWrapper.h"
 
 QtStatusBarView::QtStatusBarView(ViewLayout* viewLayout)
 	: StatusBarView(viewLayout)
diff --git a/src/lib_gui/qt/view/QtStatusView.cpp b/src/lib_gui/qt/view/QtStatusView.cpp
index d82f3a3c..fb28ec76 100644
--- a/src/lib_gui/qt/view/QtStatusView.cpp
+++ b/src/lib_gui/qt/view/QtStatusView.cpp
@@ -14,7 +14,6 @@
 #include "settings/ColorScheme.h"
 #include "utility/messaging/type/MessageClearStatusView.h"
 #include "utility/messaging/type/MessageStatusFilterChanged.h"
-#include "utility/ResourcePaths.h"
 
 QtStatusView::QtStatusView(ViewLayout* viewLayout)
 	: StatusView(viewLayout)
diff --git a/src/lib_gui/qt/view/QtUndoRedoView.cpp b/src/lib_gui/qt/view/QtUndoRedoView.cpp
index 0b28ba56..8c0ff1cf 100644
--- a/src/lib_gui/qt/view/QtUndoRedoView.cpp
+++ b/src/lib_gui/qt/view/QtUndoRedoView.cpp
@@ -3,7 +3,6 @@
 #include "utility/ResourcePaths.h"
 #include "qt/utility/utilityQt.h"
 
-#include "qt/view/QtMainView.h"
 #include "qt/view/QtViewWidgetWrapper.h"
 
 QtUndoRedoView::QtUndoRedoView(ViewLayout* viewLayout)
diff --git a/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp b/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp
index 1d15a413..10116dc8 100644
--- a/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp
+++ b/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp
@@ -16,7 +16,6 @@
 #include "utility/messaging/type/MessageFocusOut.h"
 #include "utility/messaging/type/MessageGraphNodeBundleSplit.h"
 #include "utility/utility.h"
-#include "utility/utilityString.h"
 
 QtGraphEdge* QtGraphEdge::s_focusedTrailEdge = nullptr;
 
diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp
index 6601e112..a119ba61 100644
--- a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp
+++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp
@@ -7,7 +7,7 @@
 #include "utility/ResourcePaths.h"
 
 #include "component/view/GraphViewStyle.h"
-#include "qt/graphics/QtRoundedRectItem.h"
+#include "data/graph/token_component/TokenComponentAccess.h"
 #include "qt/utility/QtDeviceScaledPixmap.h"
 #include "qt/utility/utilityQt.h"
 
diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h
index 92a144aa..e47780c9 100644
--- a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h
+++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h
@@ -1,9 +1,10 @@
 #ifndef QT_GRAPH_NODE_ACCESS_H
 #define QT_GRAPH_NODE_ACCESS_H
 
-#include "data/graph/token_component/TokenComponentAccess.h"
 #include "qt/view/graphElements/QtGraphNode.h"
 
+#include "data/parser/AccessKind.h"
+
 class QtGraphNodeAccess
 	: public QtGraphNode
 {
diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp
index 2499aa83..ad944fee 100644
--- a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp
+++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp
@@ -2,14 +2,13 @@
 
 #include <QFontMetrics>
 
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageGraphNodeExpand.h"
-#include "utility/ResourcePaths.h"
-
 #include "qt/graphics/QtRoundedRectItem.h"
 #include "qt/utility/QtDeviceScaledPixmap.h"
 #include "qt/utility/utilityQt.h"
-#include "qt/view/graphElements/QtGraphNodeData.h"
+
+#include "utility/logging/logging.h"
+#include "utility/messaging/type/MessageGraphNodeExpand.h"
+#include "utility/ResourcePaths.h"
 
 QtGraphNodeExpandToggle::QtGraphNodeExpandToggle(bool expanded, int invisibleSubNodeCount)
 	: m_invisibleSubNodeCount(invisibleSubNodeCount)
diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp
index 73484073..e261a6c7 100644
--- a/src/lib_gui/qt/window/QtMainWindow.cpp
+++ b/src/lib_gui/qt/window/QtMainWindow.cpp
@@ -46,7 +46,7 @@
 #include "utility/ResourcePaths.h"
 #include "utility/tracing.h"
 #include "utility/UserPaths.h"
-#include "version.h"
+#include "utility/utilityString.h"
 
 QtViewToggle::QtViewToggle(View* view, QWidget *parent)
 	: QWidget(parent)
diff --git a/src/lib_gui/qt/window/QtMainWindow.h b/src/lib_gui/qt/window/QtMainWindow.h
index 40cf4573..913f9e29 100644
--- a/src/lib_gui/qt/window/QtMainWindow.h
+++ b/src/lib_gui/qt/window/QtMainWindow.h
@@ -8,7 +8,6 @@
 #include <QMainWindow>
 
 #include "data/search/SearchMatch.h"
-#include "qt/utility/QtThreadedFunctor.h"
 #include "qt/window/QtWindowStack.h"
 
 class QDockWidget;
diff --git a/src/lib_gui/qt/window/QtStartScreen.cpp b/src/lib_gui/qt/window/QtStartScreen.cpp
index 36ae8b54..08977ac6 100644
--- a/src/lib_gui/qt/window/QtStartScreen.cpp
+++ b/src/lib_gui/qt/window/QtStartScreen.cpp
@@ -8,13 +8,10 @@
 
 #include "settings/ApplicationSettings.h"
 #include "settings/ProjectSettings.h"
-#include "utility/file/FileSystem.h"
 #include "utility/messaging/type/MessageLoadProject.h"
 #include "utility/ResourcePaths.h"
 
-#include "qt/utility/QtDeviceScaledPixmap.h"
 #include "qt/utility/utilityQt.h"
-#include "utility/logging/logging.h"
 #include "utility/Version.h"
 #include "License.h"
 #include "utility/AppPath.h"
diff --git a/src/lib_gui/qt/window/QtTextEditDialog.cpp b/src/lib_gui/qt/window/QtTextEditDialog.cpp
index 3b01d4b2..d805200b 100644
--- a/src/lib_gui/qt/window/QtTextEditDialog.cpp
+++ b/src/lib_gui/qt/window/QtTextEditDialog.cpp
@@ -3,8 +3,6 @@
 #include <QLabel>
 #include <QPlainTextEdit>
 
-#include "utility/utilityString.h"
-
 QtTextEditDialog::QtTextEditDialog(const QString& title, const QString& description, QWidget* parent)
 	: QtWindow(parent)
 	, m_title(title)
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
index 1f4484c7..c7b3cbbc 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
@@ -12,13 +12,12 @@
 #include "qt/window/project_wizzard/QtProjectWizzardContentPath.h"
 #include "qt/window/project_wizzard/QtProjectWizzardContentPaths.h"
 #include "qt/window/project_wizzard/QtProjectWizzardContentPreferences.h"
+#include "qt/window/project_wizzard/QtProjectWizzardContentSelect.h"
 #include "qt/window/project_wizzard/QtProjectWizzardContentSimple.h"
 #include "qt/window/project_wizzard/QtProjectWizzardContentSummary.h"
 #include "qt/window/project_wizzard/QtProjectWizzardWindow.h"
 #include "settings/SourceGroupSettingsCxx.h"
 #include "settings/SourceGroupSettingsJava.h"
-#include "utility/file/FileSystem.h"
-#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageLoadProject.h"
 #include "utility/messaging/type/MessagePluginPortChange.h"
 #include "utility/messaging/type/MessageRefresh.h"
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h
index 4eb94fef..6fd24f3a 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h
@@ -3,12 +3,12 @@
 
 #include <QWidget>
 
-#include "qt/window/project_wizzard/QtProjectWizzardContentSelect.h"
 #include "qt/window/QtWindowStack.h"
 
 #include "settings/ApplicationSettings.h"
 #include "settings/ProjectSettings.h"
 
+class QtProjectWizzardContent;
 class QtProjectWizzardContentSummary;
 class QtProjectWizzardWindow;
 
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h
index 024bea52..bb84044d 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h
@@ -9,7 +9,6 @@
 #include "qt/element/QtHelpButton.h"
 #include "qt/utility/QtThreadedFunctor.h"
 #include "qt/window/project_wizzard/QtProjectWizzardWindow.h"
-#include "settings/ProjectSettings.h"
 
 class QtTextEditDialog;
 
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp
index f8a730ff..aee48898 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp
@@ -1,7 +1,8 @@
 #include "qt/window/project_wizzard/QtProjectWizzardContentCDBSource.h"
 
-#include "settings/SourceGroupSettingsCxx.h"
 #include "data/indexer/IndexerCommandCxxCdb.h"
+#include "settings/SourceGroupSettingsCxx.h"
+#include "utility/file/FilePath.h"
 
 QtProjectWizzardContentCDBSource::QtProjectWizzardContentCDBSource(
 	std::shared_ptr<SourceGroupSettings> settings, QtProjectWizzardWindow* window
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.h
index 1f184e4a..d0aa1c01 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.h
@@ -3,6 +3,8 @@
 
 #include "qt/window/project_wizzard/QtProjectWizzardContent.h"
 
+class SourceGroupSettings;
+
 class QtProjectWizzardContentCDBSource
 	: public QtProjectWizzardContent
 {
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentData.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentData.h
index 9815ecb7..fd0cfc06 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentData.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentData.h
@@ -7,6 +7,9 @@
 #include "qt/window/project_wizzard/QtProjectWizzardContent.h"
 #include "qt/element/QtLocationPicker.h"
 
+class ProjectSettings;
+class SourceGroupSettings;
+
 class QtProjectWizzardContentData
 	: public QtProjectWizzardContent
 {
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h
index f83ced4e..86f30beb 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h
@@ -4,6 +4,7 @@
 #include "qt/window/project_wizzard/QtProjectWizzardContent.h"
 
 class QtDirectoryListBox;
+class SourceGroupSettings;
 
 class QtProjectWizzardContentExtensions
 	: public QtProjectWizzardContent
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h
index ff1fd8d3..37845344 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h
@@ -4,6 +4,7 @@
 #include "qt/window/project_wizzard/QtProjectWizzardContent.h"
 
 class QtDirectoryListBox;
+class SourceGroupSettings;
 
 class QtProjectWizzardContentFlags
 	: public QtProjectWizzardContent
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp
index e9607f52..dcd672de 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp
@@ -13,7 +13,6 @@
 #include "utility/file/FileManager.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/utilityMaven.h"
-#include "utility/ScopedFunctor.h"
 #include "Application.h"
 
 QtProjectWizzardContentPath::QtProjectWizzardContentPath(std::shared_ptr<SourceGroupSettings> settings, QtProjectWizzardWindow* window)
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h
index 27083279..8e838e45 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h
@@ -2,13 +2,13 @@
 #define QT_PROJECT_WIZZARD_CONTENT_PATH_H
 
 #include "qt/window/project_wizzard/QtProjectWizzardContent.h"
-#include "utility/path_detector/CombinedPathDetector.h"
 
 class QCheckBox;
 class QComboBox;
 class QPushButton;
 
 class QtLocationPicker;
+class SourceGroupSettings;
 
 class QtProjectWizzardContentPath
 	: public QtProjectWizzardContent
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
index 4dc544fb..e10da644 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
@@ -12,7 +12,6 @@
 #include "settings/SourceGroupSettingsJava.h"
 #include "utility/CompilationDatabase.h"
 #include "utility/file/FileManager.h"
-#include "utility/file/FileSystem.h"
 #include "utility/utility.h"
 #include "utility/utilityPathDetection.h"
 
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h
index 6206fa90..1106ffc9 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h
@@ -7,6 +7,7 @@
 class QtDirectoryListBox;
 class QPushButton;
 class QComboBox;
+class SourceGroupSettings;
 
 class QtProjectWizzardContentPaths
 	: public QtProjectWizzardContent
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
index 6e6ccc1d..8cef037e 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
@@ -6,6 +6,7 @@
 #include <QPushButton>
 
 #include "qt/window/project_wizzard/QtProjectWizzardWindow.h"
+#include "settings/LanguageType.h"
 #include "utility/ResourcePaths.h"
 #include "utility/utilityString.h"
 
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h
index 72c96ba3..91ee4d6b 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h
@@ -2,6 +2,7 @@
 #define QT_PROJECT_WIZZARD_CONTENT_SELECT_H
 
 #include "qt/window/project_wizzard/QtProjectWizzardContent.h"
+#include "settings/LanguageType.h"
 #include "settings/SourceGroupType.h"
 
 class QButtonGroup;
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.h
index a1950c9f..0c0a97f9 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.h
@@ -5,6 +5,7 @@
 
 class QCheckBox;
 class QButtonGroup;
+class SourceGroupSettings;
 
 class QtProjectWizzardContentSimple
 	: public QtProjectWizzardContent
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp
index 40a4e82f..83a5e98a 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp
@@ -7,7 +7,6 @@
 
 #include "qt/utility/utilityQt.h"
 #include "qt/window/project_wizzard/QtProjectWizzardContent.h"
-#include "utility/ResourcePaths.h"
 
 QtProjectWizzardWindow::QtProjectWizzardWindow(QWidget *parent)
 	: QtWindow(parent)
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h
index 05e5108b..baf7fad3 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h
@@ -2,7 +2,6 @@
 #define QT_PROJECT_WIZZARD_WINDOW_H
 
 #include "qt/window/QtWindow.h"
-#include "settings/ProjectSettings.h"
 
 class QtProjectWizzardContent;
 
diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp b/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp
index 666b014f..a5572e05 100644
--- a/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp
+++ b/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp
@@ -2,7 +2,6 @@
 
 #include "utility/file/FilePath.h"
 #include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h"
-#include "utility/utilityApp.h"
 #include "utility/utilityString.h"
 
 CxxFrameworkPathDetector::CxxFrameworkPathDetector(const std::string& compilerName)
diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp b/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp
index b35aeecb..ffc4f437 100644
--- a/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp
+++ b/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp
@@ -2,7 +2,6 @@
 
 #include "utility/file/FilePath.h"
 #include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h"
-#include "utility/utilityApp.h"
 #include "utility/utilityString.h"
 
 CxxHeaderPathDetector::CxxHeaderPathDetector(const std::string& compilerName)
diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxVsHeaderPathDetector.cpp b/src/lib_gui/utility/path_detector/cxx_header/CxxVsHeaderPathDetector.cpp
index c18e20dd..2436c6b1 100644
--- a/src/lib_gui/utility/path_detector/cxx_header/CxxVsHeaderPathDetector.cpp
+++ b/src/lib_gui/utility/path_detector/cxx_header/CxxVsHeaderPathDetector.cpp
@@ -6,7 +6,6 @@
 #include <QSysInfo>
 
 #include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
 
 CxxVsHeaderPathDetector::CxxVsHeaderPathDetector(int version, bool isExpress, ApplicationArchitectureType architecture)
 	: PathDetector("Visual Studio " + std::to_string(version) + (isExpress ? " Express" : "") + (architecture == APPLICATION_ARCHITECTURE_X86_64 ? " 64 Bit" : ""))
diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
index 81c66f1a..6ed57606 100644
--- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
+++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
@@ -4,7 +4,6 @@
 #include <QSysInfo>
 
 #include "utility/file/FilePath.h"
-#include "utility/utilityApp.h"
 #include "utility/utility.h"
 
 JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion)
diff --git a/src/lib_gui/utility/utilityApp.h b/src/lib_gui/utility/utilityApp.h
index 8ed90a51..032f257e 100644
--- a/src/lib_gui/utility/utilityApp.h
+++ b/src/lib_gui/utility/utilityApp.h
@@ -5,8 +5,6 @@
 #include <set>
 #include <string>
 
-#include "utility/ApplicationArchitectureType.h"
-
 namespace utility
 {
 	std::string executeProcess(const std::string& command, const std::string& workingDirectory = "", int timeout = 30000);
diff --git a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp
index 998bc6ac..7dd4b769 100644
--- a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp
+++ b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp
@@ -6,7 +6,6 @@
 
 #include "data/parser/java/JavaEnvironment.h"
 #include "settings/ApplicationSettings.h"
-#include "utility/file/FileSystem.h"
 #include "utility/logging/logging.h"
 #include "utility/utilityLibrary.h"
 
diff --git a/src/lib_java/data/parser/java/JavaParser.cpp b/src/lib_java/data/parser/java/JavaParser.cpp
index 30a1f364..a391f502 100644
--- a/src/lib_java/data/parser/java/JavaParser.cpp
+++ b/src/lib_java/data/parser/java/JavaParser.cpp
@@ -8,7 +8,6 @@
 #include "data/parser/ReferenceKind.h"
 #include "data/parser/ParserClient.h"
 #include "settings/ApplicationSettings.h"
-#include "settings/LanguageType.h"
 #include "utility/file/FileSystem.h"
 #include "utility/text/TextAccess.h"
 #include "utility/ResourcePaths.h"
diff --git a/src/lib_java/project/SourceGroupJava.cpp b/src/lib_java/project/SourceGroupJava.cpp
index fefa1e5a..e4f649f8 100644
--- a/src/lib_java/project/SourceGroupJava.cpp
+++ b/src/lib_java/project/SourceGroupJava.cpp
@@ -1,9 +1,8 @@
 #include "project/SourceGroupJava.h"
 
-#include "utility/file/FileRegister.h"
+#include "utility/file/FileManager.h"
 #include "utility/file/FileSystem.h"
 #include "utility/messaging/type/MessageStatus.h"
-#include "utility/ResourcePaths.h"
 #include "utility/text/TextAccess.h"
 #include "utility/ScopedFunctor.h"
 #include "utility/utility.h"
diff --git a/src/lib_java/project/SourceGroupJava.h b/src/lib_java/project/SourceGroupJava.h
index 8d9f7f26..675f82da 100644
--- a/src/lib_java/project/SourceGroupJava.h
+++ b/src/lib_java/project/SourceGroupJava.h
@@ -6,7 +6,6 @@
 
 #include "settings/SourceGroupSettingsJava.h"
 #include "project/SourceGroup.h"
-#include "utility/file/FileManager.h"
 
 class SourceGroupJava: public SourceGroup
 {
diff --git a/src/test/CxxParserTestSuite.h b/src/test/CxxParserTestSuite.h
index 8efef1f1..7bcddb7c 100644
--- a/src/test/CxxParserTestSuite.h
+++ b/src/test/CxxParserTestSuite.h
@@ -1,14 +1,11 @@
 #include "cxxtest/TestSuite.h"
 
-#include "utility/file/FileRegister.h"
 #include "utility/text/TextAccess.h"
 #include "utility/utility.h"
 #include "utility/utilityString.h"
 
 #include "data/indexer/IndexerCommandCxxManual.h"
 #include "data/parser/cxx/CxxParser.h"
-#include "data/parser/ParseLocation.h"
-#include "data/parser/ParserClient.h"
 
 #include "helper/TestFileRegister.h"
 #include "helper/TestParserClient.h"
diff --git a/src/test/CxxTypeNameTestSuite.h b/src/test/CxxTypeNameTestSuite.h
index c610e841..80c6911e 100644
--- a/src/test/CxxTypeNameTestSuite.h
+++ b/src/test/CxxTypeNameTestSuite.h
@@ -1,6 +1,5 @@
 #include "cxxtest/TestSuite.h"
 
-#include "utility/utilityString.h"
 #include "data/parser/cxx/name/CxxTypeName.h"
 
 class CxxTypeNameTestSuite: public CxxTest::TestSuite
diff --git a/src/test/GeneratorTestSuite.h b/src/test/GeneratorTestSuite.h
index 14ad2c98..5696eca2 100644
--- a/src/test/GeneratorTestSuite.h
+++ b/src/test/GeneratorTestSuite.h
@@ -1,7 +1,5 @@
 #include "cxxtest/TestSuite.h"
 
-#include "utility/text/TextAccess.h"
-
 #include "License.h"
 #include "Generator.h"
 
diff --git a/src/test/GraphTestSuite.h b/src/test/GraphTestSuite.h
index 3c5a1164..9bc9c561 100644
--- a/src/test/GraphTestSuite.h
+++ b/src/test/GraphTestSuite.h
@@ -1,7 +1,5 @@
 #include "cxxtest/TestSuite.h"
 
-#include "utility/utilityString.h"
-
 #include "data/graph/Graph.h"
 
 class GraphTestSuite : public CxxTest::TestSuite
diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h
index e8ffecef..ab16c03c 100644
--- a/src/test/JavaParserTestSuite.h
+++ b/src/test/JavaParserTestSuite.h
@@ -2,10 +2,8 @@
 
 #include "settings/ApplicationSettings.h"
 #include "utility/utilityPathDetection.h"
-#include "utility/file/FileRegister.h"
 #include "utility/text/TextAccess.h"
 #include "utility/utility.h"
-#include "utility/utilityString.h"
 
 #include "data/parser/java/JavaEnvironmentFactory.h"
 #include "data/parser/java/JavaParser.h"
diff --git a/src/test/MatrixBaseTestSuite.h b/src/test/MatrixBaseTestSuite.h
index 03847238..7700cf5f 100644
--- a/src/test/MatrixBaseTestSuite.h
+++ b/src/test/MatrixBaseTestSuite.h
@@ -1,6 +1,5 @@
 #include "cxxtest/TestSuite.h"
 
-#include "utility/logging/logging.h"
 #include "utility/math/MatrixBase.h"
 #include "utility/math/VectorBase.h"
 
diff --git a/src/test/SearchIndexTestSuite.h b/src/test/SearchIndexTestSuite.h
index 371a63d4..a4edd025 100644
--- a/src/test/SearchIndexTestSuite.h
+++ b/src/test/SearchIndexTestSuite.h
@@ -2,7 +2,6 @@
 
 #include "data/name/NameHierarchy.h"
 #include "data/search/SearchIndex.h"
-#include "utility/utilityString.h"
 
 class SearchIndexTestSuite : public CxxTest::TestSuite
 {
diff --git a/src/test/SqliteBookmarkStorageTestSuite.h b/src/test/SqliteBookmarkStorageTestSuite.h
index 8dee687d..7879b7a9 100644
--- a/src/test/SqliteBookmarkStorageTestSuite.h
+++ b/src/test/SqliteBookmarkStorageTestSuite.h
@@ -2,8 +2,6 @@
 
 #include "boost/filesystem.hpp"
 
-#include "data/bookmark/EdgeBookmark.h"
-#include "data/bookmark/NodeBookmark.h"
 #include "data/SqliteBookmarkStorage.h"
 
 class SqliteBookmarkStorageTestSuite: public CxxTest::TestSuite
diff --git a/src/test/SqliteIndexStorageTestSuite.h b/src/test/SqliteIndexStorageTestSuite.h
index c407ccf5..7150cd9d 100644
--- a/src/test/SqliteIndexStorageTestSuite.h
+++ b/src/test/SqliteIndexStorageTestSuite.h
@@ -2,7 +2,6 @@
 
 #include "boost/filesystem.hpp"
 
-#include "sqlite/CppSQLite3.h"
 #include "data/SqliteIndexStorage.h"
 
 class SqliteIndexStorageTestSuite: public CxxTest::TestSuite
diff --git a/src/test/StorageTestSuite.h b/src/test/StorageTestSuite.h
index 20563394..5d67dcf0 100644
--- a/src/test/StorageTestSuite.h
+++ b/src/test/StorageTestSuite.h
@@ -2,10 +2,8 @@
 
 #include "utility/utilityString.h"
 
-#include "data/graph/token_component/TokenComponentAbstraction.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
-#include "data/graph/token_component/TokenComponentStatic.h"
 #include "data/parser/ParseLocation.h"
+#include "data/IntermediateStorage.h"
 #include "data/PersistentStorage.h"
 
 class StorageTestSuite: public CxxTest::TestSuite
diff --git a/src/test/TestSuiteFixture.cpp b/src/test/TestSuiteFixture.cpp
index 99d5e45d..eff3f4bc 100644
--- a/src/test/TestSuiteFixture.cpp
+++ b/src/test/TestSuiteFixture.cpp
@@ -3,7 +3,6 @@
 #include <sstream>
 
 #include "utility/logging/FileLogger.h"
-#include "utility/logging/logging.h"
 #include "utility/logging/LogManager.h"
 #include "utility/logging/PlainFileLogger.h"
 #include "settings/ApplicationSettings.h"
diff --git a/src/test/Vector2TestSuite.h b/src/test/Vector2TestSuite.h
index 7bd72da2..fb9f9bab 100644
--- a/src/test/Vector2TestSuite.h
+++ b/src/test/Vector2TestSuite.h
@@ -1,6 +1,5 @@
 #include "cxxtest/TestSuite.h"
 
-#include "utility/logging/logging.h"
 #include "utility/math/Vector2.h"
 
 class Vector2TestSuite : public CxxTest::TestSuite