[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevplatform] /: Remove unused/unneeded includes & forward declarations from kdevplatform
From:       Friedrich W. H. Kossebau <null () kde ! org>
Date:       2017-03-23 2:03:06
Message-ID: E1cqs5i-0003F1-97 () code ! kde ! org
[Download RAW message or body]

Git commit 91d466fc1ea0b5473ae08b6d5818a638d986a92b by Friedrich W. H. Kossebau.
Committed on 23/03/2017 at 02:01.
Pushed by kossebau into branch 'master'.

Remove unused/unneeded includes & forward declarations from kdevplatform

M  +2    -4    debugger/breakpoint/breakpoint.cpp
M  +3    -1    debugger/breakpoint/breakpoint.h
M  +0    -4    debugger/breakpoint/breakpointdetails.cpp
M  +0    -1    debugger/framestack/framestackmodel.cpp
M  +0    -1    debugger/framestack/framestackmodel.h
M  +0    -1    debugger/interfaces/ivariablecontroller.h
M  +1    -1    debugger/variable/variablecollection.h
M  +1    -1    debugger/variable/variabletooltip.cpp
M  +1    -1    debugger/variable/variabletooltip.h
M  +0    -1    interfaces/idebugcontroller.h
M  +0    -1    interfaces/ilanguagecheck.h
M  +0    -2    interfaces/ilauncher.h
M  +2    -2    interfaces/iproblem.h
M  +0    -2    interfaces/iprojectprovider.h
M  +1    -1    language/assistant/renameassistant.cpp
M  +0    -2    language/assistant/renameassistant.h
M  +2    -2    language/assistant/staticassistantsmanager.cpp
M  +0    -1    language/backgroundparser/backgroundparser.cpp
M  +1    -1    language/backgroundparser/backgroundparser.h
M  +1    -1    language/backgroundparser/documentchangetracker.cpp
M  +0    -1    language/backgroundparser/documentchangetracker.h
M  +1    -0    language/backgroundparser/parsejob.cpp
M  +1    -1    language/backgroundparser/parsejob.h
M  +0    -1    language/backgroundparser/tests/test_backgroundparser.cpp
M  +0    -1    language/checks/dataaccessrepository.cpp
M  +0    -1    language/checks/dataaccessrepository.h
M  +1    -0    language/codecompletion/codecompletion.cpp
M  +0    -1    language/codecompletion/codecompletioncontext.cpp
M  +0    -1    language/codecompletion/codecompletionitem.h
M  +0    -1    language/codecompletion/codecompletionmodel.h
M  +1    -0    language/codecompletion/normaldeclarationcompletionitem.h
M  +0    -1    language/codegen/archivetemplateloader.cpp
M  +1    -1    language/codegen/codegenerator.h
M  +4    -2    language/codegen/documentchangeset.h
M  +1    -0    language/codegen/duchainchangeset.cpp
M  +0    -1    language/codegen/progressdialogs/refactoringdialog.cpp
M  +0    -5    language/codegen/templateclassgenerator.cpp
M  +0    -1    language/codegen/templateclassgenerator.h
M  +0    -2    language/codegen/templaterenderer.h
M  +0    -2    language/duchain/declarationid.cpp
M  +0    -1    language/duchain/duchainbase.cpp
M  +0    -1    language/duchain/duchainbase.h
M  +1    -0    language/duchain/duchaindumper.cpp
M  +1    -0    language/duchain/navigation/problemnavigationcontext.cpp
M  +0    -1    language/duchain/navigation/usescollector.h
M  +2    -0    language/duchain/problem.cpp
M  +0    -1    language/duchain/problem.h
M  +2    -0    language/duchain/topducontext.cpp
M  +0    -1    language/duchain/topducontextdynamicdata.h
M  +0    -1    language/duchain/types/integraltype.h
M  +0    -2    language/duchain/types/typesystem.cpp
M  +0    -2    language/duchain/types/typesystemdata.h
M  +0    -1    language/editor/documentcursor.h
M  +2    -2    language/editor/documentrange.h
M  +0    -1    language/editor/persistentmovingrange.cpp
M  +0    -1    language/editor/persistentmovingrangeprivate.h
M  +2    -0    language/highlighting/colorcache.cpp
M  +4    -0    language/highlighting/configurablecolors.cpp
M  +4    -3    language/highlighting/configurablecolors.h
M  +0    -3    language/interfaces/ilanguagesupport.cpp
M  +1    -0    language/util/setrepository.cpp
M  +0    -1    language/util/setrepository.h
M  +0    -1    outputview/outputexecutejob.h
M  +0    -1    outputview/outputmodel.h
M  +1    -1    plugins/appwizard/appwizarddialog.h
M  +0    -1    plugins/appwizard/appwizardplugin.cpp
M  +1    -1    plugins/appwizard/projectvcspage.h
M  +0    -1    plugins/bazaar/copyjob.cpp
M  +0    -3    plugins/classbrowser/classbrowserplugin.cpp
M  +0    -2    plugins/classbrowser/classtree.cpp
M  +0    -2    plugins/codeutils/codeutilsplugin.cpp
M  +0    -1    plugins/contextbrowser/browsemanager.cpp
M  +0    -2    plugins/contextbrowser/contextbrowserview.cpp
M  +0    -2    plugins/contextbrowser/contextbrowserview.h
M  +0    -1    plugins/documentswitcher/documentswitcherplugin.h
M  +1    -0    plugins/documentview/kdevdocumentviewplugin.cpp
M  +0    -1    plugins/documentview/kdevdocumentviewplugin.h
M  +1    -5    plugins/execute/nativeappconfig.cpp
M  +0    -3    plugins/executescript/executescriptplugin.cpp
M  +1    -8    plugins/executescript/scriptappconfig.cpp
M  +0    -1    plugins/executescript/scriptappjob.cpp
M  +0    -1    plugins/externalscript/externalscriptjob.cpp
M  +0    -1    plugins/externalscript/externalscriptplugin.cpp
M  +0    -1    plugins/filetemplates/templateclassassistant.cpp
M  +0    -1    plugins/filetemplates/templateoptionspage.cpp
M  +0    -2    plugins/filetemplates/templateselectionpage.cpp
M  +0    -1    plugins/git/gitplugin.cpp
M  +0    -1    plugins/grepview/grepjob.cpp
M  +0    -1    plugins/grepview/grepjob.h
M  +0    -2    plugins/grepview/grepoutputview.cpp
M  +0    -1    plugins/grepview/grepoutputview.h
M  +0    -3    plugins/grepview/grepviewplugin.cpp
M  +0    -1    plugins/konsole/kdevkonsoleview.cpp
M  +0    -1    plugins/openwith/openwithplugin.cpp
M  +0    -2    plugins/outlineview/outlinemodel.cpp
M  +0    -2    plugins/outlineview/outlinewidget.cpp
M  +0    -1    plugins/patchreview/patchreview.cpp
M  +1    -0    plugins/patchreview/patchreviewtoolview.cpp
M  +0    -1    plugins/patchreview/patchreviewtoolview.h
M  +1    -0    plugins/perforce/perforceplugin.cpp
M  +0    -1    plugins/perforce/perforceplugin.h
M  +0    -1    plugins/perforce/test/test_perforce.cpp
M  +1    -2    plugins/problemreporter/problemhighlighter.cpp
M  +0    -1    plugins/problemreporter/problemreportermodel.cpp
M  +0    -1    plugins/problemreporter/problemreporterplugin.cpp
M  +1    -0    plugins/problemreporter/problemtreeview.cpp
M  +0    -4    plugins/projectfilter/projectfilterconfigpage.cpp
M  +0    -1    plugins/projectmanagerview/projectmanagerviewplugin.cpp
M  +0    -7    plugins/projectmanagerview/projectmanagerviewplugin.h
M  +0    -5    plugins/projectmanagerview/projecttreeview.h
M  +0    -1    plugins/projectmanagerview/vcsoverlayproxymodel.cpp
M  +0    -1    plugins/quickopen/duchainitemquickopen.cpp
M  +0    -4    plugins/quickopen/quickopenplugin.cpp
M  +0    -3    plugins/subversion/kdevsvnplugin.cpp
M  +0    -1    plugins/subversion/svnblamejob_p.h
M  +0    -2    plugins/subversion/svncatjob.h
M  +1    -4    plugins/subversion/svnclient.h
M  +0    -1    plugins/subversion/svnimportjob.h
M  +0    -1    plugins/subversion/svnimportjob_p.h
M  +0    -3    plugins/testview/testviewplugin.cpp
M  +2    -1    plugins/vcschangesview/vcschangesview.h
M  +0    -6    plugins/vcschangesview/vcschangesviewplugin.cpp
M  +0    -2    plugins/vcschangesview/vcschangesviewplugin.h
M  +0    -1    plugins/welcomepage/declarative/icoreobject.cpp
M  +0    -1    plugins/welcomepage/uihelper.cpp
M  +0    -1    plugins/welcomepage/welcomepageview.cpp
M  +0    -2    project/abstractfilemanagerplugin.h
M  +0    -1    project/helper.cpp
M  +0    -1    project/importprojectjob.cpp
M  +0    -1    shell/configdialog.cpp
M  +1    -2    shell/documentcontroller.cpp
M  +3    -0    shell/filteredproblemstore.cpp
M  +0    -1    shell/ktexteditorpluginintegration.cpp
M  +0    -1    shell/mainwindow.cpp
M  +0    -1    shell/mainwindow_actions.cpp
M  +1    -1    shell/partdocument.cpp
M  +2    -0    shell/problem.cpp
M  +3    -2    shell/problem.h
M  +3    -2    shell/problemmodel.cpp
M  +1    -1    shell/problemmodel.h
M  +2    -0    shell/problemstore.cpp
M  +0    -2    shell/projectcontroller.cpp
M  +0    -3    shell/projectinfopage.cpp
M  +0    -4    shell/runcontroller.cpp
M  +0    -1    shell/session.cpp
M  +0    -1    shell/session.h
M  +0    -2    shell/sessioncontroller.cpp
M  +0    -1    shell/sourceformattercontroller.cpp
M  +1    -0    shell/tests/test_detectedproblem.cpp
M  +1    -0    shell/tests/test_filteredproblemstore.cpp
M  +1    -0    shell/tests/test_problemmodel.cpp
M  +0    -1    shell/tests/test_sessioncontroller.cpp
M  +0    -1    shell/tests/test_testcontroller.cpp
M  +0    -5    shell/uicontroller.cpp
M  +0    -1    shell/uicontroller.h
M  +0    -1    shell/workingsets/workingsettoolbutton.cpp
M  +1    -1    sublime/container.cpp
M  +0    -1    sublime/container.h
M  +0    -1    sublime/idealcontroller.cpp
M  +0    -1    sublime/ideallayout.cpp
M  +0    -2    sublime/ideallayout.h
M  +0    -1    sublime/tests/test_toolviewtoolbar.cpp
M  +0    -2    util/duchainify/main.cpp
M  +1    -0    util/duchainify/main.h
M  +0    -2    util/projecttestjob.h
M  +0    -3    util/widgetcolorizer.cpp
M  +0    -2    vcs/dvcs/dvcsplugin.cpp
M  +0    -1    vcs/dvcs/dvcsplugin.h
M  +2    -2    vcs/dvcs/ui/branchmanager.cpp
M  +0    -2    vcs/models/vcsannotationmodel.h
M  +0    -2    vcs/vcspluginhelper.cpp
M  +0    -1    vcs/vcspluginhelper.h
M  +0    -8    vcs/widgets/vcscommitdialog.cpp
M  +1    -1    vcs/widgets/vcsdiffpatchsources.h
M  +0    -3    vcs/widgets/vcseventwidget.cpp
M  +0    -1    vcs/widgets/vcsimportmetadatawidget.h

https://commits.kde.org/kdevplatform/91d466fc1ea0b5473ae08b6d5818a638d986a92b

diff --git a/debugger/breakpoint/breakpoint.cpp b/debugger/breakpoint/breakpoint.cpp
index cfd6eacc3..cb1e85b2c 100644
--- a/debugger/breakpoint/breakpoint.cpp
+++ b/debugger/breakpoint/breakpoint.cpp
@@ -21,14 +21,12 @@
 
 #include "breakpoint.h"
 
+#include <QIcon>
+
 #include <KLocalizedString>
 #include <KConfigGroup>
 
 #include "breakpointmodel.h"
-#include "../../interfaces/icore.h"
-#include "../../interfaces/idebugcontroller.h"
-#include "../interfaces/idebugsession.h"
-#include "../interfaces/ibreakpointcontroller.h"
 
 using namespace KDevelop;
 
diff --git a/debugger/breakpoint/breakpoint.h b/debugger/breakpoint/breakpoint.h
index 9dbd54f1f..bae4b971f 100644
--- a/debugger/breakpoint/breakpoint.h
+++ b/debugger/breakpoint/breakpoint.h
@@ -23,8 +23,10 @@
 
 #include <QtCore/QSet>
 #include <QUrl>
-#include "../util/treeitem.h"
 
