diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h
index f8263f4a9bf9847b734eebbb7751907b83359663..a3aaaa5acd7001baa4e1bb1aa9d81e18cdffbd5e 100644
--- a/src/plugins/cppeditor/cppeditorconstants.h
+++ b/src/plugins/cppeditor/cppeditorconstants.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPPLUGIN_GLOBAL_H
-#define CPPPLUGIN_GLOBAL_H
+#ifndef CPPEDITORCONSTANTS_H
+#define CPPEDITORCONSTANTS_H
 
 namespace CppEditor {
 namespace Constants {
@@ -61,4 +61,4 @@ const char CPP_SNIPPETS_GROUP_ID[] = "C++";
 } // namespace Constants
 } // namespace CppEditor
 
-#endif // CPPPLUGIN_GLOBAL_H
+#endif // CPPEDITORCONSTANTS_H
diff --git a/src/plugins/cppeditor/cppeditorenums.h b/src/plugins/cppeditor/cppeditorenums.h
index 3c62038b105a573c41821eeeae752943565f5404..b363cd170630017ce13ddfb810e6b66cd30d546c 100644
--- a/src/plugins/cppeditor/cppeditorenums.h
+++ b/src/plugins/cppeditor/cppeditorenums.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPPLUGIN_ENUMS_H
-#define CPPPLUGIN_ENUMS_H
+#ifndef CPPEDITORENUMS_H
+#define CPPEDITORENUMS_H
 
 namespace CppEditor {
 namespace Internal {
@@ -56,4 +56,4 @@ enum CppFormats {
 } // namespace Internal
 } // namespace CppEditor
 
-#endif // CPPPLUGIN_ENUMS_H
+#endif // CPPEDITORENUMS_H
diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h
index 1a7527bd6b70c6a2ca2d05e7133672ea0062e395..d636d6cf926503e54ee98a67fa897ef753b03683 100644
--- a/src/plugins/cppeditor/cppelementevaluator.h
+++ b/src/plugins/cppeditor/cppelementevaluator.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPHIGHLEVELMODEL_H
-#define CPPHIGHLEVELMODEL_H
+#ifndef CPPELEMENTEVALUATOR_H
+#define CPPELEMENTEVALUATOR_H
 
 #include "cppeditor.h"
 
@@ -199,4 +199,4 @@ public:
 } // namespace Internal
 } // namespace CppEditor
 
-#endif // CPPHIGHLEVELMODEL_H
+#endif // CPPELEMENTEVALUATOR_H
diff --git a/src/plugins/cppeditor/cppsnippetprovider.h b/src/plugins/cppeditor/cppsnippetprovider.h
index 5c562d8c871d46e2afa1184b675f93cc1e256a61..ce798b206fd6b1155efab547bf2ecd9c115192eb 100644
--- a/src/plugins/cppeditor/cppsnippetprovider.h
+++ b/src/plugins/cppeditor/cppsnippetprovider.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPSNIPPETEDITORDECORATOR_H
-#define CPPSNIPPETEDITORDECORATOR_H
+#ifndef CPPSNIPPETPROVIDER_H
+#define CPPSNIPPETPROVIDER_H
 
 #include <texteditor/snippets/isnippetprovider.h>
 
@@ -50,4 +50,4 @@ public:
 } // Internal
 } // CppEditor
 
-#endif // CPPSNIPPETEDITORDECORATOR_H
+#endif // CPPSNIPPETPROVIDER_H
diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.h b/src/plugins/cpptools/TypeHierarchyBuilder.h
index 4bdbc5fa59e9c9303d603e4ead612a398ffa34a5..205d7ee1650d1b5f4da50b202c0fbe1c09f00435 100644
--- a/src/plugins/cpptools/TypeHierarchyBuilder.h
+++ b/src/plugins/cpptools/TypeHierarchyBuilder.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FINDDERIVEDCLASSES_H
-#define FINDDERIVEDCLASSES_H
+#ifndef TYPEHIERARCHYBUILDER_H
+#define TYPEHIERARCHYBUILDER_H
 
 #include "CppDocument.h"
 #include "ModelManagerInterface.h"
