qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin

Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

69 files changed, 88 insertions, 395 deletions

diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 5220320023..b5f2154847 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -33,6 +33,7 @@ Product {
         if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
             return ["-Wl,-s"]
     }
+    cpp.includePaths: [ ".", ".." ]
 
     Group {
         files: [ name + ".pluginspec.in" ]
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index eb89035109..36a11871ed 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -17,11 +17,6 @@ QtcPlugin {
         "ANALYZER_LIBRARY",
         "QT_NO_CAST_FROM_ASCII"
     ])
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "analyzerbase.qrc",
@@ -56,9 +51,6 @@ QtcPlugin {
     ]
 
     ProductModule {
-        Depends { name: "cpp" }
-        cpp.includePaths: ["."]
-
         Depends { name: "CPlusPlus" }
     }
 }
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 618d83a5c8..bd2a2e83dd 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -15,12 +15,7 @@ QtcPlugin {
     property bool enable: false
     property var pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
 
-    cpp.includePaths: [
-        "..",
-        buildDirectory,
-        "../../libs",
-        "../../shared"
-    ]
+    cpp.includePaths: base.concat("../../shared")
 
     files: [
         "addnewavddialog.ui",
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index 00222dd272..d5b9e0ebac 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
@@ -13,12 +13,6 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "autogenstep.cpp",
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index d383da7cee..b43ff69dd0 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "annotationhighlighter.cpp",
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index ad7aaf9c3a..638c13fb1d 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/src/plugins/bineditor/bineditor.qbs
@@ -11,11 +11,6 @@ QtcPlugin {
     Depends { name: "Find" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "bineditor.cpp",
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index d1c0863f88..c7d02f9e7d 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/src/plugins/bookmarks/bookmarks.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "bookmark.cpp",
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index 65052fb16c..338cec83eb 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "classview.qrc",
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 2a3776d6d1..18a15de51a 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -18,12 +18,6 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "activityselector.cpp",
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 4a55c77dbe..3ce75fbbcb 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -14,14 +14,6 @@ QtcPlugin {
     Depends { name: "Locator" }
     Depends { name: "QtSupport" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "CMakeProject.mimetypes.xml",
         "cmakebuildconfiguration.cpp",
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 614f35e23c..83e3328054 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -15,18 +15,15 @@ QtcPlugin {
     Depends { name: "Aggregation" }
     Depends { name: "app_version_header" }
 
-    cpp.includePaths: [
-        ".",
-        "..",
+    cpp.includePaths: base.concat([
         "../..",
-        "../../libs",
-        "../../../src/shared/scriptwrapper/",
+        "../../shared/scriptwrapper",
         "dialogs",
         "editormanager",
         "progressmanager",
         "scriptmanager",
         "actionmanager"
-    ]
+    ])
 
     cpp.dynamicLibraries: {
         if (qbs.targetOS == "windows") return [
@@ -257,11 +254,5 @@ QtcPlugin {
         Depends { name: "Aggregation" }
         Depends { name: "ExtensionSystem" }
         Depends { name: "Utils" }
-        cpp.includePaths: [
-            "../..",
-            "../../libs",
-            product.buildDirectory + "/.obj/Core/actionmanager"
-        ]
     }
 }
-
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h
index cfda66eda6..c06c4ebc59 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.h
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.h
@@ -31,7 +31,7 @@
 #ifndef INAVIGATIONWIDGET_H
 #define INAVIGATIONWIDGET_H
 
-#include <coreplugin/id.h>
+#include "id.h"
 
 #include <QObject>
 #include <QList>
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 9e30f93c50..61bd22af9a 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -30,8 +30,8 @@
 
 #include "progressmanager_p.h"
 #include "progressview.h"
-#include "coreconstants.h"
-#include "icore.h"
+#include "../coreconstants.h"
+#include "../icore.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index a906d6ccea..14cf63b416 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -10,13 +10,7 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        ".",
-        "../../shared/cpaster",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
+    cpp.includePaths: base.concat("../../shared/cpaster")
 
     files: [
         "codepasterprotocol.cpp",
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 9c86f15f35..8cd892a574 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -12,12 +12,8 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        "../../libs/3rdparty",
-        buildDirectory
-    ]
+
+    cpp.includePaths: base.concat("../../libs/3rdparty")
 
     files: [
         "CppEditor.mimetypes.xml",
@@ -62,4 +58,3 @@ QtcPlugin {
         "cpptypehierarchy.h",
     ]
 }
-
diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h
index 805945f7e8..8a50a3d887 100644
--- a/src/plugins/cpptools/cppfunctionsfilter.h
+++ b/src/plugins/cpptools/cppfunctionsfilter.h
@@ -31,7 +31,7 @@
 #ifndef CPPFUNCTIONSFILTER_H
 #define CPPFUNCTIONSFILTER_H
 
-#include <cpplocatorfilter.h>
+#include "cpplocatorfilter.h"
 
 namespace CppTools {
 namespace Internal {
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 5de56fa444..3a2ba29005 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -17,12 +17,6 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII"])
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "ModelManagerInterface.cpp",
@@ -117,4 +111,3 @@ QtcPlugin {
         Depends { name: "CPlusPlus" }
     }
 }
-
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 1067321d7f..d89725f59d 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 74236e3948..08b64d69cb 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -20,17 +20,12 @@ QtcPlugin {
     Depends { name: "QtcSsh" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        ".",
+    cpp.includePaths: base.concat([
         "shared",
         "lldb",
-        "..",
-        "../../libs",
         "../../shared/json",
-        buildDirectory,
-        "../../libs/utils",
-        "../../shared/registryaccess/"
-    ]
+        "../../shared/registryaccess"
+    ])
 
     Group {
         condition: Defaults.testsEnabled(qbs)
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 8c793f586f..f30940b731 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -14,15 +14,11 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["CPP_ENABLED"])
-    cpp.includePaths: [
+    cpp.includePaths: base.concat([
         "../../libs/3rdparty",
         "cpp",
-        "../../shared/designerintegrationv2",
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
+        "../../shared/designerintegrationv2"
+    ])
 
     files: [
         "Designer.mimetypes.xml",
@@ -88,4 +84,3 @@ QtcPlugin {
         "cpp/formclasswizardparameters.h",
     ]
 }
-
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index ed44480700..218897eb2e 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -9,15 +9,8 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "Find" }
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
 
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "fakevimactions.cpp",
         "fakevimactions.h",
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index 8cc6d8ecf0..56e3eab12a 100644
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -9,16 +9,12 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "cpp" }
 
-    cpp.includePaths: [
-        ".",
-        "..",
+    cpp.includePaths: base.concat([
         "generichighlighter",
         "tooltip",
         "snippets",
-        "codeassist",
-        "../../libs",
-        buildDirectory
-    ]
+        "codeassist"
+    ])
 
     files: [
         "basetextfind.cpp",
@@ -57,4 +53,3 @@ QtcPlugin {
         "treeviewfind.h",
     ]
 }
-
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 866e88c9cf..8a47a547cb 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -15,13 +15,6 @@ QtcPlugin {
     Depends { name: "Locator" }
     Depends { name: "QtSupport" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "filesselectionwizardpage.cpp",
         "filesselectionwizardpage.h",
@@ -50,4 +43,3 @@ QtcPlugin {
         "selectablefilesmodel.h",
     ]
 }
-
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index e935869d76..f852fd98d0 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -34,10 +34,10 @@
 #include "gerritmodel.h"
 #include "gerritoptionspage.h"
 
-#include <gitplugin.h>
-#include <gitclient.h>
-#include <gitversioncontrol.h>
-#include <gitconstants.h>
+#include "../gitplugin.h"
+#include "../gitclient.h"
+#include "../gitversioncontrol.h"
+#include "../gitconstants.h"
 #include <vcsbase/vcsbaseconstants.h>
 #include <vcsbase/vcsbaseeditor.h>
 
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 4e2e7fb3bb..e11a830c96 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -14,14 +14,6 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-    cpp.includePaths: [
-        ".",
-        "gitorious",
-        "gerrit",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "annotationhighlighter.cpp",
@@ -117,4 +109,3 @@ QtcPlugin {
         ]
     }
 }
-
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.cpp b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
index 77296a1f3a..ebe207274b 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.cpp
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
@@ -32,9 +32,9 @@
 #include "gitorioushostwizardpage.h"
 #include "gitoriousprojectwizardpage.h"
 #include "gitoriousrepositorywizardpage.h"
-#include "clonewizardpage.h"
 
-#include <git/gitplugin.h>
+#include "../clonewizardpage.h"
+#include "../gitplugin.h"
 
 #include <coreplugin/iversioncontrol.h>
 #include <vcsbase/checkoutjobs.h>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 6647b5a1a7..0d396c35ae 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -40,12 +40,12 @@
 #include "branchdialog.h"
 #include "remotedialog.h"
 #include "clonewizard.h"
-#include "gitoriousclonewizard.h"
+#include "gitorious/gitoriousclonewizard.h"
 #include "stashdialog.h"
 #include "settingspage.h"
 #include "resetdialog.h"
 
-#include <gerritplugin.h>
+#include "gerrit/gerritplugin.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 732220ad84..6627277314 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -13,14 +13,6 @@ QtcPlugin {
     Depends { name: "GLSL" }
     Depends { name: "CPlusPlus" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "../..",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "GLSLEditor.mimetypes.xml",
         "glslautocompleter.cpp",
@@ -52,4 +44,3 @@ QtcPlugin {
         "reuse.h",
     ]
 }
-
diff --git a/src/plugins/helloworld/helloworld.qbs b/src/plugins/helloworld/helloworld.qbs
index d1beb7d1a2..e5546e282a 100644
--- a/src/plugins/helloworld/helloworld.qbs
+++ b/src/plugins/helloworld/helloworld.qbs
@@ -6,15 +6,8 @@ QtcPlugin {
     name: "HelloWorld"
 
     Depends { name: "Core" }
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
 
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "helloworldplugin.cpp",
         "helloworldplugin.h",
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 7af96d862e..53dd30c2cd 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -26,13 +26,7 @@ QtcPlugin {
         cpp.defines: base.concat(["QT_NO_WEBKIT"])
     }
     cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"])
-    cpp.includePaths: [
-        "../../shared/help",
-        ".",
-        "..",
-        "../..",
-        "../../libs"
-    ]
+    cpp.includePaths: base.concat("../../shared/help")
 
     files: [
         "centralwidget.cpp",
@@ -96,4 +90,3 @@ QtcPlugin {
         "../../shared/help/topicchooser.ui",
     ]
 }
-
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 6029976044..79e5528baa 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -8,14 +8,6 @@ QtcPlugin {
     Depends { name: "Qt"; submodules: ["widgets", "svg"] }
     Depends { name: "Core" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "ImageViewer.mimetypes.xml",
         "imageview.cpp",
@@ -35,4 +27,3 @@ QtcPlugin {
         "imageviewertoolbar.ui",
     ]
 }
-
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index e93438998a..af809cfd84 100644
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -9,16 +9,12 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "cpp" }
 
-    cpp.includePaths: [
-        ".",
-        "..",
+    cpp.includePaths: base.concat([
         "generichighlighter",
         "tooltip",
         "snippets",
-        "codeassist",
-        "../../libs",
-        buildDirectory
-    ]
+        "codeassist"
+    ])
 
     files: [
         "basefilefilter.cpp",
@@ -55,4 +51,3 @@ QtcPlugin {
         "images/reload.png",
     ]
 }
-
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 15abb6e07f..c30877a7cc 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "app_version_header" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        "../.."
-    ]
-
     files: [
         "actionmacrohandler.cpp",
         "actionmacrohandler.h",
@@ -53,4 +46,3 @@ QtcPlugin {
         "texteditormacrohandler.h",
     ]
 }
-
diff --git a/src/plugins/madde/madde.qbs b/src/plugins/madde/madde.qbs
index 8f84d46de9..86adadbf5e 100644
--- a/src/plugins/madde/madde.qbs
+++ b/src/plugins/madde/madde.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
     Depends { name: "Qt.gui" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
     cpp.defines: base.concat(['QT_NO_CAST_TO_ASCII'])
 
     files: [
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index 518d50bc1e..fcf9752e5f 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",
@@ -54,4 +47,3 @@ QtcPlugin {
         "srcdestdialog.ui",
     ]
 }
-
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index ddf831b359..ee31c90959 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",
@@ -50,4 +43,3 @@ QtcPlugin {
         "submitpanel.ui",
     ]
 }
-
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index 83980e6133..55a924cbdf 100644
--- a/src/plugins/projectexplorer/applicationlauncher.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher.cpp
@@ -29,13 +29,13 @@
 **************************************************************************/
 
 #include "applicationlauncher.h"
-#include "consoleprocess.h"
 #ifdef Q_OS_WIN
 #include "windebuginterface.h"
 #endif
 
 #include <coreplugin/icore.h>
 
+#include <utils/consoleprocess.h>
 #include <utils/qtcprocess.h>
 #ifdef Q_OS_WIN
 #include <utils/winutils.h>
diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h
index 511a56893c..b25ae12bbd 100644
--- a/src/plugins/projectexplorer/processstep.h
+++ b/src/plugins/projectexplorer/processstep.h
@@ -33,7 +33,8 @@
 
 #include "ui_processstep.h"
 #include "abstractprocessstep.h"
-#include "environment.h"
+
+#include <utils/environment.h>
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index b00c48ba2f..8eb13f4812 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -33,7 +33,6 @@
 #include "buildconfiguration.h"
 #include "deployconfiguration.h"
 #include "editorconfiguration.h"
-#include "environment.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
 #include "projectnodes.h"
@@ -49,6 +48,7 @@
 #include <projectexplorer/kitmanager.h>
 #include <limits>
 #include <utils/qtcassert.h>
+#include <utils/environment.h>
 
 /*!
     \class ProjectExplorer::Project
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 84b8e16062..d5a1127af4 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -1,4 +1,5 @@
 import qbs.base 1.0
+
 import "../QtcPlugin.qbs" as QtcPlugin
 import "../../../qbs/defaults.js" as Defaults
 
@@ -14,15 +15,10 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QTC_CPU=X86Architecture"])
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        "../../libs/utils",
+    cpp.includePaths: base.concat([
         "customwizard",
-        "publishing",
-        buildDirectory
-    ]
+        "publishing"
+    ])
 
     files: [
         "abi.cpp",
@@ -342,8 +338,6 @@ QtcPlugin {
     }
 
     ProductModule {
-        Depends { name: "cpp" }
-        Depends { name: "Qt"; submodules: ["network"] }
-        cpp.includePaths: [".."]
+        Depends { name: "Qt.network" }
     }
 }
diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs
index 138d83abc3..b59049546b 100644
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -21,8 +21,7 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QWEAKPOINTER_ENABLE_ARROW"])
-    cpp.includePaths: [
-        ".",
+    cpp.includePaths: base.concat([
         "designercore",
         "designercore/include",
         "../../../share/qtcreator/qml/qmlpuppet/interfaces",
@@ -35,11 +34,8 @@ QtcPlugin {
         "components/itemlibrary",
         "components/navigator",
         "components/pluginmanager",
-        "components/stateseditor",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
+        "components/stateseditor"
+    ])
 
     Group {
         prefix: "designercore/filemanager/"
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index fc5afc2322..9e81ca3ca3 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -18,12 +18,6 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QT_CREATOR"])
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "QmlJSEditor.mimetypes.xml",
@@ -98,4 +92,3 @@ QtcPlugin {
         Depends { name: "QmlJSTools" }
     }
 }
-
diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp
index e8ee5c8c6f..94dea0444e 100644
--- a/src/plugins/qmljseditor/quicktoolbar.cpp
+++ b/src/plugins/qmljseditor/quicktoolbar.cpp
@@ -29,10 +29,11 @@
 **************************************************************************/
 
 #include "quicktoolbar.h"
-#include <contextpanewidget.h>
-#include <quicktoolbarsettingspage.h>
+#include "quicktoolbarsettingspage.h"
 
 #include <utils/changeset.h>
+#include <qmleditorwidgets/contextpanewidget.h>
+#include <qmleditorwidgets/customcolordialog.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljspropertyreader.h>
@@ -46,7 +47,6 @@
 #include <texteditor/basetexteditor.h>
 #include <texteditor/tabsettings.h>
 #include <coreplugin/icore.h>
-#include <customcolordialog.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 2aea7349c0..079f804d7e 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -19,12 +19,7 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII"])
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        "../../libs/3rdparty",
-        buildDirectory
-    ]
+    cpp.includePaths: base.concat("../../libs/3rdparty")
 
     files: [
         "qmljscodestylepreferencesfactory.cpp",
@@ -70,4 +65,3 @@ QtcPlugin {
         Depends { name: "QmlDebug" }
     }
 }
-
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index ef22fbf627..24996f068c 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -20,12 +20,7 @@ QtcPlugin {
     Depends { name: "CPlusPlus" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "canvas",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
+    cpp.includePaths: base.concat("canvas")
 
     files: [
         "abstractqmlprofilerrunner.h",
@@ -87,4 +82,3 @@ QtcPlugin {
         "qml/qmlprofiler.qrc",
     ]
 }
-
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 7d7879a487..9b453b8363 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -15,12 +15,6 @@ QtcPlugin {
     Depends { name: "QtSupport" }
     Depends { name: "app_version_header" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs"
-    ]
-
     files: [
         "QmlProject.mimetypes.xml",
         "qmlproject.cpp",
@@ -55,4 +49,3 @@ QtcPlugin {
         "fileformat/qmlprojectitem.h",
     ]
 }
-
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index b47e960b5c..ff11e279aa 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -18,12 +18,7 @@ QtcPlugin {
     property var pluginspecreplacements: ({"QNX_EXPERIMENTAL_STR": (enable ? "false" : "true")})
 
     cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII", "QT_NO_CAST_FROM_ASCII"])
-    cpp.includePaths: [
-        "..",
-        buildDirectory,
-        "../../libs",
-        "../../shared"
-    ]
+    cpp.includePaths: base.concat("../../shared")
 
     files: [
         "bardescriptorfileimagewizardpage.cpp",
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index d21b19838f..271bd76850 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -29,7 +29,7 @@
 **************************************************************************/
 
 #include "desktopqtversion.h"
-#include "qt4projectmanagerconstants.h"
+#include "../qt4projectmanagerconstants.h"
 
 #include <qtsupport/qtsupportconstants.h>
 #include <proparser/profileevaluator.h>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
index 29e7e75afd..9094862d18 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
@@ -28,8 +28,8 @@
 **
 **************************************************************************/
 #include "desktopqtversionfactory.h"
-#include "qt4projectmanagerconstants.h"
 #include "desktopqtversion.h"
+#include "../qt4projectmanagerconstants.h"
 
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index ea09317c8a..32f5515e34 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -30,12 +30,12 @@
 
 #include "qt4runconfiguration.h"
 
-#include "makestep.h"
-#include "qt4nodes.h"
-#include "qt4project.h"
-#include "qt4buildconfiguration.h"
-#include "qt4projectmanagerconstants.h"
-#include "qmakestep.h"
+#include "../makestep.h"
+#include "../qt4nodes.h"
+#include "../qt4project.h"
+#include "../qt4buildconfiguration.h"
+#include "../qt4projectmanagerconstants.h"
+#include "../qmakestep.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index bec27ebe29..2a7584399f 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -17,22 +17,16 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     Depends { name: "cpp" }
-    cpp.defines: {
-        return base.concat([
-            "PROPARSER_AS_LIBRARY",
-            "PROPARSER_THREAD_SAFE",
-            "PROEVALUATOR_THREAD_SAFE",
-            "PROEVALUATOR_CUMULATIVE"
-        ])
-    }
-    cpp.includePaths: [
-        ".",
-        "..",
-        buildDirectory,
+    cpp.defines: base.concat([
+        "PROPARSER_AS_LIBRARY",
+        "PROPARSER_THREAD_SAFE",
+        "PROEVALUATOR_THREAD_SAFE",
+        "PROEVALUATOR_CUMULATIVE"
+    ])
+    cpp.includePaths: base.concat([
         "customwidgetwizard",
-        "../../libs",
         "../../shared",
-    ]
+    ])
 
     files: [
         "Qt4ProjectManager.mimetypes.xml",
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 3cbac807c7..5532bc253e 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -12,14 +12,10 @@ QtcPlugin {
     Depends { name: "QmlJS" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        ".",
+    cpp.includePaths: base.concat([
         "../../shared",
-        "../../shared/proparser",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
+        "../../shared/proparser"
+    ])
 
     cpp.defines: base.concat([
         "QT_NO_CAST_FROM_ASCII",
@@ -108,7 +104,7 @@ QtcPlugin {
 
     ProductModule {
         Depends { name: "cpp" }
-        cpp.includePaths: [ "../../shared" ]
+        cpp.includePaths: "../../shared"
         cpp.defines: [
             "QMAKE_AS_LIBRARY",
             "PROEVALUATOR_THREAD_SAFE",
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index c5dda762fc..8246f6b39d 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
     Depends { name: "QtSupport" }
     Depends { name: "QtcSsh" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "abstractpackagingstep.cpp",
         "abstractpackagingstep.h",
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 9f51b8b086..889bd951f2 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -10,14 +10,7 @@ QtcPlugin {
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "xml"] }
 
-    cpp.includePaths: [
-        "..",
-        "../..",
-        "../../libs",
-        buildDirectory,
-        "qrceditor",
-        "../../tools/utils"
-    ]
+    cpp.includePaths: base.concat("qrceditor")
 
     files: [
         "ResourceEditor.mimetypes.xml",
@@ -42,4 +35,3 @@ QtcPlugin {
         "qrceditor/undocommands_p.h",
     ]
 }
-
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index d4769f818b..ed5571e47c 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index 9f0a56620d..9a92e0493e 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
     Depends { name: "Locator" }
     Depends { name: "TextEditor" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "TaskList.mimetypes.xml",
         "stopmonitoringhandler.cpp",
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h
index 29e3428b8e..9a941f1534 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.h
+++ b/src/plugins/texteditor/generichighlighter/highlighter.h
@@ -31,8 +31,8 @@
 #ifndef HIGHLIGHTER_H
 #define HIGHLIGHTER_H
 
-#include "basetextdocumentlayout.h"
-#include "syntaxhighlighter.h"
+#include "../basetextdocumentlayout.h"
+#include "../syntaxhighlighter.h"
 
 #include <QString>
 #include <QVector>
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
index de97f7a7a1..7d81b939f7 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
+++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
@@ -31,7 +31,7 @@
 #ifndef HIGHLIGHTERSETTINGSPAGE_H
 #define HIGHLIGHTERSETTINGSPAGE_H
 
-#include "texteditoroptionspage.h"
+#include "../texteditoroptionspage.h"
 
 QT_BEGIN_NAMESPACE
 template <class> class QList;
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.h b/src/plugins/texteditor/snippets/snippetssettingspage.h
index d04157d7f6..f880228599 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.h
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.h
@@ -31,7 +31,7 @@
 #ifndef SNIPPETSSETTINGSPAGE_H
 #define SNIPPETSSETTINGSPAGE_H
 
-#include "texteditoroptionspage.h"
+#include "../texteditoroptionspage.h"
 
 namespace TextEditor {
 namespace Internal {
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index aa98ab169f..3eaa4bb194 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -11,16 +11,12 @@ QtcPlugin {
     Depends { name: "Find" }
     Depends { name: "Locator" }
 
-    cpp.includePaths: [
-        ".",
-        "..",
+    cpp.includePaths: base.concat([
         "generichighlighter",
         "tooltip",
         "snippets",
-        "codeassist",
-        "../../libs",
-        buildDirectory
-    ]
+        "codeassist"
+    ])
 
     files: [
         "TextEditor.mimetypes.xml",
@@ -290,4 +286,3 @@ QtcPlugin {
         Depends { name: "Locator" }
     }
 }
-
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index eb9c48f419..85d218de15 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -15,11 +15,6 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
 
     files: [
         "constants.h",
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index e615e9816f..868c6d02bb 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -29,12 +29,11 @@
 **************************************************************************/
 
 #include "callgrindcontroller.h"
+#include "../valgrindprocess.h"
 
 #include <QDebug>
 #include <QDir>
 
-#include <valgrindprocess.h>
-
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <ssh/sftpchannel.h>
diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.h b/src/plugins/valgrind/callgrind/callgrindrunner.h
index fce8653551..5c6a64fb7a 100644
--- a/src/plugins/valgrind/callgrind/callgrindrunner.h
+++ b/src/plugins/valgrind/callgrind/callgrindrunner.h
@@ -31,7 +31,7 @@
 #ifndef VALGRIND_CALLGRIND_CALLGRINDRUNNER_H
 #define VALGRIND_CALLGRIND_CALLGRINDRUNNER_H
 
-#include <valgrindrunner.h>
+#include "../valgrindrunner.h"
 
 #include "callgrindcontroller.h"
 
diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.cpp b/src/plugins/valgrind/memcheck/memcheckrunner.cpp
index 7867ff7bce..83feffab97 100644
--- a/src/plugins/valgrind/memcheck/memcheckrunner.cpp
+++ b/src/plugins/valgrind/memcheck/memcheckrunner.cpp
@@ -32,9 +32,9 @@
 
 #include "memcheckrunner.h"
 
-#include <xmlprotocol/error.h>
-#include <xmlprotocol/status.h>
-#include <xmlprotocol/threadedparser.h>
+#include "../xmlprotocol/error.h"
+#include "../xmlprotocol/status.h"
+#include "../xmlprotocol/threadedparser.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.h b/src/plugins/valgrind/memcheck/memcheckrunner.h
index 03ba4b5fb5..4fa63cefe7 100644
--- a/src/plugins/valgrind/memcheck/memcheckrunner.h
+++ b/src/plugins/valgrind/memcheck/memcheckrunner.h
@@ -33,7 +33,7 @@
 #ifndef VALGRIND_PROTOCOL_MEMCHECKRUNNER_H
 #define VALGRIND_PROTOCOL_MEMCHECKRUNNER_H
 
-#include <valgrindrunner.h>
+#include "../valgrindrunner.h"
 
 namespace Valgrind {
 
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index d6cb683372..e3add86457 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -13,15 +13,6 @@ QtcPlugin {
     Depends { name: "RemoteLinux" }
     Depends { name: "CPlusPlus"}
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        ".",
-        "valgrind",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "callgrindcostdelegate.cpp",
         "callgrindcostdelegate.h",
@@ -118,4 +109,3 @@ QtcPlugin {
         "xmlprotocol/threadedparser.h",
     ]
 }
-
diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp
index f890c9a8a3..86427b1f17 100644
--- a/src/plugins/vcsbase/checkoutjobs.cpp
+++ b/src/plugins/vcsbase/checkoutjobs.cpp
@@ -30,8 +30,8 @@
 
 #include "checkoutjobs.h"
 
-#include <vcsbaseplugin.h>
-#include <vcsbaseoutputwindow.h>
+#include "vcsbaseplugin.h"
+#include "vcsbaseoutputwindow.h"
 
 #include <QDebug>
 #include <QQueue>
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 68ee417077..aefb0c04f9 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -14,14 +14,6 @@ QtcPlugin {
     Depends { name: "CppTools" }
     Depends { name: "CPlusPlus" }
 
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        "../../libs/3rdparty",
-        buildDirectory
-    ]
-
     files: [
         "VcsBase.mimetypes.xml",
         "baseannotationhighlighter.cpp",
@@ -90,4 +82,3 @@ QtcPlugin {
         "images/submit.png",
     ]
 }
-
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 01c277c168..3f4182aedf 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -10,13 +10,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
 
     Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        "../../../src/shared/scriptwrapper",
-        "../../Core/dynamiclibrary",
-        buildDirectory
-    ]
+    cpp.includePaths: base.concat("../../shared/scriptwrapper")
 
     files: [
         "welcome_global.h",
@@ -24,4 +18,3 @@ QtcPlugin {
         "welcomeplugin.h",
     ]
 }
-