diff --git a/src/plugins/qnx/blackberrycertificatemodel.h b/src/plugins/qnx/blackberrycertificatemodel.h
index a22ce38e407..1e49fcfdc2c 100644
--- a/src/plugins/qnx/blackberrycertificatemodel.h
+++ b/src/plugins/qnx/blackberrycertificatemodel.h
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-#ifndef QNX_INTERNAL_BLACKBERRYCERTIFICATESTOREMODEL_H
-#define QNX_INTERNAL_BLACKBERRYCERTIFICATESTOREMODEL_H
+#ifndef BLACKBERRYCERTIFICATEMODEL_H
+#define BLACKBERRYCERTIFICATEMODEL_H
 
 #include <QAbstractTableModel>
 #include <QList>
@@ -86,4 +86,4 @@ private:
 } // namespace Internal
 } // namespace Qnx
 
-#endif // QNX_INTERNAL_BLACKBERRYCERTIFICATESTOREMODEL_H
+#endif // BLACKBERRYCERTIFICATEMODEL_H
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
index 107fe40a6a7..a8f172c021c 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
@@ -29,9 +29,9 @@
 **
 ****************************************************************************/
 
+#include "blackberrydeviceconfigurationwidget.h"
 #include "blackberrydebugtokenuploader.h"
 #include "blackberrydebugtokenrequestdialog.h"
-#include "blackberrydeviceconfigurationwidget.h"
 #include "ui_blackberrydeviceconfigurationwidget.h"
 #include "qnxconstants.h"
 
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
index 00926822929..9961fcc37ae 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-#include "blackberrydebugtokenrequestdialog.h"
 #include "blackberrydeviceconfigurationwizardpages.h"
+#include "blackberrydebugtokenrequestdialog.h"
 #include "ui_blackberrydeviceconfigurationwizardsetuppage.h"
 #include "ui_blackberrydeviceconfigurationwizardsshkeypage.h"
 
diff --git a/src/plugins/qnx/blackberrykeyspage.h b/src/plugins/qnx/blackberrykeyspage.h
index 04027ee8cf3..0ba17f02b58 100644
--- a/src/plugins/qnx/blackberrykeyspage.h
+++ b/src/plugins/qnx/blackberrykeyspage.h
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-#ifndef BLACKBERRYSIGNINGPAGE_H
-#define BLACKBERRYSIGNINGPAGE_H
+#ifndef BLACKBERRYKEYSPAGE_H
+#define BLACKBERRYKEYSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
@@ -55,4 +55,4 @@ private:
 } // namespace Internal
 } // namespace Qnx
 
-#endif // BLACKBERRYSIGNINGPAGE_H
+#endif // BLACKBERRYKEYSPAGE_H
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index f10dfec02a5..c3899b5cbe2 100644
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -43,7 +43,6 @@
 #include <debugger/debuggerrunner.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerstartparameters.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtkitinformation.h>