@@ -78,4 +78,4 @@ private:
 
 } // CPlusPlus
 
-#endif // FINDDERIVEDCLASSES_H
+#endif // TYPEHIERARCHYBUILDER_H
diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h
index 2b69e0008159b1fd88ddb5d8bfb3161bf039a62c..a1b87f2b7be80ced618f9c6f6771c0761d9a3fec 100644
--- a/src/plugins/cpptools/cppchecksymbols.h
+++ b/src/plugins/cpptools/cppchecksymbols.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPLUSPLUS_CHECKSYMBOLS_H
-#define CPLUSPLUS_CHECKSYMBOLS_H
+#ifndef CPLUSPLUSCHECKSYMBOLS_H
+#define CPLUSPLUSCHECKSYMBOLS_H
 
 #include "cpptools_global.h"
 
@@ -182,4 +182,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // CPLUSPLUS_CHECKSYMBOLS_H
+#endif // CPLUSPLUSCHECKSYMBOLS_H
diff --git a/src/plugins/cpptools/cppcodestylesettings.cpp b/src/plugins/cpptools/cppcodestylesettings.cpp
index 17a140ad0ed9ba36e82cdb0a0233320342047b9a..a4f67e762366bcf10725bf11c3b61d479388c248 100644
--- a/src/plugins/cpptools/cppcodestylesettings.cpp
+++ b/src/plugins/cpptools/cppcodestylesettings.cpp
@@ -31,7 +31,6 @@
 #include "cppcodestylepreferencesfactory.h"
 
 #include <cpptools/cppcodestylepreferences.h>
-#include <cpptools/cppcodestylesettings.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/cpptoolssettings.h>
 
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index a8b9fee3fbff95cb1266146a4029d61da46b3ca8..a9cdadd1bd36df220f7908a7405a46b8d931ef10 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "cppcodestylepreferences.h"
 #include "cppcodestylesettingspage.h"
+#include "cppcodestylepreferences.h"
 #include "cpppointerdeclarationformatter.h"
 #include "cppqtstyleindenter.h"
 #include "cpptoolsconstants.h"
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 72be9a4bf04c2dcc11917e5c40b18b4e21e47c5b..5d9995d3c49db26c25ca9f799d7017103914a9d7 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -27,10 +27,9 @@
 **
 ****************************************************************************/
 
-#include "cppmodelmanager.h"
 #include "cppcompletionassist.h"
-#include "cppdoxygen.h"
 #include "cppmodelmanager.h"
+#include "cppdoxygen.h"
 #include "cpptoolsconstants.h"
 
 #include <Control.h>
diff --git a/src/plugins/cpptools/cppdoxygen.h b/src/plugins/cpptools/cppdoxygen.h
index 326a66756efab03f48d08b97995e82c92b250493..4c33b8f3529057f783691ed2fbd1385c8aca72df 100644
--- a/src/plugins/cpptools/cppdoxygen.h
+++ b/src/plugins/cpptools/cppdoxygen.h
@@ -27,6 +27,9 @@
 **
 ****************************************************************************/
 
+#ifndef CPPDOXYGEN_H
+#define CPPDOXYGEN_H
+
 #include "cpptools_global.h"
 
 QT_FORWARD_DECLARE_CLASS(QChar)
@@ -260,3 +263,4 @@ CPPTOOLS_EXPORT const char *doxygenTagSpell(int index);
 
 } // namespace ::CppTools
 
+#endif // CPPDOXYGEN_H
diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index 606f91ccced37c99aebd3eeda0d8dc3f41ff7ed3..06db6d63b3b6bc9e4cbbf6f7ce390b9c1b58be75 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPSETTINGSPAGE_H
-#define CPPSETTINGSPAGE_H
+#ifndef CPPFILESETTINGSPAGE_H
+#define CPPFILESETTINGSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
@@ -110,4 +110,4 @@ private:
 } // namespace Internal
 } // namespace CppTools
 
-#endif // CPPSETTINGSPAGE_H
+#endif // CPPFILESETTINGSPAGE_H
diff --git a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
index 28e22d27875a3a5cde6b221fe29da643ec52415f..5d17c3f3dee37148e867ddf4987b6dfbe41bec4c 100644
--- a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
+++ b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "cppchecksymbols.h"
 #include "cpphighlightingsupportinternal.h"
