diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp
index 26a57ec14..d08fd66f1 100644
--- a/src/libcalamares/PythonHelper.cpp
+++ b/src/libcalamares/PythonHelper.cpp
@@ -25,14 +25,6 @@
 #include <QDir>
 #include <QFileInfo>
 
-#undef slots
-#include "utils/boost-warnings.h"
-#include <boost/python.hpp>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 namespace bp = boost::python;
 
 namespace CalamaresPython
diff --git a/src/libcalamares/PythonHelper.h b/src/libcalamares/PythonHelper.h
index 9035ba6d4..ed1d56151 100644
--- a/src/libcalamares/PythonHelper.h
+++ b/src/libcalamares/PythonHelper.h
@@ -21,20 +21,10 @@
 #define CALAMARES_PYTHONJOBHELPER_H
 
 #include "PythonJob.h"
+#include "utils/BoostPython.h"
 
 #include <QStringList>
 
-#undef slots
-#include "utils/boost-warnings.h"
-
-#include <boost/python/dict.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/object.hpp>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 namespace CalamaresPython
 {
 
diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index f5c033826..db14c10f8 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -23,19 +23,12 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "PythonHelper.h"
+#include "PythonJobApi.h"
+#include "utils/BoostPython.h"
 #include "utils/Logger.h"
 
 #include <QDir>
 
-#undef slots
-#include "utils/boost-warnings.h"
-
-#include <boost/python.hpp>
-#include <boost/python/args.hpp>
-
-#include "PythonJobApi.h"
-
-
 namespace bp = boost::python;
 
 BOOST_PYTHON_FUNCTION_OVERLOADS( mount_overloads, CalamaresPython::mount, 2, 4 );
diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 7b65e979c..e0bb686cd 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -19,26 +19,17 @@
 
 #include "PythonJobApi.h"
 
+#include "GlobalStorage.h"
+#include "JobQueue.h"
 #include "PythonHelper.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
 #include "utils/String.h"
 
-#include "GlobalStorage.h"
-#include "JobQueue.h"
-
 #include <QCoreApplication>
 #include <QDir>
 #include <QStandardPaths>
 
-#undef slots
-#include "utils/boost-warnings.h"
-#include <boost/python.hpp>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 namespace bp = boost::python;
 
 static int
diff --git a/src/libcalamares/PythonJobApi.h b/src/libcalamares/PythonJobApi.h
index 80a32b930..941527d66 100644
--- a/src/libcalamares/PythonJobApi.h
+++ b/src/libcalamares/PythonJobApi.h
@@ -22,13 +22,7 @@
 
 #include "qglobal.h"  // For qreal
 
-#undef slots
-#include "utils/boost-warnings.h"
-#include <boost/python/dict.hpp>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#include "utils/BoostPython.h"
 
 namespace Calamares
 {