From c2eef9ac30fe1638f66eabb70ed46055120687c7 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Thu, 2 Jul 2015 13:49:21 +0200
Subject: [PATCH] The Humongous Include Fixage For KPMcore Headers.

---
 .../partition/core/BootLoaderModel.cpp        | 11 +++----
 src/modules/partition/core/ColorUtils.cpp     | 10 +++----
 src/modules/partition/core/DeviceModel.cpp    |  8 ++---
 src/modules/partition/core/PMUtils.cpp        | 12 ++++----
 src/modules/partition/core/PMUtils.h          |  4 +--
 .../partition/core/PartitionCoreModule.cpp    | 12 ++++----
 .../partition/core/PartitionCoreModule.h      |  8 ++---
 src/modules/partition/core/PartitionInfo.cpp  |  7 +++--
 .../partition/core/PartitionIterator.cpp      |  8 ++---
 src/modules/partition/core/PartitionModel.cpp | 19 ++++++------
 src/modules/partition/gui/AlongsidePage.cpp   |  6 ++--
 .../partition/gui/CreatePartitionDialog.cpp   | 24 +++++++--------
 .../partition/gui/CreatePartitionDialog.h     |  5 ++--
 src/modules/partition/gui/EraseDiskPage.cpp   |  8 +++--
 src/modules/partition/gui/PartitionPage.cpp   | 26 ++++++++--------
 .../partition/gui/PartitionSizeController.cpp | 12 ++++----
 .../partition/gui/PartitionSizeController.h   |  4 +--
 .../partition/gui/PartitionViewStep.cpp       | 29 +++++++++---------
 src/modules/partition/gui/ReplacePage.cpp     | 29 +++++++++---------
 .../partition/jobs/CheckFileSystemJob.cpp     | 10 +++----
 src/modules/partition/jobs/ClearMountsJob.cpp | 14 +++++----
 .../partition/jobs/ClearTempMountsJob.cpp     |  6 ++--
 .../partition/jobs/CreatePartitionJob.cpp     | 30 +++++++++----------
 .../jobs/CreatePartitionTableJob.cpp          | 30 +++++++++----------
 .../partition/jobs/CreatePartitionTableJob.h  |  4 +--
 .../partition/jobs/DeletePartitionJob.cpp     | 24 +++++++--------
 .../partition/jobs/FillGlobalStorageJob.cpp   | 18 +++++------
 .../partition/jobs/FormatPartitionJob.cpp     | 30 +++++++++----------
 .../partition/jobs/MoveFileSystemJob.cpp      | 14 ++++-----
 .../partition/jobs/ResizePartitionJob.cpp     | 30 +++++++++----------
 30 files changed, 233 insertions(+), 219 deletions(-)

diff --git a/src/modules/partition/core/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp
index 262954e83..b94a23e9a 100644
--- a/src/modules/partition/core/BootLoaderModel.cpp
+++ b/src/modules/partition/core/BootLoaderModel.cpp
@@ -16,13 +16,14 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <core/BootLoaderModel.h>
 
-#include <core/PartitionInfo.h>
-#include <core/PMUtils.h>
+#include "core/BootLoaderModel.h"
 
-// CalaPM
-#include <core/device.h>
+#include "core/PartitionInfo.h"
+#include "core/PMUtils.h"
+
+// KPMcore
+#include <kpmcore/core/device.h>
 
 static QStandardItem*
 createBootLoaderItem( const QString& description, const QString& path, bool isPartition )
diff --git a/src/modules/partition/core/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp
index 28f5661a3..35a7ae511 100644
--- a/src/modules/partition/core/ColorUtils.cpp
+++ b/src/modules/partition/core/ColorUtils.cpp
@@ -17,13 +17,13 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <core/ColorUtils.h>
+#include "core/ColorUtils.h"
 
-#include <core/PMUtils.h>
-#include <core/PartitionIterator.h>
+#include "core/PMUtils.h"
+#include "core/PartitionIterator.h"
 
