71 files changed, 140 insertions, 135 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 9b8c2a430..cabaa9231 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -43,7 +43,7 @@
 #include "remoteclient.h"
 #include "settings.h"
 
-#include <kdupdaterupdateoperationfactory.h>
+#include "updateoperationfactory.h"
 
 #include <productkeycheck.h>
 
diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp
index 5ce08c26f..c4101c3d2 100644
--- a/src/libs/installer/createlocalrepositoryoperation.cpp
+++ b/src/libs/installer/createlocalrepositoryoperation.cpp
@@ -45,7 +45,7 @@
 #include "packagemanagercore.h"
 #include "productkeycheck.h"
 
-#include "kdupdaterupdateoperations.h"
+#include "updateoperations.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp
index 828e7f99a..536a8963f 100644
--- a/src/libs/installer/downloadarchivesjob.cpp
+++ b/src/libs/installer/downloadarchivesjob.cpp
@@ -39,8 +39,8 @@
 #include "packagemanagercore.h"
 #include "utils.h"
 
-#include "kdupdaterfiledownloader.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloader.h"
+#include "filedownloaderfactory.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QTimerEvent>
diff --git a/src/libs/installer/downloadarchivesjob.h b/src/libs/installer/downloadarchivesjob.h
index 61600c596..e1359de71 100644
--- a/src/libs/installer/downloadarchivesjob.h
+++ b/src/libs/installer/downloadarchivesjob.h
@@ -35,7 +35,7 @@
 #ifndef DOWNLOADARCHIVESJOB_H
 #define DOWNLOADARCHIVESJOB_H
 
-#include <kdjob.h>
+#include "job.h"
 
 #include <QtCore/QPair>
 
diff --git a/src/libs/installer/downloadfiletask.h b/src/libs/installer/downloadfiletask.h
index 2d0d4cf41..63134e3be 100644
--- a/src/libs/installer/downloadfiletask.h
+++ b/src/libs/installer/downloadfiletask.h
@@ -36,7 +36,7 @@
 #define DOWNLOADFILETASK_H
 
 #include "abstractfiletask.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloaderfactory.h"
 
 #include <QAuthenticator>
 Q_DECLARE_METATYPE(QAuthenticator)
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp
index cedf93a8b..117eed54f 100644
--- a/src/libs/installer/init.cpp
+++ b/src/libs/installer/init.cpp
@@ -57,8 +57,8 @@
 #include "lib7z_facade.h"
 #include "utils.h"
 
-#include "kdupdaterupdateoperationfactory.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "updateoperationfactory.h"
+#include "filedownloaderfactory.h"
 
 #include <QtPlugin>
 #include <QElapsedTimer>
diff --git a/src/libs/installer/metadatajob.h b/src/libs/installer/metadatajob.h
index 5dbb5d833..4369c5566 100644
--- a/src/libs/installer/metadatajob.h
+++ b/src/libs/installer/metadatajob.h
@@ -37,7 +37,7 @@
 
 #include "downloadfiletask.h"
 #include "fileutils.h"
-#include "kdjob.h"
+#include "job.h"
 #include "repository.h"
 
 #include <QFutureWatcher>
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index ddd35b974..7ee6f5e06 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -65,8 +65,8 @@
 #include <QDesktopServices>
 #include <QFileDialog>
 
-#include "kdsysinfo.h"
-#include "kdupdaterupdateoperationfactory.h"
+#include "sysinfo.h"
+#include "updateoperationfactory.h"
 
 #ifdef Q_OS_WIN
 #   include "qt_windows.h"
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index f240a309f..cfa7574ad 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -55,9 +55,9 @@
 #include "componentchecker.h"
 #include "globals.h"
 
-#include "kdselfrestarter.h"
-#include "kdupdaterfiledownloaderfactory.h"
-#include "kdupdaterupdateoperationfactory.h"
+#include "selfrestarter.h"
+#include "filedownloaderfactory.h"
+#include "updateoperationfactory.h"
 
 #include <productkeycheck.h>
 
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 6a7db3edb..62a36f30f 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -42,8 +42,8 @@
 #include "packagesource.h"
 #include "qinstallerglobal.h"
 
-#include "kdsysinfo.h"
-#include "kdupdaterupdatefinder.h"
+#include "sysinfo.h"
+#include "updatefinder.h"
 
 #include <QObject>
 
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 116a9e039..22092cfdd 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -46,7 +46,7 @@
 #include "scriptengine.h"
 #include "productkeycheck.h"
 
-#include "kdsysinfo.h"
+#include "sysinfo.h"
 
 #include <QApplication>
 
diff --git a/src/libs/installer/packagemanagerpagefactory.h b/src/libs/installer/packagemanagerpagefactory.h
index ee8b8ff66..928fc53bc 100644
--- a/src/libs/installer/packagemanagerpagefactory.h
+++ b/src/libs/installer/packagemanagerpagefactory.h
@@ -35,7 +35,7 @@
 #ifndef PACKAGEMANAGERPAGEFACTORY_H
 #define PACKAGEMANAGERPAGEFACTORY_H
 