+#include <debugger/debuggerexport.h>
+
+class QVariant;
 class KConfigGroup;
 namespace KTextEditor {
 class MovingCursor;
diff --git a/debugger/breakpoint/breakpointdetails.cpp \
b/debugger/breakpoint/breakpointdetails.cpp index 37c3688df..ffc1fcb0d 100644
--- a/debugger/breakpoint/breakpointdetails.cpp
+++ b/debugger/breakpoint/breakpointdetails.cpp
@@ -30,10 +30,6 @@
 #include <KLocalizedString>
 
 #include "../breakpoint/breakpoint.h"
-#include "../interfaces/idebugsession.h"
-#include "../../interfaces/icore.h"
-#include "../interfaces/ibreakpointcontroller.h"
-#include "../../interfaces/idebugcontroller.h"
 
 using namespace KDevelop;
 
diff --git a/debugger/framestack/framestackmodel.cpp \
b/debugger/framestack/framestackmodel.cpp index b889d7a4c..61453c319 100644
--- a/debugger/framestack/framestackmodel.cpp
+++ b/debugger/framestack/framestackmodel.cpp
@@ -29,7 +29,6 @@
 #include <KColorScheme>
 
 #include "../../interfaces/icore.h"
-#include "../../interfaces/idebugcontroller.h"
 #include "../../interfaces/iprojectcontroller.h"
 #include "../interfaces/isession.h"
 #include "util/debug.h"
diff --git a/debugger/framestack/framestackmodel.h \
b/debugger/framestack/framestackmodel.h index 327283a90..bf8aaa5cb 100644
--- a/debugger/framestack/framestackmodel.h
+++ b/debugger/framestack/framestackmodel.h
@@ -29,7 +29,6 @@
 
 namespace KDevelop {
 
-class DebugController;
 class FrameStackModelPrivate;
 
 /** FIXME: This class needs rework, since at present it is not true model.
diff --git a/debugger/interfaces/ivariablecontroller.h \
b/debugger/interfaces/ivariablecontroller.h index ef0d9e4cd..a03851573 100644
--- a/debugger/interfaces/ivariablecontroller.h
+++ b/debugger/interfaces/ivariablecontroller.h
@@ -33,7 +33,6 @@ class Cursor;
 
 namespace KDevelop {
 
-class IDebugSession;
 class VariableCollection;
 class Variable;
 class TreeModel;
diff --git a/debugger/variable/variablecollection.h \
b/debugger/variable/variablecollection.h index ede5712b4..aaeb88a7c 100644
--- a/debugger/variable/variablecollection.h
+++ b/debugger/variable/variablecollection.h
@@ -33,7 +33,6 @@
 #include "../util/treemodel.h"
 #include "../util/treeitem.h"
 #include "../../interfaces/idocument.h"
-#include "../interfaces/idebugsession.h"
 #include "../../interfaces/idebugcontroller.h"
 
 namespace KDevMI { namespace GDB {
@@ -44,6 +43,7 @@ namespace KDevMI { namespace GDB {
 namespace KDevelop
 {
 class VariableToolTip;
+class IDebugSession;
 
 class KDEVPLATFORMDEBUGGER_EXPORT Variable : public TreeItem
 {
diff --git a/debugger/variable/variabletooltip.cpp \
b/debugger/variable/variabletooltip.cpp index 149b7d94d..87257893f 100644
--- a/debugger/variable/variabletooltip.cpp
+++ b/debugger/variable/variabletooltip.cpp
@@ -37,7 +37,7 @@
 #include <QSortFilterProxyModel>
 
 #include "variablecollection.h"
-#include "../breakpoint/breakpointmodel.h"
+#include "../util/treeview.h"
 #include "../interfaces/ivariablecontroller.h"
 #include "../../util/activetooltip.h"
 #include "../../interfaces/icore.h"
diff --git a/debugger/variable/variabletooltip.h \
b/debugger/variable/variabletooltip.h index 60d4c7ef6..cc415ffac 100644
--- a/debugger/variable/variabletooltip.h
+++ b/debugger/variable/variabletooltip.h
@@ -24,7 +24,6 @@
 #define KDEVPLATFORM_VARIABLETOOLTIP_H
 
 #include "../../util/activetooltip.h"
-#include "../util/treeview.h"
 
 class QItemSelectionModel;
 class QString;
@@ -35,6 +34,7 @@ namespace KDevelop
     class Variable;
     class TreeModel;
     class TreeItem;
+    class AsyncTreeView;
 
     class VariableToolTip : public ActiveToolTip
     {
diff --git a/interfaces/idebugcontroller.h b/interfaces/idebugcontroller.h
index 170e15215..1eaab0a96 100644
--- a/interfaces/idebugcontroller.h
+++ b/interfaces/idebugcontroller.h
@@ -29,7 +29,6 @@ namespace KDevelop {
 
 class VariableCollection;
 class BreakpointModel;
-class FrameStackModel;
 class IDebugSession;
 
 /** Top level debugger object. Exists as long as KDevelop exists
diff --git a/interfaces/ilanguagecheck.h b/interfaces/ilanguagecheck.h
index 907d96c89..0b4bfe05a 100644
--- a/interfaces/ilanguagecheck.h
+++ b/interfaces/ilanguagecheck.h
@@ -30,7 +30,6 @@ namespace KDevelop
 class DataAccessRepository;
 class ControlFlowGraph;
 class TopDUContext;
-class ControlFlowGraph;
 
 class CheckData
 {
diff --git a/interfaces/ilauncher.h b/interfaces/ilauncher.h
index c2ef2ee2a..c51d7814b 100644
--- a/interfaces/ilauncher.h
+++ b/interfaces/ilauncher.h
@@ -24,8 +24,6 @@
 
 #include <QtCore/QList>
 
-#include "iruncontroller.h"
-
 class KJob;
 class QString;
 
diff --git a/interfaces/iproblem.h b/interfaces/iproblem.h
index ab70cda11..58334e737 100644
--- a/interfaces/iproblem.h
+++ b/interfaces/iproblem.h
@@ -23,14 +23,14 @@
 
 #include <QExplicitlySharedDataPointer>
 #include <QVector>
-
-#include <language/editor/documentrange.h>
+#include <QMetaType>
 
 #include "interfacesexport.h"
 
 namespace KDevelop
 {
 class IAssistant;
+class DocumentRange;
 
 /// Interface for the Problem classes
 class KDEVPLATFORMINTERFACES_EXPORT IProblem : public QSharedData
diff --git a/interfaces/iprojectprovider.h b/interfaces/iprojectprovider.h
index 5301d03da..d943c478b 100644
--- a/interfaces/iprojectprovider.h
+++ b/interfaces/iprojectprovider.h
@@ -29,8 +29,6 @@ class QUrl;
 namespace KDevelop
 {
 
-class VcsLocationWidget;
-class VcsLocation;
 class VcsJob;
 
 class KDEVPLATFORMINTERFACES_EXPORT IProjectProviderWidget : public QWidget
diff --git a/language/assistant/renameassistant.cpp \
b/language/assistant/renameassistant.cpp index 3ae2540fa..48675ffd8 100644
--- a/language/assistant/renameassistant.cpp
+++ b/language/assistant/renameassistant.cpp
@@ -23,7 +23,6 @@
 #include "renamefileaction.h"
 #include "util/debug.h"
 #include "../codegen/basicrefactoring.h"
-#include "../codegen/documentchangeset.h"
 #include "../duchain/duchain.h"
 #include "../duchain/duchainlock.h"
 #include "../duchain/duchainutils.h"
@@ -33,6 +32,7 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/ilanguagecontroller.h>
+#include <interfaces/ilanguagesupport.h>
 
 #include <ktexteditor/view.h>
 #include <ktexteditor/document.h>
diff --git a/language/assistant/renameassistant.h \
b/language/assistant/renameassistant.h index f3fdf0580..6d15b9190 100644
--- a/language/assistant/renameassistant.h
+++ b/language/assistant/renameassistant.h
@@ -22,8 +22,6 @@
 
 #include <language/assistant/staticassistant.h>
 #include <language/duchain/identifier.h>
-#include <serialization/indexedstring.h>
-#include <language/editor/persistentmovingrange.h>
 #include "renameaction.h"
 
 namespace KTextEditor {
diff --git a/language/assistant/staticassistantsmanager.cpp \
b/language/assistant/staticassistantsmanager.cpp index 06002af0e..7b11392e2 100644
--- a/language/assistant/staticassistantsmanager.cpp
+++ b/language/assistant/staticassistantsmanager.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "staticassistantsmanager.h"
-#include <interfaces/icodehighlighting.h>
 #include "util/debug.h"
 
 #include <KTextEditor/Document>
@@ -26,8 +25,8 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/idocumentcontroller.h>
-#include <interfaces/iuicontroller.h>
 #include <interfaces/ilanguagecontroller.h>
+#include <interfaces/ilanguagesupport.h>
 
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/duchain.h>
@@ -35,6 +34,7 @@
 #include <language/duchain/duchainutils.h>
 
 #include <language/duchain/problem.h>
+#include <language/editor/documentrange.h>
 
 using namespace KDevelop;
 using namespace KTextEditor;
diff --git a/language/backgroundparser/backgroundparser.cpp \
b/language/backgroundparser/backgroundparser.cpp index 6f86ab8f1..932404eaa 100644
--- a/language/backgroundparser/backgroundparser.cpp
+++ b/language/backgroundparser/backgroundparser.cpp
@@ -51,7 +51,6 @@
 #include "util/debug.h"
 
 #include "parsejob.h"
-#include <editor/modificationrevisionset.h>
 
 using namespace KDevelop;
 
diff --git a/language/backgroundparser/backgroundparser.h \
b/language/backgroundparser/backgroundparser.h index ab7eb0cb9..e8005f0dd 100644
--- a/language/backgroundparser/backgroundparser.h
+++ b/language/backgroundparser/backgroundparser.h
@@ -27,6 +27,7 @@
 #include <language/languageexport.h>
 #include <interfaces/istatus.h>
 #include <language/duchain/topducontext.h>
+#include <language/interfaces/ilanguagesupport.h>
 #include "parsejob.h"
 
 namespace ThreadWeaver
@@ -44,7 +45,6 @@ class DocumentChangeTracker;
 class IDocument;
 class IProject;
 class ILanguageController;
-class ParseJob;
 class ParserDependencyPolicy;
 
 /**
diff --git a/language/backgroundparser/documentchangetracker.cpp \
b/language/backgroundparser/documentchangetracker.cpp index e78fe2cd5..1098d2856 \
                100644
--- a/language/backgroundparser/documentchangetracker.cpp
+++ b/language/backgroundparser/documentchangetracker.cpp
@@ -25,7 +25,7 @@
 #include <ktexteditor/movinginterface.h>
 
 #include <util/foregroundlock.h>
-#include <editor/modificationrevisionset.h>
+#include <editor/modificationrevision.h>
 #include <serialization/indexedstring.h>
 #include <interfaces/icore.h>
 #include <interfaces/ilanguagecontroller.h>
diff --git a/language/backgroundparser/documentchangetracker.h \
b/language/backgroundparser/documentchangetracker.h index 5dcfd5990..9a16b0023 100644
--- a/language/backgroundparser/documentchangetracker.h
+++ b/language/backgroundparser/documentchangetracker.h
@@ -29,7 +29,6 @@
 #include <ktexteditor/movingrange.h>
 #include <language/editor/rangeinrevision.h>
 #include <serialization/indexedstring.h>
-#include <language/interfaces/ilanguagesupport.h>
 
 namespace KTextEditor
 {
diff --git a/language/backgroundparser/parsejob.cpp \
b/language/backgroundparser/parsejob.cpp index 9690437c8..897c2918d 100644
--- a/language/backgroundparser/parsejob.cpp
+++ b/language/backgroundparser/parsejob.cpp
@@ -38,6 +38,7 @@
 #include "duchain/duchainlock.h"
 #include "duchain/duchain.h"
 #include "duchain/parsingenvironment.h"
+#include "editor/documentrange.h"
 
 #include <util/foregroundlock.h>
 #include <interfaces/icore.h>
diff --git a/language/backgroundparser/parsejob.h \
b/language/backgroundparser/parsejob.h index a08e6ba85..658fa0c3f 100644
--- a/language/backgroundparser/parsejob.h
+++ b/language/backgroundparser/parsejob.h
@@ -41,9 +41,9 @@ namespace KDevelop
 class ParsingEnvironment;
 class ControlFlowGraph;
 class DataAccessRepository;
-class BackgroundParser;
 class TopDUContext;
 class ReferencedTopDUContext;
+class ILanguageSupport;
 
 /**
  * The base class for background parser jobs.
diff --git a/language/backgroundparser/tests/test_backgroundparser.cpp \
b/language/backgroundparser/tests/test_backgroundparser.cpp index \
                174640afd..5b7e27880 100644
--- a/language/backgroundparser/tests/test_backgroundparser.cpp
+++ b/language/backgroundparser/tests/test_backgroundparser.cpp
@@ -40,7 +40,6 @@
 #include <language/backgroundparser/backgroundparser.h>
 
 #include <interfaces/ilanguagecontroller.h>
-#include <interfaces/iplugincontroller.h>
 
 #include "testlanguagesupport.h"
 #include "testparsejob.h"
diff --git a/language/checks/dataaccessrepository.cpp \
b/language/checks/dataaccessrepository.cpp index 04b592018..8587077e1 100644
--- a/language/checks/dataaccessrepository.cpp
+++ b/language/checks/dataaccessrepository.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "dataaccessrepository.h"
-#include <editor/rangeinrevision.h>
 
 namespace KDevelop {
 
diff --git a/language/checks/dataaccessrepository.h \
b/language/checks/dataaccessrepository.h index 76e38c32e..02c20fc08 100644
--- a/language/checks/dataaccessrepository.h
+++ b/language/checks/dataaccessrepository.h
@@ -25,7 +25,6 @@
 
 namespace KDevelop
 {
-class DataAccess;
 
 /**
  * @brief Stores all the data accesses in a file
diff --git a/language/codecompletion/codecompletion.cpp \
b/language/codecompletion/codecompletion.cpp index 5de2ddc10..4c65976b3 100644
--- a/language/codecompletion/codecompletion.cpp
+++ b/language/codecompletion/codecompletion.cpp
@@ -28,6 +28,7 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/ilanguagecontroller.h>
+#include <interfaces/ilanguagesupport.h>
 
 #include "../duchain/duchain.h"
 #include "../duchain/topducontext.h"
diff --git a/language/codecompletion/codecompletioncontext.cpp \
b/language/codecompletion/codecompletioncontext.cpp index c4b2bed00..005a50132 100644
--- a/language/codecompletion/codecompletioncontext.cpp
+++ b/language/codecompletion/codecompletioncontext.cpp
@@ -18,7 +18,6 @@
 
 #include "codecompletioncontext.h"
 
-#include "codecompletionitem.h"
 #include "util/debug.h"
 
 #include <util/pushvalue.h>
diff --git a/language/codecompletion/codecompletionitem.h \
b/language/codecompletion/codecompletionitem.h index df260b2ca..c9b03b232 100644
--- a/language/codecompletion/codecompletionitem.h
+++ b/language/codecompletion/codecompletionitem.h
@@ -25,7 +25,6 @@
 #include <ktexteditor/codecompletionmodel.h>
 
 #include "../duchain/duchainpointer.h"
-#include "codecompletioncontext.h"
 
 namespace KTextEditor {
   class CodeCompletionModel;
diff --git a/language/codecompletion/codecompletionmodel.h \
b/language/codecompletion/codecompletionmodel.h index bbeda7e67..4f3585510 100644
--- a/language/codecompletion/codecompletionmodel.h
+++ b/language/codecompletion/codecompletionmodel.h
@@ -33,7 +33,6 @@
 #include <language/languageexport.h>
 #include "codecompletioncontext.h"
 #include "codecompletionitem.h"
-#include <interfaces/icompletionsettings.h>
 #include <ktexteditor/codecompletionmodel.h>
 #include <ktexteditor/codecompletionmodelcontrollerinterface.h>
 
diff --git a/language/codecompletion/normaldeclarationcompletionitem.h \
b/language/codecompletion/normaldeclarationcompletionitem.h index \
                c8a169292..97126ffaf 100644
--- a/language/codecompletion/normaldeclarationcompletionitem.h
+++ b/language/codecompletion/normaldeclarationcompletionitem.h
@@ -23,6 +23,7 @@
 #define KDEVPLATFORM_NORMALDECLARATIONCOMPLETIONITEM_H
 
 #include "codecompletionitem.h"
+#include "codecompletioncontext.h"
 #include <language/languageexport.h>
 
 namespace KDevelop {
diff --git a/language/codegen/archivetemplateloader.cpp \
b/language/codegen/archivetemplateloader.cpp index d720385cb..ff3f2b374 100644
--- a/language/codegen/archivetemplateloader.cpp
+++ b/language/codegen/archivetemplateloader.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "archivetemplateloader.h"
-#include "templateengine.h"
 
 #include <grantlee/engine.h>
 
diff --git a/language/codegen/codegenerator.h b/language/codegen/codegenerator.h
index 35b9f0f9d..8796f11ac 100644
--- a/language/codegen/codegenerator.h
+++ b/language/codegen/codegenerator.h
@@ -17,7 +17,6 @@
 #ifndef KDEVPLATFORM_CODEGENERATOR_H
 #define KDEVPLATFORM_CODEGENERATOR_H
 
-#include "language/editor/documentrange.h"
 #include <serialization/indexedstring.h>
 #include "../duchain/topducontext.h"
 #include "../duchain/duchain.h"
@@ -33,6 +32,7 @@ class AstChangeSet;
 class DUContext;
 class DUChainChangeSet;
 class DocumentChangeSet;
+class DocumentRange;
 
 /**
  * \short Base class for generic code generators
diff --git a/language/codegen/documentchangeset.h \
b/language/codegen/documentchangeset.h index d73ed26e2..f21d75d8a 100644
--- a/language/codegen/documentchangeset.h
+++ b/language/codegen/documentchangeset.h
@@ -19,13 +19,15 @@
 #ifndef KDEVPLATFORM_DOCUMENTCHANGESET_H
 #define KDEVPLATFORM_DOCUMENTCHANGESET_H
 
+#include <language/languageexport.h>
+
 #include <serialization/indexedstring.h>
 
+#include <KTextEditor/Range>
+
 #include <QExplicitlySharedDataPointer>
 #include <QUrl>
 
-#include "coderepresentation.h"
-
 namespace KDevelop {
 
 struct DocumentChangeSetPrivate;
diff --git a/language/codegen/duchainchangeset.cpp \
b/language/codegen/duchainchangeset.cpp index 95401918b..cb15fff0f 100644
--- a/language/codegen/duchainchangeset.cpp
+++ b/language/codegen/duchainchangeset.cpp
@@ -18,6 +18,7 @@
 
 #include "duchainchangeset.h"
 #include "util/debug.h"
+#include <serialization/indexedstring.h>
 
 namespace KDevelop
 {
diff --git a/language/codegen/progressdialogs/refactoringdialog.cpp \
b/language/codegen/progressdialogs/refactoringdialog.cpp index 48abd1cf4..a0818f4b6 \
                100644
--- a/language/codegen/progressdialogs/refactoringdialog.cpp
+++ b/language/codegen/progressdialogs/refactoringdialog.cpp
@@ -21,7 +21,6 @@
 #include "refactoringdialog.h"
 
 #include <language/duchain/duchainlock.h>
-#include <serialization/indexedstring.h>
 #include <language/duchain/navigation/usescollector.h>
 
 namespace KDevelop
diff --git a/language/codegen/templateclassgenerator.cpp \
b/language/codegen/templateclassgenerator.cpp index 90b7e4b28..2f469c3b9 100644
--- a/language/codegen/templateclassgenerator.cpp
+++ b/language/codegen/templateclassgenerator.cpp
@@ -21,20 +21,15 @@
 #include "archivetemplateloader.h"
 #include "util/debug.h"
 
-#include "interfaces/icore.h"
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
 #include "language/codegen/documentchangeset.h"
 #include "codedescription.h"
 #include "templaterenderer.h"
 #include "sourcefiletemplate.h"
-#include "templateengine.h"
 #include <duchain/declaration.h>
 #include <duchain/duchainlock.h>
 #include <duchain/persistentsymboltable.h>
 #include <duchain/types/structuretype.h>
-#include <project/interfaces/iprojectfilemanager.h>
-#include <project/interfaces/ibuildsystemmanager.h>
 #include <project/projectmodel.h>
 
 #include <QFileInfo>
diff --git a/language/codegen/templateclassgenerator.h \
b/language/codegen/templateclassgenerator.h index b41a217d2..ba4d2e39a 100644
--- a/language/codegen/templateclassgenerator.h
+++ b/language/codegen/templateclassgenerator.h
@@ -35,7 +35,6 @@ class Cursor;
 namespace KDevelop
 {
 
-class TemplateEngine;
 struct ClassDescription;
 class TemplateRenderer;
 class SourceFileTemplate;
diff --git a/language/codegen/templaterenderer.h \
b/language/codegen/templaterenderer.h index fef4b7d66..197455199 100644
--- a/language/codegen/templaterenderer.h
+++ b/language/codegen/templaterenderer.h
@@ -30,8 +30,6 @@ class QUrl;
 namespace KDevelop
 {
 
-class TemplateEngine;
-
 class SourceFileTemplate;
 
 class DocumentChangeSet;
diff --git a/language/duchain/declarationid.cpp b/language/duchain/declarationid.cpp
index 649df0bfd..a52cc0cce 100644
--- a/language/duchain/declarationid.cpp
+++ b/language/duchain/declarationid.cpp
@@ -25,8 +25,6 @@
 #include "persistentsymboltable.h"
 #include "instantiationinformation.h"
 
-#include "../editor/cursorinrevision.h"
-
 #include <util/convenientfreelist.h>
 
 namespace KDevelop {
diff --git a/language/duchain/duchainbase.cpp b/language/duchain/duchainbase.cpp
index 37f5d5d46..970b2c4a2 100644
--- a/language/duchain/duchainbase.cpp
+++ b/language/duchain/duchainbase.cpp
@@ -33,7 +33,6 @@
 #include <backgroundparser/backgroundparser.h>
 #include <backgroundparser/documentchangetracker.h>
 #include <ktexteditor/movinginterface.h>
-#include <editor/persistentmovingrange.h>
 
 namespace KDevelop
 {
diff --git a/language/duchain/duchainbase.h b/language/duchain/duchainbase.h
index 1ab9fc831..a0de1624b 100644
--- a/language/duchain/duchainbase.h
+++ b/language/duchain/duchainbase.h
@@ -33,7 +33,6 @@ class Range;
 
 namespace KDevelop
 {
-class PersistentMovingRange;
 class DUContext;
 class TopDUContext;
 class DUChainBase;
diff --git a/language/duchain/duchaindumper.cpp b/language/duchain/duchaindumper.cpp
index 23f9fdd4d..65260e492 100644
--- a/language/duchain/duchaindumper.cpp
+++ b/language/duchain/duchaindumper.cpp
@@ -36,6 +36,7 @@
 #include "functiondefinition.h"
 
 #include <editor/rangeinrevision.h>
+#include <editor/documentrange.h>
 
 using namespace KDevelop;
 
diff --git a/language/duchain/navigation/problemnavigationcontext.cpp \
b/language/duchain/navigation/problemnavigationcontext.cpp index c26e7637e..1d1ccbbf0 \
                100644
--- a/language/duchain/navigation/problemnavigationcontext.cpp
+++ b/language/duchain/navigation/problemnavigationcontext.cpp
@@ -31,6 +31,7 @@
 #include <language/duchain/problem.h>
 
 #include <language/duchain/duchain.h>
+#include <language/editor/documentrange.h>
 
 using namespace KDevelop;
 
diff --git a/language/duchain/navigation/usescollector.h \
b/language/duchain/navigation/usescollector.h index b7e58d074..e8ce7a13a 100644
--- a/language/duchain/navigation/usescollector.h
+++ b/language/duchain/navigation/usescollector.h
@@ -26,7 +26,6 @@
 
 namespace KDevelop {
     class IndexedDeclaration;
-    class IndexedString;
     ///A helper base-class for collecting the top-contexts that contain all uses of \
                a declaration
     ///The most important part is that this also updates the duchain if it's not \
                up-to-date or doesn't contain
     ///the required features. The virtual function processUses(..) is called with \
                each up-to-date top-context found
diff --git a/language/duchain/problem.cpp b/language/duchain/problem.cpp
index bbf33eb05..371effc7e 100644
--- a/language/duchain/problem.cpp
+++ b/language/duchain/problem.cpp
@@ -26,6 +26,8 @@ Boston, MA 02110-1301, USA.
 #include "duchain.h"
 #include "duchainlock.h"
 
+#include <editor/documentrange.h>
+
 #include <interfaces/iassistant.h>
 #include <KLocalizedString>
 
diff --git a/language/duchain/problem.h b/language/duchain/problem.h
index 3a98f8dca..c1a757e29 100644
--- a/language/duchain/problem.h
+++ b/language/duchain/problem.h
@@ -23,7 +23,6 @@ Boston, MA 02110-1301, USA.
 
 #include <QExplicitlySharedDataPointer>
 
-#include "../editor/documentrange.h"
 #include <language/languageexport.h>
 
 #include "duchainbase.h"
diff --git a/language/duchain/topducontext.cpp b/language/duchain/topducontext.cpp
index 13e864933..325a05e7c 100644
--- a/language/duchain/topducontext.cpp
+++ b/language/duchain/topducontext.cpp
@@ -38,6 +38,8 @@
 #include "topducontextdynamicdata.h"
 #include "util/debug.h"
 
+#include <language/interfaces/iastcontainer.h>
+
 // #define DEBUG_SEARCH
 
 const uint maxApplyAliasesRecursion = 100;
diff --git a/language/duchain/topducontextdynamicdata.h \
b/language/duchain/topducontextdynamicdata.h index 78accde4d..8d021440a 100644
--- a/language/duchain/topducontextdynamicdata.h
+++ b/language/duchain/topducontextdynamicdata.h
@@ -21,7 +21,6 @@
 
 #include <QtCore/QVector>
 #include <QtCore/QByteArray>
-#include <interfaces/iastcontainer.h>
 #include "problem.h"
 
 class QFile;
diff --git a/language/duchain/types/integraltype.h \
b/language/duchain/types/integraltype.h index 69f070282..60394d521 100644
--- a/language/duchain/types/integraltype.h
+++ b/language/duchain/types/integraltype.h
@@ -27,7 +27,6 @@
 namespace KDevelop
 {
 class IntegralTypeData;
-class IndexedString;
 
 /**
  * \short A type representing inbuilt data types.
diff --git a/language/duchain/types/typesystem.cpp \
b/language/duchain/types/typesystem.cpp index 9db7c0bc5..60ade0f78 100644
--- a/language/duchain/types/typesystem.cpp
+++ b/language/duchain/types/typesystem.cpp
@@ -25,8 +25,6 @@
 #include "integraltype.h"
 #include "structuretype.h"
 
-#include <serialization/indexedstring.h>
-
 namespace KDevelop
 {
 
diff --git a/language/duchain/types/typesystemdata.h \
b/language/duchain/types/typesystemdata.h index 63e4e29be..bca2f286d 100644
--- a/language/duchain/types/typesystemdata.h
+++ b/language/duchain/types/typesystemdata.h
@@ -26,8 +26,6 @@
 #include "delayedtype.h"
 #include "identifiedtype.h"
 
-#include <serialization/indexedstring.h>
-
 namespace KDevelop {
 
 KDEVPLATFORMLANGUAGE_EXPORT DECLARE_LIST_MEMBER_HASH(FunctionTypeData, m_arguments, \
                IndexedType)
diff --git a/language/editor/documentcursor.h b/language/editor/documentcursor.h
index 77260cb25..eedfefe82 100644
--- a/language/editor/documentcursor.h
+++ b/language/editor/documentcursor.h
@@ -21,7 +21,6 @@
 
 #include <language/languageexport.h>
 #include <serialization/indexedstring.h>
-#include "cursorinrevision.h"
 
 #include <ktexteditor/cursor.h>
 
diff --git a/language/editor/documentrange.h b/language/editor/documentrange.h
index 9403ee25a..868399baf 100644
--- a/language/editor/documentrange.h
+++ b/language/editor/documentrange.h
@@ -21,11 +21,11 @@
 
 #include <language/languageexport.h>
 #include <serialization/indexedstring.h>
-#include "rangeinrevision.h"
+
+#include <KTextEditor/Range>
 
 namespace KDevelop
 {
-class IndexedString;
 
 /**
  * Lightweight object that extends a range with information about the URL to which \
                the range refers.
diff --git a/language/editor/persistentmovingrange.cpp \
b/language/editor/persistentmovingrange.cpp index fb9e22c0c..1485a5eb0 100644
--- a/language/editor/persistentmovingrange.cpp
+++ b/language/editor/persistentmovingrange.cpp
@@ -21,7 +21,6 @@
 #include "persistentmovingrange.h"
 #include "persistentmovingrangeprivate.h"
 #include <interfaces/icore.h>
-#include <interfaces/ilanguagecontroller.h>
 #include <util/foregroundlock.h>
 
 KDevelop::PersistentMovingRange::PersistentMovingRange(const KTextEditor::Range& \
                range, const IndexedString& document, bool shouldExpand)
diff --git a/language/editor/persistentmovingrangeprivate.h \
b/language/editor/persistentmovingrangeprivate.h index c182ecf46..6cf018497 100644
--- a/language/editor/persistentmovingrangeprivate.h
+++ b/language/editor/persistentmovingrangeprivate.h
@@ -24,7 +24,6 @@
 #include <QObject>
 #include <ktexteditor/movingrange.h>
 #include <ktexteditor/movinginterface.h>
-#include "documentrange.h"
 #include <backgroundparser/documentchangetracker.h>
 #include <QApplication>
 
diff --git a/language/highlighting/colorcache.cpp \
b/language/highlighting/colorcache.cpp index e6da75017..28495d231 100644
--- a/language/highlighting/colorcache.cpp
+++ b/language/highlighting/colorcache.cpp
@@ -20,7 +20,9 @@
  */
 
 #include "colorcache.h"
+
 #include "configurablecolors.h"
+#include "codehighlighting.h"
 
 #include <KColorScheme>
 
diff --git a/language/highlighting/configurablecolors.cpp \
b/language/highlighting/configurablecolors.cpp index bac352c9d..e0671069b 100644
--- a/language/highlighting/configurablecolors.cpp
+++ b/language/highlighting/configurablecolors.cpp
@@ -22,6 +22,10 @@
  */
 
 #include "configurablecolors.h"
+
+#include "codehighlighting.h"
+#include "colorcache.h"
+
 #include "util/debug.h"
 
 #define ifDebug(x)
diff --git a/language/highlighting/configurablecolors.h \
b/language/highlighting/configurablecolors.h index 52b07be4d..3af472bd6 100644
--- a/language/highlighting/configurablecolors.h
+++ b/language/highlighting/configurablecolors.h
@@ -24,12 +24,13 @@
 #ifndef KDEVPLATFORM_CONFIGURABLECOLORS_H
 #define KDEVPLATFORM_CONFIGURABLECOLORS_H
 
-#include "codehighlighting.h"
-#include "colorcache.h"
-
 #include <language/languageexport.h>
 
+#include <KTextEditor/Attribute>
+
 namespace KDevelop {
+class ColorCache;
+
 class KDEVPLATFORMLANGUAGE_EXPORT ConfigurableHighlightingColors {
   public:
     explicit ConfigurableHighlightingColors();
diff --git a/language/interfaces/ilanguagesupport.cpp \
b/language/interfaces/ilanguagesupport.cpp index 9eacc17b9..0cf6352f2 100644
--- a/language/interfaces/ilanguagesupport.cpp
+++ b/language/interfaces/ilanguagesupport.cpp
@@ -21,9 +21,6 @@
 #include "ilanguagesupport.h"
 #include "../duchain/duchain.h"
 
-#include <interfaces/icore.h>
-#include <interfaces/ilanguagecontroller.h>
-
 #include <QReadWriteLock>
 
 namespace KDevelop {
diff --git a/language/util/setrepository.cpp b/language/util/setrepository.cpp
index d89609108..cc8a89b6b 100644
--- a/language/util/setrepository.cpp
+++ b/language/util/setrepository.cpp
@@ -19,6 +19,7 @@
 #include <iostream>
 #include <limits>
 #include <serialization/itemrepository.h>
+#include <serialization/indexedstring.h>
 #include <QtCore/QMutex>
 #include <algorithm>
 
diff --git a/language/util/setrepository.h b/language/util/setrepository.h
index c278658b6..0437c5d9b 100644
--- a/language/util/setrepository.h
+++ b/language/util/setrepository.h
@@ -17,7 +17,6 @@
 #include "basicsetrepository.h"
 #include <QtCore/QMutex>
 #include <list>
-#include <serialization/indexedstring.h>
 
 /**
  * This header defines convenience-class that allow handling set-repositories using \
                the represented higher-level objects instead
diff --git a/outputview/outputexecutejob.h b/outputview/outputexecutejob.h
index 1d0f6b7cd..92aa3f34f 100644
--- a/outputview/outputexecutejob.h
+++ b/outputview/outputexecutejob.h
@@ -28,7 +28,6 @@
 namespace KDevelop
 {
 
-class ProcessLineMaker;
 class OutputExecuteJobPrivate;
 
 class KDEVPLATFORMOUTPUTVIEW_EXPORT OutputExecuteJob : public OutputJob
diff --git a/outputview/outputmodel.h b/outputview/outputmodel.h
index df2838746..d34c592c0 100644
--- a/outputview/outputmodel.h
+++ b/outputview/outputmodel.h
@@ -33,7 +33,6 @@
 namespace KDevelop
 {
 
-struct FilteredItem;
 struct OutputModelPrivate;
 
 class KDEVPLATFORMOUTPUTVIEW_EXPORT OutputModel : public QAbstractListModel, public \
                KDevelop::IOutputViewModel
diff --git a/plugins/appwizard/appwizarddialog.h \
b/plugins/appwizard/appwizarddialog.h index 58ad5e9b8..89ac34dff 100644
--- a/plugins/appwizard/appwizarddialog.h
+++ b/plugins/appwizard/appwizarddialog.h
@@ -15,7 +15,7 @@
 
 #include <KAssistantDialog>
 
-#include <vcs/interfaces/ibasicversioncontrol.h>
+#include <vcs/vcslocation.h>
 
 class KPageWidgetItem;
 class QSignalMapper;
diff --git a/plugins/appwizard/appwizardplugin.cpp \
b/plugins/appwizard/appwizardplugin.cpp index 997efef50..15a6d2da2 100644
--- a/plugins/appwizard/appwizardplugin.cpp
+++ b/plugins/appwizard/appwizardplugin.cpp
@@ -47,7 +47,6 @@
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/context.h>
 #include <interfaces/contextmenuextension.h>
-#include <vcs/vcslocation.h>
 #include <vcs/vcsjob.h>
 #include <vcs/interfaces/icentralizedversioncontrol.h>
 #include <vcs/interfaces/idistributedversioncontrol.h>
diff --git a/plugins/appwizard/projectvcspage.h b/plugins/appwizard/projectvcspage.h
index 0c2633f25..cd2c2932e 100644
--- a/plugins/appwizard/projectvcspage.h
+++ b/plugins/appwizard/projectvcspage.h
@@ -22,7 +22,6 @@
 #define KDEVPLATFORM_PLUGIN_PROJECTVCSPAGE_H
 
 #include "appwizardpagewidget.h"
-#include <vcs/interfaces/ibasicversioncontrol.h>
 
 namespace Ui
 {
@@ -33,6 +32,7 @@ namespace KDevelop
 {
 class IPluginController;
 class VcsImportMetadataWidget;
+class VcsLocation;
 }
 
 class QUrl;
diff --git a/plugins/bazaar/copyjob.cpp b/plugins/bazaar/copyjob.cpp
index 4d426bd1c..0763e4ef3 100644
--- a/plugins/bazaar/copyjob.cpp
+++ b/plugins/bazaar/copyjob.cpp
@@ -25,7 +25,6 @@
 #include <KIO/CopyJob>
 
 #include <interfaces/iplugin.h>
-#include <vcs/dvcs/dvcsjob.h>
 
 #include "bazaarplugin.h"
 
diff --git a/plugins/classbrowser/classbrowserplugin.cpp \
b/plugins/classbrowser/classbrowserplugin.cpp index 4a51d9cbf..6a841ec2c 100644
--- a/plugins/classbrowser/classbrowserplugin.cpp
+++ b/plugins/classbrowser/classbrowserplugin.cpp
@@ -38,13 +38,10 @@
 #include "language/duchain/duchain.h"
 #include "language/duchain/duchainlock.h"
 #include "language/duchain/declaration.h"
-#include <serialization/indexedstring.h>
 
 #include "debug.h"
-#include "language/classmodel/classmodel.h"
 #include "classtree.h"
 #include "classwidget.h"
-#include <language/interfaces/editorcontext.h>
 #include <language/duchain/persistentsymboltable.h>
 #include <language/duchain/functiondeclaration.h>
 #include <language/duchain/classfunctiondeclaration.h>
diff --git a/plugins/classbrowser/classtree.cpp b/plugins/classbrowser/classtree.cpp
index e48c736e6..6a5000853 100644
--- a/plugins/classbrowser/classtree.cpp
+++ b/plugins/classbrowser/classtree.cpp
@@ -30,7 +30,6 @@
 
 #include "interfaces/contextmenuextension.h"
 #include "interfaces/icore.h"
-#include "interfaces/idocumentcontroller.h"
 #include "interfaces/idocument.h"
 #include "interfaces/iplugincontroller.h"
 
@@ -40,7 +39,6 @@
 #include "language/duchain/duchain.h"
 #include "language/duchain/duchainlock.h"
 #include "language/duchain/declaration.h"
-#include <serialization/indexedstring.h>
 
 #include "language/classmodel/classmodel.h"
 #include "classbrowserplugin.h"
diff --git a/plugins/codeutils/codeutilsplugin.cpp \
b/plugins/codeutils/codeutilsplugin.cpp index df72c5b92..f377bce51 100644
--- a/plugins/codeutils/codeutilsplugin.cpp
+++ b/plugins/codeutils/codeutilsplugin.cpp
@@ -44,8 +44,6 @@
 #include <language/duchain/types/functiontype.h>
 #include <language/codegen/templaterenderer.h>
 #include <language/codegen/codedescription.h>
-#include <language/codegen/sourcefiletemplate.h>
-#include <language/codegen/documentchangeset.h>
 #include <language/interfaces/ilanguagesupport.h>
 
 Q_LOGGING_CATEGORY(PLUGIN_CODEUTILS, "kdevplatform.plugins.codeutils")
diff --git a/plugins/contextbrowser/browsemanager.cpp \
b/plugins/contextbrowser/browsemanager.cpp index 3b68397b8..0fb1a9b04 100644
--- a/plugins/contextbrowser/browsemanager.cpp
+++ b/plugins/contextbrowser/browsemanager.cpp
@@ -33,7 +33,6 @@
 #include <interfaces/idocumentcontroller.h>
 #include "contextbrowserview.h"
 #include <interfaces/iuicontroller.h>
-#include <interfaces/icore.h>
 #include <interfaces/ilanguagecontroller.h>
 #include <language/interfaces/ilanguagesupport.h>
 #include <language/duchain/duchainutils.h>
diff --git a/plugins/contextbrowser/contextbrowserview.cpp \
b/plugins/contextbrowser/contextbrowserview.cpp index 4ceae2a3d..15b0343a9 100644
--- a/plugins/contextbrowser/contextbrowserview.cpp
+++ b/plugins/contextbrowser/contextbrowserview.cpp
@@ -37,10 +37,8 @@
 #include <language/duchain/ducontext.h>
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
-#include <serialization/indexedstring.h>
 
 #include <interfaces/icore.h>
-#include <interfaces/idocumentcontroller.h>
 
 #include "contextbrowser.h"
 #include "debug.h"
diff --git a/plugins/contextbrowser/contextbrowserview.h \
b/plugins/contextbrowser/contextbrowserview.h index 50d55b5ae..c1928b358 100644
--- a/plugins/contextbrowser/contextbrowserview.h
+++ b/plugins/contextbrowser/contextbrowserview.h
@@ -26,8 +26,6 @@
 #include <QPointer>
 
 #include <language/duchain/topducontext.h>
-#include <language/editor/documentcursor.h>
-#include <serialization/indexedstring.h>
 #include <interfaces/itoolviewactionlistener.h>
 
 class ContextBrowserPlugin;
diff --git a/plugins/documentswitcher/documentswitcherplugin.h \
b/plugins/documentswitcher/documentswitcherplugin.h index 7e34e0857..675351b2c 100644
--- a/plugins/documentswitcher/documentswitcherplugin.h
+++ b/plugins/documentswitcher/documentswitcherplugin.h
@@ -29,7 +29,6 @@ namespace Sublime
 {
     class View;
     class MainWindow;
-    class AreaIndex;
     class Area;
 class MainWindow;
 }
diff --git a/plugins/documentview/kdevdocumentviewplugin.cpp \
b/plugins/documentview/kdevdocumentviewplugin.cpp index 82dea8095..d34f24a41 100644
--- a/plugins/documentview/kdevdocumentviewplugin.cpp
+++ b/plugins/documentview/kdevdocumentviewplugin.cpp
@@ -29,6 +29,7 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/iuicontroller.h>
+#include <interfaces/idocumentcontroller.h>
 
 using namespace KDevelop;
 
diff --git a/plugins/documentview/kdevdocumentviewplugin.h \
b/plugins/documentview/kdevdocumentviewplugin.h index f51336732..161f11dfd 100644
--- a/plugins/documentview/kdevdocumentviewplugin.h
+++ b/plugins/documentview/kdevdocumentviewplugin.h
@@ -21,7 +21,6 @@
 #define KDEVPLATFORM_PLUGIN_KDEVDOCUMENTVIEW_PART_H
 
 #include <interfaces/iplugin.h>
-#include <interfaces/idocumentcontroller.h>
 
 class KDevDocumentViewPluginFactory;
 
diff --git a/plugins/execute/nativeappconfig.cpp \
b/plugins/execute/nativeappconfig.cpp index 7aee432be..aef218f61 100644
--- a/plugins/execute/nativeappconfig.cpp
+++ b/plugins/execute/nativeappconfig.cpp
@@ -21,6 +21,7 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/iprojectcontroller.h>
+#include <interfaces/iruncontroller.h>
 #include <interfaces/ilaunchconfiguration.h>
 
 #include <project/projectmodel.h>
@@ -28,10 +29,6 @@
 #include "nativeappjob.h"
 #include <interfaces/iproject.h>
 #include <project/interfaces/iprojectfilemanager.h>
-#include <project/interfaces/ibuildsystemmanager.h>
-#include <project/interfaces/iprojectbuilder.h>
-#include <project/builderjob.h>
-#include <interfaces/iuicontroller.h>
 #include <util/executecompositejob.h>
 
 #include <interfaces/iplugincontroller.h>
@@ -39,7 +36,6 @@
 #include "executeplugin.h"
 #include "debug.h"
 #include <util/kdevstringhandler.h>
-#include <project/projectitemlineedit.h>
 #include "projecttargetscombobox.h"
 
 #include <QDebug>
diff --git a/plugins/executescript/executescriptplugin.cpp \
b/plugins/executescript/executescriptplugin.cpp index 362afc831..ec6813782 100644
--- a/plugins/executescript/executescriptplugin.cpp
+++ b/plugins/executescript/executescriptplugin.cpp
@@ -30,12 +30,9 @@
 #include <interfaces/icore.h>
 #include <interfaces/iruncontroller.h>
 #include <interfaces/ilaunchconfiguration.h>
-#include <interfaces/iprojectcontroller.h>
-#include <interfaces/iuicontroller.h>
 #include "scriptappconfig.h"
 #include "debug.h"
 #include <project/projectmodel.h>
-#include <project/builderjob.h>
 #include <util/kdevstringhandler.h>
 
 QString ExecuteScriptPlugin::_scriptAppConfigTypeId = QStringLiteral("Script \
                Application");
diff --git a/plugins/executescript/scriptappconfig.cpp \
b/plugins/executescript/scriptappconfig.cpp index 429bec0d6..db09cb785 100644
--- a/plugins/executescript/scriptappconfig.cpp
+++ b/plugins/executescript/scriptappconfig.cpp
@@ -28,24 +28,17 @@
 #include <QMimeDatabase>
 
 #include <interfaces/icore.h>
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/ilaunchconfiguration.h>
 
 #include <project/projectmodel.h>
 
 #include "scriptappjob.h"
 #include <interfaces/iproject.h>
-#include <project/interfaces/ibuildsystemmanager.h>
-#include <project/interfaces/iprojectbuilder.h>
-#include <project/builderjob.h>
-#include <interfaces/iuicontroller.h>
-#include <util/executecompositejob.h>
-#include <interfaces/iplugincontroller.h>
 #include <interfaces/idocumentcontroller.h>
 
 #include "executescriptplugin.h"
 #include <util/kdevstringhandler.h>
-#include <project/projectitemlineedit.h>
+#include <util/path.h>
 
 using namespace KDevelop;
 
diff --git a/plugins/executescript/scriptappjob.cpp \
b/plugins/executescript/scriptappjob.cpp index 942e33496..daee5e2d8 100644
--- a/plugins/executescript/scriptappjob.cpp
+++ b/plugins/executescript/scriptappjob.cpp
@@ -36,7 +36,6 @@
 #include <util/environmentprofilelist.h>
 
 #include <interfaces/icore.h>
-#include <interfaces/iuicontroller.h>
 #include <interfaces/iplugincontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <project/projectmodel.h>
diff --git a/plugins/externalscript/externalscriptjob.cpp \
b/plugins/externalscript/externalscriptjob.cpp index 5f49cfe6d..de47e09d9 100644
--- a/plugins/externalscript/externalscriptjob.cpp
+++ b/plugins/externalscript/externalscriptjob.cpp
@@ -40,7 +40,6 @@
 #include <util/processlinemaker.h>
 
 #include <interfaces/icore.h>
-#include <interfaces/iuicontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
diff --git a/plugins/externalscript/externalscriptplugin.cpp \
b/plugins/externalscript/externalscriptplugin.cpp index b79179527..dfdee6458 100644
--- a/plugins/externalscript/externalscriptplugin.cpp
+++ b/plugins/externalscript/externalscriptplugin.cpp
@@ -35,7 +35,6 @@
 #include <interfaces/isession.h>
 
 #include <outputview/outputjob.h>
-#include <outputview/outputmodel.h>
 
 #include <project/projectmodel.h>
 #include <util/path.h>
diff --git a/plugins/filetemplates/templateclassassistant.cpp \
b/plugins/filetemplates/templateclassassistant.cpp index e9cbb80a7..66e300852 100644
--- a/plugins/filetemplates/templateclassassistant.cpp
+++ b/plugins/filetemplates/templateclassassistant.cpp
@@ -34,7 +34,6 @@
 #include <language/codegen/sourcefiletemplate.h>
 #include <language/codegen/documentchangeset.h>
 #include <language/codegen/templaterenderer.h>
-#include <language/codegen/templateengine.h>
 #include <language/interfaces/icreateclasshelper.h>
 #include <language/interfaces/ilanguagesupport.h>
 
diff --git a/plugins/filetemplates/templateoptionspage.cpp \
b/plugins/filetemplates/templateoptionspage.cpp index d66361774..a218e1b59 100644
--- a/plugins/filetemplates/templateoptionspage.cpp
+++ b/plugins/filetemplates/templateoptionspage.cpp
@@ -21,7 +21,6 @@
 #include "templateclassassistant.h"
 #include "debug.h"
 
-#include <language/codegen/templateclassgenerator.h>
 #include <language/codegen/sourcefiletemplate.h>
 
 #include <KLocalizedString>
diff --git a/plugins/filetemplates/templateselectionpage.cpp \
b/plugins/filetemplates/templateselectionpage.cpp index af6555b1f..3a5c43ddd 100644
--- a/plugins/filetemplates/templateselectionpage.cpp
+++ b/plugins/filetemplates/templateselectionpage.cpp
@@ -26,10 +26,8 @@
 #include <language/codegen/sourcefiletemplate.h>
 #include <language/codegen/documentchangeset.h>
 #include <language/codegen/templaterenderer.h>
-#include <language/interfaces/icreateclasshelper.h>
 #include <language/interfaces/ilanguagesupport.h>
 #include <interfaces/icore.h>
-#include <interfaces/ilanguagecontroller.h>
 #include <interfaces/iproject.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/isession.h>
diff --git a/plugins/git/gitplugin.cpp b/plugins/git/gitplugin.cpp
index 6d65958f8..25d54f5e4 100644
--- a/plugins/git/gitplugin.cpp
+++ b/plugins/git/gitplugin.cpp
@@ -32,7 +32,6 @@
 #include <QRegularExpression>
 
 #include <interfaces/icore.h>
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
 
 #include <util/path.h>
diff --git a/plugins/grepview/grepjob.cpp b/plugins/grepview/grepjob.cpp
index b9de18579..8713239b7 100644
--- a/plugins/grepview/grepjob.cpp
+++ b/plugins/grepview/grepjob.cpp
@@ -29,7 +29,6 @@
 #include <serialization/indexedstring.h>
 #include <interfaces/icore.h>
 #include <interfaces/iuicontroller.h>
-#include <language/codegen/documentchangeset.h>
 
 using namespace KDevelop;
 
diff --git a/plugins/grepview/grepjob.h b/plugins/grepview/grepjob.h
index 4591535c5..2a364677b 100644
--- a/plugins/grepview/grepjob.h
+++ b/plugins/grepview/grepjob.h
@@ -29,7 +29,6 @@
 namespace KDevelop
 {
     class IProject;
-    class ProcessLineMaker;
 }
 
 class QRegExp;
diff --git a/plugins/grepview/grepoutputview.cpp \
b/plugins/grepview/grepoutputview.cpp index 6cb95d323..337d8f747 100644
--- a/plugins/grepview/grepoutputview.cpp
+++ b/plugins/grepview/grepoutputview.cpp
@@ -20,8 +20,6 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/isession.h>
-#include <interfaces/iprojectcontroller.h>
-#include <outputview/ioutputview.h>
 
 #include <KConfigGroup>
 #include <KMessageBox>
diff --git a/plugins/grepview/grepoutputview.h b/plugins/grepview/grepoutputview.h
index 0c9450214..08309d3aa 100644
--- a/plugins/grepview/grepoutputview.h
+++ b/plugins/grepview/grepoutputview.h
@@ -26,7 +26,6 @@ class QModelIndex;
 
 class GrepViewPlugin;
 class GrepOutputModel;
-class GrepOutputDelegate;
 
 class GrepOutputViewFactory: public KDevelop::IToolViewFactory
 {
diff --git a/plugins/grepview/grepviewplugin.cpp \
b/plugins/grepview/grepviewplugin.cpp index aedb437ee..7d92a8b23 100644
--- a/plugins/grepview/grepviewplugin.cpp
+++ b/plugins/grepview/grepviewplugin.cpp
@@ -32,16 +32,13 @@
 #include <KTextEditor/View>
 
 #include <interfaces/icore.h>
-#include <interfaces/iplugincontroller.h>
 #include <interfaces/iuicontroller.h>
 #include <interfaces/idocument.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/iproject.h>
-#include <interfaces/iprojectcontroller.h>
 #include <project/projectmodel.h>
 #include <util/path.h>
 #include <language/interfaces/editorcontext.h>
-#include <outputview/ioutputview.h>
 
 Q_LOGGING_CATEGORY(PLUGIN_GREPVIEW, "kdevplatform.plugins.grepview")
 
diff --git a/plugins/konsole/kdevkonsoleview.cpp \
b/plugins/konsole/kdevkonsoleview.cpp index eaaeded7c..899571ed5 100644
--- a/plugins/konsole/kdevkonsoleview.cpp
+++ b/plugins/konsole/kdevkonsoleview.cpp
@@ -24,7 +24,6 @@
 #include <KParts/ReadOnlyPart>
 
 #include <interfaces/icore.h>
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/isession.h>
 
 #include "kdevkonsoleviewplugin.h"
diff --git a/plugins/openwith/openwithplugin.cpp \
b/plugins/openwith/openwithplugin.cpp index b92d11136..293b27d80 100644
--- a/plugins/openwith/openwithplugin.cpp
+++ b/plugins/openwith/openwithplugin.cpp
@@ -46,7 +46,6 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/iuicontroller.h>
-#include <interfaces/iruncontroller.h>
 #include <interfaces/idocumentcontroller.h>
 
 using namespace KDevelop;
diff --git a/plugins/outlineview/outlinemodel.cpp \
b/plugins/outlineview/outlinemodel.cpp index 6fc955e17..0df6abb54 100644
--- a/plugins/outlineview/outlinemodel.cpp
+++ b/plugins/outlineview/outlinemodel.cpp
@@ -24,11 +24,9 @@
 #include <language/duchain/topducontext.h>
 #include <language/duchain/ducontext.h>
 #include <language/duchain/declaration.h>
-#include <language/backgroundparser/backgroundparser.h>
 #include <interfaces/icore.h>
 #include <interfaces/idocument.h>
 #include <interfaces/idocumentcontroller.h>
-#include <interfaces/ilanguagecontroller.h>
 
 #include "debug_outline.h"
 #include "outlinenode.h"
diff --git a/plugins/outlineview/outlinewidget.cpp \
b/plugins/outlineview/outlinewidget.cpp index e67228914..6358b4a25 100644
--- a/plugins/outlineview/outlinewidget.cpp
+++ b/plugins/outlineview/outlinewidget.cpp
@@ -28,8 +28,6 @@
 #include <KLocalizedString>
 #include <KRecursiveFilterProxyModel>
 
-#include <interfaces/idocumentcontroller.h>
-
 #include "outlineviewplugin.h"
 #include "outlinemodel.h"
 
diff --git a/plugins/patchreview/patchreview.cpp \
b/plugins/patchreview/patchreview.cpp index ee654594a..936a62a98 100644
--- a/plugins/patchreview/patchreview.cpp
+++ b/plugins/patchreview/patchreview.cpp
@@ -27,7 +27,6 @@
 
 #include <interfaces/idocument.h>
 #include <interfaces/icore.h>
-#include <interfaces/iplugincontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/iuicontroller.h>
 #include <interfaces/contextmenuextension.h>
diff --git a/plugins/patchreview/patchreviewtoolview.cpp \
b/plugins/patchreview/patchreviewtoolview.cpp index c088414ac..3a1e78713 100644
--- a/plugins/patchreview/patchreviewtoolview.cpp
+++ b/plugins/patchreview/patchreviewtoolview.cpp
@@ -20,6 +20,7 @@
 #include <interfaces/icore.h>
 #include <interfaces/idocumentcontroller.h>
 #include <vcs/models/vcsfilechangesmodel.h>
+#include <interfaces/ipatchsource.h>
 #include <interfaces/iplugincontroller.h>
 #include <interfaces/itestcontroller.h>
 #include <interfaces/itestsuite.h>
diff --git a/plugins/patchreview/patchreviewtoolview.h \
b/plugins/patchreview/patchreviewtoolview.h index c4b6bbd31..26d93ebbe 100644
--- a/plugins/patchreview/patchreviewtoolview.h
+++ b/plugins/patchreview/patchreviewtoolview.h
@@ -19,7 +19,6 @@
 #include <QTime>
 
 #include <ui_patchreview.h>
-#include <interfaces/ipatchsource.h>
 
 namespace Sublime { class Area; }
 namespace KDevelop { class IDocument; }
diff --git a/plugins/perforce/perforceplugin.cpp \
b/plugins/perforce/perforceplugin.cpp index 1523270ef..7f141d101 100644
--- a/plugins/perforce/perforceplugin.cpp
+++ b/plugins/perforce/perforceplugin.cpp
@@ -29,6 +29,7 @@
 #include <kmessagebox.h>
 #include <vcs/vcsjob.h>
 #include <vcs/vcsrevision.h>
+#include <vcs/vcsstatusinfo.h>
 #include <vcs/vcsevent.h>
 #include <vcs/dvcs/dvcsjob.h>
 #include <vcs/vcsannotation.h>
diff --git a/plugins/perforce/perforceplugin.h b/plugins/perforce/perforceplugin.h
index 17369fb7e..b32da1c72 100644
--- a/plugins/perforce/perforceplugin.h
+++ b/plugins/perforce/perforceplugin.h
@@ -19,7 +19,6 @@
 #define KDEVPERFORCEPLUGIN_H
 
 #include <vcs/interfaces/icentralizedversioncontrol.h>
-#include <vcs/vcsstatusinfo.h>
 #include <interfaces/iplugin.h>
 #include <outputview/outputjob.h>
 
diff --git a/plugins/perforce/test/test_perforce.cpp \
b/plugins/perforce/test/test_perforce.cpp index 5dd3d2996..93f76eb1c 100644
--- a/plugins/perforce/test/test_perforce.cpp
+++ b/plugins/perforce/test/test_perforce.cpp
@@ -26,7 +26,6 @@
 #include <tests/autotestshell.h>
 #include <tests/testcore.h>
 
-#include <vcs/dvcs/dvcsjob.h>
 #include <vcs/vcsjob.h>
 #include <vcs/vcsannotation.h>
 
diff --git a/plugins/problemreporter/problemhighlighter.cpp \
b/plugins/problemreporter/problemhighlighter.cpp index f38ba7639..a4f3718e9 100644
--- a/plugins/problemreporter/problemhighlighter.cpp
+++ b/plugins/problemreporter/problemhighlighter.cpp
@@ -29,7 +29,6 @@
 
 #include <serialization/indexedstring.h>
 #include <language/duchain/navigation/abstractnavigationwidget.h>
-#include <language/util/navigationtooltip.h>
 #include <interfaces/icore.h>
 #include <interfaces/ilanguagecontroller.h>
 #include <interfaces/icompletionsettings.h>
@@ -37,7 +36,7 @@
 #include <language/duchain/duchainutils.h>
 #include <language/duchain/topducontext.h>
 #include <language/duchain/navigation/problemnavigationcontext.h>
-#include <util/texteditorhelpers.h>
+#include <language/editor/documentrange.h>
 
 #include <kcolorscheme.h>
 
diff --git a/plugins/problemreporter/problemreportermodel.cpp \
b/plugins/problemreporter/problemreportermodel.cpp index 1de4f5aab..b1944575a 100644
--- a/plugins/problemreporter/problemreportermodel.cpp
+++ b/plugins/problemreporter/problemreportermodel.cpp
@@ -21,7 +21,6 @@
 #include "problemreportermodel.h"
 
 #include <language/backgroundparser/backgroundparser.h>
-#include <language/backgroundparser/parsejob.h>
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/parsingenvironment.h>
diff --git a/plugins/problemreporter/problemreporterplugin.cpp \
b/plugins/problemreporter/problemreporterplugin.cpp index 15c69b929..b52c8056c 100644
--- a/plugins/problemreporter/problemreporterplugin.cpp
+++ b/plugins/problemreporter/problemreporterplugin.cpp
@@ -40,7 +40,6 @@
 #include <util/kdevstringhandler.h>
 
 #include "problemhighlighter.h"
-#include "problemtreeview.h"
 #include "problemreportermodel.h"
 #include "language/assistant/staticassistantsmanager.h"
 #include <interfaces/context.h>
diff --git a/plugins/problemreporter/problemtreeview.cpp \
b/plugins/problemreporter/problemtreeview.cpp index ca0ab459a..eaf446012 100644
--- a/plugins/problemreporter/problemtreeview.cpp
+++ b/plugins/problemreporter/problemtreeview.cpp
@@ -36,6 +36,7 @@
 #include <interfaces/iassistant.h>
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
+#include <language/editor/documentrange.h>
 #include <util/kdevstringhandler.h>
 
 #include "problemreporterplugin.h"
diff --git a/plugins/projectfilter/projectfilterconfigpage.cpp \
b/plugins/projectfilter/projectfilterconfigpage.cpp index 7d314ae61..31b9597a7 100644
--- a/plugins/projectfilter/projectfilterconfigpage.cpp
+++ b/plugins/projectfilter/projectfilterconfigpage.cpp
@@ -23,11 +23,7 @@
 #include <KMessageWidget>
 #include <KLocalizedString>
 
-#include <interfaces/icore.h>
-#include <interfaces/iplugincontroller.h>
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
-#include <project/interfaces/iprojectfilemanager.h>
 #include <project/projectmodel.h>
 
 #include "ui_projectfiltersettings.h"
diff --git a/plugins/projectmanagerview/projectmanagerviewplugin.cpp \
b/plugins/projectmanagerview/projectmanagerviewplugin.cpp index f458b936f..d3f3aaa9d \
                100644
--- a/plugins/projectmanagerview/projectmanagerviewplugin.cpp
+++ b/plugins/projectmanagerview/projectmanagerviewplugin.cpp
@@ -42,7 +42,6 @@
 #include <interfaces/iuicontroller.h>
 #include <interfaces/iruncontroller.h>
 #include <interfaces/idocumentcontroller.h>
-#include <project/interfaces/iprojectbuilder.h>
 #include <util/jobstatus.h>
 #include <util/path.h>
 #include <interfaces/iprojectcontroller.h>
diff --git a/plugins/projectmanagerview/projectmanagerviewplugin.h \
b/plugins/projectmanagerview/projectmanagerviewplugin.h index 058f1a50c..c9d92e259 \
                100644
--- a/plugins/projectmanagerview/projectmanagerviewplugin.h
+++ b/plugins/projectmanagerview/projectmanagerviewplugin.h
@@ -24,16 +24,9 @@
 #include <QVariantList>
 #include <project/builderjob.h>
 
-class ProjectBuildSetModel;
-
 namespace KDevelop
 {
 class ProjectBaseItem;
-class ProjectBuilder;
-class ProjectFileItem;
-class ProjectFolderItem;
-class ProjectTargetItem;
-class IProjectBuilder;
 class IProject;
 class ContextMenuExtension;
 class Context;
diff --git a/plugins/projectmanagerview/projecttreeview.h \
b/plugins/projectmanagerview/projecttreeview.h index b067f8710..0c9f576ac 100644
--- a/plugins/projectmanagerview/projecttreeview.h
+++ b/plugins/projectmanagerview/projecttreeview.h
@@ -29,11 +29,6 @@ class QAbstractProxyModel;
 namespace KDevelop
 {
 class IProject;
-class ProjectModel;
-class ProjectBaseItem;
-class ProjectFolderItem;
-class ProjectFileItem;
-class ProjectTargetItem;
 class ProjectBaseItem;
 class NavigationToolTip;
 class Path;
diff --git a/plugins/projectmanagerview/vcsoverlayproxymodel.cpp \
b/plugins/projectmanagerview/vcsoverlayproxymodel.cpp index b2009b85e..8e08567db \
                100644
--- a/plugins/projectmanagerview/vcsoverlayproxymodel.cpp
+++ b/plugins/projectmanagerview/vcsoverlayproxymodel.cpp
@@ -26,7 +26,6 @@
 #include <interfaces/iplugin.h>
 #include <vcs/interfaces/ibranchingversioncontrol.h>
 #include <vcs/vcsjob.h>
-#include <vcs/models/vcsfilechangesmodel.h>
 #include <project/projectmodel.h>
 #include <util/path.h>
 
diff --git a/plugins/quickopen/duchainitemquickopen.cpp \
b/plugins/quickopen/duchainitemquickopen.cpp index 258523c21..9637aba1e 100644
--- a/plugins/quickopen/duchainitemquickopen.cpp
+++ b/plugins/quickopen/duchainitemquickopen.cpp
@@ -31,7 +31,6 @@
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/declaration.h>
-#include <serialization/indexedstring.h>
 #include <language/duchain/types/functiontype.h>
 #include <language/duchain/functiondefinition.h>
 
diff --git a/plugins/quickopen/quickopenplugin.cpp \
b/plugins/quickopen/quickopenplugin.cpp index b17e999c9..59df2fc82 100644
--- a/plugins/quickopen/quickopenplugin.cpp
+++ b/plugins/quickopen/quickopenplugin.cpp
@@ -41,12 +41,9 @@
 #include <QAction>
 
 #include <interfaces/icore.h>
-#include <interfaces/idocumentcontroller.h>
-#include <interfaces/icore.h>
 #include <interfaces/iuicontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/ilanguagecontroller.h>
-#include <interfaces/iprojectcontroller.h>
 #include <language/interfaces/ilanguagesupport.h>
 #include <language/duchain/duchainutils.h>
 #include <language/duchain/duchainlock.h>
@@ -65,7 +62,6 @@
 #include <language/duchain/functiondefinition.h>
 #include <qdesktopwidget.h>
 #include <util/activetooltip.h>
-#include <language/util/navigationtooltip.h>
 #include <interfaces/contextmenuextension.h>
 #include <language/interfaces/codecontext.h>
 #include <KConfigGroup>
diff --git a/plugins/subversion/kdevsvnplugin.cpp \
b/plugins/subversion/kdevsvnplugin.cpp index cb70196f6..39bf50383 100644
--- a/plugins/subversion/kdevsvnplugin.cpp
+++ b/plugins/subversion/kdevsvnplugin.cpp
@@ -27,10 +27,7 @@
 #include <KUrlRequester>
 #include <KUrlRequesterDialog>
 
-#include <interfaces/iuicontroller.h>
-#include <interfaces/idocumentcontroller.h>
 #include <interfaces/idocument.h>
-#include <interfaces/iplugincontroller.h>
 #include <interfaces/icore.h>
 #include <interfaces/iruncontroller.h>
 #include <project/projectmodel.h>
diff --git a/plugins/subversion/svnblamejob_p.h b/plugins/subversion/svnblamejob_p.h
index 0488d7324..734a696aa 100644
--- a/plugins/subversion/svnblamejob_p.h
+++ b/plugins/subversion/svnblamejob_p.h
@@ -25,7 +25,6 @@
 #include "svninternaljobbase.h"
 
 #include <vcs/vcsrevision.h>
-#include <vcs/vcsevent.h>
 
 namespace KDevelop {
     class VcsAnnotationLine;
diff --git a/plugins/subversion/svncatjob.h b/plugins/subversion/svncatjob.h
index bb27f0a0e..0bc7805f4 100644
--- a/plugins/subversion/svncatjob.h
+++ b/plugins/subversion/svncatjob.h
@@ -23,8 +23,6 @@
 
 #include "svnjobbase.h"
 
-#include <vcs/vcsdiff.h>
-
 namespace KDevelop
 {
     class VcsRevision;
diff --git a/plugins/subversion/svnclient.h b/plugins/subversion/svnclient.h
index 68ad8fc34..e50bd1989 100644
--- a/plugins/subversion/svnclient.h
+++ b/plugins/subversion/svnclient.h
@@ -28,10 +28,7 @@
 #include "kdevsvncpp/client.hpp"
 
 #include <vcs/vcsevent.h>
-namespace KDevelop
-{
-class VcsAnnotationLine;
-}
+
 class SvnClient : public QObject, public svn::Client
 {
     Q_OBJECT
diff --git a/plugins/subversion/svnimportjob.h b/plugins/subversion/svnimportjob.h
index 5d8ee6c55..7242a3762 100644
--- a/plugins/subversion/svnimportjob.h
+++ b/plugins/subversion/svnimportjob.h
@@ -22,7 +22,6 @@
 #define KDEVPLATFORM_PLUGIN_SVNIMPORTJOB_H
 
 #include "svnjobbase.h"
-#include <vcs/interfaces/ibasicversioncontrol.h>
 
 class SvnImportInternalJob;
 
diff --git a/plugins/subversion/svnimportjob_p.h \
b/plugins/subversion/svnimportjob_p.h index 4430f75f0..013fd4036 100644
--- a/plugins/subversion/svnimportjob_p.h
+++ b/plugins/subversion/svnimportjob_p.h
@@ -22,7 +22,6 @@
 #define KDEVPLATFORM_PLUGIN_SVNIMPORTJOB_P_H
 
 #include "svninternaljobbase.h"
-#include <vcs/interfaces/ibasicversioncontrol.h>
 
 class SvnImportInternalJob : public SvnInternalJobBase
 {
diff --git a/plugins/testview/testviewplugin.cpp \
b/plugins/testview/testviewplugin.cpp index 36302e66f..bd7049f90 100644
--- a/plugins/testview/testviewplugin.cpp
+++ b/plugins/testview/testviewplugin.cpp
@@ -24,10 +24,7 @@
 #include <interfaces/iuicontroller.h>
 #include <interfaces/itestsuite.h>
 #include <interfaces/itestcontroller.h>
-#include <interfaces/ilaunchconfiguration.h>
-#include <interfaces/launchconfigurationtype.h>
 #include <interfaces/iruncontroller.h>
-#include <interfaces/ilauncher.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
 #include <util/executecompositejob.h>
diff --git a/plugins/vcschangesview/vcschangesview.h \
b/plugins/vcschangesview/vcschangesview.h index 166474dc7..58492410d 100644
--- a/plugins/vcschangesview/vcschangesview.h
+++ b/plugins/vcschangesview/vcschangesview.h
@@ -22,9 +22,10 @@
 #define KDEVPLATFORM_PLUGIN_VCSCHANGESVIEW_H
 
 #include <QTreeView>
+#include <QList>
+#include <QUrl>
 
 class VcsProjectIntegrationPlugin;
-class QUrl;
 namespace KDevelop { class IProject; }
 
 class VcsChangesView : public QTreeView
diff --git a/plugins/vcschangesview/vcschangesviewplugin.cpp \
b/plugins/vcschangesview/vcschangesviewplugin.cpp index 64c4398a2..384ffd885 100644
--- a/plugins/vcschangesview/vcschangesviewplugin.cpp
+++ b/plugins/vcschangesview/vcschangesviewplugin.cpp
@@ -28,15 +28,9 @@
 #include <interfaces/icore.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
-#include <interfaces/iruncontroller.h>
-#include <interfaces/idocumentcontroller.h>
 #include <interfaces/iuicontroller.h>
-#include <vcs/interfaces/ibasicversioncontrol.h>
-#include <vcs/vcsstatusinfo.h>
-#include <vcs/vcsjob.h>
 #include <project/projectchangesmodel.h>
 #include <project/projectmodel.h>
-#include <interfaces/iplugincontroller.h>
 #include "vcschangesview.h"
 
 K_PLUGIN_FACTORY_WITH_JSON(VcsProjectIntegrationFactory, "kdevvcschangesview.json", \
                registerPlugin<VcsProjectIntegrationPlugin>();)
diff --git a/plugins/vcschangesview/vcschangesviewplugin.h \
b/plugins/vcschangesview/vcschangesviewplugin.h index eb3ea0d9c..ff9ad3716 100644
--- a/plugins/vcschangesview/vcschangesviewplugin.h
+++ b/plugins/vcschangesview/vcschangesviewplugin.h
@@ -21,7 +21,6 @@
 #define KDEVPLATFORM_PLUGIN_VCSPROJECTINTEGRATIONPLUGIN_H
 
 #include <interfaces/iplugin.h>
-#include <vcs/interfaces/ibasicversioncontrol.h>
 #include <QVariant>
 
 class QModelIndex;
@@ -30,7 +29,6 @@ namespace KDevelop
 {
     class IProject;
     class IDocument;
-    class VcsStatusInfo;
     class ProjectChangesModel;
 }
 
diff --git a/plugins/welcomepage/declarative/icoreobject.cpp \
b/plugins/welcomepage/declarative/icoreobject.cpp index aba4d47cc..a7fc09795 100644
--- a/plugins/welcomepage/declarative/icoreobject.cpp
+++ b/plugins/welcomepage/declarative/icoreobject.cpp
@@ -17,7 +17,6 @@
  *************************************************************************************/
  
 #include "icoreobject.h"
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/icore.h>
 
 ICoreObject::ICoreObject(QObject* parent)
diff --git a/plugins/welcomepage/uihelper.cpp b/plugins/welcomepage/uihelper.cpp
index cdf26075e..da666716e 100644
--- a/plugins/welcomepage/uihelper.cpp
+++ b/plugins/welcomepage/uihelper.cpp
@@ -20,7 +20,6 @@
 #include <interfaces/icore.h>
 #include <interfaces/iuicontroller.h>
 #include <KParts/MainWindow>
-#include <interfaces/iprojectcontroller.h>
 #include <QDebug>
 #include <QMenuBar>
 #include <sublime/area.h>
diff --git a/plugins/welcomepage/welcomepageview.cpp \
b/plugins/welcomepage/welcomepageview.cpp index 943c4b6a1..523f69260 100644
--- a/plugins/welcomepage/welcomepageview.cpp
+++ b/plugins/welcomepage/welcomepageview.cpp
@@ -31,7 +31,6 @@
 
 #include <sublime/area.h>
 #include <sublime/mainwindow.h>
-#include <interfaces/idocumentcontroller.h>
 #include <interfaces/iprojectcontroller.h>
 #include <KDeclarative/KDeclarative>
 
diff --git a/project/abstractfilemanagerplugin.h \
b/project/abstractfilemanagerplugin.h index a4619eaa6..207147cae 100644
--- a/project/abstractfilemanagerplugin.h
+++ b/project/abstractfilemanagerplugin.h
@@ -33,8 +33,6 @@ class KDirWatch;
 
 namespace KDevelop {
 
-class FileManagerListJob;
-
 /**
  * This class can be used as a common base for file managers.
  *
diff --git a/project/helper.cpp b/project/helper.cpp
index ec40dc0f5..b63b6f8dd 100644
--- a/project/helper.cpp
+++ b/project/helper.cpp
@@ -40,7 +40,6 @@
 #include <interfaces/iplugin.h>
 #include <vcs/vcsjob.h>
 #include <interfaces/icore.h>
-#include <interfaces/iuicontroller.h>
 #include <interfaces/idocumentcontroller.h>
 
 using namespace KDevelop;
diff --git a/project/importprojectjob.cpp b/project/importprojectjob.cpp
index acc13d9c5..7ea5cb41d 100644
--- a/project/importprojectjob.cpp
+++ b/project/importprojectjob.cpp
@@ -29,7 +29,6 @@
 #include <interfaces/iprojectfilemanager.h>
 #include <interfaces/iproject.h>
 #include <interfaces/icore.h>
-#include <interfaces/iprojectcontroller.h>
 
 #include <KLocalizedString>
 
diff --git a/shell/configdialog.cpp b/shell/configdialog.cpp
index 5af5cf8e2..156c51c5f 100644
--- a/shell/configdialog.cpp
+++ b/shell/configdialog.cpp
@@ -29,7 +29,6 @@
 
 #include <KMessageBox>
 #include <KLocalizedString>
-#include <KTextEditor/ConfigPage>
 
 #include <iplugin.h>
 #include <configpage.h>
diff --git a/shell/documentcontroller.cpp b/shell/documentcontroller.cpp
index d5cde35d8..d1a496003 100644
--- a/shell/documentcontroller.cpp
+++ b/shell/documentcontroller.cpp
@@ -31,6 +31,7 @@ Boston, MA 02110-1301, USA.
 #include <QFileInfo>
 #include <QMimeDatabase>
 #include <QRegularExpression>
+#include <QPointer>
 
 #include <KActionCollection>
 #include <KEncodingFileDialog>
@@ -64,8 +65,6 @@ Boston, MA 02110-1301, USA.
 #include "debug.h"
 
 #include <vcs/interfaces/ibasicversioncontrol.h>
-#include <vcs/models/vcsannotationmodel.h>
-#include <vcs/vcsjob.h>
 #include <vcs/vcspluginhelper.h>
 
 #define EMPTY_DOCUMENT_URL i18n("Untitled")
diff --git a/shell/filteredproblemstore.cpp b/shell/filteredproblemstore.cpp
index 67f95b75e..f9889e8f1 100644
--- a/shell/filteredproblemstore.cpp
+++ b/shell/filteredproblemstore.cpp
@@ -18,10 +18,13 @@
  */
 
 #include "filteredproblemstore.h"
+
 #include "problem.h"
 #include "watcheddocumentset.h"
 #include "problemstorenode.h"
 
+#include <language/editor/documentrange.h>
+
 #include <KLocalizedString>
 
 using namespace KDevelop;
diff --git a/shell/ktexteditorpluginintegration.cpp \
b/shell/ktexteditorpluginintegration.cpp index 7164a4861..762cdb21c 100644
--- a/shell/ktexteditorpluginintegration.cpp
+++ b/shell/ktexteditorpluginintegration.cpp
@@ -33,7 +33,6 @@
 #include <sublime/view.h>
 
 #include "core.h"
-#include "partcontroller.h"
 #include "uicontroller.h"
 #include "documentcontroller.h"
 #include "plugincontroller.h"
diff --git a/shell/mainwindow.cpp b/shell/mainwindow.cpp
index e36ad292c..f221b603a 100644
--- a/shell/mainwindow.cpp
+++ b/shell/mainwindow.cpp
@@ -48,7 +48,6 @@ Boston, MA 02110-1301, USA.
 #include "projectcontroller.h"
 #include "uicontroller.h"
 #include "documentcontroller.h"
-#include "debugcontroller.h"
 #include "workingsetcontroller.h"
 #include "sessioncontroller.h"
 #include "sourceformattercontroller.h"
diff --git a/shell/mainwindow_actions.cpp b/shell/mainwindow_actions.cpp
index c4315f77f..7bc17b29e 100644
--- a/shell/mainwindow_actions.cpp
+++ b/shell/mainwindow_actions.cpp
@@ -40,7 +40,6 @@ Boston, MA 02110-1301, USA.
 #include "loadedpluginsdialog.h"
 
 #include <interfaces/itoolviewactionlistener.h>
-#include <interfaces/ipartcontroller.h>
 
 namespace KDevelop {
 
diff --git a/shell/partdocument.cpp b/shell/partdocument.cpp
index 66cf6f80e..50af8e17d 100644
--- a/shell/partdocument.cpp
+++ b/shell/partdocument.cpp
@@ -22,6 +22,7 @@
 
 #include <KMessageBox>
 #include <KLocalizedString>
+#include <KTextEditor/Cursor>
 
 #include <sublime/area.h>
 #include <sublime/view.h>
@@ -31,7 +32,6 @@
 #include "core.h"
 #include "uicontroller.h"
 #include "partcontroller.h"
-#include "documentcontroller.h"
 
 namespace KDevelop {
 
diff --git a/shell/problem.cpp b/shell/problem.cpp
index 1db8ca353..07bae8b7a 100644
--- a/shell/problem.cpp
+++ b/shell/problem.cpp
@@ -18,7 +18,9 @@
  */
 
 #include <shell/problem.h>
+
 #include <interfaces/iassistant.h>
+#include <language/editor/documentrange.h>
 
 #include <KLocalizedString>
 
diff --git a/shell/problem.h b/shell/problem.h
index a13b80d59..c3dfdc6f8 100644
--- a/shell/problem.h
+++ b/shell/problem.h
@@ -23,11 +23,12 @@
 #include <interfaces/iproblem.h>
 
 #include <shell/shellexport.h>
-#include <language/editor/documentrange.h>
-#include <QString>
+
+#include <QScopedPointer>
 
 struct DetectedProblemPrivate;
 
+
 namespace KDevelop
 {
 
diff --git a/shell/problemmodel.cpp b/shell/problemmodel.cpp
index 7ae5ea27f..952d871f1 100644
--- a/shell/problemmodel.cpp
+++ b/shell/problemmodel.cpp
@@ -21,6 +21,7 @@
 
 #include "problemmodel.h"
 #include <QThread>
+#include <QIcon>
 #include <KLocalizedString>
 #include <interfaces/icore.h>
 #include <interfaces/idocument.h>
@@ -29,9 +30,9 @@
 #include <interfaces/ilanguagecontroller.h>
 #include <interfaces/icompletionsettings.h>
 #include <interfaces/iassistant.h>
-#include <QIcon>
-#include <shell/problem.h>
+#include <language/editor/documentrange.h>
 
+#include <shell/problem.h>
 #include <shell/problemstore.h>
 #include <shell/problemstorenode.h>
 #include <shell/filteredproblemstore.h>
diff --git a/shell/problemmodel.h b/shell/problemmodel.h
index ef21946d2..18a70870f 100644
--- a/shell/problemmodel.h
+++ b/shell/problemmodel.h
@@ -31,7 +31,7 @@ struct ProblemModelPrivate;
 
 namespace KDevelop {
     class IDocument;
-
+class IndexedString;
 class ProblemStore;
 
 /**
diff --git a/shell/problemstore.cpp b/shell/problemstore.cpp
index 1da337d06..de83d8d1a 100644
--- a/shell/problemstore.cpp
+++ b/shell/problemstore.cpp
@@ -19,6 +19,8 @@
 
 
 #include "problemstore.h"
+
+#include <language/editor/documentrange.h>
 #include <shell/problem.h>
 #include <shell/watcheddocumentset.h>
 #include "problemstorenode.h"
diff --git a/shell/projectcontroller.cpp b/shell/projectcontroller.cpp
index 205e2b12c..649e3cc0b 100644
--- a/shell/projectcontroller.cpp
+++ b/shell/projectcontroller.cpp
@@ -61,8 +61,6 @@ Boston, MA 02110-1301, USA.
 #include <project/projectmodel.h>
 #include <project/projectbuildsetmodel.h>
 #include <projectconfigpage.h>
-#include <interfaces/ilanguagecontroller.h>
-#include <language/backgroundparser/backgroundparser.h>
 #include <language/backgroundparser/parseprojectjob.h>
 #include <interfaces/iruncontroller.h>
 #include <vcs/widgets/vcsdiffpatchsources.h>
diff --git a/shell/projectinfopage.cpp b/shell/projectinfopage.cpp
index 163efdcda..e78fdafcb 100644
--- a/shell/projectinfopage.cpp
+++ b/shell/projectinfopage.cpp
@@ -11,9 +11,6 @@
 #include "projectinfopage.h"
 #include "ui_projectinfopage.h"
 
-#include "core.h"
-#include "plugincontroller.h"
-
 namespace KDevelop
 {
     
diff --git a/shell/runcontroller.cpp b/shell/runcontroller.cpp
index f1bfc47e2..029a7c705 100644
--- a/shell/runcontroller.cpp
+++ b/shell/runcontroller.cpp
@@ -38,14 +38,10 @@ Boston, MA 02110-1301, USA.
 #include <interfaces/ilauncher.h>
 #include <interfaces/ilaunchmode.h>
 #include <interfaces/launchconfigurationtype.h>
-#include <outputview/ioutputview.h>
 #include <outputview/outputjob.h>
 #include <project/projectmodel.h>
-#include <project/interfaces/iprojectbuilder.h>
-#include <project/interfaces/ibuildsystemmanager.h>
 
 #include "core.h"
-#include "plugincontroller.h"
 #include "uicontroller.h"
 #include "projectcontroller.h"
 #include "mainwindow.h"
diff --git a/shell/session.cpp b/shell/session.cpp
index 37ad2b052..5729abcf1 100644
--- a/shell/session.cpp
+++ b/shell/session.cpp
@@ -25,7 +25,6 @@ Boston, MA 02110-1301, USA.
 #include <KConfigGroup>
 
 #include <interfaces/iplugincontroller.h>
-#include <interfaces/iuicontroller.h>
 #include <interfaces/iplugin.h>
 #include "core.h"
 #include "sessioncontroller.h"
diff --git a/shell/session.h b/shell/session.h
index 304084a68..a7d3db38a 100644
--- a/shell/session.h
+++ b/shell/session.h
@@ -24,7 +24,6 @@ Boston, MA 02110-1301, USA.
 #include <QtCore/QUuid>
 #include <QUrl>
 #include <interfaces/isession.h>
-#include <interfaces/isessionlock.h>
 
 namespace KDevelop
 {
diff --git a/shell/sessioncontroller.cpp b/shell/sessioncontroller.cpp
index 8345d2974..9038b9cd4 100644
--- a/shell/sessioncontroller.cpp
+++ b/shell/sessioncontroller.cpp
@@ -50,9 +50,7 @@ Boston, MA 02110-1301, USA.
 #include "sessionlock.h"
 #include "sessionchooserdialog.h"
 #include "debug.h"
-#include <interfaces/iprojectcontroller.h>
 #include <sublime/mainwindow.h>
-#include <interfaces/idocumentcontroller.h>
 #include <serialization/itemrepositoryregistry.h>
 #include <ktexteditor/document.h>
 
diff --git a/shell/sourceformattercontroller.cpp \
b/shell/sourceformattercontroller.cpp index 386e63134..f47d8a90b 100644
--- a/shell/sourceformattercontroller.cpp
+++ b/shell/sourceformattercontroller.cpp
@@ -42,7 +42,6 @@ Boston, MA 02110-1301, USA.
 #include <interfaces/icore.h>
 #include <interfaces/idocument.h>
 #include <interfaces/idocumentcontroller.h>
-#include <interfaces/ilanguagecontroller.h>
 #include <interfaces/iplugincontroller.h>
 #include <interfaces/isession.h>
 #include <interfaces/isourceformatter.h>
diff --git a/shell/tests/test_detectedproblem.cpp \
b/shell/tests/test_detectedproblem.cpp index 61c457f4b..436728f23 100644
--- a/shell/tests/test_detectedproblem.cpp
+++ b/shell/tests/test_detectedproblem.cpp
@@ -23,6 +23,7 @@
 
 #include <serialization/itemrepositoryregistry.h>
 #include <interfaces/icore.h>
+#include <language/editor/documentrange.h>
 #include <tests/testcore.h>
 #include <tests/autotestshell.h>
 
diff --git a/shell/tests/test_filteredproblemstore.cpp \
b/shell/tests/test_filteredproblemstore.cpp index e8ac05725..05c5cbdae 100644
--- a/shell/tests/test_filteredproblemstore.cpp
+++ b/shell/tests/test_filteredproblemstore.cpp
@@ -23,6 +23,7 @@
 #include <shell/problem.h>
 #include <shell/problemstorenode.h>
 #include <shell/problemconstants.h>
+#include <language/editor/documentrange.h>
 
 #include <tests/testcore.h>
 #include <tests/autotestshell.h>
diff --git a/shell/tests/test_problemmodel.cpp b/shell/tests/test_problemmodel.cpp
index c1eaad91d..828f00a02 100644
--- a/shell/tests/test_problemmodel.cpp
+++ b/shell/tests/test_problemmodel.cpp
@@ -22,6 +22,7 @@
 #include <shell/problemmodel.h>
 #include <shell/problem.h>
 #include <shell/problemconstants.h>
+#include <language/editor/documentrange.h>
 
 #include <tests/testcore.h>
 #include <tests/autotestshell.h>
diff --git a/shell/tests/test_sessioncontroller.cpp \
b/shell/tests/test_sessioncontroller.cpp index eafd8638e..5761be7e0 100644
--- a/shell/tests/test_sessioncontroller.cpp
+++ b/shell/tests/test_sessioncontroller.cpp
@@ -28,7 +28,6 @@
 #include "../core.h"
 #include "../sessioncontroller.h"
 #include "../session.h"
-#include "../uicontroller.h"
 #include <QDebug>
 #include <QFileInfo>
 #include <QtTest/QSignalSpy>
diff --git a/shell/tests/test_testcontroller.cpp \
b/shell/tests/test_testcontroller.cpp index 35b6e6cb0..cc7c3e286 100644
--- a/shell/tests/test_testcontroller.cpp
+++ b/shell/tests/test_testcontroller.cpp
@@ -27,7 +27,6 @@
 #include <tests/testproject.h>
 #include <itestsuite.h>
 #include <iproject.h>
-#include <iprojectcontroller.h>
 #include <language/duchain/indexeddeclaration.h>
 
 using namespace KDevelop;
diff --git a/shell/uicontroller.cpp b/shell/uicontroller.cpp
index c9ffe8fc8..adfcef9e1 100644
--- a/shell/uicontroller.cpp
+++ b/shell/uicontroller.cpp
@@ -43,13 +43,8 @@
 #include "debug.h"
 #include "editorconfigpage.h"
 #include "shellextension.h"
-#include "partcontroller.h"
 #include "plugincontroller.h"
 #include "mainwindow.h"
-#include "partdocument.h"
-#include "textdocument.h"
-#include "documentcontroller.h"
-#include <ktexteditor/view.h>
 #include "workingsetcontroller.h"
 #include "workingsets/workingset.h"
 #include "settings/bgpreferences.h"
diff --git a/shell/uicontroller.h b/shell/uicontroller.h
index 63d71d200..b9bfa7b28 100644
--- a/shell/uicontroller.h
+++ b/shell/uicontroller.h
@@ -30,7 +30,6 @@
 class QListWidgetItem;
 
 namespace Sublime {
-    class AreaIndex;
     class ToolDocument;
 }
 
diff --git a/shell/workingsets/workingsettoolbutton.cpp \
b/shell/workingsets/workingsettoolbutton.cpp index ddb9aeb2f..45f465842 100644
--- a/shell/workingsets/workingsettoolbutton.cpp
+++ b/shell/workingsets/workingsettoolbutton.cpp
@@ -30,7 +30,6 @@
 #include "workingsethelpers.h"
 #include "documentcontroller.h"
 
-#include <interfaces/iuicontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <util/activetooltip.h>
 
diff --git a/sublime/container.cpp b/sublime/container.cpp
index c4b8b91d0..ad45cb618 100644
--- a/sublime/container.cpp
+++ b/sublime/container.cpp
@@ -39,7 +39,7 @@
 #include <KSharedConfig>
 
 #include "view.h"
-#include "document.h"
+#include "urldocument.h"
 #include <ksqueezedtextlabel.h>
 
 namespace Sublime {
diff --git a/sublime/container.h b/sublime/container.h
index a7b96ff79..e85afd159 100644
--- a/sublime/container.h
+++ b/sublime/container.h
@@ -20,7 +20,6 @@
 #define KDEVPLATFORM_SUBLIMECONTAINER_H
 
 #include <QWidget>
-#include "urldocument.h"
 #include "sublimeexport.h"
 
 class QMenu;
diff --git a/sublime/idealcontroller.cpp b/sublime/idealcontroller.cpp
index 9e4bd90d8..dfc95c3b0 100644
--- a/sublime/idealcontroller.cpp
+++ b/sublime/idealcontroller.cpp
@@ -36,7 +36,6 @@
 #include "document.h"
 #include "mainwindow.h"
 #include "ideallayout.h"
-#include "idealtoolbutton.h"
 #include "idealdockwidget.h"
 #include "idealbuttonbarwidget.h"
 
diff --git a/sublime/ideallayout.cpp b/sublime/ideallayout.cpp
index 2b717cd39..bfa94251d 100644
--- a/sublime/ideallayout.cpp
+++ b/sublime/ideallayout.cpp
@@ -21,7 +21,6 @@
 */
 
 #include "ideallayout.h"
-#include "idealcontroller.h"
 
 using namespace Sublime;
 
diff --git a/sublime/ideallayout.h b/sublime/ideallayout.h
index 3c4c45748..806608a39 100644
--- a/sublime/ideallayout.h
+++ b/sublime/ideallayout.h
@@ -31,8 +31,6 @@
 
 namespace Sublime {
 
-class IdealDockWidget;
-
 class IdealButtonBarLayout: public QLayout
 {
     Q_OBJECT
diff --git a/sublime/tests/test_toolviewtoolbar.cpp \
b/sublime/tests/test_toolviewtoolbar.cpp index aafa6fb99..8706c0564 100644
--- a/sublime/tests/test_toolviewtoolbar.cpp
+++ b/sublime/tests/test_toolviewtoolbar.cpp
@@ -26,7 +26,6 @@
 #include <QTextEdit>
 #include <QToolBar>
 
-#include <sublime/idealcontroller.h>
 #include <sublime/view.h>
 #include <sublime/area.h>
 #include <sublime/controller.h>
diff --git a/util/duchainify/main.cpp b/util/duchainify/main.cpp
index 1f19fdcc4..20a84da53 100644
--- a/util/duchainify/main.cpp
+++ b/util/duchainify/main.cpp
@@ -22,7 +22,6 @@
 #include <shell/core.h>
 #include <shell/shellextension.h>
 
-#include <language/backgroundparser/parsejob.h>
 #include <language/backgroundparser/backgroundparser.h>
 #include <language/duchain/definitions.h>
 #include <language/duchain/duchain.h>
@@ -32,7 +31,6 @@
 #include <language/duchain/problem.h>
 #include <language/duchain/persistentsymboltable.h>
 
-#include <interfaces/iplugincontroller.h>
 #include <interfaces/ilanguagecontroller.h>
 #include <tests/autotestshell.h>
 #include <tests/testcore.h>
diff --git a/util/duchainify/main.h b/util/duchainify/main.h
index 54729fd83..b52e74ecd 100644
--- a/util/duchainify/main.h
+++ b/util/duchainify/main.h
@@ -25,6 +25,7 @@
 #include <QUrl>
 
 #include <language/duchain/topducontext.h>
+#include <serialization/indexedstring.h>
 
 class QCommandLineParser;
 
diff --git a/util/projecttestjob.h b/util/projecttestjob.h
index 1347ba8ba..fdc034fef 100644
--- a/util/projecttestjob.h
+++ b/util/projecttestjob.h
@@ -29,8 +29,6 @@
 namespace KDevelop {
 
 class IProject;
-class ITestSuite;
-struct TestResult;
 
 /**
  * A combined result of a project test job
diff --git a/util/widgetcolorizer.cpp b/util/widgetcolorizer.cpp
index b28f30e4a..fd91b70ee 100644
--- a/util/widgetcolorizer.cpp
+++ b/util/widgetcolorizer.cpp
@@ -21,9 +21,6 @@
 
 #include "widgetcolorizer.h"
 
-#include <interfaces/icore.h>
-#include <interfaces/iuicontroller.h>
-
 #include <KColorUtils>
 #include <KSharedConfig>
 #include <KConfigGroup>
diff --git a/vcs/dvcs/dvcsplugin.cpp b/vcs/dvcs/dvcsplugin.cpp
index d2ff6b462..6f7bbd06c 100644
--- a/vcs/dvcs/dvcsplugin.cpp
+++ b/vcs/dvcs/dvcsplugin.cpp
@@ -35,8 +35,6 @@
 #include <KParts/MainWindow>
 
 #include <interfaces/iuicontroller.h>
-#include <interfaces/iruncontroller.h>
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/icore.h>
 #include <interfaces/context.h>
 #include <interfaces/contextmenuextension.h>
diff --git a/vcs/dvcs/dvcsplugin.h b/vcs/dvcs/dvcsplugin.h
index 42b8a2115..7e6936bfe 100644
--- a/vcs/dvcs/dvcsplugin.h
+++ b/vcs/dvcs/dvcsplugin.h
@@ -24,7 +24,6 @@
 #include <QObject>
 #include <QUrl>
 
-#include <interfaces/iuicontroller.h>
 #include <interfaces/iplugin.h>
 
 #include "dvcsevent.h"
diff --git a/vcs/dvcs/ui/branchmanager.cpp b/vcs/dvcs/ui/branchmanager.cpp
index 05cef416b..67bd87bbb 100644
--- a/vcs/dvcs/ui/branchmanager.cpp
+++ b/vcs/dvcs/ui/branchmanager.cpp
@@ -22,12 +22,11 @@
 
 #include <QInputDialog>
 
-#include <KJob>
 #include <KMessageBox>
 #include <KLocalizedString>
 
-#include "../dvcsjob.h"
 #include "../dvcsplugin.h"
+#include <vcs/vcsjob.h>
 #include <vcs/models/brancheslistmodel.h>
 #include "ui_branchmanager.h"
 #include "../../debug.h"
@@ -35,6 +34,7 @@
 
 #include <interfaces/icore.h>
 #include <interfaces/iruncontroller.h>
+#include <interfaces/iuicontroller.h>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
diff --git a/vcs/models/vcsannotationmodel.h b/vcs/models/vcsannotationmodel.h
index fb6184689..b9d43f632 100644
--- a/vcs/models/vcsannotationmodel.h
+++ b/vcs/models/vcsannotationmodel.h
@@ -33,8 +33,6 @@ template<typename T> class QList;
 namespace KDevelop
 {
 
-class VcsAnnotation;
-class VcsAnnotationLine;
 class VcsJob;
     
 class KDEVPLATFORMVCS_EXPORT VcsAnnotationModel : public \
                KTextEditor::AnnotationModel
diff --git a/vcs/vcspluginhelper.cpp b/vcs/vcspluginhelper.cpp
index 6750952b2..19810b4d0 100644
--- a/vcs/vcspluginhelper.cpp
+++ b/vcs/vcspluginhelper.cpp
@@ -34,7 +34,6 @@
 #include <interfaces/icore.h>
 #include <interfaces/idocument.h>
 #include <interfaces/idocumentcontroller.h>
-#include <interfaces/ipatchsource.h>
 #include <interfaces/iplugin.h>
 #include <interfaces/iplugincontroller.h>
 #include <interfaces/iproject.h>
@@ -52,7 +51,6 @@
 #include <vcs/vcsdiff.h>
 
 #include "interfaces/idistributedversioncontrol.h"
-#include "vcsstatusinfo.h"
 #include "vcsevent.h"
 #include "debug.h"
 #include "widgets/vcsdiffpatchsources.h"
diff --git a/vcs/vcspluginhelper.h b/vcs/vcspluginhelper.h
index e15d89331..24df8dce7 100644
--- a/vcs/vcspluginhelper.h
+++ b/vcs/vcspluginhelper.h
@@ -30,7 +30,6 @@ using KTextEditor::View;
 
 namespace KDevelop
 {
-class VcsDiff;
 class IPlugin;
 class IBasicVersionControl;
 class Context;
diff --git a/vcs/widgets/vcscommitdialog.cpp b/vcs/widgets/vcscommitdialog.cpp
index f115d4977..5cc07d89b 100644
--- a/vcs/widgets/vcscommitdialog.cpp
+++ b/vcs/widgets/vcscommitdialog.cpp
@@ -14,22 +14,14 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 
-#include <interfaces/icore.h>
-#include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
 #include <interfaces/iplugin.h>
-#include <interfaces/iuicontroller.h>
 #include <interfaces/ipatchsource.h>
 
-#include "../vcsjob.h"
-#include "../interfaces/ibasicversioncontrol.h"
-#include "../interfaces/idistributedversioncontrol.h"
-#include "../interfaces/icentralizedversioncontrol.h"
 #include "../vcsstatusinfo.h"
 #include "../models/vcsfilechangesmodel.h"
 
 #include "ui_vcscommitdialog.h"
-#include <vcspluginhelper.h>
 
 namespace KDevelop
 {
diff --git a/vcs/widgets/vcsdiffpatchsources.h b/vcs/widgets/vcsdiffpatchsources.h
index 0e162bdab..da1aef411 100644
--- a/vcs/widgets/vcsdiffpatchsources.h
+++ b/vcs/widgets/vcsdiffpatchsources.h
@@ -25,7 +25,6 @@
 
 #include <interfaces/ipatchsource.h>
 #include "vcs/vcsstatusinfo.h"
-#include "vcs/vcsjob.h"
 
 #include <vcs/vcsexport.h>
 
@@ -34,6 +33,7 @@
 
 class KTextEdit;
 class KComboBox;
+class KJob;
 namespace KDevelop {
 class VcsCommitDialog;
 class IBasicVersionControl;
diff --git a/vcs/widgets/vcseventwidget.cpp b/vcs/widgets/vcseventwidget.cpp
index 5199e6c72..0fb5dd049 100644
--- a/vcs/widgets/vcseventwidget.cpp
+++ b/vcs/widgets/vcseventwidget.cpp
@@ -32,9 +32,7 @@
 
 #include <KLocalizedString>
 
-#include <interfaces/icore.h>
 #include <interfaces/iplugin.h>
-#include <interfaces/iruncontroller.h>
 
 #include "ui_vcseventwidget.h"
 #include "vcsdiffwidget.h"
@@ -45,7 +43,6 @@
 #include "../debug.h"
 #include "../vcsevent.h"
 #include "../vcsjob.h"
-#include "../vcslocation.h"
 #include "../vcsrevision.h"
 
 
diff --git a/vcs/widgets/vcsimportmetadatawidget.h \
b/vcs/widgets/vcsimportmetadatawidget.h index b049a6d4c..fc74508ed 100644
--- a/vcs/widgets/vcsimportmetadatawidget.h
+++ b/vcs/widgets/vcsimportmetadatawidget.h
@@ -23,7 +23,6 @@
 
 #include <QWidget>
 #include <vcs/vcsexport.h>
-#include <vcs/interfaces/ibasicversioncontrol.h>
 
 class QUrl;
 


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic