Simplify KD* directory structure.

Change-Id: Ia6a4a9581873ada42aed3818d8fd2a4f41763f75
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

95 files changed, 100 insertions, 106 deletions

diff --git a/installerbuilder/binarycreator/binarycreator.cpp b/installerbuilder/binarycreator/binarycreator.cpp
index 3449ff10e..200e0481c 100644
--- a/installerbuilder/binarycreator/binarycreator.cpp
+++ b/installerbuilder/binarycreator/binarycreator.cpp
@@ -39,7 +39,7 @@
 #include <init.h>
 #include <settings.h>
 
-#include <KDToolsCore/kdsavefile.h>
+#include <kdsavefile.h>
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp
index a9412482f..a8710ca27 100644
--- a/installerbuilder/common/binaryformat.cpp
+++ b/installerbuilder/common/binaryformat.cpp
@@ -38,7 +38,7 @@
 #include "utils.h"
 #include "zipjob.h"
 
-#include <KDUpdater/kdupdaterupdateoperationfactory.h>
+#include <kdupdaterupdateoperationfactory.h>
 
 #include <QtCore/QResource>
 #include <QtCore/QTemporaryFile>
diff --git a/installerbuilder/common/consolepasswordprovider.h b/installerbuilder/common/consolepasswordprovider.h
index faabed7cf..fd16c6bbb 100644
--- a/installerbuilder/common/consolepasswordprovider.h
+++ b/installerbuilder/common/consolepasswordprovider.h
@@ -23,10 +23,11 @@
 ** (qt-info@nokia.com).
 **
 **************************************************************************/
+
 #ifndef CONSOLEPASSWORDPROVIDER_H
 #define CONSOLEPASSWORDPROVIDER_H
 
-#include <KDUpdater/kdupdatercrypto.h>
+#include <kdupdatercrypto.h>
 
 #include <iostream>
 #include <string>
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index 03af930ac..d637ae19e 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -49,8 +49,8 @@
 #include <settings.h>
 #include <updater.h>
 
-#include <KDToolsCore/kdselfrestarter.h>
-#include <KDToolsCore/kdrunoncechecker.h>
+#include <kdselfrestarter.h>
+#include <kdrunoncechecker.h>
 
 #include <QtCore/QTranslator>
 
diff --git a/installerbuilder/installerbase/installerbase_p.cpp b/installerbuilder/installerbase/installerbase_p.cpp
index d335921ef..d0a0b2de4 100644
--- a/installerbuilder/installerbase/installerbase_p.cpp
+++ b/installerbuilder/installerbase/installerbase_p.cpp
@@ -39,10 +39,10 @@
 #include <lib7z_facade.h>
 #include <qprocesswrapper.h>
 
-#include <KDUpdater/kdupdaterfiledownloader.h>
-#include <KDUpdater/kdupdaterfiledownloaderfactory.h>
+#include <kdupdaterfiledownloader.h>
+#include <kdupdaterfiledownloaderfactory.h>
 
-#include <KDToolsCore/kdsavefile.h>
+#include <kdsavefile.h>
 
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDToolsCore.pri b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDToolsCore.pri
deleted file mode 100644
index 2dea65a66..000000000
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/KDToolsCore.pri
+++ /dev/null
@@ -1,31 +0,0 @@
-DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD
-
-CONFIG( shared, static|shared) {
-    DEFINES += BUILD_SHARED_KDTOOLSCORE
-}
-
-HEADERS += $$PWD/pimpl_ptr.h \
-    $$PWD/kdtoolsglobal.h \
-    $$PWD/kdjob.h \
-    $$PWD/kdgenericfactory.h \
-    $$PWD/kdselfrestarter.h \
-    $$PWD/kdsavefile.h \
-    $$PWD/kdrunoncechecker.h \
-    $$PWD/kdlockfile.h \
-    $$PWD/kdsysinfo.h
-
-SOURCES += $$PWD/pimpl_ptr.cpp \
-    $$PWD/kdjob.cpp \
-    $$PWD/kdgenericfactory.cpp \
-    $$PWD/kdselfrestarter.cpp \
-    $$PWD/kdsavefile.cpp \
-    $$PWD/kdrunoncechecker.cpp \
-    $$PWD/kdlockfile.cpp \
-    $$PWD/kdsysinfo.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
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr b/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr
deleted file mode 100644
index aa2f3984a..000000000
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr
+++ /dev/null
@@ -1 +0,0 @@
-#include "pimpl_ptr.h"
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/environment.cpp
index f269bba72..f269bba72 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/environment.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.h b/installerbuilder/libinstaller/3rdparty/kdtools/environment.h
index 2c0d272d1..2c0d272d1 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/environment.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/environment.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.cpp
index 9352f83cd..9352f83cd 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.h
index 08a9984a2..1e044bafd 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdgenericfactory.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdgenericfactory.h
@@ -23,7 +23,7 @@
 #ifndef __KDTOOLSCORE__KDGENERICFACTORY_H__
 #define __KDTOOLSCORE__KDGENERICFACTORY_H__
 
