diff --git a/aboutdialog/aboutdialog.h b/aboutdialog/aboutdialog.h
index 0670956..05dd8a5 100644
--- a/aboutdialog/aboutdialog.h
+++ b/aboutdialog/aboutdialog.h
@@ -1,5 +1,5 @@
-#ifndef ABOUTDIALOG_H
-#define ABOUTDIALOG_H
+#ifndef DIALOGS_ABOUTDIALOG_H
+#define DIALOGS_ABOUTDIALOG_H
 
 #include <c++utilities/application/global.h>
 
@@ -9,8 +9,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
 
-namespace Dialogs
-{
+namespace Dialogs {
 
 namespace Ui {
 class AboutDialog;
@@ -32,5 +31,4 @@ private:
 
 }
 
-
-#endif // ABOUTDIALOG_H
+#endif // DIALOGS_ABOUTDIALOG_H
diff --git a/enterpassworddialog/enterpassworddialog.h b/enterpassworddialog/enterpassworddialog.h
index c58d5c7..1c2d361 100644
--- a/enterpassworddialog/enterpassworddialog.h
+++ b/enterpassworddialog/enterpassworddialog.h
@@ -1,5 +1,5 @@
-#ifndef ENTERPASSWORDDIALOG_H
-#define ENTERPASSWORDDIALOG_H
+#ifndef DIALOGS_ENTERPASSWORDDIALOG_H
+#define DIALOGS_ENTERPASSWORDDIALOG_H
 
 #include <c++utilities/application/global.h>
 
@@ -103,4 +103,4 @@ inline void EnterPasswordDialog::abort()
 
 }
 
-#endif // ENTERPASSWORDDIALOG_H
+#endif // DIALOGS_ENTERPASSWORDDIALOG_H
diff --git a/misc/adoptlocker.h b/misc/adoptlocker.h
index 4bc860e..40cea2c 100644
--- a/misc/adoptlocker.h
+++ b/misc/adoptlocker.h
@@ -1,5 +1,5 @@
-#ifndef ADOPTLOCKER_H
-#define ADOPTLOCKER_H
+#ifndef THEADING_UTILS_ADOPTLOCKER_H
+#define THEADING_UTILS_ADOPTLOCKER_H
 
 #include <QtGlobal>
 
@@ -35,4 +35,4 @@ private:
 
 }
 
-#endif // ADOPTLOCKER_H
+#endif // THEADING_UTILS_ADOPTLOCKER_H
diff --git a/misc/desktoputils.h b/misc/desktoputils.h
index 47772f1..ac7364f 100644
--- a/misc/desktoputils.h
+++ b/misc/desktoputils.h
@@ -1,5 +1,5 @@
-#ifndef DESKTOPSERVICES_H
-#define DESKTOPSERVICES_H
+#ifndef DESKTOP_UTILS_DESKTOPSERVICES_H
+#define DESKTOP_UTILS_DESKTOPSERVICES_H
 
 #include <QtGlobal>
 
@@ -11,4 +11,4 @@ bool openLocalFileOrDir(const QString &path);
 
 }
 
-#endif // DESKTOPSERVICES_H
+#endif // DESKTOP_UTILS_DESKTOPSERVICES_H
diff --git a/misc/recentmenumanager.h b/misc/recentmenumanager.h
index ae7ae48..1012335 100644
--- a/misc/recentmenumanager.h
+++ b/misc/recentmenumanager.h
@@ -1,5 +1,5 @@
-#ifndef RECENTMENUMANAGER_H
-#define RECENTMENUMANAGER_H
+#ifndef MISC_UTILS_RECENTMENUMANAGER_H
+#define MISC_UTILS_RECENTMENUMANAGER_H
 
 #include <c++utilities/application/global.h>
 
@@ -37,4 +37,4 @@ private:
 
 }
 
-#endif // RECENTMENUMANAGER_H
+#endif // MISC_UTILS_RECENTMENUMANAGER_H
diff --git a/misc/trylocker.h b/misc/trylocker.h
index 7d432ae..a3073eb 100644
--- a/misc/trylocker.h
+++ b/misc/trylocker.h
@@ -1,5 +1,5 @@
-#ifndef TRYLOCKER_H
-#define TRYLOCKER_H
+#ifndef THREADING_UTILS_TRYLOCKER_H
+#define THREADING_UTILS_TRYLOCKER_H
 
 #include <QtGlobal>
 
@@ -54,4 +54,4 @@ private:
 
 }
 
