diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index 0ff38acb36e..1c410d2e018 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "abiwidget.h"
 #include "customtoolchain.h"
+#include "abiwidget.h"
 #include "gccparser.h"
 #include "projectexplorerconstants.h"
 #include "toolchainmanager.h"
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h
index 7b7f52c926b..17bb7db3169 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.h
+++ b/src/plugins/projectexplorer/customwizard/customwizard.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CUSTOMPROJECTWIZARD_H
-#define CUSTOMPROJECTWIZARD_H
+#ifndef CUSTOMWIZARD_H
+#define CUSTOMWIZARD_H
 
 #include "../projectexplorer_export.h"
 
@@ -159,4 +159,4 @@ private slots:
 
 } // namespace ProjectExplorer
 
-#endif // CUSTOMPROJECTWIZARD_H
+#endif // CUSTOMWIZARD_H
diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.h b/src/plugins/projectexplorer/customwizard/customwizardpage.h
index abd1c4e513f..766845268d1 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardpage.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardpage.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CUSTOMPROJECTWIZARDDIALOG_H
-#define CUSTOMPROJECTWIZARDDIALOG_H
+#ifndef CUSTOMWIZARDPAGE_H
+#define CUSTOMWIZARDPAGE_H
 
 #include <QComboBox>
 #include <QCheckBox>
@@ -188,4 +188,4 @@ private:
 } // namespace Internal
 } // namespace ProjectExplorer
 
-#endif // CUSTOMPROJECTWIZARDDIALOG_H
+#endif // CUSTOMWIZARDPAGE_H
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
index 2bb002176fe..2dfdf62b5af 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CUSTOMPROJECTWIZARDPARAMETERS_H
-#define CUSTOMPROJECTWIZARDPARAMETERS_H
+#ifndef CUSTOMWIZARDPARAMETERS_H
+#define CUSTOMWIZARDPARAMETERS_H
 
 #include <coreplugin/basefilewizard.h>
 
@@ -153,4 +153,4 @@ extern const char customWizardFileOpenProjectAttributeC[];
 } // namespace Internal
 } // namespace ProjectExplorer
 
-#endif // CUSTOMPROJECTWIZARDPARAMETERS_H
+#endif // CUSTOMWIZARDPARAMETERS_H
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index f8585de7958..efc6dfcb3cd 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -50,7 +50,6 @@
 #include <QPushButton>
 #include <QToolButton>
 #include <QWidget>
-#include <QLabel>
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/dependenciespanel.h b/src/plugins/projectexplorer/dependenciespanel.h
index 93feef31404..9fc7e041e7f 100644
--- a/src/plugins/projectexplorer/dependenciespanel.h
+++ b/src/plugins/projectexplorer/dependenciespanel.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEPENDENCIESDIALOG_H
-#define DEPENDENCIESDIALOG_H
+#ifndef DEPENDENCIESPANEL_H
+#define DEPENDENCIESPANEL_H
 
 #include "iprojectproperties.h"
 
@@ -122,4 +122,4 @@ private:
 } // namespace Internal
 } // namespace ProjectExplorer
 
-#endif // DEPENDENCIESDIALOG_H
+#endif // DEPENDENCIESPANEL_H
diff --git a/src/plugins/projectexplorer/deploymentdata.h b/src/plugins/projectexplorer/deploymentdata.h
index 8b9acb67e35..b63c3dfdf3b 100644
--- a/src/plugins/projectexplorer/deploymentdata.h
+++ b/src/plugins/projectexplorer/deploymentdata.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef PROJECTEXPLORER_DEPLOYMENTINFO_H
-#define PROJECTEXPLORER_DEPLOYMENTINFO_H
+#ifndef DEPLOYMENTDATA_H
+#define DEPLOYMENTDATA_H
 
 #include "deployablefile.h"
 #include "projectexplorer_export.h"
