diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp
index 5f021dd3d..6c5f9ad16 100644
--- a/src/modules/finished/FinishedPage.cpp
+++ b/src/modules/finished/FinishedPage.cpp
@@ -10,21 +10,15 @@
  */
 
 #include "FinishedPage.h"
+
+#include "Config.h"
 #include "ui_FinishedPage.h"
 
 #include "Branding.h"
-#include "CalamaresVersion.h"
 #include "Settings.h"
-#include "ViewManager.h"
-#include "utils/CalamaresUtilsGui.h"
-#include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
-#include <QApplication>
-#include <QBoxLayout>
 #include <QFocusEvent>
-#include <QLabel>
-#include <QProcess>
 
 
 FinishedPage::FinishedPage( Config* config, QWidget* parent )
diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h
index 4e312ab8b..068efbdb5 100644
--- a/src/modules/finished/FinishedPage.h
+++ b/src/modules/finished/FinishedPage.h
@@ -12,12 +12,11 @@
 #define FINISHEDPAGE_H
 
 
-#include "Config.h"
-
 #include <QWidget>
 
 #include <optional>
 
+class Config;
 namespace Ui
 {
 class FinishedPage;
diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp
index 176b27cb4..146a7c215 100644
--- a/src/modules/finished/FinishedViewStep.cpp
+++ b/src/modules/finished/FinishedViewStep.cpp
@@ -10,12 +10,13 @@
  */
 
 #include "FinishedViewStep.h"
+
+#include "Config.h"
 #include "FinishedPage.h"
 
 #include "Branding.h"
 #include "JobQueue.h"
 #include "Settings.h"
-
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Variant.h"
diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h
index ac54fdd35..e2ce8ba55 100644
--- a/src/modules/finished/FinishedViewStep.h
+++ b/src/modules/finished/FinishedViewStep.h
@@ -11,15 +11,11 @@
 #ifndef FINISHEDVIEWSTEP_H
 #define FINISHEDVIEWSTEP_H
 
-#include "Config.h"
-
 #include "DllMacro.h"
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
 
-
-#include <QObject>
-
+class Config;
 class FinishedPage;
 
 class PLUGINDLLEXPORT FinishedViewStep : public Calamares::ViewStep