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 .
*/
-#include
-#include
-#include
+#include "core/BootLoaderModel.h"
-// CalaPM
-#include
+#include "core/PartitionInfo.h"
+#include "core/PMUtils.h"
+
+// KPMcore
+#include
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 .
*/
-#include
+#include "core/ColorUtils.h"
-#include
-#include
+#include "core/PMUtils.h"
+#include "core/PartitionIterator.h"
-// CalaPM
-#include
+// KPMcore
+#include
// Qt
#include
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 .
*/
-#include
+#include "core/DeviceModel.h"
-#include
+#include "core/PartitionModel.h"
#include "utils/CalamaresUtilsGui.h"
-// CalaPM
-#include
+// KPMcore
+#include
// KF5
#include
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 .
*/
-#include
+#include "core/PMUtils.h"
-#include
-#include
+#include "core/PartitionInfo.h"
+#include "core/PartitionIterator.h"
-// CalaPM
-#include
-#include
+// KPMcore
+#include
+#include
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
+// KPMcore
+#include
// Qt
#include
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
#include
-// CalaPM
+// KPMcore
#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
// Qt
#include
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
-#include
+#include "core/PartitionModel.h"
+#include "Typedefs.h"
-// CalaPM
-#include
+// KPMcore
+#include
// Qt
#include
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 .
*/
-#include
-// CalaPM
-#include
+#include "core/PartitionInfo.h"
+
+// KPMcore
+#include
// Qt
#include
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
-// CalaPM
-#include
-#include
-#include
+// KPMcore
+#include
+#include
+#include
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 .
*/
-#include
-#include
-#include
-#include
-#include
+#include "core/PartitionModel.h"
+
+#include "core/ColorUtils.h"
+#include "core/PartitionInfo.h"
+#include "core/PMUtils.h"
+#include "utils/Logger.h"
// CalaPM
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
// KF5
#include
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
+#include
+
#include
#include
#include
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 .
*/
-#include
+#include "gui/CreatePartitionDialog.h"
-#include
-#include
-#include
-#include
+#include "core/ColorUtils.h"
+#include "core/PartitionInfo.h"
+#include "core/PMUtils.h"
+#include "gui/PartitionSizeController.h"
-#include
+#include "ui_CreatePartitionDialog.h"
-#include
+#include "utils/Logger.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
-// CalaPM
-#include
-#include
-#include
-#include
+// KPMcore
+#include
+#include
+#include
+#include
// Qt
#include
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
+
#include
#include
-// CalaPM
-#include
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
+#include
+#include
+
#include
#include
#include
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
-#include
-#include
-#include
-#include
-#include
-#include
+#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
-#include
-
-// CalaPM
-#include
-#include
+#include "ui_PartitionPage.h"
+#include "ui_CreatePartitionTableDialog.h"
#include "utils/Retranslator.h"
+// KPMcore
+#include
+#include
+
// Qt
#include
#include
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 .
*/
-#include
+#include "gui/PartitionSizeController.h"
-#include
-#include
+#include "core/ColorUtils.h"
+#include "core/PMUtils.h"
// Qt
#include
-// CalaPM
-#include
-#include
+// KPMcore
+#include
+#include
// stdc++
#include
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
+// KPMcore
+#include
// Qt
#include
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 .
*/
-#include
-
-#include
-#include
-#include
-#include
-#include "core/partition.h"
-#include "core/device.h"
-#include
-#include
-#include
-#include
-#include
-#include
+#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
+#include
+
// Qt
#include
#include
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
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
+#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
+#include
+#include
#include
#include
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 .
*/
-#include
+#include "jobs/CheckFileSystemJob.h"
-// CalaPM
-#include
-#include
-#include
+// KPMcore
+#include
+#include
+#include
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
-#include
-#include
-#include
-#include
-#include
+#include "core/PartitionInfo.h"
+#include "core/PartitionIterator.h"
+#include "utils/Logger.h"
+
+// KPMcore
+#include
+#include
+#include
#include
#include
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
-#include
+#include "utils/Logger.h"
+
+// KPMcore
+#include
#include
#include
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 .
*/
-#include
-
-#include
-
-// CalaPM
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "jobs/CreatePartitionJob.h"
+
+#include "utils/Logger.h"
+
+// KPMcore
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
// Qt
#include
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 .
*/
-#include
-
-#include
-
-// CalaPM
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "jobs/CreatePartitionTableJob.h"
+
+#include "utils/Logger.h"
+
+// KPMcore
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
// Qt
#include
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
-// CalaPM
-#include
+// KPMcore
+#include
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 .
*/
-#include
-
-// CalaPM
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "jobs/DeletePartitionJob.h"
+
+// KPMcore
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
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 .
*/
-#include
+#include "jobs/FillGlobalStorageJob.h"
-#include
-#include