diff --git a/src/libcalamares/utils/CalamaresUtils.h b/src/libcalamares/utils/CalamaresUtils.h
index 2eb202b2c..85661a94b 100644
--- a/src/libcalamares/utils/CalamaresUtils.h
+++ b/src/libcalamares/utils/CalamaresUtils.h
@@ -22,8 +22,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CALAMARESUTILS_H
-#define CALAMARESUTILS_H
+#ifndef UTILS_CALAMARESUTILS_H
+#define UTILS_CALAMARESUTILS_H
 
 #include "DllMacro.h"
 
@@ -108,6 +108,6 @@ namespace CalamaresUtils
      * @brief crash makes Calamares crash immediately.
      */
     DLLEXPORT void crash();
-}
+}  // namespace
 
-#endif // CALAMARESUTILS_H
+#endif
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h
index 2b5967591..6809859ee 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.h
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.h
@@ -16,8 +16,8 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef CALAMARESUTILSSYSTEM_H
-#define CALAMARESUTILSSYSTEM_H
+#ifndef UTILS_CALAMARESUTILSSYSTEM_H
+#define UTILS_CALAMARESUTILSSYSTEM_H
 
 #include "DllMacro.h"
 
@@ -235,6 +235,6 @@ private:
     bool m_doChroot;
 };
 
-}
+}  // namespace
 
-#endif // CALAMARESUTILSSYSTEM_H
+#endif
diff --git a/src/libcalamares/utils/CommandList.h b/src/libcalamares/utils/CommandList.h
index 9faf705f2..3dccdec6a 100644
--- a/src/libcalamares/utils/CommandList.h
+++ b/src/libcalamares/utils/CommandList.h
@@ -16,8 +16,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COMMANDLIST_H
-#define COMMANDLIST_H
+#ifndef UTILS_COMMANDLIST_H
+#define UTILS_COMMANDLIST_H
 
 #include "Job.h"
 
@@ -110,4 +110,4 @@ private:
 } ;
 
 }  // namespace
-#endif // COMMANDLIST_H
+#endif
diff --git a/src/libcalamares/utils/LocaleLabel.h b/src/libcalamares/utils/LocaleLabel.h
index d3113c869..b56b29f33 100644
--- a/src/libcalamares/utils/LocaleLabel.h
+++ b/src/libcalamares/utils/LocaleLabel.h
@@ -17,8 +17,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBCALAMARES_LOCALELABEL_H
-#define LIBCALAMARES_LOCALELABEL_H
+#ifndef UTILS_LOCALELABEL_H
+#define UTILS_LOCALELABEL_H
 
 #include <QLocale>
 #include <QString>
@@ -41,7 +41,7 @@ public:
 
     /** @brief Empty locale. This uses the system-default locale. */
     LocaleLabel();
-    
+
     /** @brief Construct from a locale name.
      *
      * The @p localeName should be one that Qt recognizes, e.g. en_US or ar_EY.
@@ -100,7 +100,7 @@ public:
 
 protected:
     void setLabels( const QString& name, LabelFormat format );
-    
+
     QLocale m_locale;
     QString m_localeId;  // the locale identifier, e.g. "en_GB"
     QString m_label;  // the native name of the locale
@@ -108,6 +108,6 @@ protected:
 } ;
 
 
-}  // namespace CalamaresUtils
+}  // namespace
 
-#endif // LIBCALAMARES_LOCALELABEL_H
+#endif
diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h
index d7af886b3..4d1534e4b 100644
--- a/src/libcalamares/utils/Logger.h
+++ b/src/libcalamares/utils/Logger.h
@@ -18,8 +18,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CALAMARES_LOGGER_H
-#define CALAMARES_LOGGER_H
+#ifndef UTILS_LOGGER_H
+#define UTILS_LOGGER_H
 
 #include <QDebug>
 
@@ -186,10 +186,10 @@ namespace Logger
             s << Continuation << it.key().toUtf8().constData() << ':' << ' ' << toString( it.value() ).toUtf8().constData();
         return s;
     }
-}
+}  // namespace
 
 #define cDebug Logger::CDebug
 #define cWarning() Logger::CDebug(Logger::LOGWARNING)
 #define cError() Logger::CDebug(Logger::LOGERROR)
 
-#endif // CALAMARES_LOGGER_H
+#endif
diff --git a/src/libcalamares/utils/NamedEnum.h b/src/libcalamares/utils/NamedEnum.h
index fd3791e72..5ff62f54c 100644
--- a/src/libcalamares/utils/NamedEnum.h
+++ b/src/libcalamares/utils/NamedEnum.h
@@ -26,8 +26,8 @@
  * in printing integer (underlying) values of an enum.
  */
 
