10 files changed, 20 insertions, 37 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index fb06e44e5..e400ac197 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -45,7 +45,6 @@
 #include "fsengineclient.h"
 #include "lib7z_facade.h"
 #include "packagemanagercore.h"
-#include "qinstallerglobal.h"
 #include "messageboxhandler.h"
 
 #include <kdupdaterupdatesourcesinfo.h>
diff --git a/src/libs/installer/getrepositoriesmetainfojob.cpp b/src/libs/installer/getrepositoriesmetainfojob.cpp
index 996bf4692..7604bcf06 100644
--- a/src/libs/installer/getrepositoriesmetainfojob.cpp
+++ b/src/libs/installer/getrepositoriesmetainfojob.cpp
@@ -43,7 +43,6 @@
 
 #include "getrepositorymetainfojob.h"
 #include "packagemanagercore_p.h"
-#include "qinstallerglobal.h"
 
 #include <QtCore/QDebug>
 
diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp
index 6fa21e32c..34441b02b 100644
--- a/src/libs/installer/getrepositorymetainfojob.cpp
+++ b/src/libs/installer/getrepositorymetainfojob.cpp
@@ -44,22 +44,13 @@
 #include "lib7z_facade.h"
 #include "messageboxhandler.h"
 #include "packagemanagercore_p.h"
-#include "qinstallerglobal.h"
 #include "utils.h"
 
 #include "kdupdaterfiledownloader.h"
 #include "kdupdaterfiledownloaderfactory.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QTimer>
-#include <QtCore/QUrl>
+#include <QTimer>
 
-#include <QMessageBox>
-
-#include <QtNetwork/QAuthenticator>
-
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
 
 using namespace KDUpdater;
 using namespace QInstaller;
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index 0c02890e2..fbec5e644 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -17,12 +17,12 @@
 #include "Windows/PropVariant.h"
 #include "Windows/PropVariantConversions.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QIODevice>
+#include <QDir>
+#include <QFileInfo>
+#include <QIODevice>
 #include <QtCore/QMutexLocker>
-#include <QtCore/QPointer>
-#include <QtCore/QTemporaryFile>
+#include <QPointer>
+#include <QTemporaryFile>
 
 #ifdef _MSC_VER
 #pragma warning(disable:4297)
diff --git a/src/libs/installer/lib7z_facade.h b/src/libs/installer/lib7z_facade.h
index e61cce6ac..88185375e 100644
--- a/src/libs/installer/lib7z_facade.h
+++ b/src/libs/installer/lib7z_facade.h
@@ -3,14 +3,14 @@
 
 #include "installer_global.h"
 
+#include <QCoreApplication>
 #include <QDateTime>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QPoint>
-#include <QtCore/QRunnable>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QVariant>
+#include <QFile>
+#include <QPoint>
+#include <QRunnable>
+#include <QString>
+#include <QVariant>
+#include <QVector>
 
 #include "Common/MyWindows.h"
 
diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp
index cb9a845ff..219bc8057 100644
--- a/src/libs/installer/messageboxhandler.cpp
+++ b/src/libs/installer/messageboxhandler.cpp
@@ -47,8 +47,8 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
+#include <QScriptEngine>
+#include <QScriptValue>
 
 QScriptValue QInstaller::registerMessageBox(QScriptEngine *scriptEngine)
 {
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index b10d194de..7f7c6b907 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -52,7 +52,6 @@
 #include "packagemanagercore_p.h"
 #include "packagemanagerproxyfactory.h"
 #include "progresscoordinator.h"
-#include "qinstallerglobal.h"
 #include "qprocesswrapper.h"
 #include "qsettingswrapper.h"
 #include "settings.h"
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 72c7096d6..e77bff18f 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -43,18 +43,15 @@
 #define PACKAGEMANAGERCORE_P_H
 
 #include "getrepositoriesmetainfojob.h"
-#include "settings.h"
 #include "packagemanagercore.h"
 #include "packagemanagercoredata.h"
+#include "qinstallerglobal.h"
 
-#include <kdsysinfo.h>
-#include <kdupdaterapplication.h>
-#include <kdupdaterupdatefinder.h>
+#include "kdsysinfo.h"
+#include "kdupdaterapplication.h"
+#include "kdupdaterfiledownloaderfactory.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QPair>
-#include <QtCore/QPointer>
+#include <QObject>
 
 class FSEngineClientHandler;
 class KDJob;
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 1e01e69ff..9dfcaa91c 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -46,7 +46,6 @@
 #include "fileutils.h"
 #include "messageboxhandler.h"
 #include "packagemanagercore.h"
-#include "qinstallerglobal.h"
 #include "progresscoordinator.h"
 #include "performinstallationform.h"
 #include "settings.h"
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index a01836253..c5e41ed3f 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -41,7 +41,6 @@
 #include "settings.h"
 
 #include "errors.h"
-#include "qinstallerglobal.h"
 #include "repository.h"
 
 #include <QtCore/QFileInfo>