diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp
index 6b9ef9d3e..9174ed696 100644
--- a/src/modules/fsresizer/ResizeFSJob.cpp
+++ b/src/modules/fsresizer/ResizeFSJob.cpp
@@ -18,6 +18,14 @@
 
 #include "ResizeFSJob.h"
 
+#include "CalamaresVersion.h"
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "partition/PartitionIterator.h"
+#include "utils/Logger.h"
+#include "utils/Units.h"
+#include "utils/Variant.h"
+
 #include <QProcess>
 #include <QDateTime>
 #include <QThread>
@@ -29,17 +37,7 @@
 #include <kpmcore/ops/resizeoperation.h>
 #include <kpmcore/util/report.h>
 
-#include "CalamaresVersion.h"
-#include "JobQueue.h"
-#include "GlobalStorage.h"
-
-#include "utils/Logger.h"
-#include "utils/Units.h"
-#include "utils/Variant.h"
-
-// From partition module
-#include "core/PartitionIterator.h"
-
+using CalamaresUtils::Partition::PartitionIterator;
 
 ResizeFSJob::ResizeFSJob( QObject* parent )
     : Calamares::CppJob( parent )
diff --git a/src/modules/partition/core/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp
index ffe45d443..843b02711 100644
--- a/src/modules/partition/core/ColorUtils.cpp
+++ b/src/modules/partition/core/ColorUtils.cpp
@@ -20,8 +20,8 @@
 #include "core/ColorUtils.h"
 
 #include "core/KPMHelpers.h"
-#include "core/PartitionIterator.h"
 
+#include "partition/PartitionIterator.h"
 #include "utils/Logger.h"
 
 // KPMcore
@@ -32,6 +32,8 @@
 #include <QColor>
 #include <QMap>
 
+using CalamaresUtils::Partition::PartitionIterator;
+
 static const int NUM_PARTITION_COLORS = 5;
 static const int NUM_NEW_PARTITION_COLORS = 4;
 //Let's try to use the Breeze palette
diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index 680d30dd6..6d5ec8dd1 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -20,23 +20,24 @@
 #include "DeviceList.h"
 
 #include "PartitionCoreModule.h"
-
 #include "core/DeviceModel.h"
 #include "core/KPMHelpers.h"
-#include "core/PartitionIterator.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "partition/PartitionIterator.h"
+#include "utils/Logger.h"
 
 #include <kpmcore/backend/corebackend.h>
 #include <kpmcore/backend/corebackendmanager.h>
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
 
-#include <utils/Logger.h>
-#include <JobQueue.h>
-#include <GlobalStorage.h>
-
 #include <QProcess>
 #include <QTemporaryDir>
 