+#include "cppchecksymbols.h"
 
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/SimpleLexer.h>
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 7b235cf8dfa2ba44dbd6fe2414f706dd555c217b..ce615d5c6bc79ba9787eeec09dea9cc0443f8334 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -27,11 +27,8 @@
 **
 ****************************************************************************/
 
-#include <cplusplus/pp.h>
-#include <cplusplus/Overview.h>
-
-#include "builtinindexingsupport.h"
 #include "cppmodelmanager.h"
+#include "builtinindexingsupport.h"
 #include "cppcompletionassist.h"
 #include "cpphighlightingsupport.h"
 #include "cpphighlightingsupportinternal.h"
@@ -41,6 +38,9 @@
 #include "cpptoolseditorsupport.h"
 #include "cppfindreferences.h"
 
+#include <cplusplus/pp.h>
+#include <cplusplus/Overview.h>
+
 #include <functional>
 #include <QtConcurrentRun>
 #include <QFutureSynchronizer>
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.h b/src/plugins/cpptools/cpppointerdeclarationformatter.h
index cc0e1b8d7f13f4db986ab32137318e49c396dff3..a2d25c559ee0b44b48b96c6c88c52e349c13eb9d 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter.h
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPPOINTERFORMATTER_H
-#define CPPPOINTERFORMATTER_H
+#ifndef CPPPOINTERDECLARATIONFORMATTER_H
+#define CPPPOINTERDECLARATIONFORMATTER_H
 
 #include "cpptools_global.h"
 
@@ -128,4 +128,4 @@ private:
 
 } // namespace CppTools
 
-#endif // CPPPOINTERFORMATTER_H
+#endif // CPPPOINTERDECLARATIONFORMATTER_H
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index 0afb194be288f412d97e9e440740770ae3a0a0c6..0d2d72be407ccbe6b2b691a63757eaaacfb77659 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
+#include "cpptoolseditorsupport.h"
 #include "cppcompletionsupport.h"
 #include "cpphighlightingsupport.h"
-#include "cpptoolseditorsupport.h"
 #include "cppmodelmanager.h"
 
 #include <coreplugin/idocument.h>
diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp
index c1c74059fe1c13e07ed3749a0130ad60d739cff3..72ebf2a1337462ad4c18c9a07d1deaa30b26181e 100644
--- a/src/plugins/cpptools/cpptoolssettings.cpp
+++ b/src/plugins/cpptools/cpptoolssettings.cpp
@@ -34,7 +34,6 @@
 #include "commentssettings.h"
 #include "completionsettingspage.h"
 
-#include <texteditor/texteditorsettings.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/tabsettings.h>
 #include <texteditor/codestylepool.h>
diff --git a/src/plugins/cpptools/doxygengenerator.h b/src/plugins/cpptools/doxygengenerator.h
index 313593425e2cb3e44b252cf43e07dc00c337119e..ae8cd5a149985785fe7ecf11813ac588ab2a4412 100644
--- a/src/plugins/cpptools/doxygengenerator.h
+++ b/src/plugins/cpptools/doxygengenerator.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DOXYGEGENERATOR_H
-#define DOXYGEGENERATOR_H
+#ifndef DOXYGENGENERATOR_H
+#define DOXYGENGENERATOR_H
 
 #include "cpptools_global.h"
 
@@ -99,4 +99,4 @@ private:
 
 } // CppTools
 
-#endif // DOXYGEGENERATOR_H
+#endif // DOXYGENGENERATOR_H
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
index 3cc3cf6f77f52015783e8ec8c941d987c18dd58d..4c9cc8840110fdef847db91bcc952271ae718bc3 100644
--- a/src/plugins/cpptools/insertionpointlocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
+#include "insertionpointlocator.h"
 #include "cpptoolsreuse.h"
 #include "cpprefactoringchanges.h"
-#include "insertionpointlocator.h"
 #include "symbolfinder.h"
 
 #include <AST.h>