diff --git a/src/plugins/nim/editor/nimeditorfactory.cpp b/src/plugins/nim/editor/nimeditorfactory.cpp
index dc3a231a93c..32e23d0eeb4 100644
--- a/src/plugins/nim/editor/nimeditorfactory.cpp
+++ b/src/plugins/nim/editor/nimeditorfactory.cpp
@@ -23,12 +23,12 @@
 **
 ****************************************************************************/
 
-#include "editor/nimeditorfactory.h"
+#include "nimeditorfactory.h"
+#include "nimindenter.h"
+#include "nimhighlighter.h"
 
-#include "nimconstants.h"
-#include "nimplugin.h"
-#include "editor/nimindenter.h"
-#include "editor/nimhighlighter.h"
+#include "../nimconstants.h"
+#include "../nimplugin.h"
 
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
diff --git a/src/plugins/nim/editor/nimhighlighter.cpp b/src/plugins/nim/editor/nimhighlighter.cpp
index eed765df212..f9cb055a0d0 100644
--- a/src/plugins/nim/editor/nimhighlighter.cpp
+++ b/src/plugins/nim/editor/nimhighlighter.cpp
@@ -23,9 +23,9 @@
 **
 ****************************************************************************/
 
-#include "editor/nimhighlighter.h"
+#include "nimhighlighter.h"
 
-#include "tools/nimlexer.h"
+#include "../tools/nimlexer.h"
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditorconstants.h>
diff --git a/src/plugins/nim/editor/nimhighlighter.h b/src/plugins/nim/editor/nimhighlighter.h
index cb563294e98..2ae10033253 100644
--- a/src/plugins/nim/editor/nimhighlighter.h
+++ b/src/plugins/nim/editor/nimhighlighter.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "tools/nimlexer.h"
+#include "../tools/nimlexer.h"
 
 #include <texteditor/syntaxhighlighter.h>
 
diff --git a/src/plugins/nim/editor/nimindenter.cpp b/src/plugins/nim/editor/nimindenter.cpp
index 223294beab8..d08a0e35d03 100644
--- a/src/plugins/nim/editor/nimindenter.cpp
+++ b/src/plugins/nim/editor/nimindenter.cpp
@@ -23,9 +23,9 @@
 **
 ****************************************************************************/
 
-#include "editor/nimindenter.h"
+#include "nimindenter.h"
 
-#include "tools/nimlexer.h"
+#include "../tools/nimlexer.h"
 
 #include <texteditor/icodestylepreferences.h>
 #include <texteditor/tabsettings.h>
