diff --git a/src/libs/qmljs/jsoncheck.cpp b/src/libs/qmljs/jsoncheck.cpp
index ce5f434c4c3..c1a28d311dc 100644
--- a/src/libs/qmljs/jsoncheck.cpp
+++ b/src/libs/qmljs/jsoncheck.cpp
@@ -35,7 +35,6 @@
 #include <QDebug>
 #include <QLatin1String>
 #include <QRegExp>
-#include <QMap>
 
 #include <cmath>
 
diff --git a/src/libs/qmljs/jsoncheck.h b/src/libs/qmljs/jsoncheck.h
index b45c848ec78..a6d7186bd0d 100644
--- a/src/libs/qmljs/jsoncheck.h
+++ b/src/libs/qmljs/jsoncheck.h
@@ -33,14 +33,11 @@
 #include "qmljs_global.h"
 
 #include <qmljs/qmljsdocument.h>
-#include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/parser/qmljsastvisitor_p.h>
 #include <qmljs/qmljsstaticanalysismessage.h>
 
 #include <utils/json.h>
 
-#include <QString>
-#include <QSet>
 #include <QStack>
 #include <QList>
 
diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp
index dd8ee8443ae..05d2e143df8 100644
--- a/src/libs/qmljs/qmljsbind.cpp
+++ b/src/libs/qmljs/qmljsbind.cpp
@@ -33,10 +33,6 @@
 #include "qmljsdocument.h"
 #include "qmljsmodelmanagerinterface.h"
 
-#include <languageutils/componentversion.h>
-
-#include <QDir>
-#include <QFileInfo>
 #include <QDebug>
 
 using namespace LanguageUtils;
diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h
index 5e13f3752de..24596cd2976 100644
--- a/src/libs/qmljs/qmljsbind.h
+++ b/src/libs/qmljs/qmljsbind.h
@@ -31,12 +31,9 @@
 #define QMLJSBIND_H
 
 #include <qmljs/parser/qmljsastvisitor_p.h>
-#include <qmljs/qmljsinterpreter.h>
 #include <qmljs/qmljsvalueowner.h>
 
 #include <QHash>