+using CalamaresUtils::Partition::PartitionIterator;
+
 namespace PartUtils
 {
 
diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp
index 0265a17e5..1e5770b26 100644
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -21,7 +21,9 @@
 #include "core/KPMHelpers.h"
 
 #include "core/PartitionInfo.h"
-#include "core/PartitionIterator.h"
+
+#include "partition/PartitionIterator.h"
+#include "utils/Logger.h"
 
 // KPMcore
 #include <kpmcore/core/device.h>
@@ -30,10 +32,7 @@
 #include <kpmcore/backend/corebackendmanager.h>
 #include <kpmcore/fs/luks.h>
 
-#include "utils/Logger.h"
-
-#include <QDebug>
-
+using CalamaresUtils::Partition::PartitionIterator;
 
 namespace KPMHelpers
 {
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 562474865..4a70848a5 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -25,17 +25,18 @@
 #include "core/DeviceModel.h"
 #include "core/KPMHelpers.h"
 #include "core/PartitionInfo.h"
-#include "core/PartitionIterator.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "partition/PartitionIterator.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
 
 #include <kpmcore/backend/corebackend.h>
 #include <kpmcore/backend/corebackendmanager.h>
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
 
-#include <utils/CalamaresUtilsSystem.h>
-#include <utils/Logger.h>
-#include <JobQueue.h>
-#include <GlobalStorage.h>
 
 #include <QProcess>
 #include <QTemporaryDir>
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 4b23c86e4..78d3245f7 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -27,7 +27,6 @@
 #include "core/DeviceList.h"
 #include "core/DeviceModel.h"
 #include "core/PartitionInfo.h"
-#include "core/PartitionIterator.h"
 #include "core/PartitionModel.h"
 #include "core/KPMHelpers.h"
 #include "core/PartUtils.h"
@@ -45,12 +44,12 @@
 #include "jobs/ResizeVolumeGroupJob.h"
 #include "jobs/SetPartitionFlagsJob.h"
 
-#include "utils/Variant.h"
-
 #ifdef DEBUG_PARTITION_LAME
 #include "JobExample.h"
 #endif
+#include "partition/PartitionIterator.h"
 #include "utils/Logger.h"
+#include "utils/Variant.h"
 
 // KPMcore
 #include <kpmcore/core/device.h>
@@ -70,6 +69,7 @@
 #include <QFutureWatcher>
 #include <QtConcurrent/QtConcurrent>
 
+using CalamaresUtils::Partition::PartitionIterator;
 
 PartitionCoreModule::RefreshHelper::RefreshHelper(PartitionCoreModule* module)
     : m_module( module )
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 5e8260dec..719e91dec 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -28,7 +28,6 @@
 #include "core/PartitionActions.h"
 #include "core/PartitionCoreModule.h"
 #include "core/PartitionInfo.h"
-#include "core/PartitionIterator.h"
 #include "core/PartitionModel.h"
 
 #include "BootInfoWidget.h"
@@ -40,14 +39,15 @@
 #include "ReplaceWidget.h"
 #include "ScanningDialog.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "partition/PartitionIterator.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/Units.h"
 
 #include "Branding.h"
-#include "GlobalStorage.h"
-#include "JobQueue.h"
+#include "utils/CalamaresUtilsGui.h"
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
@@ -65,6 +65,7 @@
 #include <QtConcurrent/QtConcurrent>
 
 using PartitionActions::Choices::SwapChoice;
+using CalamaresUtils::Partition::PartitionIterator;
 
 /** @brief Given a set of swap choices, return a sensible value from it.
  *
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
index 0281ab32c..62da1fe3d 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
@@ -19,10 +19,11 @@
 #include "PartitionSplitterWidget.h"
 
 #include "core/ColorUtils.h"
-#include "core/PartitionIterator.h"
 #include "core/KPMHelpers.h"
 
 #include "utils/Logger.h"
+#include "partition/PartitionIterator.h"
+
 #include "utils/CalamaresUtilsGui.h"
 
 #include <kpmcore/core/device.h>
@@ -33,6 +34,8 @@
 #include <QMouseEvent>
 #include <QStyleOption>
 
+using CalamaresUtils::Partition::PartitionIterator;
+
 static const int VIEW_HEIGHT = qMax( CalamaresUtils::defaultFontHeight() + 8, // wins out with big fonts
                                      int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts
 static const int CORNER_RADIUS = 3;
diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp
index 605087147..31428e87d 100644
--- a/src/modules/partition/jobs/ClearMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearMountsJob.cpp
@@ -21,7 +21,8 @@
 #include "ClearMountsJob.h"
 
 #include "core/PartitionInfo.h"
-#include "core/PartitionIterator.h"
+
+#include "partition/PartitionIterator.h"
 #include "utils/Logger.h"
 
 // KPMcore
@@ -33,6 +34,7 @@
 #include <QProcess>
 #include <QStringList>
 
+using CalamaresUtils::Partition::PartitionIterator;
 
 ClearMountsJob::ClearMountsJob( Device* device )
     : Calamares::Job()
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 3465a0e2d..e481cdd63 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -20,8 +20,7 @@
 
 #include "jobs/CreatePartitionTableJob.h"
 
-#include "core/PartitionIterator.h"
-
+#include "partition/PartitionIterator.h"
 #include "utils/Logger.h"
 
 // KPMcore
@@ -35,6 +34,8 @@
 // Qt
 #include <QProcess>
 
+using CalamaresUtils::Partition::PartitionIterator;
+
 CreatePartitionTableJob::CreatePartitionTableJob( Device* device, PartitionTable::TableType type )
     : m_device( device )
     , m_type( type )
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index 8b981ce3e..12bf0cf03 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -23,11 +23,13 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "core/PartitionInfo.h"
-#include "core/PartitionIterator.h"
 #include "core/KPMHelpers.h"
-#include "Branding.h"
+
+#include "partition/PartitionIterator.h"
 #include "utils/Logger.h"
 
+#include "Branding.h"
+
 // KPMcore
 #include <core/device.h>
 #include <core/partition.h>
@@ -40,6 +42,8 @@
 #include <QFileInfo>
 #include <QProcess>
 
+using CalamaresUtils::Partition::PartitionIterator;
+
 typedef QHash<QString, QString> UuidForPartitionHash;
 
 static UuidForPartitionHash