@@ -83,4 +83,4 @@ inline bool operator!=(const DeploymentData &d1, const DeploymentData &d2)
 
 } // namespace ProjectExplorer
 
-#endif // PROJECTEXPLORER_DEPLOYMENTINFO_H
+#endif // DEPLOYMENTDATA_H
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.h b/src/plugins/projectexplorer/devicesupport/devicemanager.h
index 7da5ed21406..8fc16631a25 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.h
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.h
@@ -34,8 +34,6 @@
 #include <projectexplorer/projectexplorer_export.h>
 #include <utils/fileutils.h>
 
-#include <utils/fileutils.h>
-
 #include <QObject>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
index ae94c018fe6..4882eb01545 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
@@ -38,7 +38,6 @@
 #include "idevice.h"
 #include "idevicefactory.h"
 #include "idevicewidget.h"
-#include "projectexplorerconstants.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/id.h>
diff --git a/src/plugins/projectexplorer/iprojectmanager.h b/src/plugins/projectexplorer/iprojectmanager.h
index bf16a6f2434..a85108a7827 100644
--- a/src/plugins/projectexplorer/iprojectmanager.h
+++ b/src/plugins/projectexplorer/iprojectmanager.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PROJECTMANAGERINTERFACE_H
-#define PROJECTMANAGERINTERFACE_H
+#ifndef PROJECTMANAGER_H
+#define PROJECTMANAGER_H
 
 #include "projectexplorer_export.h"
 
@@ -55,4 +55,4 @@ public:
 
 } // namespace ProjectExplorer
 
-#endif //PROJECTMANAGERINTERFACE_H
+#endif //PROJECTMANAGER_H
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.h b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
index 9ea72406c51..2ef5ad3b109 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.h
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef KITMANAGERWIDGET_H
-#define KITMANAGERWIDGET_H
+#ifndef KITMANAGERCONFIGWIDGET_H
+#define KITMANAGERCONFIGWIDGET_H
 
 #include "kitconfigwidget.h"
 
@@ -106,4 +106,4 @@ private:
 } // namespace Internal
 } // namespace ProjectExplorer
 
-#endif // KITMANAGERWIDGET_H
+#endif // KITMANAGERCONFIGWIDGET_H
diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h
index a69a6cf1c9b..a879cd2221c 100644
--- a/src/plugins/projectexplorer/settingsaccessor.h
+++ b/src/plugins/projectexplorer/settingsaccessor.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PROJECTMANAGER_USERFILEACCESSOR_H
-#define PROJECTMANAGER_USERFILEACCESSOR_H
+#ifndef SETTINGSACCESSOR_H
+#define SETTINGSACCESSOR_H
 
 #include <utils/fileutils.h>
 #include <utils/persistentsettings.h>
@@ -117,4 +117,4 @@ private:
 
 } // namespace ProjectExplorer
 
-#endif // PROJECTMANAGER_USERFILEACCESSOR_H
+#endif // SETTINGSACCESSOR_H
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index a24e53a2128..c29920af64d 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -57,7 +57,6 @@
 #include <QStackedWidget>
 #include <QToolTip>
 #include <QVBoxLayout>
-#include <QToolTip>
 
 
 using namespace Core;
diff --git a/src/plugins/projectexplorer/taskmodel.h b/src/plugins/projectexplorer/taskmodel.h
index 1c91fe7c9cf..5d98a6436b2 100644
--- a/src/plugins/projectexplorer/taskmodel.h
+++ b/src/plugins/projectexplorer/taskmodel.h
@@ -27,6 +27,9 @@
 **
 ****************************************************************************/
 
+#ifndef TASKMODEL_H
+#define TASKMODEL_H
+
 #include <QAbstractItemModel>
 
 #include <QIcon>
@@ -187,3 +190,5 @@ private:
 
 } // namespace Internal
 } // namespace ProjectExplorer
+
+#endif // TASKMODEL_H