diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
index 5dbf4b318cb..cdf43f1ab72 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-#ifndef AUTOTOOLSPROJECTMANAGER_H
-#define AUTOTOOLSPROJECTMANAGER_H
+#ifndef AUTOTOOLSPROJECTPLUGIN_H
+#define AUTOTOOLSPROJECTPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
 
@@ -80,4 +80,4 @@ public:
 } // namespace Internal
 } // namespace AutotoolsProjectManager
 
-#endif // AUTOTOOLSPROJECTMANAGER_H
+#endif // AUTOTOOLSPROJECTPLUGIN_H
diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h
index 471b3a9e26d..b07fde3967f 100644
--- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h
+++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CMAKEPROJECTMANAGER_INTERNAL_CMAKEFILTER_H
-#define CMAKEPROJECTMANAGER_INTERNAL_CMAKEFILTER_H
+#ifndef CMAKELOCATORFILTER_H
+#define CMAKELOCATORFILTER_H
 
 #include <locator/ilocatorfilter.h>
 
@@ -56,4 +56,4 @@ private slots:
 } // namespace Internal
 } // namespace CMakeProjectManager
 
-#endif // CMAKEPROJECTMANAGER_INTERNAL_CMAKEFILTER_H
+#endif // CMAKELOCATORFILTER_H
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index be9ce97c486..aa430eb691c 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -35,7 +35,6 @@
 #include "cmakerunconfiguration.h"
 #include "makestep.h"
 #include "cmakeopenprojectwizard.h"
-#include "cmakebuildconfiguration.h"
 #include "cmakeuicodemodelsupport.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 0d82f110987..827226baee0 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "cmakeopenprojectwizard.h"
 #include "cmakeprojectmanager.h"
+#include "cmakeopenprojectwizard.h"
 #include "cmakeprojectconstants.h"
 #include "cmakeproject.h"