-#include "kdgenericfactory.h"
+#include "genericfactory.h"
 #include "qinstallerglobal.h"
 
 namespace QInstaller {
diff --git a/src/libs/installer/packagemanagerproxyfactory.h b/src/libs/installer/packagemanagerproxyfactory.h
index 34b834807..28f53df6e 100644
--- a/src/libs/installer/packagemanagerproxyfactory.h
+++ b/src/libs/installer/packagemanagerproxyfactory.h
@@ -35,7 +35,7 @@
 #ifndef PACKAGEMANAGERPROXYFACTORY_H
 #define PACKAGEMANAGERPROXYFACTORY_H
 
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloaderfactory.h"
 
 namespace QInstaller {
 
diff --git a/src/libs/installer/qinstallerglobal.h b/src/libs/installer/qinstallerglobal.h
index 4831d99f3..a03daf6a4 100644
--- a/src/libs/installer/qinstallerglobal.h
+++ b/src/libs/installer/qinstallerglobal.h
@@ -37,8 +37,8 @@
 
 #include <installer_global.h>
 
-#include <kdupdaterupdate.h>
-#include <kdupdaterupdateoperation.h>
+#include "update.h"
+#include "updateoperation.h"
 #include "localpackagehub.h"
 
 namespace QInstaller {
diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp
index 8911b3950..dda22bb59 100644
--- a/src/libs/installer/repository.cpp
+++ b/src/libs/installer/repository.cpp
@@ -33,7 +33,7 @@
 **************************************************************************/
 
 #include "repository.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloaderfactory.h"
 
 #include <QDataStream>
 #include <QFileInfo>
diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp
index 4c6965176..7b0358b86 100644
--- a/src/libs/installer/selfrestartoperation.cpp
+++ b/src/libs/installer/selfrestartoperation.cpp
@@ -35,7 +35,7 @@
 #include "selfrestartoperation.h"
 #include "packagemanagercore.h"
 
-#include <kdselfrestarter.h>
+#include "selfrestarter.h"
 
 using namespace QInstaller;
 
diff --git a/src/libs/installer/settingsoperation.cpp b/src/libs/installer/settingsoperation.cpp
index 9884a95e9..d2d91872c 100644
--- a/src/libs/installer/settingsoperation.cpp
+++ b/src/libs/installer/settingsoperation.cpp
@@ -33,7 +33,7 @@
 **************************************************************************/
 #include "settingsoperation.h"
 #include "packagemanagercore.h"
-#include "kdupdaterupdateoperations.h"
+#include "updateoperations.h"
 #include "qsettingswrapper.h"
 
 #include <QDir>
diff --git a/src/libs/installer/sysinfo_win.cpp b/src/libs/installer/sysinfo_win.cpp
index 969ab69d3..6bca3e304 100644
--- a/src/libs/installer/sysinfo_win.cpp
+++ b/src/libs/installer/sysinfo_win.cpp
@@ -32,7 +32,7 @@
 **
 **************************************************************************/
 
-#include "kdsysinfo.h"
+#include "sysinfo.h"
 #include "link.h"
 
 #ifdef Q_CC_MINGW
diff --git a/src/libs/installer/testrepository.h b/src/libs/installer/testrepository.h
index a056b60e4..4116f1967 100644
--- a/src/libs/installer/testrepository.h
+++ b/src/libs/installer/testrepository.h
@@ -35,7 +35,7 @@
 #define TESTREPOSITORY_H
 
 #include "downloadfiletask.h"
-#include "kdjob.h"
+#include "job.h"
 #include "repository.h"
 
 #include <QFutureWatcher>
@@ -44,7 +44,6 @@
 namespace QInstaller {
 
 class PackageManagerCore;
-class Repository;
 
 class INSTALLER_EXPORT TestRepository : public KDJob
 {
diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/filedownloader.cpp
index 919a0a20e..fbc328d50 100644
--- a/src/libs/kdtools/kdupdaterfiledownloader.cpp
+++ b/src/libs/kdtools/filedownloader.cpp
@@ -32,11 +32,11 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterfiledownloader_p.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloader_p.h"
+#include "filedownloaderfactory.h"
 #include "ui_authenticationdialog.h"
 
-#include <fileutils.h>
+#include "fileutils.h"
 
 #include <QDialog>
 #include <QDir>
diff --git a/src/libs/kdtools/kdupdaterfiledownloader.h b/src/libs/kdtools/filedownloader.h
index a74097625..a74097625 100644
--- a/src/libs/kdtools/kdupdaterfiledownloader.h
+++ b/src/libs/kdtools/filedownloader.h
diff --git a/src/libs/kdtools/kdupdaterfiledownloader_p.h b/src/libs/kdtools/filedownloader_p.h
index e3be06ae4..b787e8392 100644
--- a/src/libs/kdtools/kdupdaterfiledownloader_p.h
+++ b/src/libs/kdtools/filedownloader_p.h
@@ -35,7 +35,7 @@
 #ifndef KD_UPDATER_FILE_DOWNLOADER_P_H
 #define KD_UPDATER_FILE_DOWNLOADER_P_H
 
-#include "kdupdaterfiledownloader.h"
+#include "filedownloader.h"
 
 #include <QtNetwork/QNetworkReply>
 
diff --git a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp b/src/libs/kdtools/filedownloaderfactory.cpp
index 73eb4c02f..2581aa11f 100644
--- a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp
+++ b/src/libs/kdtools/filedownloaderfactory.cpp
@@ -32,8 +32,8 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterfiledownloaderfactory.h"
-#include "kdupdaterfiledownloader_p.h"
+#include "filedownloaderfactory.h"
+#include "filedownloader_p.h"
 
 #include <QtNetwork/QSslSocket>
 
diff --git a/src/libs/kdtools/kdupdaterfiledownloaderfactory.h b/src/libs/kdtools/filedownloaderfactory.h
index ad0aa00d0..6f3740489 100644
--- a/src/libs/kdtools/kdupdaterfiledownloaderfactory.h
+++ b/src/libs/kdtools/filedownloaderfactory.h
@@ -35,8 +35,8 @@
 #ifndef KD_UPDATER_FILE_DOWNLOADER_FACTORY_H
 #define KD_UPDATER_FILE_DOWNLOADER_FACTORY_H
 
-#include "kdupdater.h"
-#include <kdgenericfactory.h>
+#include "genericfactory.h"
+#include "updater.h"
 
 #include <QtCore/QStringList>
 #include <QtCore/QUrl>
diff --git a/src/libs/kdtools/kdgenericfactory.cpp b/src/libs/kdtools/genericfactory.cpp
index 2a7718be3..f38cec31a 100644
--- a/src/libs/kdtools/kdgenericfactory.cpp
+++ b/src/libs/kdtools/genericfactory.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdgenericfactory.h"
+#include "genericfactory.h"
 
 /*!
     \inmodule kdupdater
diff --git a/src/libs/kdtools/kdgenericfactory.h b/src/libs/kdtools/genericfactory.h
index 048dc90ad..29051e22a 100644
--- a/src/libs/kdtools/kdgenericfactory.h
+++ b/src/libs/kdtools/genericfactory.h
@@ -35,7 +35,7 @@
 #ifndef KDTOOLS__KDGENERICFACTORY_H
 #define KDTOOLS__KDGENERICFACTORY_H
 
-#include <kdtoolsglobal.h>
+#include "kdtoolsglobal.h"
 
 #include <QtCore/QHash>
 
diff --git a/src/libs/kdtools/kdjob.cpp b/src/libs/kdtools/job.cpp
index cca082f9f..ad2472ae3 100644
--- a/src/libs/kdtools/kdjob.cpp
+++ b/src/libs/kdtools/job.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdjob.h"
+#include "job.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QEventLoop>
@@ -245,4 +245,4 @@ void KDJob::onFinished()
         deleteLater();
 }
 
-#include "moc_kdjob.cpp"
+#include "moc_job.cpp"
diff --git a/src/libs/kdtools/kdjob.h b/src/libs/kdtools/job.h
index 14231e7ed..14231e7ed 100644
--- a/src/libs/kdtools/kdjob.h
+++ b/src/libs/kdtools/job.h
diff --git a/src/libs/kdtools/kdsysinfo_win.cpp b/src/libs/kdtools/kdsysinfo_win.cpp
index 545cc6aad..c7358dbf1 100644
--- a/src/libs/kdtools/kdsysinfo_win.cpp
+++ b/src/libs/kdtools/kdsysinfo_win.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdsysinfo.h"
+#include "sysinfo.h"
 
 #include <QLibrary>
 #include <QStringList>
diff --git a/src/libs/kdtools/kdtools.pri b/src/libs/kdtools/kdtools.pri
index 80a569d86..eaa391e0f 100644
--- a/src/libs/kdtools/kdtools.pri
+++ b/src/libs/kdtools/kdtools.pri
@@ -5,49 +5,54 @@ DEFINES += BUILD_SHARED_KDTOOLS
 FORMS += $$PWD/authenticationdialog.ui
 
 HEADERS += $$PWD/kdtoolsglobal.h \
-    $$PWD/kdjob.h \
-    $$PWD/kdgenericfactory.h \
-    $$PWD/kdselfrestarter.h \
-    $$PWD/kdrunoncechecker.h \
-    $$PWD/kdlockfile.h \
-    $$PWD/kdsysinfo.h
-
-SOURCES += $$PWD/kdjob.cpp \
-    $$PWD/kdselfrestarter.cpp \
-    $$PWD/kdrunoncechecker.cpp \
-    $$PWD/kdlockfile.cpp \
-    $$PWD/kdsysinfo.cpp
-
-
-HEADERS += $$PWD/kdupdater.h \
-    $$PWD/kdupdaterfiledownloader.h \
-    $$PWD/kdupdaterfiledownloader_p.h \
-    $$PWD/kdupdaterfiledownloaderfactory.h \
+    $$PWD/job.h \
+    $$PWD/genericfactory.h \
+    $$PWD/selfrestarter.h \
+    $$PWD/runoncechecker.h \
+    $$PWD/lockfile.h \
+    $$PWD/sysinfo.h
+
+SOURCES += $$PWD/job.cpp \
+    $$PWD/selfrestarter.cpp \
+    $$PWD/runoncechecker.cpp \
+    $$PWD/lockfile.cpp \
+    $$PWD/sysinfo.cpp
+
+
+HEADERS += $$PWD/updater.h \
+    $$PWD/filedownloader.h \
+    $$PWD/filedownloader_p.h \
+    $$PWD/filedownloaderfactory.h \
     $$PWD/localpackagehub.h \
-    $$PWD/kdupdaterupdate.h \
-    $$PWD/kdupdaterupdateoperation.h \
-    $$PWD/kdupdaterupdateoperationfactory.h \
-    $$PWD/kdupdaterupdateoperations.h \
-    $$PWD/kdupdatertask.h \
-    $$PWD/kdupdaterupdatefinder.h \
-    $$PWD/kdupdaterupdatesinfo_p.h \
+    $$PWD/update.h \
+    $$PWD/updateoperation.h \
+    $$PWD/updateoperationfactory.h \
+    $$PWD/updateoperations.h \
+    $$PWD/task.h \
+    $$PWD/updatefinder.h \
+    $$PWD/updatesinfo_p.h \
     $$PWD/environment.h \
-    $$PWD/kdupdaterupdatesinfodata_p.h
+    $$PWD/updatesinfodata_p.h
 
-SOURCES += $$PWD/kdupdaterfiledownloader.cpp \
-    $$PWD/kdupdaterfiledownloaderfactory.cpp \
+SOURCES += $$PWD/filedownloader.cpp \
+    $$PWD/filedownloaderfactory.cpp \
     $$PWD/localpackagehub.cpp \
-    $$PWD/kdupdaterupdate.cpp \
-    $$PWD/kdupdaterupdateoperation.cpp \
-    $$PWD/kdupdaterupdateoperationfactory.cpp \
-    $$PWD/kdupdaterupdateoperations.cpp \
-    $$PWD/kdupdatertask.cpp \
-    $$PWD/kdupdaterupdatefinder.cpp \
-    $$PWD/kdupdaterupdatesinfo.cpp \
+    $$PWD/update.cpp \
+    $$PWD/updateoperation.cpp \
+    $$PWD/updateoperationfactory.cpp \
+    $$PWD/updateoperations.cpp \
+    $$PWD/task.cpp \
+    $$PWD/updatefinder.cpp \
+    $$PWD/updatesinfo.cpp \
     $$PWD/environment.cpp
 
-unix:SOURCES += $$PWD/kdlockfile_unix.cpp
-win32:SOURCES += $$PWD/kdlockfile_win.cpp
-win32:SOURCES += $$PWD/kdsysinfo_win.cpp
-macx:SOURCES += $$PWD/kdsysinfo_mac.cpp
-unix:!macx:SOURCES += $$PWD/kdsysinfo_x11.cpp
+win32 {
+    SOURCES += $$PWD/lockfile_win.cpp \
+        $$PWD/kdsysinfo_win.cpp
+}
+
+unix {
+    SOURCES += $$PWD/lockfile_unix.cpp
+    osx: SOURCES += $$PWD/sysinfo_mac.cpp
+    else: SOURCES += $$PWD/sysinfo_x11.cpp
+}
diff --git a/src/libs/kdtools/localpackagehub.h b/src/libs/kdtools/localpackagehub.h
index 4e2f6634f..540b24481 100644
--- a/src/libs/kdtools/localpackagehub.h
+++ b/src/libs/kdtools/localpackagehub.h
@@ -36,7 +36,7 @@
 #ifndef KD_UPDATER_PACKAGES_INFO_H
 #define KD_UPDATER_PACKAGES_INFO_H
 
-#include "kdupdater.h"
+#include "updater.h"
 
 #include <QCoreApplication>
 #include <QDate>
diff --git a/src/libs/kdtools/kdlockfile.cpp b/src/libs/kdtools/lockfile.cpp
index c929298e3..5923dc07e 100644
--- a/src/libs/kdtools/kdlockfile.cpp
+++ b/src/libs/kdtools/lockfile.cpp
@@ -33,8 +33,8 @@
 **
 ****************************************************************************/
 
-#include "kdlockfile.h"
-#include "kdlockfile_p.h"
+#include "lockfile.h"
+#include "lockfile_p.h"
 
 KDLockFile::KDLockFile(const QString &name)
     : d(new Private(name))
diff --git a/src/libs/kdtools/kdlockfile.h b/src/libs/kdtools/lockfile.h
index 615793fb4..9a762a716 100644
--- a/src/libs/kdtools/kdlockfile.h
+++ b/src/libs/kdtools/lockfile.h
@@ -36,7 +36,7 @@
 #ifndef KDLOCKFILE_H
 #define KDLOCKFILE_H
 
-#include <kdtoolsglobal.h>
+#include "kdtoolsglobal.h"
 
 class KDTOOLS_EXPORT KDLockFile
 {
diff --git a/src/libs/kdtools/kdlockfile_p.h b/src/libs/kdtools/lockfile_p.h
index 8c482a3a0..7bdd74494 100644
--- a/src/libs/kdtools/kdlockfile_p.h
+++ b/src/libs/kdtools/lockfile_p.h
@@ -36,7 +36,7 @@
 #ifndef KDLOCKFILE_P_H
 #define KDLOCKFILE_P_H
 
-#include "kdlockfile.h"
+#include "lockfile.h"
 
 #include <QString>
 
diff --git a/src/libs/kdtools/kdlockfile_unix.cpp b/src/libs/kdtools/lockfile_unix.cpp
index d763c7c14..d37fc8fb1 100644
--- a/src/libs/kdtools/kdlockfile_unix.cpp
+++ b/src/libs/kdtools/lockfile_unix.cpp
@@ -33,7 +33,7 @@
 **
 ****************************************************************************/
 
-#include "kdlockfile_p.h"
+#include "lockfile_p.h"
 
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/libs/kdtools/kdlockfile_win.cpp b/src/libs/kdtools/lockfile_win.cpp
index b3241b003..137cf3cf4 100644
--- a/src/libs/kdtools/kdlockfile_win.cpp
+++ b/src/libs/kdtools/lockfile_win.cpp
@@ -33,10 +33,10 @@
 **
 ****************************************************************************/
 
-#include "kdlockfile.h"
-#include "kdlockfile_p.h"
+#include "lockfile.h"
+#include "lockfile_p.h"
 
-#include <utils.h>
+#include "utils.h"
 
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/libs/kdtools/kdrunoncechecker.cpp b/src/libs/kdtools/runoncechecker.cpp
index d3f953fcc..741708a69 100644
--- a/src/libs/kdtools/kdrunoncechecker.cpp
+++ b/src/libs/kdtools/runoncechecker.cpp
@@ -33,9 +33,9 @@
 **
 ****************************************************************************/
 
-#include "kdrunoncechecker.h"
-#include "kdlockfile.h"
-#include "kdsysinfo.h"
+#include "runoncechecker.h"
+#include "lockfile.h"
+#include "sysinfo.h"
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/src/libs/kdtools/kdrunoncechecker.h b/src/libs/kdtools/runoncechecker.h
index 9ee71b8e0..cc64e9d06 100644
--- a/src/libs/kdtools/kdrunoncechecker.h
+++ b/src/libs/kdtools/runoncechecker.h
@@ -36,7 +36,7 @@
 #ifndef KDTOOLS_RUNONCECHECKER_H
 #define KDTOOLS_RUNONCECHECKER_H
 
-#include "kdlockfile.h"
+#include "lockfile.h"
 
 #include <QString>
 
diff --git a/src/libs/kdtools/kdselfrestarter.cpp b/src/libs/kdtools/selfrestarter.cpp
index 358076506..915f55c43 100644
--- a/src/libs/kdtools/kdselfrestarter.cpp
+++ b/src/libs/kdtools/selfrestarter.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdselfrestarter.h"
+#include "selfrestarter.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
diff --git a/src/libs/kdtools/kdselfrestarter.h b/src/libs/kdtools/selfrestarter.h
index 3808ac207..3808ac207 100644
--- a/src/libs/kdtools/kdselfrestarter.h
+++ b/src/libs/kdtools/selfrestarter.h
diff --git a/src/libs/kdtools/kdsysinfo.cpp b/src/libs/kdtools/sysinfo.cpp
index c56e4c98f..ea3326499 100644
--- a/src/libs/kdtools/kdsysinfo.cpp
+++ b/src/libs/kdtools/sysinfo.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdsysinfo.h"
+#include "sysinfo.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
diff --git a/src/libs/kdtools/kdsysinfo.h b/src/libs/kdtools/sysinfo.h
index 4b8f24fa1..34192f60e 100644
--- a/src/libs/kdtools/kdsysinfo.h
+++ b/src/libs/kdtools/sysinfo.h
@@ -35,7 +35,7 @@
 #ifndef KDSYSINFO_H
 #define KDSYSINFO_H
 
-#include <kdtoolsglobal.h>
+#include "kdtoolsglobal.h"
 
 #include <QtCore/QString>
 
diff --git a/src/libs/kdtools/kdsysinfo_mac.cpp b/src/libs/kdtools/sysinfo_mac.cpp
index 8c25bde42..437ccf29f 100644
--- a/src/libs/kdtools/kdsysinfo_mac.cpp
+++ b/src/libs/kdtools/sysinfo_mac.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdsysinfo.h"
+#include "sysinfo.h"
 
 #include <Carbon/Carbon.h>
 
diff --git a/src/libs/kdtools/kdsysinfo_x11.cpp b/src/libs/kdtools/sysinfo_x11.cpp
index 41575f775..b5bd9d6a6 100644
--- a/src/libs/kdtools/kdsysinfo_x11.cpp
+++ b/src/libs/kdtools/sysinfo_x11.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdsysinfo.h"
+#include "sysinfo.h"
 
 #include <sys/utsname.h>
 #include <sys/statvfs.h>
diff --git a/src/libs/kdtools/kdupdatertask.cpp b/src/libs/kdtools/task.cpp
index 8278ff6a6..5c56da187 100644
--- a/src/libs/kdtools/kdupdatertask.cpp
+++ b/src/libs/kdtools/task.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdupdatertask.h"
+#include "task.h"
 
 using namespace KDUpdater;
 
diff --git a/src/libs/kdtools/kdupdatertask.h b/src/libs/kdtools/task.h
index 5eea26348..66e85e662 100644
--- a/src/libs/kdtools/kdupdatertask.h
+++ b/src/libs/kdtools/task.h
@@ -35,7 +35,7 @@
 #ifndef KD_UPDATER_TASK_H
 #define KD_UPDATER_TASK_H
 
-#include "kdupdater.h"
+#include "updater.h"
 
 #include <QObject>
 
diff --git a/src/libs/kdtools/kdupdaterupdate.cpp b/src/libs/kdtools/update.cpp
index 9b6f7b3d9..87caff878 100644
--- a/src/libs/kdtools/kdupdaterupdate.cpp
+++ b/src/libs/kdtools/update.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterupdate.h"
+#include "update.h"
 
 using namespace KDUpdater;
 
diff --git a/src/libs/kdtools/kdupdaterupdate.h b/src/libs/kdtools/update.h
index ecd5508f5..d301a5360 100644
--- a/src/libs/kdtools/kdupdaterupdate.h
+++ b/src/libs/kdtools/update.h
@@ -35,8 +35,8 @@
 #ifndef KD_UPDATER_UPDATE_H
 #define KD_UPDATER_UPDATE_H
 
-#include <packagesource.h>
-#include <kdupdaterupdatesinfo_p.h>
+#include "packagesource.h"
+#include "updatesinfo_p.h"
 #include <QVariant>
 
 namespace KDUpdater {
diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/updatefinder.cpp
index 9791ca454..3472cd13e 100644
--- a/src/libs/kdtools/kdupdaterupdatefinder.cpp
+++ b/src/libs/kdtools/updatefinder.cpp
@@ -33,11 +33,11 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterupdatefinder.h"
-#include "kdupdaterupdate.h"
-#include "kdupdaterfiledownloader.h"
-#include "kdupdaterfiledownloaderfactory.h"
-#include "kdupdaterupdatesinfo_p.h"
+#include "updatefinder.h"
+#include "update.h"
+#include "filedownloader.h"
+#include "filedownloaderfactory.h"
+#include "updatesinfo_p.h"
 #include "localpackagehub.h"
 
 #include "fileutils.h"
@@ -637,4 +637,4 @@ int KDUpdater::compareVersion(const QString &v1, const QString &v2)
     return 0;
 }
 
-#include "moc_kdupdaterupdatefinder.cpp"
+#include "moc_updatefinder.cpp"
diff --git a/src/libs/kdtools/kdupdaterupdatefinder.h b/src/libs/kdtools/updatefinder.h
index 5994bb685..1cb75d05a 100644
--- a/src/libs/kdtools/kdupdaterupdatefinder.h
+++ b/src/libs/kdtools/updatefinder.h
@@ -36,7 +36,7 @@
 #ifndef KD_UPDATER_UPDATE_FINDER_H
 #define KD_UPDATER_UPDATE_FINDER_H
 
-#include "kdupdatertask.h"
+#include "task.h"
 #include "packagesource.h"
 
 #include <memory>
diff --git a/src/libs/kdtools/kdupdaterupdateoperation.cpp b/src/libs/kdtools/updateoperation.cpp
index f4505d6da..8bde8add1 100644
--- a/src/libs/kdtools/kdupdaterupdateoperation.cpp
+++ b/src/libs/kdtools/updateoperation.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterupdateoperation.h"
+#include "updateoperation.h"
 
 #include "constants.h"
 #include "fileutils.h"
diff --git a/src/libs/kdtools/kdupdaterupdateoperation.h b/src/libs/kdtools/updateoperation.h
index 76b6fc6eb..17c399c6f 100644
--- a/src/libs/kdtools/kdupdaterupdateoperation.h
+++ b/src/libs/kdtools/updateoperation.h
@@ -35,7 +35,7 @@
 #ifndef KD_UPDATER_UPDATE_OPERATION_H
 #define KD_UPDATER_UPDATE_OPERATION_H
 
-#include "kdupdater.h"
+#include "updater.h"
 
 #include <QCoreApplication>
 #include <QStringList>
diff --git a/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp b/src/libs/kdtools/updateoperationfactory.cpp
index a74658cc2..b045532ec 100644
--- a/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp
+++ b/src/libs/kdtools/updateoperationfactory.cpp
@@ -32,9 +32,10 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterupdateoperationfactory.h"
+#include "updateoperationfactory.h"
 
-#include "kdupdaterupdateoperations.h"
+#include "packagemanagercore.h"
+#include "updateoperations.h"
 
 using namespace KDUpdater;
 
diff --git a/src/libs/kdtools/kdupdaterupdateoperationfactory.h b/src/libs/kdtools/updateoperationfactory.h
index 03a2ba047..22b0c7f58 100644
--- a/src/libs/kdtools/kdupdaterupdateoperationfactory.h
+++ b/src/libs/kdtools/updateoperationfactory.h
@@ -35,9 +35,9 @@
 #ifndef KD_UPDATER_UPDATE_OPERATION_FACTORY_H
 #define KD_UPDATER_UPDATE_OPERATION_FACTORY_H
 
-#include "kdgenericfactory.h"
+#include "genericfactory.h"
 
-#include "kdupdater.h"
+#include "updater.h"
 
 namespace QInstaller {
 class PackageManagerCore;
diff --git a/src/libs/kdtools/kdupdaterupdateoperations.cpp b/src/libs/kdtools/updateoperations.cpp
index cc5c5ba8d..f72bd100c 100644
--- a/src/libs/kdtools/kdupdaterupdateoperations.cpp
+++ b/src/libs/kdtools/updateoperations.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterupdateoperations.h"
+#include "updateoperations.h"
 #include "errors.h"
 #include "fileutils.h"
 
diff --git a/src/libs/kdtools/kdupdaterupdateoperations.h b/src/libs/kdtools/updateoperations.h
index 5114196a9..b0a49a08d 100644
--- a/src/libs/kdtools/kdupdaterupdateoperations.h
+++ b/src/libs/kdtools/updateoperations.h
@@ -35,7 +35,7 @@
 #ifndef KD_UPDATER_UPDATE_OPERATIONS_H
 #define KD_UPDATER_UPDATE_OPERATIONS_H
 
-#include "kdupdaterupdateoperation.h"
+#include "updateoperation.h"
 
 namespace KDUpdater {
 
diff --git a/src/libs/kdtools/kdupdater.h b/src/libs/kdtools/updater.h
index bd873227a..bd873227a 100644
--- a/src/libs/kdtools/kdupdater.h
+++ b/src/libs/kdtools/updater.h
diff --git a/src/libs/kdtools/kdupdaterupdatesinfo.cpp b/src/libs/kdtools/updatesinfo.cpp
index 48003279b..44539171b 100644
--- a/src/libs/kdtools/kdupdaterupdatesinfo.cpp
+++ b/src/libs/kdtools/updatesinfo.cpp
@@ -32,7 +32,7 @@
 **
 ****************************************************************************/
 
-#include "kdupdaterupdatesinfo_p.h"
+#include "updatesinfo_p.h"
 
 #include <QDomDocument>
 #include <QFile>
diff --git a/src/libs/kdtools/kdupdaterupdatesinfo_p.h b/src/libs/kdtools/updatesinfo_p.h
index 716bc4fcf..831440a62 100644
--- a/src/libs/kdtools/kdupdaterupdatesinfo_p.h
+++ b/src/libs/kdtools/updatesinfo_p.h
@@ -35,8 +35,8 @@
 #ifndef KD_UPDATER_UPDATE_INFO_H
 #define KD_UPDATER_UPDATE_INFO_H
 
-#include "kdupdater.h"
-#include "kdupdaterupdatesinfodata_p.h"
+#include "updater.h"
+#include "updatesinfodata_p.h"
 
 #include <QHash>
 #include <QSharedData>
diff --git a/src/libs/kdtools/kdupdaterupdatesinfodata_p.h b/src/libs/kdtools/updatesinfodata_p.h
index 402c25567..402c25567 100644
--- a/src/libs/kdtools/kdupdaterupdatesinfodata_p.h
+++ b/src/libs/kdtools/updatesinfodata_p.h
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 03fb98f8b..0557f36a2 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -42,7 +42,7 @@
 #include <copydirectoryoperation.h>
 #include <errors.h>
 #include <init.h>
-#include <kdupdaterupdateoperations.h>
+#include <updateoperations.h>
 #include <messageboxhandler.h>
 #include <packagemanagercore.h>
 #include <packagemanagerproxyfactory.h>
@@ -53,8 +53,8 @@
 #include <utils.h>
 #include <globals.h>
 
-#include <kdrunoncechecker.h>
-#include <kdupdaterfiledownloaderfactory.h>
+#include <runoncechecker.h>
+#include <filedownloaderfactory.h>
 
 #include <QDirIterator>
 #include <QTemporaryFile>
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index b80c10a6e..feea95a37 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -40,7 +40,7 @@
 #include "updatechecker.h"
 
 #include <errors.h>
-#include <kdselfrestarter.h>
+#include <selfrestarter.h>
 #include <remoteserver.h>
 #include <utils.h>
 
diff --git a/src/sdk/updatechecker.cpp b/src/sdk/updatechecker.cpp
index 35e2dda88..ea0427098 100644
--- a/src/sdk/updatechecker.cpp
+++ b/src/sdk/updatechecker.cpp
@@ -38,7 +38,7 @@
 #include <component.h>
 #include <errors.h>
 #include <init.h>
-#include <kdrunoncechecker.h>
+#include <runoncechecker.h>
 #include <packagemanagercore.h>
 #include <productkeycheck.h>
 
diff --git a/tests/auto/installer/binaryformat/tst_binaryformat.cpp b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
index 7402f05f2..17d7faf8b 100644
--- a/tests/auto/installer/binaryformat/tst_binaryformat.cpp
+++ b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
@@ -36,7 +36,7 @@
 #include <binaryformat.h>
 #include <errors.h>
 #include <fileio.h>
-#include <kdupdaterupdateoperation.h>
+#include <updateoperation.h>
 
 #include <QTest>
 #include <QTemporaryFile>
diff --git a/tests/auto/installer/componentmodel/tst_componentmodel.cpp b/tests/auto/installer/componentmodel/tst_componentmodel.cpp
index f764a9371..ea76bb2e6 100644
--- a/tests/auto/installer/componentmodel/tst_componentmodel.cpp
+++ b/tests/auto/installer/componentmodel/tst_componentmodel.cpp
@@ -1,6 +1,6 @@
 #include "component.h"
 #include "componentmodel.h"
-#include "kdupdaterupdatesinfo_p.h"
+#include "updatesinfo_p.h"
 #include "packagemanagercore.h"
 
 #include <QTest>
diff --git a/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp b/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp
index 6cc564742..9450dbdc7 100644
--- a/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp
+++ b/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp
@@ -33,7 +33,7 @@
 **************************************************************************/
 
 #include <init.h>
-#include <kdupdaterupdateoperations.h>
+#include <updateoperations.h>
 #include <utils.h>
 
 #include <QDir>
diff --git a/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp b/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp
index 875e5107b..f3c2e6b56 100644
--- a/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp
+++ b/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp
@@ -33,7 +33,7 @@
 **************************************************************************/
 
 #include "init.h"
-#include "kdupdaterupdateoperations.h"
+#include "updateoperations.h"
 
 #include <QDir>
 #include <QObject>
diff --git a/tests/downloadspeed/main.cpp b/tests/downloadspeed/main.cpp
index c56305657..891e7c835 100644
--- a/tests/downloadspeed/main.cpp
+++ b/tests/downloadspeed/main.cpp
@@ -32,8 +32,8 @@
 **
 **************************************************************************/
 
-#include <kdupdaterfiledownloader.h>
-#include <kdupdaterfiledownloaderfactory.h>
+#include <filedownloader.h>
+#include <filedownloaderfactory.h>
 
 #include <fileutils.h>
 
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index 63ee2385b..40caf388b 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -45,7 +45,7 @@
 #include <utils.h>
 #include <scriptengine.h>
 
-#include <kdupdater.h>
+#include <updater.h>
 
 #include <QtCore/QDirIterator>
 
diff --git a/tools/devtool/operationrunner.cpp b/tools/devtool/operationrunner.cpp
index 8e232ef2e..543bfcf0c 100644
--- a/tools/devtool/operationrunner.cpp
+++ b/tools/devtool/operationrunner.cpp
@@ -35,7 +35,7 @@
 #include "operationrunner.h"
 
 #include <errors.h>
-#include <kdupdaterupdateoperationfactory.h>
+#include <updateoperationfactory.h>
 #include <packagemanagercore.h>
 
 #include <QMetaObject>
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp
index 7554cfa20..2353555e1 100644
--- a/tools/repogen/repogen.cpp
+++ b/tools/repogen/repogen.cpp
@@ -36,7 +36,7 @@
 #include <errors.h>
 #include <fileutils.h>
 #include <init.h>
-#include <kdupdater.h>
+#include <updater.h>
 #include <settings.h>
 #include <utils.h>
 #include <lib7z_facade.h>