diff --git a/src/libcalamaresui/viewpages/QmlViewStep.cpp b/src/libcalamaresui/viewpages/QmlViewStep.cpp
index b009d1626..a7a157343 100644
--- a/src/libcalamaresui/viewpages/QmlViewStep.cpp
+++ b/src/libcalamaresui/viewpages/QmlViewStep.cpp
@@ -23,6 +23,7 @@
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
+#include "utils/Qml.h"
 #include "utils/Variant.h"
 #include "widgets/WaitingWidget.h"
 
@@ -80,57 +81,56 @@ QmlViewStep::prettyName() const
 }
 
 
-}  // namespace Calamares
 
 bool
-Calamares::QmlViewStep::isAtBeginning() const
+QmlViewStep::isAtBeginning() const
 {
     return true;
 }
 
 bool
-Calamares::QmlViewStep::isAtEnd() const
+QmlViewStep::isAtEnd() const
 {
     return true;
 }
 bool
-Calamares::QmlViewStep::isBackEnabled() const
+QmlViewStep::isBackEnabled() const
 {
     return true;
 }
 
 bool
-Calamares::QmlViewStep::isNextEnabled() const
+QmlViewStep::isNextEnabled() const
 {
     return true;
 }
 
 Calamares::JobList
-Calamares::QmlViewStep::jobs() const
+QmlViewStep::jobs() const
 {
     return JobList();
 }
 
 void
-Calamares::QmlViewStep::onActivate()
+QmlViewStep::onActivate()
 {
     // TODO: call into QML
 }
 
 void
-Calamares::QmlViewStep::onLeave()
+QmlViewStep::onLeave()
 {
     // TODO: call into QML
 }
 
 QWidget*
-Calamares::QmlViewStep::widget()
+QmlViewStep::widget()
 {
     return m_widget;
 }
 
 void
-Calamares::QmlViewStep::loadComplete()
+QmlViewStep::loadComplete()
 {
     cDebug() << "QML component" << m_qmlFileName << m_qmlComponent->status();
     if ( m_qmlComponent->status() == QQmlComponent::Error )
@@ -163,7 +163,7 @@ Calamares::QmlViewStep::loadComplete()
 }
 
 void
-Calamares::QmlViewStep::showQml()
+QmlViewStep::showQml()
 {
     if ( !m_qmlWidget || !m_qmlObject )
     {
@@ -190,7 +190,7 @@ Calamares::QmlViewStep::showQml()
  * is badly configured).
  */
 QString
-searchQmlFile( Calamares::QmlViewStep::QmlSearch method, const QString& configuredName, const QString& moduleName )
+searchQmlFile( QmlViewStep::QmlSearch method, const QString& configuredName, const QString& moduleName )
 {
     using QmlSearch = Calamares::QmlViewStep::QmlSearch;
 
@@ -235,7 +235,7 @@ searchQmlFile( Calamares::QmlViewStep::QmlSearch method, const QString& configur
 }
 
 void
-Calamares::QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
+QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     bool ok = false;
     m_searchMethod = searchNames().find( CalamaresUtils::getString( configurationMap, "search" ), ok );
@@ -270,8 +270,10 @@ Calamares::QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap
 }
 
 void
-Calamares::QmlViewStep::showFailedQml()
+QmlViewStep::showFailedQml()
 {
     cWarning() << "QmlViewStep" << moduleInstanceKey() << "loading failed.";
     m_spinner->setText( prettyName() + ' ' + tr( "Loading failed." ) );
 }
+
+}  // namespace Calamares