-#endif // TRYLOCKER_H
+#endif // THREADING_UTILS_TRYLOCKER_H
diff --git a/models/checklistmodel.h b/models/checklistmodel.h
index f1ebf9e..7a1bd4a 100644
--- a/models/checklistmodel.h
+++ b/models/checklistmodel.h
@@ -1,5 +1,5 @@
-#ifndef CHECKLISTMODEL_H
-#define CHECKLISTMODEL_H
+#ifndef MODELS_CHECKLISTMODEL_H
+#define MODELS_CHECKLISTMODEL_H
 
 #include <c++utilities/application/global.h>
 
@@ -114,4 +114,4 @@ inline constexpr int ChecklistModel::idRole()
 
 }
 
-#endif // CHECKLISTMODEL_H
+#endif // MODELS_CHECKLISTMODEL_H
diff --git a/paletteeditor/colorbutton.h b/paletteeditor/colorbutton.h
index 196e666..d4e6455 100644
--- a/paletteeditor/colorbutton.h
+++ b/paletteeditor/colorbutton.h
@@ -1,5 +1,5 @@
-#ifndef COLORBUTTON_H
-#define COLORBUTTON_H
+#ifndef WIDGETS_COLORBUTTON_H
+#define WIDGETS_COLORBUTTON_H
 
 #include <c++utilities/application/global.h>
 
@@ -50,4 +50,4 @@ private:
 
 }
 
-#endif
+#endif // WIDGETS_COLORBUTTON_H
diff --git a/paletteeditor/paletteeditor.h b/paletteeditor/paletteeditor.h
index 7b4bf1d..73ba2a5 100644
--- a/paletteeditor/paletteeditor.h
+++ b/paletteeditor/paletteeditor.h
@@ -1,5 +1,5 @@
-#ifndef PALETTEEDITOR_H
-#define PALETTEEDITOR_H
+#ifndef WIDGETS_PALETTEEDITOR_H
+#define WIDGETS_PALETTEEDITOR_H
 
 #include "ui_paletteeditor.h"
 
@@ -177,4 +177,4 @@ public:
 
 }
 
-#endif // PALETTEEDITOR_H
+#endif // WIDGETS_PALETTEEDITOR_H
diff --git a/resources/qtconfigarguments.h b/resources/qtconfigarguments.h
index c1c116b..046968d 100644
--- a/resources/qtconfigarguments.h
+++ b/resources/qtconfigarguments.h
@@ -1,5 +1,5 @@
-#ifndef QTCONFIGARGUMENTS_H
-#define QTCONFIGARGUMENTS_H
+#ifndef APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H
+#define APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H
 
 #include <c++utilities/application/argumentparser.h>
 
@@ -62,10 +62,10 @@ inline bool QtConfigArguments::areQtGuiArgsPresent() const
 
 }
 
-#endif // QTCONFIGARGUMENTS_H
+#endif // APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H
 
 #ifdef QT_CONFIG_ARGUMENTS
-#undef QT_CONFIG_ARGUMENTS
+# undef QT_CONFIG_ARGUMENTS
 #endif
 #define QT_CONFIG_ARGUMENTS ApplicationUtilities::QtConfigArguments
 
diff --git a/resources/resources.h b/resources/resources.h
index 7652a52..93407b0 100644
--- a/resources/resources.h
+++ b/resources/resources.h
@@ -1,5 +1,5 @@
-#ifndef RESOURCES_H
-#define RESOURCES_H
+#ifndef APPLICATION_UTILITIES_RESOURCES_H
+#define APPLICATION_UTILITIES_RESOURCES_H
 
 #include <c++utilities/application/global.h>
 
@@ -52,4 +52,4 @@ LIB_EXPORT QString locateConfigFile(const QString &applicationName, const QStrin
 
 }
 
-#endif // RESOURCES_H
+#endif // APPLICATION_UTILITIES_RESOURCES_H
diff --git a/settingsdialog/optioncategory.h b/settingsdialog/optioncategory.h
index 9dce4c4..4b52673 100644
--- a/settingsdialog/optioncategory.h
+++ b/settingsdialog/optioncategory.h
@@ -1,5 +1,5 @@
-#ifndef OPTIONSCATEGORY_H
-#define OPTIONSCATEGORY_H
+#ifndef DIALOGS_OPTIONSCATEGORY_H
+#define DIALOGS_OPTIONSCATEGORY_H
 
 #include <c++utilities/application/global.h>
 
@@ -88,4 +88,4 @@ inline const QList<OptionPage *> OptionCategory::pages() const
 
 }
 
