diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h
index 87d148fe79d..88faec9c2cf 100644
--- a/src/libs/aggregation/aggregate.h
+++ b/src/libs/aggregation/aggregate.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QAGGREGATION_H
-#define QAGGREGATION_H
+#ifndef AGGREGATE_H
+#define AGGREGATE_H
 
 #include "aggregation_global.h"
 
@@ -131,4 +131,4 @@ template <typename T> QList<T *> query_all(QObject *obj)
 
 } // namespace Aggregation
 
-#endif // QAGGREGATION_H
+#endif // AGGREGATE_H
diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h
index d89863ee206..93e7a898abd 100644
--- a/src/plugins/macros/actionmacrohandler.h
+++ b/src/plugins/macros/actionmacrohandler.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef MACROSPLUGIN_ACTIONEVENTHANDLER_H
-#define MACROSPLUGIN_ACTIONEVENTHANDLER_H
+#ifndef ACTIOMACROHANDLER_H
+#define ACTIOMACROHANDLER_H
 
 #include "imacrohandler.h"
 
@@ -70,4 +70,4 @@ private:
 } // namespace Internal
 } // namespace Macros
 
-#endif // MACROSPLUGIN_ACTIONEVENTHANDLER_H
+#endif // ACTIOMACROHANDLER_H
diff --git a/src/plugins/macros/findmacrohandler.h b/src/plugins/macros/findmacrohandler.h
index a7dcdd6522d..07f5a5f6ef1 100644
--- a/src/plugins/macros/findmacrohandler.h
+++ b/src/plugins/macros/findmacrohandler.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef MACROSPLUGIN_FINDEVENTHANDLER_H
-#define MACROSPLUGIN_FINDEVENTHANDLER_H
+#ifndef FINDMACROHANDLER_H
+#define FINDMACROHANDLER_H
 
 #include "imacrohandler.h"
 
@@ -68,4 +68,4 @@ private slots:
 } // namespace Internal
 } // namespace Macros
 
-#endif // MACROSPLUGIN_FINDEVENTHANDLER_H
+#endif // FINDMACROHANDLER_H
diff --git a/src/plugins/macros/texteditormacrohandler.h b/src/plugins/macros/texteditormacrohandler.h
index 02d50688c3d..b14065f8547 100644
--- a/src/plugins/macros/texteditormacrohandler.h
+++ b/src/plugins/macros/texteditormacrohandler.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef MACROSPLUGIN_TEXTEDITOREVENTHANDLER_H
-#define MACROSPLUGIN_TEXTEDITOREVENTHANDLER_H
+#ifndef TEXTEDITORMACROHANDLER_H
+#define TEXTEDITORMACROHANDLER_H
 
 #include "imacrohandler.h"
 
@@ -69,4 +69,4 @@ private:
 } // namespace Internal
 } // namespace Macros
 
-#endif // MACROSPLUGIN_TEXTEDITOREVENTHANDLER_H
+#endif // TEXTEDITORMACROHANDLER_H
diff --git a/src/plugins/madde/maddeqemustartstep.h b/src/plugins/madde/maddeqemustartstep.h
index ca990f8490c..f7e2b3180ea 100644
--- a/src/plugins/madde/maddeqemustartstep.h
+++ b/src/plugins/madde/maddeqemustartstep.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef MAEMOQEMUSTARTSTEP_H
-#define MAEMOQEMUSTARTSTEP_H
+#ifndef MADDEQEMUSTARTSTEP_H
+#define MADDEQEMUSTARTSTEP_H
 
 #include <remotelinux/abstractremotelinuxdeploystep.h>
 
@@ -57,4 +57,4 @@ private:
 } // namespace Internal
 } // namespace Madde
 
-#endif // MAEMOQEMUSTARTSTEP_H
+#endif // MADDEQEMUSTARTSTEP_H
diff --git a/src/plugins/qmljseditor/qmljssnippetprovider.h b/src/plugins/qmljseditor/qmljssnippetprovider.h
index 8799bc331e6..3612cdac6ca 100644
--- a/src/plugins/qmljseditor/qmljssnippetprovider.h
+++ b/src/plugins/qmljseditor/qmljssnippetprovider.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLJSSNIPPETEDITORPROVIDER_H
-#define QMLJSSNIPPETEDITORPROVIDER_H
+#ifndef QMLJSSNIPPETPROVIDER_H
+#define QMLJSSNIPPETPROVIDER_H
 
 #include <texteditor/snippets/isnippetprovider.h>
 
@@ -50,4 +50,4 @@ public:
 } // Internal
 } // QmlJSEditor
 
-#endif // QMLJSSNIPPETEDITORPROVIDER_H
+#endif // QMLJSSNIPPETPROVIDER_H
diff --git a/src/plugins/texteditor/convenience.h b/src/plugins/texteditor/convenience.h
index 10fcd5ed72b..99c296e1dbd 100644
--- a/src/plugins/texteditor/convenience.h
+++ b/src/plugins/texteditor/convenience.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CONCENIENCE_H
-#define CONCENIENCE_H
+#ifndef CONVENIENCE_H
+#define CONVENIENCE_H
 
 #include "texteditor_global.h"
 
@@ -51,4 +51,4 @@ TEXTEDITOR_EXPORT QString textAt(QTextCursor tc, int pos, int length);
 } // Util
 } // TextEditor
 
-#endif // CONCENIENCE_H
+#endif // CONVENIENCE_H