diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp
index c79d4771c..848d319db 100644
--- a/src/modules/welcome/WelcomeViewStep.cpp
+++ b/src/modules/welcome/WelcomeViewStep.cpp
@@ -18,19 +18,18 @@
  */
 
 #include "WelcomeViewStep.h"
-#include "Config.h"
 
+#include "Config.h"
 #include "WelcomePage.h"
 #include "checker/GeneralRequirements.h"
 
+#include "Branding.h"
 #include "geoip/Handler.h"
 #include "locale/Lookup.h"
+#include "modulesystem/ModuleManager.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
-#include "Branding.h"
-#include "modulesystem/ModuleManager.h"
-
 #include <QFutureWatcher>
 #include <QVariant>
 
diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h
index d4b9b3019..3265395fc 100644
--- a/src/modules/welcome/WelcomeViewStep.h
+++ b/src/modules/welcome/WelcomeViewStep.h
@@ -16,22 +16,22 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WELCOMEPAGEPLUGIN_H
-#define WELCOMEPAGEPLUGIN_H
+#ifndef WELCOMEVIEWSTEP_H
+#define WELCOMEVIEWSTEP_H
 
-#include <QObject>
-
-#include <modulesystem/Requirement.h>
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
 
-#include <DllMacro.h>
+#include "DllMacro.h"
+#include "modulesystem/Requirement.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
+#include <QObject>
 #include <QVariantMap>
 
 class WelcomePage;
 class GeneralRequirements;
 class Config;
+
 namespace CalamaresUtils
 {
 namespace GeoIP
@@ -80,4 +80,4 @@ private:
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeViewStepFactory )
 
-#endif  // WELCOMEPAGEPLUGIN_H
+#endif  // WELCOMEVIEWSTEP_H