-#include <KDToolsCore/kdtoolsglobal.h>
+#include <kdtoolsglobal.h>
 
 #include <QtCore/QHash>
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.cpp
index d88380ffb..d88380ffb 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h
index 10cdd6899..1da7f1074 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdjob.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdjob.h
@@ -25,7 +25,7 @@
 
 #include <QObject>
 
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 
 class KDTOOLSCORE_EXPORT KDJob : public QObject {
     Q_OBJECT
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.cpp
index 234bc448e..234bc448e 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h
index 3334f385f..3334f385f 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_p.h
index da4c4dc4c..da4c4dc4c 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_p.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_p.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_unix.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp
index 4f6ed3cbb..4f6ed3cbb 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_unix.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_win.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_win.cpp
index f7fed60ab..f7fed60ab 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdlockfile_win.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdlockfile_win.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp
index 457a6215a..457a6215a 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h
index 9e562d3cf..e7099c115 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdrunoncechecker.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.h
@@ -23,7 +23,7 @@
 #ifndef __KDTOOLS_RUNONCECHECKER_H__
 #define __KDTOOLS_RUNONCECHECKER_H__
 
-#include <KDToolsCore/pimpl_ptr>
+#include <pimpl_ptr.h>
 
 #include <QtCore/QString>
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.cpp
index 38a4b87bf..38a4b87bf 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h
index 94170608c..2dad832e8 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsavefile.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsavefile.h
@@ -23,8 +23,8 @@
 #ifndef __KDTOOLSCORE_KDSAVEFILE_H__
 #define __KDTOOLSCORE_KDSAVEFILE_H__
 
-#include <KDToolsCore/kdtoolsglobal.h>
-#include <KDToolsCore/pimpl_ptr.h>
+#include <kdtoolsglobal.h>
+#include <pimpl_ptr.h>
 
 #include <QtCore/QIODevice>
 #include <QtCore/QFile>
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.cpp
index fcd66f238..fcd66f238 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h
index 0582c778d..511cf042e 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdselfrestarter.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdselfrestarter.h
@@ -23,7 +23,7 @@
 #ifndef __KDTOOLSCORE_KDSELFRESTARTER_H__
 #define __KDTOOLSCORE_KDSELFRESTARTER_H__
 
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 
 class KDTOOLSCORE_EXPORT KDSelfRestarter {
 public:
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp
index 55b0519db..55b0519db 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h
index 8cb6868a9..69acabf81 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h
@@ -23,7 +23,7 @@
 #ifndef KDSYSINFO_H
 #define KDSYSINFO_H
 
-#include <KDToolsCore/kdtoolsglobal.h>
+#include <kdtoolsglobal.h>
 
 #include <QtCore/QString>
 #include <QtCore/QSysInfo>
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_mac.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp
index a8d62425c..a8d62425c 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_mac.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_win.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp
index 86d152431..86d152431 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_win.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_x11.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp
index f54f63c8e..f54f63c8e 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdsysinfo_x11.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater.pri b/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri
index 72a59e482..663c62434 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/KDUpdater.pri
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdtools.pri
@@ -1,10 +1,31 @@
 DEPENDPATH += $$PWD
 INCLUDEPATH += $$PWD
 
-CONFIG( shared, static|shared) {
+CONFIG(shared, static|shared) {
+    DEFINES += BUILD_SHARED_KDTOOLSCORE
     DEFINES += BUILD_SHARED_KDUPDATER
 }
 
+HEADERS += $$PWD/pimpl_ptr.h \
+    $$PWD/kdtoolsglobal.h \
+    $$PWD/kdjob.h \
+    $$PWD/kdgenericfactory.h \
+    $$PWD/kdselfrestarter.h \
+    $$PWD/kdsavefile.h \
+    $$PWD/kdrunoncechecker.h \
+    $$PWD/kdlockfile.h \
+    $$PWD/kdsysinfo.h
+
+SOURCES += $$PWD/pimpl_ptr.cpp \
+    $$PWD/kdjob.cpp \
+    $$PWD/kdgenericfactory.cpp \
+    $$PWD/kdselfrestarter.cpp \
+    $$PWD/kdsavefile.cpp \
+    $$PWD/kdrunoncechecker.cpp \
+    $$PWD/kdlockfile.cpp \
+    $$PWD/kdsysinfo.cpp
+
+
 HEADERS += $$PWD/kdupdater.h \
     $$PWD/kdupdaterapplication.h \
     $$PWD/kdupdatercrypto.h \
@@ -51,8 +72,15 @@ SOURCES += $$PWD/kdupdaterapplication.cpp \
 
 QT += gui
 
+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
+
+
 TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
-win32:TRY_INCLUDEPATHS += $$PWD/../../openssl-0.9.8k/src/include
+win32:TRY_INCLUDEPATHS += $$PWD/../openssl-0.9.8k/src/include
 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
 for(p, TRY_INCLUDEPATHS) {
     pp = $$join(p, "", "", "/openssl")
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdtoolsglobal.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h
index 8d94425d5..8d94425d5 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/kdtoolsglobal.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdtoolsglobal.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdater.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h
index 9e0007155..9e0007155 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdater.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdater.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.cpp
index cf4379c90..cf4379c90 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h
index 1d0fca6d9..1d0fca6d9 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterapplication.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterapplication.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.cpp
index b5808c9c2..b5808c9c2 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h
index 4d94c89fb..426b1fa81 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatercrypto.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatercrypto.h
@@ -25,7 +25,7 @@
 
 #include "kdupdater.h"
 
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
index 2ff1e9a4d..2ff1e9a4d 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h
index def79a236..0bf2060b3 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.h
@@ -24,7 +24,7 @@
 #define KD_UPDATER_FILE_DOWNLOADER_H
 
 #include "kdupdater.h"
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader_p.h
index 452fdbe59..94447334a 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloader_p.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader_p.h
@@ -24,7 +24,7 @@
 #define KD_UPDATER_FILE_DOWNLOADER_P_H
 
 #include "kdupdaterfiledownloader.h"
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 
 #include <QtCore/QCryptographicHash>
 #include <QtNetwork/QNetworkReply>
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.cpp
index cba271e96..cba271e96 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h
index 7afc3e35e..4c09f4173 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloaderfactory.h
@@ -24,8 +24,8 @@
 #define KD_UPDATER_FILE_DOWNLOADER_FACTORY_H
 
 #include "kdupdater.h"
-#include <KDToolsCore/pimpl_ptr.h>
-#include <KDToolsCore/kdgenericfactory.h>
+#include <pimpl_ptr.h>
+#include <kdgenericfactory.h>
 
 #include <QtCore/QStringList>
 #include <QtCore/QUrl>
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp
index 8a079ec9b..8a079ec9b 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h
index d0a7ae31c..d0a7ae31c 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterpackagesinfo.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.cpp
index 0b1f61a57..0b1f61a57 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h
index 6d426c820..6d426c820 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationresult.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationresult.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.cpp
index 19c6337e4..19c6337e4 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.h
index bbad15381..72d8cd88a 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverificationrunnable.h
@@ -23,7 +23,7 @@
 #ifndef KDUPDATERSIGNATUREVERIFICATIONJOB_H
 #define KDUPDATERSIGNATUREVERIFICATIONJOB_H
 
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 #include <QtCore/QGenericArgument>
 #include <QtCore/QRunnable>
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.cpp
index 28cba7098..28cba7098 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h
index ef1da8ae3..ef1da8ae3 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatersignatureverifier.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatersignatureverifier.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.cpp
index 6297594c0..6297594c0 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h
index 311fd84cd..311fd84cd 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdatertask.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdatertask.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon.cpp
index 4a93b92c2..4a93b92c2 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h
index 6501735f1..e3edc943b 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufcompresscommon_p.h
@@ -25,7 +25,7 @@
 
 #define KD_UPDATER_UF_HEADER_MAGIC "KDVCLZ"
 
-#include <KDToolsCore/kdtoolsglobal.h>
+#include <kdtoolsglobal.h>
 
 #include <QtCore/QStringList>
 #include <QtCore/QByteArray>
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp
index f5c36e44f..f5c36e44f 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h
index 61c5cca78..8f9f55356 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterufuncompressor_p.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor_p.h
@@ -23,7 +23,7 @@
 #ifndef __KDTOOLS_KDUPDATERUFUNCOMPRESSOR_P_H__
 #define __KDTOOLS_KDUPDATERUFUNCOMPRESSOR_P_H__
 
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 
 #include <QtCore/QCoreApplication>
 
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.cpp
index 0761e7926..0761e7926 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h
index 4e4c711d6..4e4c711d6 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdate.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdate.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp
index 551a81f46..551a81f46 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h
index e472f42e0..e472f42e0 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatefinder.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.cpp
index 3b8d2dbd4..3b8d2dbd4 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h
index dc3e58e48..dc3e58e48 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateinstaller.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateinstaller.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.cpp
index 7c4121e8e..7c4121e8e 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h
index 53111d23a..53111d23a 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperation.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperation.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.cpp
index 076af5273..076af5273 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h
index d42a871c3..915d4968d 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperationfactory.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperationfactory.h
@@ -23,10 +23,10 @@
 #ifndef KD_UPDATER_UPDATE_OPERATION_FACTORY_H
 #define KD_UPDATER_UPDATE_OPERATION_FACTORY_H
 
-#include <KDToolsCore/kdgenericfactory.h>
+#include <kdgenericfactory.h>
 
 #include "kdupdater.h"
-#include <KDToolsCore/pimpl_ptr.h>
+#include <pimpl_ptr.h>
 
 namespace KDUpdater
 {
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp
index 29fb254d9..29fb254d9 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h
index 4f1a2563e..4f1a2563e 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdateoperations.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp
index b707e7720..b707e7720 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo_p.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo_p.h
index 4179e3d8d..4179e3d8d 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesinfo_p.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo_p.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp
index 14a765a5b..14a765a5b 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h
index 231002ee0..231002ee0 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDUpdater/kdupdaterupdatesourcesinfo.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.h
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.cpp
index 1a7f017a1..1a7f017a1 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.cpp
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.h b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.h
index 389e9bd69..fa0043217 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/KDToolsCore/pimpl_ptr.h
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/pimpl_ptr.h
@@ -23,7 +23,7 @@
 #ifndef __KDTOOLSCORE__PIMPL_PTR_H__
 #define __KDTOOLSCORE__PIMPL_PTR_H__
 
-#include <KDToolsCore/kdtoolsglobal.h>
+#include <kdtoolsglobal.h>
 
 #ifndef DOXYGEN_RUN
 namespace kdtools {
diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp
index ca7e43b01..2fbcd4a16 100644
--- a/installerbuilder/libinstaller/component.cpp
+++ b/installerbuilder/libinstaller/component.cpp
@@ -41,8 +41,8 @@
 #include "qinstallerglobal.h"
 #include "messageboxhandler.h"
 
-#include <KDUpdater/kdupdaterupdatesourcesinfo.h>
-#include <KDUpdater/kdupdaterupdateoperationfactory.h>
+#include <kdupdaterupdatesourcesinfo.h>
+#include <kdupdaterupdateoperationfactory.h>
 
 #include <QtCore/QDirIterator>
 #include <QtCore/QTranslator>
diff --git a/installerbuilder/libinstaller/createshortcutoperation.cpp b/installerbuilder/libinstaller/createshortcutoperation.cpp
index 66ccd2b2f..0beb7f61d 100644
--- a/installerbuilder/libinstaller/createshortcutoperation.cpp
+++ b/installerbuilder/libinstaller/createshortcutoperation.cpp
@@ -31,8 +31,8 @@
 **
 **************************************************************************/
 
-#include <KDUpdater/kdupdaterapplication.h>
-#include <KDUpdater/kdupdaterpackagesinfo.h>
+#include <kdupdaterapplication.h>
+#include <kdupdaterpackagesinfo.h>
 
 #include "createshortcutoperation.h"
 #include "common/errors.h"
diff --git a/installerbuilder/libinstaller/cryptosignatureverifier.h b/installerbuilder/libinstaller/cryptosignatureverifier.h
index b01297314..c8a1f9b50 100644
--- a/installerbuilder/libinstaller/cryptosignatureverifier.h
+++ b/installerbuilder/libinstaller/cryptosignatureverifier.h
@@ -27,10 +27,9 @@
 #ifndef CRYPTOSIGNATUREVERIFIER_H
 #define CRYPTOSIGNATUREVERIFIER_H
 
-#include "KDUpdater/kdupdatercrypto.h"
-
-#include <KDUpdater/kdupdatersignatureverifier.h>
-#include <KDUpdater/kdupdatersignatureverificationresult.h>
+#include <kdupdatercrypto.h>
+#include <kdupdatersignatureverifier.h>
+#include <kdupdatersignatureverificationresult.h>
 
 
 class CryptoSignatureVerifier : public KDUpdater::SignatureVerifier
diff --git a/installerbuilder/libinstaller/downloadarchivesjob.cpp b/installerbuilder/libinstaller/downloadarchivesjob.cpp
index 1893f440e..cbd782f33 100644
--- a/installerbuilder/libinstaller/downloadarchivesjob.cpp
+++ b/installerbuilder/libinstaller/downloadarchivesjob.cpp
@@ -39,8 +39,8 @@
 #include "messageboxhandler.h"
 #include "packagemanagercore.h"
 
-#include <KDUpdater/kdupdaterfiledownloader.h>
-#include <KDUpdater/kdupdaterfiledownloaderfactory.h>
+#include <kdupdaterfiledownloader.h>
+#include <kdupdaterfiledownloaderfactory.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QTimerEvent>
diff --git a/installerbuilder/libinstaller/downloadarchivesjob.h b/installerbuilder/libinstaller/downloadarchivesjob.h
index bb9c83d7a..53ab68215 100644
--- a/installerbuilder/libinstaller/downloadarchivesjob.h
+++ b/installerbuilder/libinstaller/downloadarchivesjob.h
@@ -26,7 +26,7 @@
 #ifndef DOWNLOADARCHIVESJOB_H
 #define DOWNLOADARCHIVESJOB_H
 
-#include <KDToolsCore/kdjob.h>
+#include <kdjob.h>
 
 #include <QtCore/QPair>
 #include <QtCore/QSet>
diff --git a/installerbuilder/libinstaller/environmentvariablesoperation.cpp b/installerbuilder/libinstaller/environmentvariablesoperation.cpp
index 6dff3f860..ec89981f1 100644
--- a/installerbuilder/libinstaller/environmentvariablesoperation.cpp
+++ b/installerbuilder/libinstaller/environmentvariablesoperation.cpp
@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "KDUpdater/environment.h"
+#include "environment.h"
 
 #ifdef Q_WS_WIN
 # include <windows.h>
diff --git a/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp b/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp
index 34e9f308f..60db16ba2 100644
--- a/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp
+++ b/installerbuilder/libinstaller/fakestopprocessforupdateoperation.cpp
@@ -33,7 +33,7 @@
 
 #include "fakestopprocessforupdateoperation.h"
 
-#include <KDToolsCore/kdsysinfo.h>
+#include <kdsysinfo.h>
 #include <QtCore/QDir>
 
 #include <algorithm>
diff --git a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h
index 9b22cdaa5..f9f93a0b1 100644
--- a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h
+++ b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h
@@ -26,7 +26,7 @@
 #ifndef GETREPOSITORIESMETAINFOJOB_H
 #define GETREPOSITORIESMETAINFOJOB_H
 
-#include <KDToolsCore/kdjob.h>
+#include <kdjob.h>
 
 #include <QtCore/QList>
 #include <QtCore/QPointer>
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
index 469e3f4ed..ba4a3ea24 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
@@ -40,8 +40,8 @@
 #include "messageboxhandler.h"
 #include "qinstallerglobal.h"
 
-#include <KDUpdater/kdupdaterfiledownloader.h>
-#include <KDUpdater/kdupdaterfiledownloaderfactory.h>
+#include <kdupdaterfiledownloader.h>
+#include <kdupdaterfiledownloaderfactory.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QTimer>
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.h b/installerbuilder/libinstaller/getrepositorymetainfojob.h
index 1f98dc1b7..fe257ac03 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.h
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.h
@@ -26,7 +26,7 @@
 #ifndef GETREPOSITORYMETAINFOJOB_H
 #define GETREPOSITORYMETAINFOJOB_H
 
-#include <KDToolsCore/kdjob.h>
+#include <kdjob.h>
 
 #include <QtCore/QPointer>
 #include <QtCore/QString>
diff --git a/installerbuilder/libinstaller/init.cpp b/installerbuilder/libinstaller/init.cpp
index c6a357e8f..1fd59347a 100644
--- a/installerbuilder/libinstaller/init.cpp
+++ b/installerbuilder/libinstaller/init.cpp
@@ -76,10 +76,10 @@
 
 #include <QtPlugin>
 
-#include <KDUpdater/kdupdaterupdateoperation.h>
-#include <KDUpdater/kdupdaterupdateoperationfactory.h>
-#include <KDUpdater/kdupdaterfiledownloader.h>
-#include <KDUpdater/kdupdaterfiledownloaderfactory.h>
+#include <kdupdaterupdateoperation.h>
+#include <kdupdaterupdateoperationfactory.h>
+#include <kdupdaterfiledownloader.h>
+#include <kdupdaterfiledownloaderfactory.h>
 
 #include <QNetworkProxyFactory>
 
diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri
index 8a23e1c15..f4fa4cde5 100644
--- a/installerbuilder/libinstaller/libinstaller.pri
+++ b/installerbuilder/libinstaller/libinstaller.pri
@@ -12,8 +12,7 @@ DEPENDPATH += $$PWD \
     $$PWD/.. \
     $$PWD/3rdparty/p7zip_9.04 \
     $$PWD/3rdparty/p7zip_9.04/unix/CPP \
-    $$PWD/3rdparty/kdtools/KDUpdater \
-    $$PWD/3rdparty/kdtools/KDToolsCore \
+    $$PWD/3rdparty/kdtools 
 
 CONFIG( shared, static|shared ):DEFINES += LIB_INSTALLER_SHARED
 CONFIG( shared, static|shared ):DEFINES += KDTOOLS_SHARED
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro
index 30c814258..dae985890 100644
--- a/installerbuilder/libinstaller/libinstaller.pro
+++ b/installerbuilder/libinstaller/libinstaller.pro
@@ -3,8 +3,8 @@ TARGET = installer
 DEPENDPATH += . \
     .. \
     ../common \
-    3rdparty/kdtools/KDToolsCore \
-    3rdparty/kdtools/KDUpdater
+    3rdparty/kdtools 
+
 INCLUDEPATH += . \
     .. \
     3rdparty/kdtools
@@ -30,8 +30,7 @@ contains(CONFIG, static): {
 }
 
 include(3rdparty/p7zip_9.04/p7zip.pri)
-include(3rdparty/kdtools/KDUpdater/KDUpdater.pri)
-include(3rdparty/kdtools/KDToolsCore/KDToolsCore.pri)
+include(3rdparty/kdtools/kdtools.pri)
 
 HEADERS += $$PWD/packagemanagercore.h \
     $$PWD/packagemanagercore_p.h \
@@ -185,7 +184,7 @@ win32:LIBS += ole32.lib \
     oleaut32.lib \
     user32.lib
 
-# Needed by KDToolsCore (in kdlog_win.cpp):
+# Needed by kdtools (in kdlog_win.cpp):
 win32:LIBS += advapi32.lib psapi.lib
 macx:LIBS += -framework Carbon
 
diff --git a/installerbuilder/libinstaller/operationrunner.cpp b/installerbuilder/libinstaller/operationrunner.cpp
index 1296b9941..fc8a11fd0 100644
--- a/installerbuilder/libinstaller/operationrunner.cpp
+++ b/installerbuilder/libinstaller/operationrunner.cpp
@@ -39,8 +39,8 @@
 #include "init.h"
 #include "packagemanagercore.h"
 
-#include <KDUpdater/kdupdaterupdateoperation.h>
-#include <KDUpdater/kdupdaterupdateoperationfactory.h>
+#include <kdupdaterupdateoperation.h>
+#include <kdupdaterupdateoperationfactory.h>
 
 #include <iostream>
 
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index e52c2b620..2c2b0947e 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -55,8 +55,8 @@
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptContext>
 
-#include <KDToolsCore/kdsysinfo.h>
-#include <KDUpdater/kdupdaterupdateoperationfactory.h>
+#include <kdsysinfo.h>
+#include <kdupdaterupdateoperationfactory.h>
 
 #ifdef Q_OS_WIN
 #include "qt_windows.h"
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 217cae9eb..60ec1618a 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -45,11 +45,11 @@
 #include "qprocesswrapper.h"
 #include "qsettingswrapper.h"
 
-#include <KDToolsCore/kdsavefile.h>
-#include <KDToolsCore/kdselfrestarter.h>
-#include <KDUpdater/kdupdaterupdatesourcesinfo.h>
-#include <KDUpdater/kdupdaterupdateoperationfactory.h>
-#include <KDUpdater/kdupdaterupdatefinder.h>
+#include <kdsavefile.h>
+#include <kdselfrestarter.h>
+#include <kdupdaterupdatesourcesinfo.h>
+#include <kdupdaterupdateoperationfactory.h>
+#include <kdupdaterupdatefinder.h>
 
 #include <QtCore/QtConcurrentRun>
 #include <QtCore/QCoreApplication>
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h
index 263538b1b..9597209cd 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.h
+++ b/installerbuilder/libinstaller/packagemanagercore_p.h
@@ -37,8 +37,8 @@
 #include "settings.h"
 #include "packagemanagercore.h"
 
-#include <KDToolsCore/kdsysinfo.h>
-#include <KDUpdater/kdupdaterapplication.h>
+#include <kdsysinfo.h>
+#include <kdupdaterapplication.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QObject>
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index 343eae272..f079431a2 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -46,7 +46,7 @@
 #include "common/utils.h"
 #include "common/fileutils.h"
 
-#include <KDToolsCore/kdsysinfo.h>
+#include <kdsysinfo.h>
 
 #include <QtCore/QDir>
 #include <QtCore/QDynamicPropertyChangeEvent>
diff --git a/installerbuilder/libinstaller/qinstallerglobal.h b/installerbuilder/libinstaller/qinstallerglobal.h
index f4ae848fe..1b4d79221 100644
--- a/installerbuilder/libinstaller/qinstallerglobal.h
+++ b/installerbuilder/libinstaller/qinstallerglobal.h
@@ -28,9 +28,9 @@
 
 #include <installer_global.h>
 
-#include <KDUpdater/kdupdaterupdate.h>
-#include <KDUpdater/kdupdaterupdateoperation.h>
-#include <KDUpdater/kdupdaterpackagesinfo.h>
+#include <kdupdaterupdate.h>
+#include <kdupdaterupdateoperation.h>
+#include <kdupdaterpackagesinfo.h>
 
 QT_BEGIN_NAMESPACE
 class QScriptContext;
diff --git a/installerbuilder/libinstaller/selfrestartoperation.cpp b/installerbuilder/libinstaller/selfrestartoperation.cpp
index 79b028cf4..918d3d82d 100644
--- a/installerbuilder/libinstaller/selfrestartoperation.cpp
+++ b/installerbuilder/libinstaller/selfrestartoperation.cpp
@@ -33,7 +33,7 @@
 #include "selfrestartoperation.h"
 #include "packagemanagercore.h"
 
-#include <KDToolsCore/kdselfrestarter.h>
+#include <kdselfrestarter.h>
 
 using namespace QInstaller;
 
diff --git a/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp b/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp
index 47b5eb76e..f53bb46b0 100644
--- a/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp
+++ b/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp
@@ -35,7 +35,7 @@
 
 #include "init.h"
 
-#include <KDUpdater/kdupdaterapplication.h>
+#include <kdupdaterapplication.h>
 
 #include <QDir>
 #include <QDirIterator>
diff --git a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp
index 4313a0c83..475297e34 100644
--- a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp
+++ b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp
@@ -35,7 +35,7 @@
 
 #include "init.h"
 
-#include <KDUpdater/kdupdaterapplication.h>
+#include <kdupdaterapplication.h>
 
 #include <QDir>
 #include <QDirIterator>