diff --git a/src/plugins/analyzerbase/analyzeroptionspage.cpp b/src/plugins/analyzerbase/analyzeroptionspage.cpp
index c36d8a45c93..259898933a2 100644
--- a/src/plugins/analyzerbase/analyzeroptionspage.cpp
+++ b/src/plugins/analyzerbase/analyzeroptionspage.cpp
@@ -28,9 +28,8 @@
 **
 ****************************************************************************/
 
-#include "analyzerconstants.h"
-
 #include "analyzeroptionspage.h"
+#include "analyzerconstants.h"
 #include "analyzersettings.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
index 914a837b114..ba2bcbac9d1 100644
--- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 #include "callgrindfunction.h"
+#include "callgrindfunction_p.h"
 
 #include "callgrindfunctioncall.h"
 #include "callgrindcostitem.h"
 #include "callgrindparsedata.h"
-#include "callgrindfunction_p.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h
index df5408146a1..1fc64e6fb71 100644
--- a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h
+++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef LIBVALGRIND_CALLGRIND_CALLEE_H
-#define LIBVALGRIND_CALLGRIND_CALLEE_H
+#ifndef CALLGRINDFUNCTIONCALL_H
+#define CALLGRINDFUNCTIONCALL_H
 
 #include <QMetaType>
 
@@ -90,4 +90,4 @@ private:
 
 Q_DECLARE_METATYPE(const Valgrind::Callgrind::FunctionCall *);
 
-#endif // LIBVALGRIND_CALLGRIND_CALLEE_H
+#endif // CALLGRINDFUNCTIONCALL_H
diff --git a/src/plugins/valgrind/valgrindplugin.h b/src/plugins/valgrind/valgrindplugin.h
index 3379ce3777f..28e24df3dba 100644
--- a/src/plugins/valgrind/valgrindplugin.h
+++ b/src/plugins/valgrind/valgrindplugin.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#ifndef VALGRINDTOOLBASEPLUGIN_H
-#define VALGRINDTOOLBASEPLUGIN_H
+#ifndef VALGRINDPLUGIN_H
+#define VALGRINDPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
 #include <analyzerbase/ianalyzertool.h>
@@ -54,4 +54,4 @@ public:
 } // namespace Internal
 } // namespace Valgrind
 
-#endif // VALGRINDTOOLBASEPLUGIN_H
+#endif // VALGRINDPLUGIN_H
diff --git a/src/plugins/valgrind/valgrindprocess.h b/src/plugins/valgrind/valgrindprocess.h
index 65fbdb28229..4d066e514cd 100644
--- a/src/plugins/valgrind/valgrindprocess.h
+++ b/src/plugins/valgrind/valgrindprocess.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#ifndef VALGRIND_RUNNER_P_H
-#define VALGRIND_RUNNER_P_H
+#ifndef VALGRINDPROCESS_H
+#define VALGRINDPROCESS_H
 
 #include <utils/qtcprocess.h>
 #include <ssh/sshremoteprocess.h>
@@ -164,4 +164,4 @@ private:
 
 } // namespace Valgrind
 
-#endif // VALGRIND_RUNNER_P_H
+#endif // VALGRINDPROCESS_H