diff --git a/src/libs/cplusplus/ModelManagerInterface.h b/src/libs/cplusplus/ModelManagerInterface.h
index 23f34bfbc4115236077b2c6d1aca61c71267bbd5..0a9cf6eaeef0ac6da81117e3035f3086cc2952fd 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 9945746f062e16d28b0199b811acf72b9bfe9cbf..ed1d99276ba85caea9c5294f7aa21a466409b399 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 d2e91311c746d899e7943020eb65231c602736bd..3d93b41f2867b390cd22d708ed6d2fe559057d7b 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 7d0212fde2c897c5fbf9216ef675afc1c38dc077..02bb21d0f5d5a1a9d87d555b289250312c3215e6 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 79e2e9bcd3d93393b0a5c4a88a89d667739e0fb0..916d5046701a78734d604390d920ff2fec97e37c 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 deeb5a11c5bdd70192d8103283cfa739b73f6d38..b4fb2ee6573ccce01565f7d71085e3450ea71132 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 7aeb5dead10641676f0da1d79f3541c62a98aafb..af8aa1f6e362f53fb35b4e851f514810c076b971 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 d530f82f400c2ee5866f7b96cc9619e807c722aa..b3506ec55cfa59bee561f34533c54a89de55f5f6 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 ec96c54118ca69791510b31e025897b0a49e5969..4cc936a3d1046fd37affcfe075529c37e792c4e7 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 78daea88186abe6b96683bb5b2d482dfcb31687f..92be9c8463010567295a006029a326b1daecbe55 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 703569357fcd46e1114cfcdae2e2ba6e36a0e087..13fbfba604efe2e5aac4ccd2bdc678baca6b6d72 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 e862555919b587b38b0033a0ebd832a671934089..3de9449f69fbb7c231b4110be38f8b46b46e4c29 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>