diff --git a/src/libs/glsl/glslsymbols.cpp b/src/libs/glsl/glslsymbols.cpp
index fc077cbca9bc6d9a7780b5d4c556615a33f759bb..69d02c5d0bf769ac04f33983340de0697b7abbc3 100644
--- a/src/libs/glsl/glslsymbols.cpp
+++ b/src/libs/glsl/glslsymbols.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "glsltypes.h"
 #include "glslsymbols.h"
+#include "glsltypes.h"
 #include <QDebug>
 
 using namespace GLSL;
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 7d2903b43e055cec8ba125de864b7998c05c4a50..feedcf00c0fa475641008928f266d18276b87d7a 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -54,7 +54,6 @@
 #include <coreplugin/id.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/mimedatabase.h>
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp
index ffbe19cee28eb0210bdb3f861dc882af9d2723b7..736ef2fd00cef2a47cd442eb0e80fb7169ce724c 100644
--- a/src/plugins/glsleditor/glslcompletionassist.cpp
+++ b/src/plugins/glsleditor/glslcompletionassist.cpp
@@ -32,7 +32,6 @@
 #include "glsleditorplugin.h"
 #include "reuse.h"
 
-#include <glsl/glslengine.h>
 #include <glsl/glslengine.h>
 #include <glsl/glsllexer.h>
 #include <glsl/glslparser.h>
diff --git a/src/plugins/glsleditor/glsleditoractionhandler.h b/src/plugins/glsleditor/glsleditoractionhandler.h
index 53aeb7bbfa109e60169d57c74b462fd4f17b7b89..ca55ff1b45c8ad59341f2f0d0a5163b2d5a113d6 100644
--- a/src/plugins/glsleditor/glsleditoractionhandler.h
+++ b/src/plugins/glsleditor/glsleditoractionhandler.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef GLSLDITORACTIONHANDLER_H
-#define GLSLDITORACTIONHANDLER_H
+#ifndef GLSLEDITORACTIONHANDLER_H
+#define GLSLEDITORACTIONHANDLER_H
 
 #include <texteditor/texteditoractionhandler.h>
 
@@ -48,4 +48,4 @@ public:
 } // namespace Internal
 } // namespace GLSLEditor
 
-#endif // GLSLDITORACTIONHANDLER_H
+#endif // GLSLEDITORACTIONHANDLER_H
diff --git a/src/plugins/glsleditor/glslfilewizard.cpp b/src/plugins/glsleditor/glslfilewizard.cpp
index fde38a2eb97c8ff999afc4a8edb73e066d1291cc..4d1c42ba90b1a727bcf70e567236d40b8bcdaa79 100644
--- a/src/plugins/glsleditor/glslfilewizard.cpp
+++ b/src/plugins/glsleditor/glslfilewizard.cpp
@@ -27,12 +27,11 @@
 **
 ****************************************************************************/
 
-#include "glsleditorconstants.h"
 #include "glslfilewizard.h"
+#include "glsleditorconstants.h"
 
 #include <utils/filewizarddialog.h>
 #include <utils/qtcassert.h>
-#include <utils/filewizarddialog.h>
 
 #include <QFileInfo>
 #include <QTextStream>