-#ifndef LIBCALAMARES_NAMEDENUM_H
-#define LIBCALAMARES_NAMEDENUM_H
+#ifndef UTILS_NAMEDENUM_H
+#define UTILS_NAMEDENUM_H
 
 #include <QString>
 
@@ -108,5 +108,4 @@ constexpr typename std::underlying_type<E>::type smash( const E e )
     return static_cast<typename std::underlying_type<E>::type>( e );
 }
 
-
 #endif
diff --git a/src/libcalamares/utils/NamedSuffix.h b/src/libcalamares/utils/NamedSuffix.h
index d4a0ed4b7..f58277698 100644
--- a/src/libcalamares/utils/NamedSuffix.h
+++ b/src/libcalamares/utils/NamedSuffix.h
@@ -36,8 +36,8 @@
  * } ;
  */
 
-#ifndef LIBCALAMARES_NAMEDSUFFIX_H
-#define LIBCALAMARES_NAMEDSUFFIX_H
+#ifndef UTILS_NAMEDSUFFIX_H
+#define UTILS_NAMEDSUFFIX_H
 
 #include "NamedEnum.h"
 
@@ -104,5 +104,4 @@ protected:
     unit_t m_unit;
 };
 
-
 #endif
diff --git a/src/libcalamares/utils/PluginFactory.h b/src/libcalamares/utils/PluginFactory.h
index 7338d53de..1ab485779 100644
--- a/src/libcalamares/utils/PluginFactory.h
+++ b/src/libcalamares/utils/PluginFactory.h
@@ -21,8 +21,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CALAMARESPLUGINFACTORY_H
-#define CALAMARESPLUGINFACTORY_H
+#ifndef UTILS_PLUGINFACTORY_H
+#define UTILS_PLUGINFACTORY_H
 
 #include "DllMacro.h"
 
@@ -311,8 +311,8 @@ inline T* PluginFactory::create( const QString& keyword, QObject* parent )
     return t;
 }
 
-}
+}  // namespace
 
 Q_DECLARE_INTERFACE( Calamares::PluginFactory, CalamaresPluginFactory_iid )
 
-#endif // CALAMARESPLUGINFACTORY_H
+#endif
diff --git a/src/libcalamares/utils/PluginFactory_p.h b/src/libcalamares/utils/PluginFactory_p.h
index ce50e8b46..7a6db217e 100644
--- a/src/libcalamares/utils/PluginFactory_p.h
+++ b/src/libcalamares/utils/PluginFactory_p.h
@@ -20,8 +20,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CALAMARESPLUGINFACTORY_P_H
-#define CALAMARESPLUGINFACTORY_P_H
+#ifndef UTILS_PLUGINFACTORY_P_H
+#define UTILS_PLUGINFACTORY_P_H
 
 #include "PluginFactory.h"
 
@@ -49,6 +49,6 @@ protected:
     PluginFactory *q_ptr;
 };
 
-}
+}  // namespace
 
-#endif // CALAMARESPLUGINFACTORY_P_H
+#endif
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index 4c719a6bf..af561a9ce 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -16,8 +16,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CALAMARESUTILS_RETRANSLATOR_H
-#define CALAMARESUTILS_RETRANSLATOR_H
+#ifndef UTILS_RETRANSLATOR_H
+#define UTILS_RETRANSLATOR_H
 
 #include <QList>
 #include <QObject>
@@ -48,11 +48,11 @@ private:
 };
 
 
-} // namespace CalamaresUtils
+}  // namespace
 
 #define CALAMARES_RETRANSLATE(body) \
     CalamaresUtils::Retranslator::attachRetranslator( this, [=] { body } );
 #define CALAMARES_RETRANSLATE_WIDGET(widget,body) \
     CalamaresUtils::Retranslator::attachRetranslator( widget, [=] { body } );
 
-#endif // CALAMARESUTILS_RETRANSLATOR_H
+#endif
diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h
index 34f80b17f..74c809362 100644
--- a/src/libcalamares/utils/Units.h
+++ b/src/libcalamares/utils/Units.h
@@ -17,8 +17,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBCALAMARES_UTILS_UNITS_H
-#define LIBCALAMARES_UTILS_UNITS_H
+#ifndef UTILS_UNITS_H
+#define UTILS_UNITS_H
 
 #include <QtCore/QIntegerForSize>