diff --git a/src/plugins/nim/nim.qbs b/src/plugins/nim/nim.qbs
index 69d33ec8d6a..becdb86f506 100644
--- a/src/plugins/nim/nim.qbs
+++ b/src/plugins/nim/nim.qbs
@@ -8,11 +8,7 @@ QtcPlugin {
 
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "QtSupport" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "cpp" }
-
-    cpp.includePaths: ['.']
 
     Group {
         name: "General"
diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp
index 5da368b4396..6837063fbf1 100644
--- a/src/plugins/nim/project/nimbuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimbuildconfiguration.cpp
@@ -23,12 +23,12 @@
 **
 ****************************************************************************/
 
-#include "project/nimbuildconfiguration.h"
+#include "nimbuildconfiguration.h"
+#include "nimbuildconfigurationwidget.h"
+#include "nimcompilerbuildstep.h"
+#include "nimproject.h"
 
-#include "nimconstants.h"
-#include "project/nimproject.h"
-#include "project/nimbuildconfigurationwidget.h"
-#include "project/nimcompilerbuildstep.h"
+#include "../nimconstants.h"
 
 #include <projectexplorer/namedwidget.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp
index bf396e95517..bd75e16c7c4 100644
--- a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp
+++ b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp
@@ -23,14 +23,14 @@
 **
 ****************************************************************************/
 
-#include "project/nimbuildconfigurationfactory.h"
+#include "nimbuildconfigurationfactory.h"
+#include "nimbuildconfiguration.h"
+#include "nimbuildinfo.h"
+#include "nimcompilerbuildstep.h"
+#include "nimcompilercleanstep.h"
+#include "nimproject.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimbuildinfo.h"
-#include "project/nimcompilerbuildstep.h"
-#include "project/nimcompilercleanstep.h"
-#include "project/nimproject.h"
+#include "../nimconstants.h"
 
 #include <coreplugin/documentmanager.h>
 #include <projectexplorer/buildinfo.h>
diff --git a/src/plugins/nim/project/nimbuildconfigurationwidget.cpp b/src/plugins/nim/project/nimbuildconfigurationwidget.cpp
index b36a344db01..e4511eba313 100644
--- a/src/plugins/nim/project/nimbuildconfigurationwidget.cpp
+++ b/src/plugins/nim/project/nimbuildconfigurationwidget.cpp
@@ -23,10 +23,10 @@
 **
 ****************************************************************************/
 
-#include "project/nimbuildconfigurationwidget.h"
+#include "nimbuildconfigurationwidget.h"
+#include "nimbuildconfiguration.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
+#include "../nimconstants.h"
 
 #include <utils/pathchooser.h>
 #include <utils/detailswidget.h>
diff --git a/src/plugins/nim/project/nimbuildinfo.cpp b/src/plugins/nim/project/nimbuildinfo.cpp
index b6d6eec205e..eb187750c53 100644
--- a/src/plugins/nim/project/nimbuildinfo.cpp
+++ b/src/plugins/nim/project/nimbuildinfo.cpp
@@ -23,9 +23,8 @@
 **
 ****************************************************************************/
 
-#include "project/nimbuildinfo.h"
-
-#include "project/nimbuildconfigurationfactory.h"
+#include "nimbuildinfo.h"
+#include "nimbuildconfigurationfactory.h"
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp
index 08973c08aaa..10c400c228e 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "project/nimcompilerbuildstep.h"
+#include "nimcompilerbuildstep.h"
+#include "nimbuildconfiguration.h"
+#include "nimcompilerbuildstepconfigwidget.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimcompilerbuildstepconfigwidget.h"
+#include "../nimconstants.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
index cc7d56bda5c..ef4b9be9437 100644
--- a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
@@ -23,13 +23,13 @@
 **
 ****************************************************************************/
 
-#include "project/nimcompilerbuildstepconfigwidget.h"
+#include "nimcompilerbuildstepconfigwidget.h"
 #include "ui_nimcompilerbuildstepconfigwidget.h"
-
-#include "nimconstants.h"
+#include "nimbuildconfiguration.h"
+#include "nimcompilerbuildstep.h"
 #include "nimproject.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimcompilerbuildstep.h"
+
+#include "../nimconstants.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp b/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp
index 211c0d186d4..a290fcdfe50 100644
--- a/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "project/nimcompilerbuildstepfactory.h"
+#include "nimbuildconfiguration.h"
+#include "nimcompilerbuildstep.h"
+#include "nimcompilerbuildstepfactory.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimcompilerbuildstep.h"
+#include "../nimconstants.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp
index 79583634a32..7a1ce2e6d09 100644
--- a/src/plugins/nim/project/nimcompilercleanstep.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstep.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "project/nimcompilercleanstep.h"
+#include "nimcompilercleanstep.h"
+#include "nimbuildconfiguration.h"
+#include "nimcompilercleanstepconfigwidget.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimcompilercleanstepconfigwidget.h"
+#include "../nimconstants.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp
index 3b8d6f289d2..3dade2e330f 100644
--- a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "project/nimcompilercleanstepconfigwidget.h"
+#include "nimcompilercleanstepconfigwidget.h"
 #include "ui_nimcompilercleanstepconfigwidget.h"
+#include "nimcompilercleanstep.h"
 
-#include "nimconstants.h"
-#include "project/nimcompilercleanstep.h"
+#include "../nimconstants.h"
 
 #include "projectexplorer/buildconfiguration.h"
 
diff --git a/src/plugins/nim/project/nimcompilercleanstepfactory.cpp b/src/plugins/nim/project/nimcompilercleanstepfactory.cpp
index 0178eca6f5e..327ea7fa312 100644
--- a/src/plugins/nim/project/nimcompilercleanstepfactory.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstepfactory.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "project/nimcompilercleanstepfactory.h"
+#include "nimcompilercleanstepfactory.h"
+#include "nimbuildconfiguration.h"
+#include "nimcompilercleanstep.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimcompilercleanstep.h"
+#include "../nimconstants.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 
diff --git a/src/plugins/nim/project/nimproject.cpp b/src/plugins/nim/project/nimproject.cpp
index 18e09d6dd1f..7f615b720de 100644
--- a/src/plugins/nim/project/nimproject.cpp
+++ b/src/plugins/nim/project/nimproject.cpp
@@ -23,12 +23,12 @@
 **
 ****************************************************************************/
 
-#include "project/nimproject.h"
+#include "nimproject.h"
+#include "nimbuildconfiguration.h"
+#include "nimprojectnode.h"
+#include "nimprojectmanager.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimprojectnode.h"
-#include "project/nimprojectmanager.h"
+#include "../nimconstants.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/kit.h>
@@ -36,10 +36,8 @@
 #include <projectexplorer/target.h>
 #include <texteditor/textdocument.h>
 
-#include <QDebug>
 #include <QFileInfo>
 #include <QQueue>
-#include <QThread>
 
 using namespace ProjectExplorer;
 using namespace Utils;
diff --git a/src/plugins/nim/project/nimprojectmanager.cpp b/src/plugins/nim/project/nimprojectmanager.cpp
index 323eb513882..6a5eff66e9c 100644
--- a/src/plugins/nim/project/nimprojectmanager.cpp
+++ b/src/plugins/nim/project/nimprojectmanager.cpp
@@ -23,10 +23,10 @@
 **
 ****************************************************************************/
 
-#include "project/nimprojectmanager.h"
+#include "nimprojectmanager.h"
+#include "nimproject.h"
 
-#include "nimconstants.h"
-#include "project/nimproject.h"
+#include "../nimconstants.h"
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/nim/project/nimprojectnode.cpp b/src/plugins/nim/project/nimprojectnode.cpp
index c0c33740ae2..8d77072a67d 100644
--- a/src/plugins/nim/project/nimprojectnode.cpp
+++ b/src/plugins/nim/project/nimprojectnode.cpp
@@ -23,9 +23,8 @@
 **
 ****************************************************************************/
 
-#include "project/nimprojectnode.h"
-
-#include "project/nimproject.h"
+#include "nimprojectnode.h"
+#include "nimproject.h"
 
 using namespace ProjectExplorer;
 using namespace Utils;
diff --git a/src/plugins/nim/project/nimrunconfiguration.cpp b/src/plugins/nim/project/nimrunconfiguration.cpp
index 6930a6be824..3ac4724e0b4 100644
--- a/src/plugins/nim/project/nimrunconfiguration.cpp
+++ b/src/plugins/nim/project/nimrunconfiguration.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "project/nimrunconfiguration.h"
+#include "nimrunconfiguration.h"
+#include "nimbuildconfiguration.h"
+#include "nimrunconfigurationwidget.h"
 
-#include "nimconstants.h"
-#include "project/nimbuildconfiguration.h"
-#include "project/nimrunconfigurationwidget.h"
+#include "../nimconstants.h"
 
 #include <projectexplorer/runnables.h>
 #include <projectexplorer/localenvironmentaspect.h>
diff --git a/src/plugins/nim/project/nimrunconfigurationfactory.cpp b/src/plugins/nim/project/nimrunconfigurationfactory.cpp
index 24d3dc693e7..f89faf8344e 100644
--- a/src/plugins/nim/project/nimrunconfigurationfactory.cpp
+++ b/src/plugins/nim/project/nimrunconfigurationfactory.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "project/nimrunconfigurationfactory.h"
+#include "nimrunconfigurationfactory.h"
+#include "nimproject.h"
+#include "nimrunconfiguration.h"
 
-#include "nimconstants.h"
-#include "project/nimproject.h"
-#include "project/nimrunconfiguration.h"
+#include "../nimconstants.h"
 
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <projectexplorer/target.h>
diff --git a/src/plugins/nim/project/nimrunconfigurationwidget.cpp b/src/plugins/nim/project/nimrunconfigurationwidget.cpp
index 57e54442e52..74ea801937b 100644
--- a/src/plugins/nim/project/nimrunconfigurationwidget.cpp
+++ b/src/plugins/nim/project/nimrunconfigurationwidget.cpp
@@ -23,9 +23,8 @@
 **
 ****************************************************************************/
 
-#include "project/nimrunconfigurationwidget.h"
-
-#include "project/nimrunconfiguration.h"
+#include "nimrunconfigurationwidget.h"
+#include "nimrunconfiguration.h"
 
 #include <projectexplorer/runconfigurationaspects.h>
 
diff --git a/src/plugins/nim/project/nimruncontrol.cpp b/src/plugins/nim/project/nimruncontrol.cpp
index ab844fb98a5..baff9ad6f3a 100644
--- a/src/plugins/nim/project/nimruncontrol.cpp
+++ b/src/plugins/nim/project/nimruncontrol.cpp
@@ -23,9 +23,8 @@
 **
 ****************************************************************************/
 
-#include "project/nimruncontrol.h"
-
-#include "project/nimrunconfiguration.h"
+#include "nimruncontrol.h"
+#include "nimrunconfiguration.h"
 
 #include <projectexplorer/runnables.h>
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/nim/project/nimruncontrolfactory.cpp b/src/plugins/nim/project/nimruncontrolfactory.cpp
index 39b588dbb83..3f02586ed7d 100644
--- a/src/plugins/nim/project/nimruncontrolfactory.cpp
+++ b/src/plugins/nim/project/nimruncontrolfactory.cpp
@@ -23,10 +23,9 @@
 **
 ****************************************************************************/
 
-#include "project/nimruncontrolfactory.h"
-
-#include "project/nimrunconfiguration.h"
-#include "project/nimruncontrol.h"
+#include "nimruncontrolfactory.h"
+#include "nimrunconfiguration.h"
+#include "nimruncontrol.h"
 
 namespace Nim {
 
diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
index de5e40d42fc..1c65350e66d 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
@@ -23,11 +23,11 @@
 **
 ****************************************************************************/
 
-#include "settings/nimcodestylepreferencesfactory.h"
+#include "nimcodestylepreferencesfactory.h"
+#include "nimcodestylepreferenceswidget.h"
 
-#include "nimconstants.h"
-#include "editor/nimindenter.h"
-#include "settings/nimcodestylepreferenceswidget.h"
+#include "../nimconstants.h"
+#include "../editor/nimindenter.h"
 
 #include <coreplugin/id.h>
 #include <texteditor/simplecodestylepreferences.h>
diff --git a/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp b/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp
index 3482cd476cd..b4f79686c4b 100644
--- a/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp
+++ b/src/plugins/nim/settings/nimcodestylepreferenceswidget.cpp
@@ -26,7 +26,7 @@
 #include "nimcodestylepreferenceswidget.h"
 #include "ui_nimcodestylepreferenceswidget.h"
 
-#include "nimconstants.h"
+#include "../nimconstants.h"
 
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/displaysettings.h>
diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp
index 876b6827f5d..4da3ab91b96 100644
--- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp
+++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp
@@ -24,10 +24,10 @@
 ****************************************************************************/
 
 #include "nimcodestylesettingspage.h"
+#include "nimcodestylepreferencesfactory.h"
+#include "nimsettings.h"
 
-#include "nimconstants.h"
-#include "settings/nimcodestylepreferencesfactory.h"
-#include "settings/nimsettings.h"
+#include "../nimconstants.h"
 
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/simplecodestylepreferences.h>
diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp
index 82b4c718d52..40ac7b74a2f 100644
--- a/src/plugins/nim/settings/nimsettings.cpp
+++ b/src/plugins/nim/settings/nimsettings.cpp
@@ -24,9 +24,9 @@
 ****************************************************************************/
 
 #include "nimsettings.h"
+#include "nimcodestylepreferencesfactory.h"
 
-#include "nimconstants.h"
-#include "settings/nimcodestylepreferencesfactory.h"
+#include "../nimconstants.h"
 
 #include <texteditor/icodestylepreferencesfactory.h>
 #include <texteditor/texteditorsettings.h>
@@ -35,14 +35,11 @@
 #include <texteditor/tabsettings.h>
 #include <coreplugin/icore.h>
 
-#include <QDebug>
-
-
 using namespace TextEditor;
 
 namespace Nim {
 
-TextEditor::SimpleCodeStylePreferences *m_globalCodeStyle = nullptr;
+SimpleCodeStylePreferences *m_globalCodeStyle = nullptr;
 
 NimSettings::NimSettings(QObject *parent)
     : QObject(parent)
diff --git a/src/plugins/nim/settings/nimsnippetprovider.cpp b/src/plugins/nim/settings/nimsnippetprovider.cpp
index e879a3e8469..12287c52f0a 100644
--- a/src/plugins/nim/settings/nimsnippetprovider.cpp
+++ b/src/plugins/nim/settings/nimsnippetprovider.cpp
@@ -25,9 +25,9 @@
 
 #include "nimsnippetprovider.h"
 
-#include "nimconstants.h"
-#include "editor/nimhighlighter.h"
-#include "editor/nimindenter.h"
+#include "../nimconstants.h"
+#include "../editor/nimhighlighter.h"
+#include "../editor/nimindenter.h"
 
 #include <texteditor/textdocument.h>
 #include <texteditor/snippets/snippeteditor.h>
diff --git a/src/plugins/nim/tools/nimlexer.cpp b/src/plugins/nim/tools/nimlexer.cpp
index 2160d156e41..2c78f125e7c 100644
--- a/src/plugins/nim/tools/nimlexer.cpp
+++ b/src/plugins/nim/tools/nimlexer.cpp
@@ -23,9 +23,8 @@
 **
 ****************************************************************************/
 
-#include "tools/nimlexer.h"
-
-#include "tools/sourcecodestream.h"
+#include "nimlexer.h"
+#include "sourcecodestream.h"
 
 #include <QRegularExpression>
 #include <QSet>