diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 39d505a9f8b..87152a09066 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -45,7 +45,6 @@
 #include <QFileDialog>
 #include <QLineEdit>
 #include <QAction>
-#include <QKeyEvent>
 #include <QTreeWidgetItem>
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 27b712df2cd..5d7b006bdb0 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -39,7 +39,6 @@
 #include <coreplugin/editormanager/editorview.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/openeditorsmodel.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 
diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h
index 7c8551ba595..a84f36f50df 100644
--- a/src/plugins/coreplugin/editortoolbar.h
+++ b/src/plugins/coreplugin/editortoolbar.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FAKETOOLBAR_H
-#define FAKETOOLBAR_H
+#ifndef EDITORTOOLBAR_H
+#define EDITORTOOLBAR_H
 
 #include "core_global.h"
 
@@ -110,4 +110,4 @@ private:
 
 } // namespace Core
 
-#endif // FAKETOOLBAR_H
+#endif // EDITORTOOLBAR_H
diff --git a/src/plugins/coreplugin/featureprovider.h b/src/plugins/coreplugin/featureprovider.h
index f6672794fed..33e4fd38795 100644
--- a/src/plugins/coreplugin/featureprovider.h
+++ b/src/plugins/coreplugin/featureprovider.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FEATUREMANAGER_H
-#define FEATUREMANAGER_H
+#ifndef FEATUREPROVIDER_H
+#define FEATUREPROVIDER_H
 
 #include "core_global.h"
 
@@ -148,4 +148,4 @@ inline Core::FeatureSet operator|(Core::Feature feature1, Core::FeatureSet featu
 { return feature2 | feature1; }
 
 
-#endif // FEATUREANAGER_H
+#endif // FEATUREPROVIDER_H
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index bab2617569a..95d4071a29d 100644
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -42,7 +42,6 @@
 
 #include <QFileIconProvider>
 #include <QIcon>
-#include <QStyle>
 
 using namespace Utils;
 
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index fc9f1537a44..4de34e5cee4 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -343,7 +343,6 @@
     (meaning that its widget got focus), or if the additional context ids changed.
 */
 
-#include "icore.h"
 #include "mainwindow.h"
 #include "documentmanager.h"
 
diff --git a/src/plugins/coreplugin/navigationsubwidget.h b/src/plugins/coreplugin/navigationsubwidget.h
index 2f9683f681a..e520e9efdba 100644
--- a/src/plugins/coreplugin/navigationsubwidget.h
+++ b/src/plugins/coreplugin/navigationsubwidget.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef NAVIGATIONSSUBWIDGET_H
-#define NAVIGATIONSSUBWIDGET_H
+#ifndef NAVIGATIONSUBWIDGET_H
+#define NAVIGATIONSUBWIDGET_H
 
 #include <QComboBox>
 
@@ -123,4 +123,4 @@ private:
 } // namespace Internal
 } // namespace Core
 
-#endif // NAVIGATIONSSUBWIDGET_H
+#endif // NAVIGATIONSUBWIDGET_H
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index c9baeb50a59..84c77c121d2 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -32,7 +32,6 @@
 #include "coreconstants.h"
 #include "findplaceholder.h"
 
-#include "coreconstants.h"
 #include "icore.h"
 #include "ioutputpane.h"
 #include "mainwindow.h"
@@ -66,7 +65,6 @@
 #include <QStackedWidget>
 #include <QToolButton>
 #include <QTimeLine>
-#include <QLabel>
 
 namespace Core {
 namespace Internal {
diff --git a/src/plugins/coreplugin/progressmanager/progressbar.h b/src/plugins/coreplugin/progressmanager/progressbar.h
index e23fa6f0c30..bbc5789fcc0 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.h
+++ b/src/plugins/coreplugin/progressmanager/progressbar.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PROGRESSPIE_H
-#define PROGRESSPIE_H
+#ifndef PROGRESSBAR_H
+#define PROGRESSBAR_H
 
 #include <QString>
 #include <QWidget>
@@ -87,4 +87,4 @@ private:
 } // namespace Internal
 } // namespace Core
 
-#endif // PROGRESSPIE_H
+#endif // PROGRESSBAR_H
diff --git a/src/plugins/coreplugin/styleanimator.h b/src/plugins/coreplugin/styleanimator.h
index 08452c6f521..37b25b5baf0 100644
--- a/src/plugins/coreplugin/styleanimator.h
+++ b/src/plugins/coreplugin/styleanimator.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef STYLEANIMATOR_H
+#define STYLEANIMATOR_H
 
 #include <QPointer>
 #include <QTime>
@@ -98,4 +98,4 @@ private:
     QList <Animation*> animations;
 };
 
-#endif // ANIMATION_H
+#endif // STYLEANIMATOR_H