-// CalaPM
-#include <core/partition.h>
+// KPMcore
+#include <kpmcore/core/partition.h>
 
 // Qt
 #include <QColor>
diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
index d010eb85c..29bcbfc38 100644
--- a/src/modules/partition/core/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -16,14 +16,14 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <core/DeviceModel.h>
+#include "core/DeviceModel.h"
 
-#include <core/PartitionModel.h>
+#include "core/PartitionModel.h"
 
 #include "utils/CalamaresUtilsGui.h"
 
-// CalaPM
-#include <core/device.h>
+// KPMcore
+#include <kpmcore/core/device.h>
 
 // KF5
 #include <KFormat>
diff --git a/src/modules/partition/core/PMUtils.cpp b/src/modules/partition/core/PMUtils.cpp
index 89d97cefd..43b31b642 100644
--- a/src/modules/partition/core/PMUtils.cpp
+++ b/src/modules/partition/core/PMUtils.cpp
@@ -17,14 +17,14 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <core/PMUtils.h>
+#include "core/PMUtils.h"
 
-#include <core/PartitionInfo.h>
-#include <core/PartitionIterator.h>
+#include "core/PartitionInfo.h"
+#include "core/PartitionIterator.h"
 
-// CalaPM
-#include <core/partition.h>
-#include <fs/filesystemfactory.h>
+// KPMcore
+#include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystemfactory.h>
 
 namespace PMUtils
 {
diff --git a/src/modules/partition/core/PMUtils.h b/src/modules/partition/core/PMUtils.h
index b5d661880..157a15d9a 100644
--- a/src/modules/partition/core/PMUtils.h
+++ b/src/modules/partition/core/PMUtils.h
@@ -19,8 +19,8 @@
 #ifndef PMUTILS_H
 #define PMUTILS_H
 
-// CalaPM
-#include <fs/filesystem.h>
+// KPMcore
+#include <kpmcore/fs/filesystem.h>
 
 // Qt
 #include <QList>
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index b6398767b..0fe4107be 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -37,13 +37,13 @@
 #include <Typedefs.h>
 #include <utils/Logger.h>
 
-// CalaPM
+// KPMcore
 #include <CalaPM.h>
-#include <core/device.h>
-#include <core/partition.h>
-#include <backend/corebackend.h>
-#include <backend/corebackendmanager.h>
-#include <fs/filesystemfactory.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/backend/corebackend.h>
+#include <kpmcore/backend/corebackendmanager.h>
+#include <kpmcore/fs/filesystemfactory.h>
 
 // Qt
 #include <QStandardItemModel>
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index e0029a0ae..74af50ff4 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -20,11 +20,11 @@
 #ifndef PARTITIONCOREMODULE_H
 #define PARTITIONCOREMODULE_H
 
-#include <core/PartitionModel.h>
-#include <Typedefs.h>
+#include "core/PartitionModel.h"
+#include "Typedefs.h"
 
-// CalaPM
-#include <core/partitiontable.h>
+// KPMcore
+#include <kpmcore/core/partitiontable.h>
 
 // Qt
 #include <QList>
diff --git a/src/modules/partition/core/PartitionInfo.cpp b/src/modules/partition/core/PartitionInfo.cpp
index 396e2f6a3..5f1d6d9f6 100644
--- a/src/modules/partition/core/PartitionInfo.cpp
+++ b/src/modules/partition/core/PartitionInfo.cpp
@@ -15,10 +15,11 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <core/PartitionInfo.h>
 
-// CalaPM
-#include <core/partition.h>
+#include "core/PartitionInfo.h"
+
+// KPMcore
+#include <kpmcore/core/partition.h>
 
 // Qt
 #include <QVariant>
diff --git a/src/modules/partition/core/PartitionIterator.cpp b/src/modules/partition/core/PartitionIterator.cpp
index 1d2112596..097e8d4aa 100644
--- a/src/modules/partition/core/PartitionIterator.cpp
+++ b/src/modules/partition/core/PartitionIterator.cpp
@@ -19,10 +19,10 @@
 
 #include <core/PartitionIterator.h>
 
-// CalaPM
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitiontable.h>
+// KPMcore
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/core/partitiontable.h>
 
 PartitionIterator::PartitionIterator( PartitionTable* table )
     : m_table( table )
diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
index ede5116e6..b236d130b 100644
--- a/src/modules/partition/core/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -15,18 +15,19 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <core/PartitionModel.h>
 
-#include <core/ColorUtils.h>
-#include <core/PartitionInfo.h>
-#include <core/PMUtils.h>
-#include <utils/Logger.h>
+#include "core/PartitionModel.h"
+
+#include "core/ColorUtils.h"
+#include "core/PartitionInfo.h"
+#include "core/PMUtils.h"
+#include "utils/Logger.h"
 
 // CalaPM
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitiontable.h>
-#include <fs/filesystem.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/core/partitiontable.h>
+#include <kpmcore/fs/filesystem.h>
 
 // KF5
 #include <KFormat>
diff --git a/src/modules/partition/gui/AlongsidePage.cpp b/src/modules/partition/gui/AlongsidePage.cpp
index fdb189944..465bca306 100644
--- a/src/modules/partition/gui/AlongsidePage.cpp
+++ b/src/modules/partition/gui/AlongsidePage.cpp
@@ -22,8 +22,6 @@
 #include "core/PartitionCoreModule.h"
 #include "core/DeviceModel.h"
 #include "core/PMUtils.h"
-#include "core/device.h"
-#include "core/partition.h"
 #include "core/PartitionInfo.h"
 #include "core/PartitionIterator.h"
 #include "gui/PartitionSplitterWidget.h"
@@ -36,6 +34,10 @@
 #include "utils/Retranslator.h"
 #include "Branding.h"
 
+// KPMcore
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QLabel>
diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp
index f9a1b95dd..3a57fd4fb 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.cpp
+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
@@ -16,24 +16,24 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gui/CreatePartitionDialog.h>
+#include "gui/CreatePartitionDialog.h"
 
-#include <core/ColorUtils.h>
-#include <core/PartitionInfo.h>
-#include <core/PMUtils.h>
-#include <gui/PartitionSizeController.h>
+#include "core/ColorUtils.h"
+#include "core/PartitionInfo.h"
+#include "core/PMUtils.h"
+#include "gui/PartitionSizeController.h"
 
-#include <ui_CreatePartitionDialog.h>
+#include "ui_CreatePartitionDialog.h"
 
-#include <utils/Logger.h>
+#include "utils/Logger.h"
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 
-// CalaPM
-#include <core/device.h>
-#include <core/partition.h>
-#include <fs/filesystem.h>
-#include <fs/filesystemfactory.h>
+// KPMcore
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystem.h>
+#include <kpmcore/fs/filesystemfactory.h>
 
 // Qt
 #include <QComboBox>
diff --git a/src/modules/partition/gui/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h
index edfd56cc9..360f3b42b 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.h
+++ b/src/modules/partition/gui/CreatePartitionDialog.h
@@ -19,11 +19,12 @@
 #ifndef CREATEPARTITIONDIALOG_H
 #define CREATEPARTITIONDIALOG_H
 
+// KPMcore
+#include <kpmcore/core/partitionrole.h>
+
 #include <QDialog>
 #include <QScopedPointer>
 
-// CalaPM
-#include <core/partitionrole.h>
 
 class Device;
 class Partition;
diff --git a/src/modules/partition/gui/EraseDiskPage.cpp b/src/modules/partition/gui/EraseDiskPage.cpp
index 9e161e160..0046a47f1 100644
--- a/src/modules/partition/gui/EraseDiskPage.cpp
+++ b/src/modules/partition/gui/EraseDiskPage.cpp
@@ -20,11 +20,8 @@
 
 #include "core/DeviceModel.h"
 #include "core/PartitionCoreModule.h"
-#include "core/partition.h"
 #include "core/PMUtils.h"
 #include "core/PartitionInfo.h"
-#include "core/device.h"
-#include "fs/filesystem.h"
 #include "gui/PartitionPreview.h"
 
 #include "utils/CalamaresUtilsGui.h"
@@ -34,6 +31,11 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 
+// KPMcore
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystem.h>
+
 #include <QBoxLayout>
 #include <QDir>
 #include <QFormLayout>
diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index 7039219d5..93ad06439 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -19,23 +19,23 @@
 #include "PartitionPage.h"
 
 // Local
-#include <core/BootLoaderModel.h>
-#include <core/DeviceModel.h>
-#include <core/PartitionCoreModule.h>
-#include <core/PartitionModel.h>
-#include <core/PMUtils.h>
-#include <gui/CreatePartitionDialog.h>
-#include <gui/EditExistingPartitionDialog.h>
+#include "core/BootLoaderModel.h"
+#include "core/DeviceModel.h"
+#include "core/PartitionCoreModule.h"
+#include "core/PartitionModel.h"
+#include "core/PMUtils.h"
+#include "gui/CreatePartitionDialog.h"
+#include "gui/EditExistingPartitionDialog.h"
 
-#include <ui_PartitionPage.h>
-#include <ui_CreatePartitionTableDialog.h>
-
-// CalaPM
-#include <core/device.h>
-#include <core/partition.h>
+#include "ui_PartitionPage.h"
+#include "ui_CreatePartitionTableDialog.h"
 
 #include "utils/Retranslator.h"
 
+// KPMcore
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+
 // Qt
 #include <QDebug>
 #include <QHeaderView>
diff --git a/src/modules/partition/gui/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp
index 0b98f4e3c..a54d6e4be 100644
--- a/src/modules/partition/gui/PartitionSizeController.cpp
+++ b/src/modules/partition/gui/PartitionSizeController.cpp
@@ -16,17 +16,17 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gui/PartitionSizeController.h>
+#include "gui/PartitionSizeController.h"
 
-#include <core/ColorUtils.h>
-#include <core/PMUtils.h>
+#include "core/ColorUtils.h"
+#include "core/PMUtils.h"
 
 // Qt
 #include <QSpinBox>
 
-// CalaPM
-#include <core/device.h>
-#include <gui/partresizerwidget.h>
+// KPMcore
+#include <kpmcore/core/device.h>
+#include <kpmcore/gui/partresizerwidget.h>
 
 // stdc++
 #include <limits>
diff --git a/src/modules/partition/gui/PartitionSizeController.h b/src/modules/partition/gui/PartitionSizeController.h
index 93e07bf70..559fdbe47 100644
--- a/src/modules/partition/gui/PartitionSizeController.h
+++ b/src/modules/partition/gui/PartitionSizeController.h
@@ -19,8 +19,8 @@
 #ifndef PARTITIONSIZECONTROLLER_H
 #define PARTITIONSIZECONTROLLER_H
 
-// CalaPM
-#include <core/partition.h>
+// KPMcore
+#include <kpmcore/core/partition.h>
 
 // Qt
 #include <QColor>
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 6103cb6d9..5e9ad5255 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -17,20 +17,18 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gui/PartitionViewStep.h>
-
-#include <core/DeviceModel.h>
-#include <core/PartitionCoreModule.h>
-#include <core/PartitionModel.h>
-#include <core/PMUtils.h>
-#include "core/partition.h"
-#include "core/device.h"
-#include <gui/ChoicePage.h>
-#include <gui/EraseDiskPage.h>
-#include <gui/AlongsidePage.h>
-#include <gui/PartitionPage.h>
-#include <gui/ReplacePage.h>
-#include <gui/PartitionPreview.h>
+#include "gui/PartitionViewStep.h"
+
+#include "core/DeviceModel.h"
+#include "core/PartitionCoreModule.h"
+#include "core/PartitionModel.h"
+#include "core/PMUtils.h"
+#include "gui/ChoicePage.h"
+#include "gui/EraseDiskPage.h"
+#include "gui/AlongsidePage.h"
+#include "gui/PartitionPage.h"
+#include "gui/ReplacePage.h"
+#include "gui/PartitionPreview.h"
 
 #include "CalamaresVersion.h"
 #include "utils/CalamaresUtilsGui.h"
@@ -42,6 +40,9 @@
 #include "Job.h"
 #include "Branding.h"
 
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+
 // Qt
 #include <QApplication>
 #include <QFormLayout>
diff --git a/src/modules/partition/gui/ReplacePage.cpp b/src/modules/partition/gui/ReplacePage.cpp
index 6fa76fc76..6b79c1495 100644
--- a/src/modules/partition/gui/ReplacePage.cpp
+++ b/src/modules/partition/gui/ReplacePage.cpp
@@ -20,20 +20,21 @@
 #include "ReplacePage.h"
 #include "ui_ReplacePage.h"
 
-#include <core/PartitionCoreModule.h>
-#include <core/device.h>
-#include <core/DeviceModel.h>
-#include <core/partition.h>
-#include <fs/filesystem.h>
-#include <core/PMUtils.h>
-#include <core/PartitionInfo.h>
-
-#include <JobQueue.h>
-#include <GlobalStorage.h>
-#include <utils/Retranslator.h>
-#include <utils/CalamaresUtilsGui.h>
-#include <utils/Logger.h>
-#include <Branding.h>
+#include "core/PartitionCoreModule.h"
+#include "core/PMUtils.h"
+#include "core/PartitionInfo.h"
+#include "core/DeviceModel.h"
+
+#include "JobQueue.h"
+#include "GlobalStorage.h"
+#include "utils/Retranslator.h"
+#include "utils/CalamaresUtilsGui.h"
+#include "utils/Logger.h"
+#include "Branding.h"
+
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystem.h>
 
 #include <QDir>
 #include <QProcess>
diff --git a/src/modules/partition/jobs/CheckFileSystemJob.cpp b/src/modules/partition/jobs/CheckFileSystemJob.cpp
index 736c0057c..7ceb0805a 100644
--- a/src/modules/partition/jobs/CheckFileSystemJob.cpp
+++ b/src/modules/partition/jobs/CheckFileSystemJob.cpp
@@ -16,12 +16,12 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <jobs/CheckFileSystemJob.h>
+#include "jobs/CheckFileSystemJob.h"
 
-// CalaPM
-#include <core/partition.h>
-#include <fs/filesystem.h>
-#include <util/report.h>
+// KPMcore
+#include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystem.h>
+#include <kpmcore/util/report.h>
 
 CheckFileSystemJob::CheckFileSystemJob( Partition* partition )
     : PartitionJob( partition )
diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp
index e793abbf6..1a397b325 100644
--- a/src/modules/partition/jobs/ClearMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearMountsJob.cpp
@@ -18,12 +18,14 @@
 
 #include "ClearMountsJob.h"
 
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/PartitionInfo.h>
-#include <core/PartitionIterator.h>
-#include <util/report.h>
-#include <utils/Logger.h>
+#include "core/PartitionInfo.h"
+#include "core/PartitionIterator.h"
+#include "utils/Logger.h"
+
+// KPMcore
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/util/report.h>
 
 #include <QProcess>
 #include <QStringList>
diff --git a/src/modules/partition/jobs/ClearTempMountsJob.cpp b/src/modules/partition/jobs/ClearTempMountsJob.cpp
index e222b3f8a..95060644a 100644
--- a/src/modules/partition/jobs/ClearTempMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearTempMountsJob.cpp
@@ -18,8 +18,10 @@
 
 #include "ClearTempMountsJob.h"
 
-#include <util/report.h>
-#include <utils/Logger.h>
+#include "utils/Logger.h"
+
+// KPMcore
+#include <kpmcore/util/report.h>
 
 #include <QFile>
 #include <QProcess>
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index a5b46a59e..9fc1b86a2 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -17,21 +17,21 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <jobs/CreatePartitionJob.h>
-
-#include <utils/Logger.h>
-
-// CalaPM
-#include <backend/corebackend.h>
-#include <backend/corebackendmanager.h>
-#include <backend/corebackenddevice.h>
-#include <backend/corebackendpartition.h>
-#include <backend/corebackendpartitiontable.h>
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitiontable.h>
-#include <fs/filesystem.h>
-#include <util/report.h>
+#include "jobs/CreatePartitionJob.h"
+
+#include "utils/Logger.h"
+
+// KPMcore
+#include <kpmcore/backend/corebackend.h>
+#include <kpmcore/backend/corebackendmanager.h>
+#include <kpmcore/backend/corebackenddevice.h>
+#include <kpmcore/backend/corebackendpartition.h>
+#include <kpmcore/backend/corebackendpartitiontable.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/core/partitiontable.h>
+#include <kpmcore/fs/filesystem.h>
+#include <kpmcore/util/report.h>
 
 // Qt
 #include <QScopedPointer>
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 3564e4bb2..5a0c4cd66 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -17,21 +17,21 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <jobs/CreatePartitionTableJob.h>
-
-#include <utils/Logger.h>
-
-// CalaPM
-#include <backend/corebackend.h>
-#include <backend/corebackendmanager.h>
-#include <backend/corebackenddevice.h>
-#include <backend/corebackendpartition.h>
-#include <backend/corebackendpartitiontable.h>
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitiontable.h>
-#include <fs/filesystem.h>
-#include <util/report.h>
+#include "jobs/CreatePartitionTableJob.h"
+
+#include "utils/Logger.h"
+
+// KPMcore
+#include <kpmcore/backend/corebackend.h>
+#include <kpmcore/backend/corebackendmanager.h>
+#include <kpmcore/backend/corebackenddevice.h>
+#include <kpmcore/backend/corebackendpartition.h>
+#include <kpmcore/backend/corebackendpartitiontable.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/core/partitiontable.h>
+#include <kpmcore/fs/filesystem.h>
+#include <kpmcore/util/report.h>
 
 // Qt
 #include <QScopedPointer>
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.h b/src/modules/partition/jobs/CreatePartitionTableJob.h
index a1e9c9bf9..6f9544de3 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.h
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.h
@@ -22,8 +22,8 @@
 
 #include <Job.h>
 
-// CalaPM
-#include <core/partitiontable.h>
+// KPMcore
+#include <kpmcore/core/partitiontable.h>
 
 class Device;
 
diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp
index cca590432..0aafc542e 100644
--- a/src/modules/partition/jobs/DeletePartitionJob.cpp
+++ b/src/modules/partition/jobs/DeletePartitionJob.cpp
@@ -17,18 +17,18 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <jobs/DeletePartitionJob.h>
-
-// CalaPM
-#include <backend/corebackend.h>
-#include <backend/corebackendmanager.h>
-#include <backend/corebackenddevice.h>
-#include <backend/corebackendpartitiontable.h>
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitiontable.h>
-#include <fs/filesystem.h>
-#include <util/report.h>
+#include "jobs/DeletePartitionJob.h"
+
+// KPMcore
+#include <kpmcore/backend/corebackend.h>
+#include <kpmcore/backend/corebackendmanager.h>
+#include <kpmcore/backend/corebackenddevice.h>
+#include <kpmcore/backend/corebackendpartitiontable.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/core/partitiontable.h>
+#include <kpmcore/fs/filesystem.h>
+#include <kpmcore/util/report.h>
 
 DeletePartitionJob::DeletePartitionJob( Device* device, Partition* partition )
     : PartitionJob( partition )
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index 6d8ba8cc4..e9d36136c 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -17,20 +17,20 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <jobs/FillGlobalStorageJob.h>
+#include "jobs/FillGlobalStorageJob.h"
 
-#include <GlobalStorage.h>
-#include <JobQueue.h>
-#include <core/PartitionInfo.h>
-#include <core/PartitionIterator.h>
-#include <core/PMUtils.h>
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "core/PartitionInfo.h"
+#include "core/PartitionIterator.h"
+#include "core/PMUtils.h"
 #include "Branding.h"
 #include "utils/Logger.h"
 
 // CalaPM
-#include <core/device.h>
-#include <core/partition.h>
-#include <fs/filesystem.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystem.h>
 
 // Qt
 #include <QDebug>
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index c7a9be920..a1a939f59 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -17,21 +17,21 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <jobs/FormatPartitionJob.h>
-
-#include <utils/Logger.h>
-
-// CalaPM
-#include <backend/corebackend.h>
-#include <backend/corebackendmanager.h>
-#include <backend/corebackenddevice.h>
-#include <backend/corebackendpartition.h>
-#include <backend/corebackendpartitiontable.h>
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitiontable.h>
-#include <fs/filesystem.h>
-#include <util/report.h>
+#include "jobs/FormatPartitionJob.h"
+
+#include "utils/Logger.h"
+
+// KPMcore
+#include <kpmcore/backend/corebackend.h>
+#include <kpmcore/backend/corebackendmanager.h>
+#include <kpmcore/backend/corebackenddevice.h>
+#include <kpmcore/backend/corebackendpartition.h>
+#include <kpmcore/backend/corebackendpartitiontable.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/core/partitiontable.h>
+#include <kpmcore/fs/filesystem.h>
+#include <kpmcore/util/report.h>
 
 // Qt
 #include <QScopedPointer>
diff --git a/src/modules/partition/jobs/MoveFileSystemJob.cpp b/src/modules/partition/jobs/MoveFileSystemJob.cpp
index ab384ec2a..9a87db91e 100644
--- a/src/modules/partition/jobs/MoveFileSystemJob.cpp
+++ b/src/modules/partition/jobs/MoveFileSystemJob.cpp
@@ -44,13 +44,13 @@
 
 #include <utils/Logger.h>
 
-// CalaPM
-#include <core/copysourcedevice.h>
-#include <core/copytargetdevice.h>
-#include <core/device.h>
-#include <core/partition.h>
-#include <fs/filesystem.h>
-#include <util/report.h>
+// KPMcore
+#include <kpmcore/core/copysourcedevice.h>
+#include <kpmcore/core/copytargetdevice.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystem.h>
+#include <kpmcore/util/report.h>
 
 MoveFileSystemJob::MoveFileSystemJob( Device* device, Partition* partition, qint64 oldFirstSector, qint64 newFirstSector, qint64 length )
     : PartitionJob( partition )
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index 171a4767d..08b23acea 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -39,21 +39,21 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <jobs/ResizePartitionJob.h>
-
-#include <jobs/CheckFileSystemJob.h>
-#include <jobs/MoveFileSystemJob.h>
-#include <utils/Logger.h>
-
-// CalaPM
-#include <backend/corebackend.h>
-#include <backend/corebackendmanager.h>
-#include <backend/corebackenddevice.h>
-#include <backend/corebackendpartition.h>
-#include <backend/corebackendpartitiontable.h>
-#include <core/device.h>
-#include <core/partition.h>
-#include <util/report.h>
+#include "jobs/ResizePartitionJob.h"
+
+#include "jobs/CheckFileSystemJob.h"
+#include "jobs/MoveFileSystemJob.h"
+#include "utils/Logger.h"
+
+// KPMcore
+#include <kpmcore/backend/corebackend.h>
+#include <kpmcore/backend/corebackendmanager.h>
+#include <kpmcore/backend/corebackenddevice.h>
+#include <kpmcore/backend/corebackendpartition.h>
+#include <kpmcore/backend/corebackendpartitiontable.h>
+#include <kpmcore/core/device.h>
+#include <kpmcore/core/partition.h>
+#include <kpmcore/util/report.h>
 
 // Qt
 #include <QScopedPointer>