-#include <QStringList>
-#include <QSharedPointer>
 #include <QCoreApplication>
 
 namespace QmlJS {
diff --git a/src/libs/qmljs/qmljsbundle.h b/src/libs/qmljs/qmljsbundle.h
index 0fa7bd9e99f..63acca2da53 100644
--- a/src/libs/qmljs/qmljsbundle.h
+++ b/src/libs/qmljs/qmljsbundle.h
@@ -35,7 +35,6 @@
 #include <qmljs/qmljsdocument.h>
 
 #include <QString>
-#include <QCoreApplication>
 #include <QHash>
 
 QT_FORWARD_DECLARE_CLASS(QTextStream)
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index f1c6a7ef03e..a636e31515f 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -29,7 +29,6 @@
 
 #include "qmljscheck.h"
 #include "qmljsbind.h"
-#include "qmljscontext.h"
 #include "qmljsevaluate.h"
 #include "qmljsutils.h"
 #include "parser/qmljsast_p.h"
@@ -38,8 +37,6 @@
 
 #include <QDebug>
 #include <QDir>
-#include <QColor>
-#include <QApplication>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h
index 2f15bdc180f..5d2408adacc 100644
--- a/src/libs/qmljs/qmljscheck.h
+++ b/src/libs/qmljs/qmljscheck.h
@@ -30,8 +30,6 @@
 #ifndef QMLJSCHECK_H
 #define QMLJSCHECK_H
 
-#include <qmljs/qmljsdocument.h>
-#include <qmljs/qmljscontext.h>
 #include <qmljs/qmljsscopebuilder.h>
 #include <qmljs/qmljsscopechain.h>
 #include <qmljs/qmljsstaticanalysismessage.h>
@@ -40,7 +38,6 @@
 #include <QCoreApplication>
 #include <QSet>
 #include <QStack>
-#include <QColor>
 
 namespace QmlJS {
 
diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp
index 60079311046..fb6e6fa55a6 100644
--- a/src/libs/qmljs/qmljscodeformatter.cpp
+++ b/src/libs/qmljs/qmljscodeformatter.cpp
@@ -32,7 +32,6 @@
 #include <QDebug>
 #include <QMetaEnum>
 #include <QTextDocument>
-#include <QTextCursor>
 #include <QTextBlock>
 
 using namespace QmlJS;
diff --git a/src/libs/qmljs/qmljsdelta.cpp b/src/libs/qmljs/qmljsdelta.cpp
index 70185ba7e54..6711852427b 100644
--- a/src/libs/qmljs/qmljsdelta.cpp
+++ b/src/libs/qmljs/qmljsdelta.cpp
@@ -30,7 +30,6 @@
 #include "qmljsdelta.h"
 #include "qmljsutils.h"
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsastvisitor_p.h>
 
 
 #include <typeinfo>
diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp
index 13e9a431168..3e55ccc42a9 100644
--- a/src/libs/qmljs/qmljsdocument.cpp
+++ b/src/libs/qmljs/qmljsdocument.cpp
@@ -29,10 +29,9 @@
 
 #include "qmljsdocument.h"
 #include "qmljsbind.h"
-#include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljslexer_p.h>
 #include <qmljs/parser/qmljsparser_p.h>
-#include <qmljs/parser/qmljsastfwd_p.h>
+
 #include <QDir>
 
 using namespace QmlJS;
diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h
index 3be442f9966..e18f95d475b 100644
--- a/src/libs/qmljs/qmljsdocument.h
+++ b/src/libs/qmljs/qmljsdocument.h
@@ -30,7 +30,6 @@
 #define QMLJSDOCUMENT_H
 
 #include <QList>
-#include <QPair>
 #include <QSharedPointer>
 #include <QString>
 
diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 78fc410fa24..b0ea53ec211 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -29,7 +29,6 @@
 
 #include "qmljsevaluate.h"
 #include "qmljscontext.h"
-#include "qmljsvalueowner.h"
 #include "qmljsscopechain.h"
 #include "parser/qmljsast_p.h"
 #include <QDebug>
diff --git a/src/libs/qmljs/qmljsicons.cpp b/src/libs/qmljs/qmljsicons.cpp
index 6235faf7833..a566cfea77a 100644
--- a/src/libs/qmljs/qmljsicons.cpp
+++ b/src/libs/qmljs/qmljsicons.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "qmljsicons.h"
+#include <QIcon>
 #include <QDebug>
 #include <QDir>
 #include <QHash>
diff --git a/src/libs/qmljs/qmljsicons.h b/src/libs/qmljs/qmljsicons.h
index 37a3ccac1ae..5a63467e14b 100644
--- a/src/libs/qmljs/qmljsicons.h
+++ b/src/libs/qmljs/qmljsicons.h
@@ -32,7 +32,8 @@
 
 #include <qmljs/qmljs_global.h>
 #include <qmljs/parser/qmljsast_p.h>
-#include <QIcon>
+
+QT_FORWARD_DECLARE_CLASS(QIcon)
 
 namespace QmlJS {
 
diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp
index 873f4100d64..834c897f1fb 100644
--- a/src/libs/qmljs/qmljsindenter.cpp
+++ b/src/libs/qmljs/qmljsindenter.cpp
@@ -66,7 +66,6 @@
 */
 
 #include <qmljs/qmljsindenter.h>
-#include <qmljs/qmljsscanner.h>
 
 #include <QDebug>
 #include <QTextBlock>
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 6627242acef..ae8c1009723 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -29,8 +29,6 @@
 
 #include "qmljsinterpreter.h"
 #include "qmljsevaluate.h"
-#include "qmljslink.h"
-#include "qmljsbind.h"
 #include "qmljsscopebuilder.h"
 #include "qmljsscopechain.h"
 #include "qmljsscopeastpath.h"
@@ -39,21 +37,14 @@
 #include "qmljscontext.h"
 #include "parser/qmljsast_p.h"
 
-#include <languageutils/fakemetaobject.h>
 #include <utils/qtcassert.h>
 
 #include <QFile>
 #include <QDir>
 #include <QString>
 #include <QStringList>
-#include <QMetaObject>
-#include <QMetaProperty>
-#include <QXmlStreamReader>
-#include <QProcess>
 #include <QDebug>
 
-#include <algorithm>
-
 using namespace LanguageUtils;
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index cff537800a9..4eddbf64560 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -30,11 +30,8 @@
 #ifndef QMLJS_INTERPRETER_H
 #define QMLJS_INTERPRETER_H
 
-#include <languageutils/componentversion.h>
-#include <languageutils/fakemetaobject.h>
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljs_global.h>
-#include <qmljs/parser/qmljsastfwd_p.h>
 
 #include <QFileInfoList>
 #include <QList>
diff --git a/src/libs/qmljs/qmljslineinfo.cpp b/src/libs/qmljs/qmljslineinfo.cpp
index e530183406b..b33a90d0c21 100644
--- a/src/libs/qmljs/qmljslineinfo.cpp
+++ b/src/libs/qmljs/qmljslineinfo.cpp
@@ -66,7 +66,6 @@
 */
 
 #include <qmljs/qmljslineinfo.h>
-#include <qmljs/qmljsscanner.h>
 
 #include <QDebug>
 
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index d1a2084ad96..e90dd9a9ae2 100644
--- a/src/libs/qmljs/qmljslink.cpp
+++ b/src/libs/qmljs/qmljslink.cpp
@@ -35,7 +35,6 @@
 #include "qmljsutils.h"
 #include "qmljsmodelmanagerinterface.h"
 
-#include <QFileInfo>
 #include <QDir>
 #include <QDebug>
 
diff --git a/src/libs/qmljs/qmljslink.h b/src/libs/qmljs/qmljslink.h
index f8057241faf..7d7875e4213 100644
--- a/src/libs/qmljs/qmljslink.h
+++ b/src/libs/qmljs/qmljslink.h
@@ -30,10 +30,7 @@
 #ifndef QMLJSLINK_H
 #define QMLJSLINK_H
 
-#include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljscontext.h>
-#include <qmljs/parser/qmljsastfwd_p.h>
-#include <languageutils/componentversion.h>
 
 #include <QCoreApplication>
 
diff --git a/src/libs/qmljs/qmljspropertyreader.h b/src/libs/qmljs/qmljspropertyreader.h
index 2d470a1a6d2..de836d089bc 100644
--- a/src/libs/qmljs/qmljspropertyreader.h
+++ b/src/libs/qmljs/qmljspropertyreader.h
@@ -30,8 +30,6 @@
 #ifndef QMLJSPROPERTYREADER_H
 #define QMLJSPROPERTYREADER_H
 
-#include <qmljs/qmljs_global.h>
-#include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsdocument.h>
 
 #include <QHash>
diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index 92822d7f70c..a9eede5e3e6 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -30,14 +30,10 @@
 #include "qmljsreformatter.h"
 
 #include "qmljscodeformatter.h"
-#include "qmljsscanner.h"
 #include "parser/qmljsast_p.h"
 #include "parser/qmljsastvisitor_p.h"
 
-#include <QCoreApplication>
 #include <QString>
-#include <QFile>
-#include <QTextStream>
 #include <QTextBlock>
 #include <QTextDocument>
 #include <QTextCursor>
diff --git a/src/libs/qmljs/qmljsrewriter.cpp b/src/libs/qmljs/qmljsrewriter.cpp
index dffaf89a87f..b4957f08a29 100644
--- a/src/libs/qmljs/qmljsrewriter.cpp
+++ b/src/libs/qmljs/qmljsrewriter.cpp
@@ -30,9 +30,7 @@
 #include "qmljsrewriter.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 #include <qmljs/qmljsutils.h>
-#include <utils/changeset.h>
 
 // ### FIXME: remove these includes:
 #include <QTextBlock>
diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp
index f782b846115..33b42cde453 100644
--- a/src/libs/qmljs/qmljsscanner.cpp
+++ b/src/libs/qmljs/qmljsscanner.cpp
@@ -29,8 +29,6 @@
 
 #include <qmljs/qmljsscanner.h>
 
-#include <QTextCharFormat>
-
 using namespace QmlJS;
 
 namespace {
diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp
index 7810c9a5d18..a68e9e28f25 100644
--- a/src/libs/qmljs/qmljsscopebuilder.cpp
+++ b/src/libs/qmljs/qmljsscopebuilder.cpp
@@ -30,7 +30,6 @@
 #include "qmljsscopebuilder.h"
 
 #include "qmljsbind.h"
-#include "qmljscontext.h"
 #include "qmljsevaluate.h"
 #include "qmljsscopechain.h"
 #include "qmljsutils.h"
diff --git a/src/libs/qmljs/qmljssimplereader.cpp b/src/libs/qmljs/qmljssimplereader.cpp
index 9ed2b6f9564..8342bc7037b 100644
--- a/src/libs/qmljs/qmljssimplereader.cpp
+++ b/src/libs/qmljs/qmljssimplereader.cpp
@@ -32,12 +32,7 @@
 #include "parser/qmljsparser_p.h"
 #include "parser/qmljslexer_p.h"
 #include "parser/qmljsengine_p.h"
-#include "parser/qmljsast_p.h"
-#include "parser/qmljsastvisitor_p.h"
-#include <qmljs/qmljsdocument.h>
 
-#include "qmljsbind.h"
-#include "qmljsinterpreter.h"
 #include "qmljsutils.h"
 
 #include <QFile>
diff --git a/src/libs/qmljs/qmljstypedescriptionreader.cpp b/src/libs/qmljs/qmljstypedescriptionreader.cpp
index 37495dcb76e..816228f268a 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.cpp
+++ b/src/libs/qmljs/qmljstypedescriptionreader.cpp
@@ -32,16 +32,10 @@
 #include "parser/qmljsparser_p.h"
 #include "parser/qmljslexer_p.h"
 #include "parser/qmljsengine_p.h"
-#include "parser/qmljsast_p.h"
-#include "parser/qmljsastvisitor_p.h"
 
-#include "qmljsbind.h"
 #include "qmljsinterpreter.h"
 #include "qmljsutils.h"
 
-#include <QIODevice>
-#include <QBuffer>
-
 using namespace QmlJS;
 using namespace QmlJS::AST;
 using namespace LanguageUtils;
diff --git a/src/libs/qmljs/qmljstypedescriptionreader.h b/src/libs/qmljs/qmljstypedescriptionreader.h
index 6643a5aa976..1a6e6e6e702 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.h
+++ b/src/libs/qmljs/qmljstypedescriptionreader.h
@@ -30,8 +30,6 @@
 #ifndef QMLJSTYPEDESCRIPTIONREADER_H
 #define QMLJSTYPEDESCRIPTIONREADER_H
 
-#include <languageutils/fakemetaobject.h>
-#include <languageutils/componentversion.h>
 #include "qmljsdocument.h"
 
 // for Q_DECLARE_TR_FUNCTIONS