diff --git a/src/libs/cplusplus/ModelManagerInterface.h b/src/libs/cplusplus/ModelManagerInterface.h
index 23f34bfbc41..0a9cf6eaeef 100644
--- a/src/libs/cplusplus/ModelManagerInterface.h
+++ b/src/libs/cplusplus/ModelManagerInterface.h
@@ -53,10 +53,6 @@ namespace ProjectExplorer {
     class Project;
 }
 
-namespace TextEditor {
-    class ITextEditor;
-}
-
 namespace CppTools {
     class AbstractEditorSupport;
 }
diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
index 9945746f062..ed1d99276ba 100644
--- a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
+++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
@@ -36,6 +36,7 @@
 #include <AST.h>
 #include <Token.h>
 #include <cplusplus/Overview.h>
+#include <cplusplus/Symbols.h>
 #include <cpptools/insertionpointlocator.h>
 #include <cpptools/cpprefactoringchanges.h>
 #include <cppeditor/cppquickfix.h>
diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/cppquickfix.h
index d2e91311c74..3d93b41f286 100644
--- a/src/plugins/cppeditor/cppquickfix.h
+++ b/src/plugins/cppeditor/cppquickfix.h
@@ -34,10 +34,6 @@
 #define CPPQUICKFIX_H
 
 #include "cppeditor_global.h"
-#include "cppsemanticinfo.h"
-
-#include <ASTfwd.h>
-#include <cplusplus/CppDocument.h>
 #include <texteditor/quickfix.h>
 
 namespace CppTools {
diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp
index 7d0212fde2c..02bb21d0f5d 100644
--- a/src/plugins/cpptools/abstracteditorsupport.cpp
+++ b/src/plugins/cpptools/abstracteditorsupport.cpp
@@ -37,6 +37,7 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/ExpressionUnderCursor.h>
+#include <cplusplus/ModelManagerInterface.h>
 #include <CoreTypes.h>
 #include <Names.h>
 #include <Symbols.h>
diff --git a/src/plugins/cpptools/abstracteditorsupport.h b/src/plugins/cpptools/abstracteditorsupport.h
index 79e2e9bcd3d..916d5046701 100644
--- a/src/plugins/cpptools/abstracteditorsupport.h
+++ b/src/plugins/cpptools/abstracteditorsupport.h
@@ -35,7 +35,11 @@
 
 #include "cpptools_global.h"
 
-#include <cplusplus/ModelManagerInterface.h>
+#include <QtCore/QString>
+
+namespace CPlusPlus {
+class CppModelManagerInterface;
+}
 
 namespace CppTools {
 
diff --git a/src/plugins/cpptools/cppqtstyleindenter.h b/src/plugins/cpptools/cppqtstyleindenter.h
index deeb5a11c5b..b4fb2ee6573 100644
--- a/src/plugins/cpptools/cppqtstyleindenter.h
+++ b/src/plugins/cpptools/cppqtstyleindenter.h
@@ -34,8 +34,8 @@
 #define CPPQTSTYLEINDENTER_H
 
 #include "cpptools_global.h"
+
 #include <texteditor/indenter.h>
-#include "cppcodestylesettingspage.h"
 
 namespace TextEditor
 {
@@ -43,6 +43,8 @@ class IFallbackPreferences;
 }
 
 namespace CppTools {
+class CppCodeStyleSettings;
+class CppCodeStylePreferences;
 
 class CPPTOOLS_EXPORT CppQtStyleIndenter : public TextEditor::Indenter
 {
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
index 7aeb5dead10..af8aa1f6e36 100644
--- a/src/plugins/cpptools/insertionpointlocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -38,6 +38,7 @@
 #include <ASTVisitor.h>
 #include <TranslationUnit.h>
 #include <Literals.h>
+#include <Symbols.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
diff --git a/src/plugins/cpptools/insertionpointlocator.h b/src/plugins/cpptools/insertionpointlocator.h
index d530f82f400..b3506ec55cf 100644
--- a/src/plugins/cpptools/insertionpointlocator.h
+++ b/src/plugins/cpptools/insertionpointlocator.h
@@ -37,7 +37,6 @@
 
 #include <ASTfwd.h>
 #include <CPlusPlusForwardDeclarations.h>
-#include <Symbols.h>
 
 #include <cplusplus/CppDocument.h>
 
diff --git a/src/plugins/find/findplugin.h b/src/plugins/find/findplugin.h
index ec96c54118c..4cc936a3d10 100644
--- a/src/plugins/find/findplugin.h
+++ b/src/plugins/find/findplugin.h
@@ -38,8 +38,6 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <QtGui/QTextDocument>
-
 QT_BEGIN_NAMESPACE
 class QStringListModel;
 QT_END_NAMESPACE
diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h
index 78daea88186..92be9c84630 100644
--- a/src/plugins/glsleditor/glslcompletionassist.h
+++ b/src/plugins/glsleditor/glslcompletionassist.h
@@ -43,6 +43,10 @@
 #include <QtCore/QScopedPointer>
 #include <QtGui/QIcon>
 
+namespace GLSL {
+class Function;
+}
+
 namespace TextEditor {
 class BasicProposalItem;
 }
diff --git a/src/plugins/glsleditor/glsleditor.h b/src/plugins/glsleditor/glsleditor.h
index 703569357fc..13fbfba604e 100644
--- a/src/plugins/glsleditor/glsleditor.h
+++ b/src/plugins/glsleditor/glsleditor.h
@@ -34,12 +34,8 @@
 #define GLSLEDITOR_H
 
 #include "glsleditor_global.h"
-#include "glsleditoreditable.h"
-
-#include <glsl/glsl.h>
 
 #include <texteditor/basetexteditor.h>
-#include <texteditor/quickfix.h>
 
 #include <QtCore/QSharedPointer>
 #include <QtCore/QSet>
@@ -49,12 +45,21 @@ class QComboBox;
 class QTimer;
 QT_END_NAMESPACE
 
+namespace GLSL {
+class Engine;
+class TranslationUnitAST;
+class Scope;
+}
+
 namespace Core {
 class ICore;
 }
 
 namespace GLSLEditor {
 class GLSLTextEditorWidget;
+namespace Internal {
+class GLSLEditorEditable;
+}
 
 class GLSLEDITOR_EXPORT Document
 {
diff --git a/src/plugins/glsleditor/glslhoverhandler.cpp b/src/plugins/glsleditor/glslhoverhandler.cpp
index e862555919b..3de9449f69f 100644
--- a/src/plugins/glsleditor/glslhoverhandler.cpp
+++ b/src/plugins/glsleditor/glslhoverhandler.cpp
@@ -32,6 +32,7 @@
 
 #include "glslhoverhandler.h"
 #include "glsleditor.h"
+#include "glsleditoreditable.h"
 
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>