-#endif // OPTIONSCATEGORY_H
+#endif // DIALOGS_OPTIONSCATEGORY_H
diff --git a/settingsdialog/optioncategoryfiltermodel.h b/settingsdialog/optioncategoryfiltermodel.h
index 7effeca..594c2b6 100644
--- a/settingsdialog/optioncategoryfiltermodel.h
+++ b/settingsdialog/optioncategoryfiltermodel.h
@@ -1,5 +1,5 @@
-#ifndef OPTIONCATEGORYFILTERMODEL_H
-#define OPTIONCATEGORYFILTERMODEL_H
+#ifndef DIALOGS_OPTIONCATEGORYFILTERMODEL_H
+#define DIALOGS_OPTIONCATEGORYFILTERMODEL_H
 
 #include <QSortFilterProxyModel>
 
@@ -19,4 +19,4 @@ protected:
 }
 
 
-#endif // OPTIONCATEGORYFILTERMODEL_H
+#endif // DIALOGS_OPTIONCATEGORYFILTERMODEL_H
diff --git a/settingsdialog/optioncategorymodel.h b/settingsdialog/optioncategorymodel.h
index 721efa2..6cd95ba 100644
--- a/settingsdialog/optioncategorymodel.h
+++ b/settingsdialog/optioncategorymodel.h
@@ -1,5 +1,5 @@
-#ifndef OPTIONCATEGORYMODEL_H
-#define OPTIONCATEGORYMODEL_H
+#ifndef DIALOGS_OPTIONCATEGORYMODEL_H
+#define DIALOGS_OPTIONCATEGORYMODEL_H
 
 #include <c++utilities/application/global.h>
 
@@ -69,4 +69,4 @@ inline OptionCategory *OptionCategoryModel::category(int row) const
 
 }
 
-#endif // OPTIONCATEGORYMODEL_H
+#endif // DIALOGS_OPTIONCATEGORYMODEL_H
diff --git a/settingsdialog/optionpage.h b/settingsdialog/optionpage.h
index 3ea3f51..b5fe313 100644
--- a/settingsdialog/optionpage.h
+++ b/settingsdialog/optionpage.h
@@ -1,5 +1,5 @@
-#ifndef OPTIONSPAGE_H
-#define OPTIONSPAGE_H
+#ifndef DIALOGS_OPTIONSPAGE_H
+#define DIALOGS_OPTIONSPAGE_H
 
 #include <c++utilities/application/global.h>
 
@@ -245,4 +245,4 @@ inline UiClass *UiFileBasedOptionPage<UiClass>::ui()
         DECLARE_SETUP_WIDGETS \
     END_DECLARE_OPTION_PAGE
 
-#endif // OPTIONSPAGE_H
+#endif // DIALOGS_OPTIONSPAGE_H
diff --git a/settingsdialog/qtsettings.h b/settingsdialog/qtsettings.h
index b6f18a2..f312742 100644
--- a/settingsdialog/qtsettings.h
+++ b/settingsdialog/qtsettings.h
@@ -1,8 +1,8 @@
 // The functions and classes declared in this header are experimental.
 // API/ABI might change in minor release!
 
-#ifndef QT_UTILITIES_QTSETTINGS_H
-#define QT_UTILITIES_QTSETTINGS_H
+#ifndef DIALOGS_QT_UTILITIES_QTSETTINGS_H
+#define DIALOGS_QT_UTILITIES_QTSETTINGS_H
 
 #include "./optionpage.h"
 
@@ -27,4 +27,4 @@ DECLARE_UI_FILE_BASED_OPTION_PAGE(QtEnvOptionPage)
 
 }
 
-#endif // QT_UTILITIES_QTSETTINGS_H
+#endif // DIALOGS_QT_UTILITIES_QTSETTINGS_H
diff --git a/settingsdialog/settingsdialog.h b/settingsdialog/settingsdialog.h
index b380fcc..bc894e0 100644
--- a/settingsdialog/settingsdialog.h
+++ b/settingsdialog/settingsdialog.h
@@ -1,5 +1,5 @@
-#ifndef QT_UTILITIES_SETTINGSDIALOG_H
-#define QT_UTILITIES_SETTINGSDIALOG_H
+#ifndef DIALOGS_SETTINGSDIALOG_H
+#define DIALOGS_SETTINGSDIALOG_H
 
 #include <c++utilities/application/global.h>
 
@@ -94,4 +94,4 @@ inline OptionCategoryModel *SettingsDialog::categoryModel()
 
 }
 
-#endif // QT_UTILITIES_SETTINGSDIALOG_H
+#endif // DIALOGS_SETTINGSDIALOG_H