diff --git a/src/app/app.qbs b/src/app/app.qbs
index c995ed5042f697947e9a0a77a573217aed7a047e..0ad34dc40e003e3b46f34f5f64d5f6b91e53f485 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -13,11 +13,8 @@ Application {
             return ["-Wl,-s"]
     }
     cpp.includePaths: [
-        "..",
-        "../libs",
         "../shared/qtsingleapplication",
         "../shared/qtlockedfile",
-        buildDirectory
     ]
 
     Depends { name: "app_version_header" }
diff --git a/src/app/main.cpp b/src/app/main.cpp
index c7317caa2fdf222152b92751347863b28dcd7dd3..81d9ff84f94e475608d221593f2be1191d80e3b6 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -27,7 +27,6 @@
 **
 ****************************************************************************/
 
-#include "qtsingleapplication.h"
 #include "../tools/qtcreatorcrashhandler/crashhandlersetup.h"
 
 #include <app/app_version.h>
@@ -35,6 +34,7 @@
 #include <extensionsystem/pluginerroroverview.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
+#include <qtsingleapplication.h>
 
 #include <QDebug>
 #include <QDir>
diff --git a/src/libs/3rdparty/cplusplus/cplusplus.pri b/src/libs/3rdparty/cplusplus/cplusplus.pri
index e179f54c89a4da23874d7d0f045835fc96f0d520..004ef4014ee8f0ba9e8778a4984287f4cea343b8 100644
--- a/src/libs/3rdparty/cplusplus/cplusplus.pri
+++ b/src/libs/3rdparty/cplusplus/cplusplus.pri
@@ -1,7 +1,3 @@
-
-DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD
-
 HEADERS += \
     $$PWD/cppassert.h \
     $$PWD/CPlusPlus.h \
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index a90826df3bdd2d48faea77330116821896ad7f4c..131c319a28f22ff2c4166b400ef26cb07cf40cc4 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -19,11 +19,11 @@ DynamicLibrary {
     cpp.rpaths: qbs.targetOS.contains("osx")
             ? ["@loader_path/..", "@executable_path/.."]
             : ["$ORIGIN", "$ORIGIN/.."]
-    cpp.includePaths: [ ".", ".." ]
+    cpp.includePaths: [path]
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: [ "." ]
+        cpp.includePaths: [path]
     }
 
     Group {
diff --git a/src/libs/languageutils/languageutils-lib.pri b/src/libs/languageutils/languageutils-lib.pri
index 6eaa31581490424796f0082c5fa21270b431507b..aab3ac1bb4d78dc2e174348a8d5b3e6693b809a7 100644
--- a/src/libs/languageutils/languageutils-lib.pri
+++ b/src/libs/languageutils/languageutils-lib.pri
@@ -4,8 +4,6 @@ contains(CONFIG, dll) {
     DEFINES += LANGUAGEUTILS_BUILD_STATIC_LIB
 }
 
-INCLUDEPATH += $$PWD/..
-
 HEADERS += \
     $$PWD/languageutils_global.h \
     $$PWD/fakemetaobject.h \
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index 88bc82979ec424c06a3cfbfb40c9341717148010..3f4a53e93c3a920838c9fb52d9274c9f6c68bc03 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "LanguageUtils"
 
-    cpp.includePaths: base.concat("../3rdparty/cplusplus")
     cpp.defines: base.concat([
         "LANGUAGEUTILS_BUILD_DIR"
     ])
diff --git a/src/libs/qmldebug/qmldebug-lib.pri b/src/libs/qmldebug/qmldebug-lib.pri
index 54f09258b07acf72607be80c496d0901d3778682..9afd866e79956cfe294f7bdd2ce3e26dd4fba5ee 100644
--- a/src/libs/qmldebug/qmldebug-lib.pri
+++ b/src/libs/qmldebug/qmldebug-lib.pri
@@ -4,8 +4,6 @@ contains(CONFIG, dll) {
     DEFINES += QMLDEBUG_STATIC_LIB
 }
 
-INCLUDEPATH += $$PWD/..
-
 HEADERS += \
     $$PWD/qmlprofilereventlocation.h \
     $$PWD/qmldebugclient.h \
diff --git a/src/libs/qmleditorwidgets/contextpanetext.ui b/src/libs/qmleditorwidgets/contextpanetext.ui
index d3d77f9425055f3ac52f7c10924e434c94415f00..8a1ceb862a3ac60bc7613f15a90658e82dedbaa1 100644
--- a/src/libs/qmleditorwidgets/contextpanetext.ui
+++ b/src/libs/qmleditorwidgets/contextpanetext.ui
@@ -438,12 +438,12 @@
   <customwidget>
    <class>QmlEditorWidgets::ColorButton</class>
    <extends>QToolButton</extends>
-   <header location="global">colorbutton.h</header>
+   <header location="global">qmleditorwidgets/colorbutton.h</header>
   </customwidget>
   <customwidget>
    <class>QmlEditorWidgets::FontSizeSpinBox</class>
    <extends>QSpinBox</extends>
-   <header location="global">fontsizespinbox.h</header>
+   <header location="global">qmleditorwidgets/fontsizespinbox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index 683bef38d1cd502ccf32391a2e7c55c6437038e3..c2f826da38f71a600fae702562e7b843569d1dee 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -43,11 +43,11 @@
 #include <QGraphicsEffect>
 #include <QAction>
 #include "contextpanetextwidget.h"
-#include "easingcontextpane.h"
 #include "contextpanewidgetimage.h"
 #include "contextpanewidgetrectangle.h"
 #include "customcolordialog.h"
 #include "colorbutton.h"
+#include <qmleditorwidgets/easingpane/easingcontextpane.h>
 
 using namespace Utils;
 
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
index fc849a02b28de4f9d1dc709ef22b87c93c355610..df35b99cdd439b4d1e562af8a1499c7c9e290392 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
@@ -300,7 +300,7 @@
   <customwidget>
    <class>QmlEditorWidgets::FileWidget</class>
    <extends>QComboBox</extends>
-   <header location="global">filewidget.h</header>
+   <header location="global">qmleditorwidgets/filewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
index dc0587de5b624abc9cd9bdf55f126cd86b94034d..ed25fbf0fd0df904fb2fa0b074fe66e197a31cc5 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
@@ -285,7 +285,7 @@
   <customwidget>
    <class>QmlEditorWidgets::FileWidget</class>
    <extends>QComboBox</extends>
-   <header location="global">filewidget.h</header>
+   <header location="global">qmleditorwidgets/filewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
index eca08408a56e12383ff9ba387ca686535d8734ae..40a8a80d664fd5952bcd6b616184b6d60d8de73d 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
@@ -30,9 +30,9 @@
 #include "contextpanewidgetrectangle.h"
 #include "ui_contextpanewidgetrectangle.h"
 #include "contextpanewidget.h"
+#include "customcolordialog.h"
 #include <qmljs/qmljspropertyreader.h>
 #include <qmljs/qmljsutils.h>
-#include <customcolordialog.h>
 #include <QDebug>
 
 namespace QmlEditorWidgets {
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
index 43e2c735f7e3efe45dd7646e50eed79a09f1b57b..1f2ba9f39b06e3efd93bc481a17dbfc0a74d6d43 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
@@ -298,12 +298,12 @@
   <customwidget>
    <class>QmlEditorWidgets::ColorButton</class>
    <extends>QToolButton</extends>
-   <header location="global">colorbutton.h</header>
+   <header location="global">qmleditorwidgets/colorbutton.h</header>
   </customwidget>
   <customwidget>
    <class>QmlEditorWidgets::GradientLine</class>
    <extends>QWidget</extends>
-   <header location="global">gradientline.h</header>
+   <header location="global">qmleditorwidgets/gradientline.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.pri b/src/libs/qmleditorwidgets/easingpane/easingpane.pri
index fc6b057d811d19d92e355f08369aad7d80f11f30..a1c04cda4b7192d1b7959fac793ec4f3d010088a 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingpane.pri
+++ b/src/libs/qmleditorwidgets/easingpane/easingpane.pri
@@ -1,5 +1,4 @@
 VPATH += $$PWD
-INCLUDEPATH += $$PWD
 SOURCES += $$PWD/easinggraph.cpp \
     $$PWD/easingcontextpane.cpp
 
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
index da748cf52dade5d652ef8ca1937f54836003eabd..fdaf629f7a482d8d359c29747afb9a38bf1f3c62 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
@@ -1,7 +1,5 @@
 QT += script declarative
 
-INCLUDEPATH += $$PWD
-
 contains(CONFIG, dll) {
     DEFINES += BUILD_QMLEDITORWIDGETS_LIB
 } else {
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index 45502583ef3f76b66cc018b95227e1e297bebf86..a8a3ebc2c1da7084bb9355daf137af2ddd9df99a 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "QmlEditorWidgets"
 
-    cpp.includePaths: base.concat(easingPane.prefix)
     cpp.defines: base.concat([
         "QWEAKPOINTER_ENABLE_ARROW",
         "BUILD_QMLEDITORWIDGETS_LIB"
diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri
index 12913de0a5242ebedc097e1328bb5b9820f827bf..1ea154d3ad269da5f3facad63155ede37441efb3 100644
--- a/src/libs/qmljs/qmljs-lib.pri
+++ b/src/libs/qmljs/qmljs-lib.pri
@@ -6,8 +6,6 @@ contains(CONFIG, dll) {
 
 include(parser/parser.pri)
 
-INCLUDEPATH += $$PWD/..
-
 HEADERS += \
     $$PWD/qmljs_global.h \
     $$PWD/qmljsbind.h \
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index a5a14daff0056a90abc659056aada55e68d740b1..8df00b7ed4c8e34df099301f4d57ae341bb9c587 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "QmlJS"
 
-    cpp.includePaths: base.concat("parser")
     cpp.defines: base.concat([
         "QMLJS_BUILD_DIR"
     ])
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 99545fcb382ccbff85abcb56f9525c10bc7810f5..15ef9194076c849368f2e590acb4ab356d0f9497 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -4,7 +4,6 @@ dll {
     DEFINES += QTCREATOR_UTILS_STATIC_LIB
 }
 
-INCLUDEPATH += $$PWD
 QT += script network
 
 CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index fcd6533e993f957fd236472354a8adae5175b93c..830d41b385ed05fae24fd6bdacb4ec8893658906 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -26,7 +26,7 @@ Product {
         if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")))
             return ["-Wl,-s"]
     }
-    cpp.includePaths: [ ".", ".." ]
+    cpp.includePaths: [path]
 
     Group {
         name: "PluginSpec"
@@ -47,5 +47,7 @@ Product {
 
     Export {
         Depends { name: "ExtensionSystem" }
+        Depends { name: "cpp" }
+        cpp.includePaths: [path]
     }
 }
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index b852ba43c450b908621cd7d6e77d5d4fda1595fe..b9c02f78cc57d530ead70a016dedfbe349bfa1b0 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -22,7 +22,6 @@ QtcPlugin {
     property bool enable: false
     pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
 
-    cpp.includePaths: base.concat("../../shared")
     cpp.defines: base.concat(project.buildQbsProjectManager ? ['HAVE_QBS'] : [])
 
     files: [
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index 1d7da8f5b4536a2ed23651eb4d38227df4f78c43..e3567b2fbbd548a31661b5f28947ad1476a06699 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -30,8 +30,8 @@
 #include "actioncontainer_p.h"
 #include "actionmanager.h"
 
-#include "coreconstants.h"
-#include "id.h"
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/id.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 287b2e0f5977f30fb08464c8586f6c000f70953e..5eb2161db70909060469d18101a272ee4c1cec26 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -29,10 +29,10 @@
 
 #include "actionmanager.h"
 #include "actionmanager_p.h"
-#include "mainwindow.h"
 #include "actioncontainer_p.h"
 #include "command_p.h"
-#include "id.h"
+#include <coreplugin/id.h>
+#include <coreplugin/mainwindow.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index 08e0f9cf8ea34c92dde3edc0b5cd1b52d3031255..2646b091c8615a64ccdce936679bd44cc6d59c5f 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -29,8 +29,8 @@
 
 #include "command_p.h"
 
-#include "icontext.h"
-#include "id.h"
+#include <coreplugin/icontext.h>
+#include <coreplugin/id.h>
 
 #include <utils/hostosinfo.h>
 
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
index b3cb20f23f29376a2e16ae3b044dea06c6e35b94..ee17ff370fab4bc1b58f7fe7d099075bdbaeccda 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -28,9 +28,9 @@
 ****************************************************************************/
 
 #include "commandmappings.h"
-#include "shortcutsettings.h"
 #include "ui_commandmappings.h"
 #include "commandsfile.h"
+#include <coreplugin/dialogs/shortcutsettings.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/headerviewstretcher.h>
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index a75ce5c80eb53c15d51cc7a3bbaaca4ea428167b..5d91694862b430722b262929862883a7f07429f7 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #include "commandsfile.h"
-#include "shortcutsettings.h"
 #include "command_p.h"
+#include <coreplugin/dialogs/shortcutsettings.h>
 
 #include <app/app_version.h>
 
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 0a477daee9fe5dbac122482969fa03327b4eea5e..4090601a4c0a54af8e90b9242fcd26a2a2799bee 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -28,16 +28,16 @@
 ****************************************************************************/
 
 #include "coreplugin.h"
-#include "actionmanager.h"
 #include "designmode.h"
 #include "editmode.h"
-#include "editormanager.h"
 #include "fileiconprovider.h"
 #include "helpmanager.h"
 #include "mainwindow.h"
 #include "mimedatabase.h"
 #include "modemanager.h"
 #include "infobar.h"
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <utils/savefile.h>
 
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 053ab3af543c0023085b19a2ec5d35a8154e87c8..6f283d19ac56c0b127693abf89acc1aee96e4e6a 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -12,10 +12,6 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 include(../../qtcreatorplugin.pri)
 include(../../shared/scriptwrapper/scriptwrapper.pri)
 win32-msvc*:QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
-INCLUDEPATH += dialogs \
-    actionmanager \
-    editormanager \
-    progressmanager
 SOURCES += mainwindow.cpp \
     editmode.cpp \
     tabpositionindicator.cpp \
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 216113bcc509975ef1bee50919eeca06ed2a5699..c645f684393e270bb797b56ce983f25435c535cf 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -15,15 +15,6 @@ QtcPlugin {
     Depends { name: "Aggregation" }
     Depends { name: "app_version_header" }
 
-    cpp.includePaths: base.concat([
-        "../..",
-        "../../shared/scriptwrapper",
-        "dialogs",
-        "editormanager",
-        "progressmanager",
-        "actionmanager"
-    ])
-
     cpp.dynamicLibraries: {
         if (qbs.targetOS.contains("windows")) return [
             "ole32",
diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp
index 9fdb675fba5f6952df4f3b2bfc3c1b30ac68d7d0..d6134c8dba6111273ca6a5b7032b429ff13eaa80 100644
--- a/src/plugins/coreplugin/dialogs/iwizard.cpp
+++ b/src/plugins/coreplugin/dialogs/iwizard.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #include "iwizard.h"
-#include "icore.h"
-#include "featureprovider.h"
+#include <coreplugin/icore.h>
+#include <coreplugin/featureprovider.h>
 
 #include <extensionsystem/pluginmanager.h>
 
diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
index 7ce8378dde8907cce22fb12873718a14753f177c..9c2350c3218b144c68447738d7b2982d9d949d80 100644
--- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 
-#include "fileiconprovider.h"
 #include "readonlyfilesdialog.h"
 #include "ui_readonlyfilesdialog.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/iversioncontrol.h>
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 97f37e0d9669226de968388689f25d6a5acfa015..bb6783bcda1e1cc8193019cfa590843c979adcb4 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -29,7 +29,7 @@
 
 #include "settingsdialog.h"
 
-#include "icore.h"
+#include <coreplugin/icore.h>
 
 #include <extensionsystem/pluginmanager.h>
 #include <utils/hostosinfo.h>
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 60fb4a89a632a9d41aa0d4eb0d4c046257f3c333..26aebb407da5941f1cb0671388706013d568ab5a 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -28,14 +28,14 @@
 ****************************************************************************/
 
 #include "shortcutsettings.h"
-#include "actionmanager/actionmanager.h"
-#include "actionmanager/command.h"
-#include "command_p.h"
-#include "commandsfile.h"
-#include "coreconstants.h"
-#include "documentmanager.h"
-#include "icore.h"
-#include "id.h"
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/documentmanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/id.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/command_p.h>
+#include <coreplugin/actionmanager/commandsfile.h>
 
 #include <QKeyEvent>
 #include <QFileDialog>
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index 91636da98fa6abfb9d0b974dd0ab29bcc12ef36e..ee56bb55938aeed219a49a9a2bab9a71168d75a0 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -29,17 +29,17 @@
 
 #include "documentmanager.h"
 
-#include "editormanager.h"
 #include "icore.h"
-#include "ieditor.h"
-#include "ieditorfactory.h"
-#include "iexternaleditor.h"
 #include "idocument.h"
 #include "mimedatabase.h"
-#include "saveitemsdialog.h"
 #include "coreconstants.h"
 
-#include "dialogs/readonlyfilesdialog.h"
+#include <coreplugin/dialogs/readonlyfilesdialog.h>
+#include <coreplugin/dialogs/saveitemsdialog.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/editormanager/ieditorfactory.h>
+#include <coreplugin/editormanager/iexternaleditor.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index ce77f78c6930cd4243e98062b4898e22aedd44ad..7eae0447312fcdd3ce36531d38e936df29063c14 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -28,14 +28,14 @@
 ****************************************************************************/
 
 #include "editmode.h"
-#include "editormanager.h"
 #include "coreconstants.h"
 #include "modemanager.h"
 #include "minisplitter.h"
 #include "outputpane.h"
 #include "navigationwidget.h"
 #include "rightpane.h"
-#include "ieditor.h"
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <QLatin1String>
 #include <QHBoxLayout>
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp
index 5de2ef54f71c3e65888a944179583258677061cc..737b2fc5faacdb07a4dc6f94653b2ba37a38c7a3 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp
@@ -29,7 +29,7 @@
 
 #include "documentmodel.h"
 #include "ieditor.h"
-#include "idocument.h"
+#include <coreplugin/idocument.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 19bc92c9448efa9d93837054b63bff789119c31a..b75a9ab6c36e462c067720d297aedd53aea5801d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -29,34 +29,34 @@
 
 #include "editormanager.h"
 #include "editorview.h"
-#include "findplaceholder.h"
 #include "openeditorswindow.h"
 #include "openeditorsview.h"
 #include "documentmodel.h"
-#include "openwithdialog.h"
-#include "outputpane.h"
-#include "outputpanemanager.h"
-#include "rightpane.h"
-#include "documentmanager.h"
-#include "icore.h"
 #include "ieditor.h"
-#include "iversioncontrol.h"
-#include "mimedatabase.h"
-#include "vcsmanager.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/dialogs/openwithdialog.h>
+#include <coreplugin/dialogs/readonlyfilesdialog.h>
+#include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 #include <coreplugin/editormanager/iexternaleditor.h>
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/fileutils.h>
+#include <coreplugin/findplaceholder.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/icorelistener.h>
 #include <coreplugin/infobar.h>
+#include <coreplugin/iversioncontrol.h>
+#include <coreplugin/mimedatabase.h>
 #include <coreplugin/modemanager.h>
+#include <coreplugin/outputpane.h>
+#include <coreplugin/outputpanemanager.h>
+#include <coreplugin/rightpane.h>
 #include <coreplugin/settingsdatabase.h>
 #include <coreplugin/variablemanager.h>
-#include <coreplugin/dialogs/readonlyfilesdialog.h>
+#include <coreplugin/vcsmanager.h>
 
 #include <extensionsystem/pluginmanager.h>
 
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 5d0931a8bfcc3d27b85269d6fd50813f4e703542..ce25cf04a8f2d441dbd39a4868b6da2ba54c6291 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -29,13 +29,13 @@
 
 #include "editorview.h"
 #include "editormanager.h"
-#include "icore.h"
-#include "minisplitter.h"
 #include "documentmodel.h"
 
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/infobar.h>
+#include <coreplugin/minisplitter.h>
 #include <coreplugin/editormanager/ieditor.h>
 
 #include <coreplugin/findplaceholder.h>
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index 21dc7b87228e6db08ae642cf48aec10797789d16..19693e9820f1ebec84539b52d56f394e5b11b39a 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -31,7 +31,7 @@
 #include "documentmodel.h"
 #include "editormanager.h"
 #include "editorview.h"
-#include "idocument.h"
+#include <coreplugin/idocument.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp
index 5e77f4aa3dcc79f033f5b6aba22d760882834b6c..f2424f359c7dd884d4f6c4948775021a94ceddc5 100644
--- a/src/plugins/coreplugin/editormanager/systemeditor.cpp
+++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "systemeditor.h"
-#include "id.h"
+#include <coreplugin/id.h>
 
 #include <QStringList>
 #include <QUrl>
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 004a2d234c2a73ae5980f6ec8e866d392a00ba17..35f47b4c04afdf99d19542846ad30de3de39d811 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -28,32 +28,21 @@
 ****************************************************************************/
 
 #include "mainwindow.h"
-#include "actioncontainer.h"
-#include "command.h"
-#include "actionmanager.h"
-#include "actionmanager_p.h"
 #include "icore.h"
 #include "coreconstants.h"
-#include "editormanager.h"
 #include "toolsettings.h"
 #include "mimetypesettings.h"
 #include "fancytabwidget.h"
 #include "documentmanager.h"
 #include "generalsettings.h"
 #include "helpmanager.h"
-#include "ieditor.h"
 #include "idocumentfactory.h"
 #include "messagemanager.h"
 #include "modemanager.h"
 #include "mimedatabase.h"
-#include "newdialog.h"
 #include "outputpanemanager.h"
 #include "plugindialog.h"
-#include "progressmanager_p.h"
-#include "progressview.h"
-#include "shortcutsettings.h"
 #include "vcsmanager.h"
-#include "settingsdialog.h"
 #include "variablemanager.h"
 #include "versiondialog.h"
 #include "statusbarmanager.h"
@@ -71,8 +60,19 @@
 #endif
 
 #include <app/app_version.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/actionmanager_p.h>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/dialogs/newdialog.h>
+#include <coreplugin/dialogs/settingsdialog.h>
+#include <coreplugin/dialogs/shortcutsettings.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icorelistener.h>
 #include <coreplugin/inavigationwidgetfactory.h>
+#include <coreplugin/progressmanager/progressmanager_p.h>
+#include <coreplugin/progressmanager/progressview.h>
 #include <coreplugin/settingsdatabase.h>
 #include <utils/historycompleter.h>
 #include <utils/hostosinfo.h>
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index 742e1a2db071635866c87bab1a3e27ddea3543ab..61a079cd92642c0bab4aaefb27250de8511444ae 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -28,14 +28,14 @@
 ****************************************************************************/
 
 #include "coreconstants.h"
-#include "editormanager.h"
 #include "icore.h"
-#include "ieditorfactory.h"
-#include "iexternaleditor.h"
 #include "mimedatabase.h"
 #include "mimetypemagicdialog.h"
 #include "mimetypesettings.h"
 #include "ui_mimetypesettingspage.h"
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditorfactory.h>
+#include <coreplugin/editormanager/iexternaleditor.h>
 
 #include <QAbstractTableModel>
 #include <QCoreApplication>
diff --git a/src/plugins/coreplugin/mimetypesettings.h b/src/plugins/coreplugin/mimetypesettings.h
index 485068167b2e81cb38702ba88e3d733f17a922c0..19908aeeb65a91f9e7a608966d3d42efa5d795a7 100644
--- a/src/plugins/coreplugin/mimetypesettings.h
+++ b/src/plugins/coreplugin/mimetypesettings.h
@@ -30,7 +30,7 @@
 #ifndef MIMETYPESETTINGSPAGE_H
 #define MIMETYPESETTINGSPAGE_H
 
-#include "ioptionspage.h"
+#include <coreplugin/dialogs/ioptionspage.h>
 
 namespace Core {
 namespace Internal {
diff --git a/src/plugins/coreplugin/textdocument.cpp b/src/plugins/coreplugin/textdocument.cpp
index 4f2bdf0b2333b1d1dfdb6613f670cfb73feeaad1..e210cbb6a26aa912100c6278ddc0cf010d7b99b2 100644
--- a/src/plugins/coreplugin/textdocument.cpp
+++ b/src/plugins/coreplugin/textdocument.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "textdocument.h"
-#include "editormanager.h"
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <QDebug>
 #include <QTextCodec>
diff --git a/src/plugins/coreplugin/toolsettings.h b/src/plugins/coreplugin/toolsettings.h
index 89bd4d680ad7f77e65699c7cf7a2307c99566aa9..c161436de98b2d49076112aaeb8625cdb1794f8a 100644
--- a/src/plugins/coreplugin/toolsettings.h
+++ b/src/plugins/coreplugin/toolsettings.h
@@ -30,7 +30,7 @@
 #ifndef TOOLSETTINGS_H
 #define TOOLSETTINGS_H
 
-#include "ioptionspage.h"
+#include <coreplugin/dialogs/ioptionspage.h>
 
 #include <QPointer>
 
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index 0fe9543f4b744bf04212b872cd99b3be9a430a1a..4a92abc289be114c5b0201ed71713b7ccf8a3179 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -31,12 +31,12 @@
 #include "iversioncontrol.h"
 #include "icore.h"
 #include "documentmanager.h"
-#include "editormanager.h"
-#include "ieditor.h"
 #include "idocument.h"
 #include "infobar.h"
 
-#include "addtovcsdialog.h"
+#include <coreplugin/dialogs/addtovcsdialog.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <vcsbase/vcsbaseconstants.h>
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/cpaster/frontend/frontend.qbs b/src/plugins/cpaster/frontend/frontend.qbs
index 748e6a6d9683a1318f7fb0f349f58d49728ad527..70be0e9f00c3813e4624259003295443350a6f69 100644
--- a/src/plugins/cpaster/frontend/frontend.qbs
+++ b/src/plugins/cpaster/frontend/frontend.qbs
@@ -9,8 +9,8 @@ QtcTool {
         submodules: ["gui", "network"]
     }
     Depends { name: "Core" }
+    Depends { name: "CppTools" }
 
-    cpp.includePaths: ["../../"]
     cpp.rpaths: [
         "$ORIGIN/../lib/qtcreator",
         "$ORIGIN/../lib/qtcreator/plugins",
diff --git a/src/plugins/cpaster/pasteview.ui b/src/plugins/cpaster/pasteview.ui
index 714826778a80988deb0cd970447252a1f3c34991..aa7675fb0a6c2b85d3b436c35635ea1a3dc9616e 100644
--- a/src/plugins/cpaster/pasteview.ui
+++ b/src/plugins/cpaster/pasteview.ui
@@ -216,7 +216,7 @@ p, li { white-space: pre-wrap; }
   <customwidget>
    <class>CodePaster::ColumnIndicatorTextEdit</class>
    <extends>QTextEdit</extends>
-   <header>columnindicatortextedit.h</header>
+   <header location="global">cpaster/columnindicatortextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 96e685b12825551c039729e150d60f1f216fa655..8d9f0525a867105ce6f5dc65f0bea0302d3ef852 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -14,8 +14,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
 
-    cpp.includePaths: base.concat("../../libs/3rdparty")
-
     files: [
         "cppautocompleter.cpp",
         "cppautocompleter.h",
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri
index f1928c0b3c0d28f09f1d1bdc7b610e9c32fcfb80..2191c4150bf6f65b35cdd7e067595a5a8ffeaa0d 100644
--- a/src/plugins/debugger/cdb/cdb.pri
+++ b/src/plugins/debugger/cdb/cdb.pri
@@ -10,4 +10,3 @@ SOURCES += $$PWD/cdbengine.cpp \
 
 FORMS += cdb/cdboptionspagewidget.ui
 
-INCLUDEPATH*=$$PWD
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index aa9e36c28a2376f5181e789744cc57716f15780d..c9e894a443f9eb2216165ad75377f8deae175316 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -29,28 +29,29 @@
 
 #include "cdbengine.h"
 
-#include "breakhandler.h"
 #include "bytearrayinputstream.h"
 #include "cdboptionspage.h"
 #include "cdbparsehelpers.h"
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerprotocol.h"
-#include "debuggermainwindow.h"
-#include "debuggerstartparameters.h"
-#include "debuggertooltipmanager.h"
-#include "disassembleragent.h"
-#include "disassemblerlines.h"
-#include "memoryagent.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
-#include "stackhandler.h"
-#include "threadshandler.h"
-#include "watchhandler.h"
-#include "shared/cdbsymbolpathlisteditor.h"
-#include "shared/hostutils.h"
-#include "procinterrupt.h"
-#include "sourceutils.h"
+
+#include <debugger/breakhandler.h>
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggermainwindow.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggertooltipmanager.h>
+#include <debugger/disassembleragent.h>
+#include <debugger/disassemblerlines.h>
+#include <debugger/memoryagent.h>
+#include <debugger/moduleshandler.h>
+#include <debugger/registerhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/threadshandler.h>
+#include <debugger/watchhandler.h>
+#include <debugger/procinterrupt.h>
+#include <debugger/sourceutils.h>
+#include <debugger/shared/cdbsymbolpathlisteditor.h>
+#include <debugger/shared/hostutils.h>
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/taskhub.h>
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index 48af1aa464c433bf1210f61fd382792774605a07..097407c3f8ced8e0c9c533e3c0a65b3a2a90fb77 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -30,7 +30,7 @@
 #ifndef DEBUGGER_CDBENGINE_H
 #define DEBUGGER_CDBENGINE_H
 
-#include "debuggerengine.h"
+#include <debugger/debuggerengine.h>
 
 #include <QSharedPointer>
 #include <QProcess>
diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp
index 648a4cd746c0b8ae551c6021bc7ef28b240fb9d6..e3b6c4cd33fc1690403fa67f16e4fa0afcc76437 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.cpp
+++ b/src/plugins/debugger/cdb/cdboptionspage.cpp
@@ -28,12 +28,12 @@
 ****************************************************************************/
 
 #include "cdboptionspage.h"
-#include "commonoptionspage.h"
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerinternalconstants.h"
 #include "cdbengine.h"
-#include "cdbsymbolpathlisteditor.h"
+#include <debugger/commonoptionspage.h>
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerinternalconstants.h>
+#include <debugger/shared/cdbsymbolpathlisteditor.h>
 
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
index 755b3c61ec9e2c9b22e2679d949c2e7a6c57fd4b..b7ca47d66332ac936771758c55abe67119e13715 100644
--- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp
+++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
@@ -30,10 +30,11 @@
 #include "cdbparsehelpers.h"
 
 #include "bytearrayinputstream.h"
-#include "debuggerprotocol.h"
-#include "disassemblerlines.h"
-#include "shared/hostutils.h"
-#include "threaddata.h"
+
+#include <debugger/debuggerprotocol.h>
+#include <debugger/disassemblerlines.h>
+#include <debugger/shared/hostutils.h>
+#include <debugger/threaddata.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.h b/src/plugins/debugger/cdb/cdbparsehelpers.h
index 2d95fc89041c20e3a3b909d186ebbd4974b736e9..4d046f30fe7a30d698fb9fced923f5e7c56fdfea 100644
--- a/src/plugins/debugger/cdb/cdbparsehelpers.h
+++ b/src/plugins/debugger/cdb/cdbparsehelpers.h
@@ -30,7 +30,7 @@
 #ifndef CDBPARSEHELPERS_H
 #define CDBPARSEHELPERS_H
 
-#include "breakpoint.h"
+#include <debugger/breakpoint.h>
 
 #include <QPair>
 
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index f0b8ae0b34cb22b0913e296d16c679eb2d51c6b0..4b2a8c81fd43297fe0f3cd43a7b8f2e5d0c754c1 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -18,12 +18,7 @@ QtcPlugin {
     Depends { name: "QtcSsh" }
     Depends { name: "Utils" }
 
-    cpp.includePaths: base.concat([
-        "shared",
-        lldblib.prefix,
-        "../../shared/json",
-        "../../shared/registryaccess"
-    ])
+    cpp.includePaths: base.concat(["../../shared/registryaccess"])
 
     pluginRecommends: [
         "CppEditor"
@@ -283,6 +278,5 @@ QtcPlugin {
     Export {
         Depends { name: "cpp" }
         Depends { name: "QtcSsh" }
-        cpp.includePaths: ["."]
     }
 }
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index e6964d4a1f6618a69006fb968c1530562a5306f2..9822f193ce626770b9272cdc9dc25556539100c7 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -40,12 +40,12 @@
 #include "disassembleragent.h"
 #include "memoryagent.h"
 #include "moduleshandler.h"
-#include "peutils.h"
 #include "registerhandler.h"
 #include "sourcefileshandler.h"
 #include "stackhandler.h"
 #include "threadshandler.h"
 #include "watchhandler.h"
+#include <debugger/shared/peutils.h>
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 5aa338b1655fd0a0f2fa8990e880d3393f0d13e6..3e31fedcd74a9f682e4ae6eded644b3d61ac2a90 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -61,8 +61,8 @@
 #include "debuggertooltipmanager.h"
 #include "localsandexpressionswindow.h"
 #include "loadcoredialog.h"
-#include "hostutils.h"
 #include "sourceutils.h"
+#include <debugger/shared/hostutils.h>
 
 #include "snapshothandler.h"
 #include "threadshandler.h"
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index cc7588bd593bb681221fc973a11e56cac76f2cb5..fff5ba4ab6c74821713a21ac4d64c8e35f59f0e8 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -42,7 +42,7 @@
 #include "breakhandler.h"
 
 #ifdef Q_OS_WIN
-#  include "peutils.h"
+#  include "shared/peutils.h"
 #  include <utils/winutils.h>
 #endif
 
diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
index dc39a49f67180f331256f8f61eeb14357b334303..51e31ef8c2608be851bd47cbeaa5ca0801e286bb 100644
--- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
@@ -29,11 +29,11 @@
 
 #include "abstractplaingdbadapter.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index bd4cd516945490f9baddefda1a44cbcdf3eb9bfc..c9f577d58a6d7efb22b9026ebc13b7128c94a5a8 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -29,9 +29,9 @@
 
 #include "attachgdbadapter.h"
 
-#include "debuggerprotocol.h"
-#include "debuggerstringutils.h"
-#include "debuggerstartparameters.h"
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/debuggerstartparameters.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index baede63b5838b0bbbe0e872cc599b7ca859130fa..8e01de03d3e2b1a3fac91f02c4ed8382bbd58875 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/src/plugins/debugger/gdb/classicgdbengine.cpp
@@ -29,13 +29,13 @@
 
 #include "gdbengine.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
-#include "sourceutils.h"
-#include "stackhandler.h"
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/sourceutils.h>
+#include <debugger/stackhandler.h>
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp
index 7807f1567c03789f9fcedae72b4070494bad3ea1..ce66963e525d82a5271cc0ff2e17dd1b3de612cd 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.cpp
+++ b/src/plugins/debugger/gdb/coregdbadapter.cpp
@@ -29,10 +29,10 @@
 
 #include "coregdbadapter.h"
 
-#include "debuggercore.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index c8f0a628246b88f82bb35d23bf11babbc909ab9c..cf137270aafeb4143271834263e4905b273d2abe 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -29,10 +29,6 @@
 
 #include "gdbengine.h"
 
-#include "debuggerstartparameters.h"
-#include "debuggerinternalconstants.h"
-#include "debuggerruncontrolfactory.h"
-#include "disassemblerlines.h"
 #include "attachgdbadapter.h"
 #include "coregdbadapter.h"
 #include "localplaingdbadapter.h"
@@ -40,28 +36,34 @@
 #include "remotegdbserveradapter.h"
 #include "remoteplaingdbadapter.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggermainwindow.h"
-#include "debuggerplugin.h"
-#include "debuggerprotocol.h"
-#include "debuggerstringutils.h"
-#include "debuggertooltipmanager.h"
-#include "disassembleragent.h"
 #include "gdboptionspage.h"
-#include "memoryagent.h"
-#include "sourceutils.h"
-
-#include "breakhandler.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
-#include "sourcefileshandler.h"
-#include "stackhandler.h"
-#include "threadshandler.h"
-#include "debuggersourcepathmappingwidget.h"
-#include "hostutils.h"
-#include "logwindow.h"
-#include "procinterrupt.h"
+
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerinternalconstants.h>
+#include <debugger/debuggerruncontrolfactory.h>
+#include <debugger/disassemblerlines.h>
+
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggermainwindow.h>
+#include <debugger/debuggerplugin.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/debuggertooltipmanager.h>
+#include <debugger/disassembleragent.h>
+#include <debugger/memoryagent.h>
+#include <debugger/sourceutils.h>
+
+#include <debugger/breakhandler.h>
+#include <debugger/moduleshandler.h>
+#include <debugger/registerhandler.h>
+#include <debugger/sourcefileshandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/threadshandler.h>
+#include <debugger/debuggersourcepathmappingwidget.h>
+#include <debugger/logwindow.h>
+#include <debugger/procinterrupt.h>
+#include <debugger/shared/hostutils.h>
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/taskhub.h>
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index de3f99c4ac57137bf62b86be86fced1d2f190188..d41c6fcfafa69f8ffdc7582fd8ca7ce97673e213 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -30,10 +30,10 @@
 #ifndef DEBUGGER_GDBENGINE_H
 #define DEBUGGER_GDBENGINE_H
 
-#include "debuggerengine.h"
+#include <debugger/debuggerengine.h>
 
-#include "watchhandler.h"
-#include "watchutils.h"
+#include <debugger/watchhandler.h>
+#include <debugger/watchutils.h>
 
 #include <coreplugin/id.h>
 
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index 162abfdf10727bff09c0d5e59337af345f4d3922..a4a336418f5642c3608ce192668dba3e7ee208a0 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.cpp
+++ b/src/plugins/debugger/gdb/gdboptionspage.cpp
@@ -28,10 +28,10 @@
 ****************************************************************************/
 
 #include "gdboptionspage.h"
-#include "commonoptionspage.h"
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerinternalconstants.h"
+#include <debugger/commonoptionspage.h>
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerinternalconstants.h>
 
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/debugger/gdb/localgdbprocess.cpp b/src/plugins/debugger/gdb/localgdbprocess.cpp
index c14eef3a19857310075352aa3ab78568e53de682..f6ad006bbc59b7c20668918dbce93360c05eff4e 100644
--- a/src/plugins/debugger/gdb/localgdbprocess.cpp
+++ b/src/plugins/debugger/gdb/localgdbprocess.cpp
@@ -29,8 +29,8 @@
 
 #include "localgdbprocess.h"
 
-#include "procinterrupt.h"
-#include "debuggerconstants.h"
+#include <debugger/procinterrupt.h>
+#include <debugger/debuggerconstants.h>
 
 #include <utils/qtcprocess.h>
 
diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.cpp b/src/plugins/debugger/gdb/localplaingdbadapter.cpp
index ad68efbd178baf2ff9fe54a8c1d1aa86afcc4fd2..914a91673da5a24380e953eaf4a9e2109a215c4a 100644
--- a/src/plugins/debugger/gdb/localplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/localplaingdbadapter.cpp
@@ -29,8 +29,8 @@
 
 #include "localplaingdbadapter.h"
 
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.h b/src/plugins/debugger/gdb/localplaingdbadapter.h
index 7163b199f347ebab7b83b7d1e4cb41735ef327b1..6e600afbe5076f23f4b5c0258ae9be935042f202 100644
--- a/src/plugins/debugger/gdb/localplaingdbadapter.h
+++ b/src/plugins/debugger/gdb/localplaingdbadapter.h
@@ -32,7 +32,7 @@
 
 #include "abstractplaingdbadapter.h"
 #include "localgdbprocess.h"
-#include <outputcollector.h>
+#include <debugger/outputcollector.h>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 0963d1e9c1d20147f0378b450ebcc632462984fc..459b4ecfaa8d340a84264c9ba98183e80a8e016b 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -29,13 +29,13 @@
 
 #include "gdbengine.h"
 
-#include "debuggerprotocol.h"
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerstringutils.h"
-#include "debuggertooltipmanager.h"
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/debuggertooltipmanager.h>
 
-#include "stackhandler.h"
+#include <debugger/stackhandler.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 1761e5a89811c0a52922537b58361aa9e7cafbf3..f87d5978980d750dd11c68cf8a94761072ba4d9a 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -29,11 +29,11 @@
 
 #include "remotegdbserveradapter.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
index d97ac2370bc9ce21cad8b0070ccfb989619e878c..eb94b6f8a40e960b1fa2a3b7ec61d9d0d3b2bee7 100644
--- a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "remoteplaingdbadapter.h"
-#include "debuggerstartparameters.h"
+#include <debugger/debuggerstartparameters.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
index 78cb32de375fc1728ab560081648cd11ce83312a..ce04b6fbeeb6dfc15e58fa21aa12c33bd9d15f9d 100644
--- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp
+++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
@@ -29,11 +29,11 @@
 
 #include "startgdbserverdialog.h"
 
-#include "debuggermainwindow.h"
-#include "debuggerplugin.h"
-#include "debuggerkitinformation.h"
-#include "debuggerruncontrolfactory.h"
-#include "debuggerstartparameters.h"
+#include <debugger/debuggermainwindow.h>
+#include <debugger/debuggerplugin.h>
+#include <debugger/debuggerkitinformation.h>
+#include <debugger/debuggerruncontrolfactory.h>
+#include <debugger/debuggerstartparameters.h>
 
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/devicesupport/deviceprocesslist.h>
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index 65e783238ce3da1da81bc9858b3c6f4feb5f2061..48e5ef4378d4ab06ddfcc06dc58293fb93f2c345 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -29,11 +29,11 @@
 
 #include "termgdbadapter.h"
 
-#include "debuggercore.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
-#include "shared/hostutils.h"
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/shared/hostutils.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/lldb/lldb.pri b/src/plugins/debugger/lldb/lldb.pri
index 4d8fd071cb8febbc01d0924b1ad88b2886b6b9df..a60318a624750f9deb6d2a876afc0aaa768d53e6 100644
--- a/src/plugins/debugger/lldb/lldb.pri
+++ b/src/plugins/debugger/lldb/lldb.pri
@@ -1,5 +1,3 @@
 HEADERS += $$PWD/lldbengine.h
 
 SOURCES += $$PWD/lldbengine.cpp
-
-INCLUDEPATH *= $$PWD
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 020dfc669f736f3b72942e6e3becb9caf0213777..88c232809c9b69ba267bc5737610490e028a9b9e 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -29,24 +29,24 @@
 
 #include "lldbengine.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerdialogs.h"
-#include "debuggerplugin.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
-#include "debuggertooltipmanager.h"
-
-#include "breakhandler.h"
-#include "disassemblerlines.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
-#include "stackhandler.h"
-#include "sourceutils.h"
-#include "threadshandler.h"
-#include "watchhandler.h"
-#include "watchutils.h"
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerdialogs.h>
+#include <debugger/debuggerplugin.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/debuggertooltipmanager.h>
+
+#include <debugger/breakhandler.h>
+#include <debugger/disassemblerlines.h>
+#include <debugger/moduleshandler.h>
+#include <debugger/registerhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/sourceutils.h>
+#include <debugger/threadshandler.h>
+#include <debugger/watchhandler.h>
+#include <debugger/watchutils.h>
 
 #include <utils/qtcassert.h>
 #include <utils/savedaction.h>
diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h
index ff239aeee30785e330f69a113546d6e61903495c..aa8d445074749d0a7af406d77e5bd9e9604cb16b 100644
--- a/src/plugins/debugger/lldb/lldbengine.h
+++ b/src/plugins/debugger/lldb/lldbengine.h
@@ -30,9 +30,9 @@
 #ifndef DEBUGGER_LLDBENGINE
 #define DEBUGGER_LLDBENGINE
 
-#include "debuggerengine.h"
-#include "disassembleragent.h"
-#include "memoryagent.h"
+#include <debugger/debuggerengine.h>
+#include <debugger/disassembleragent.h>
+#include <debugger/memoryagent.h>
 
 #include <QPointer>
 #include <QProcess>
diff --git a/src/plugins/debugger/lldblib/ipcengineguest.h b/src/plugins/debugger/lldblib/ipcengineguest.h
index 88442a67ca5153307545fe7e62dc05a2f755e5a9..505328aa85e6e4034aa753764e0fb689cefc9b77 100644
--- a/src/plugins/debugger/lldblib/ipcengineguest.h
+++ b/src/plugins/debugger/lldblib/ipcengineguest.h
@@ -30,11 +30,11 @@
 #ifndef IPCENGINEGUEST_H
 #define IPCENGINEGUEST_H
 
-#include "breakhandler.h"
-#include "debuggerengine.h"
-#include "disassemblerlines.h"
-#include "stackhandler.h"
-#include "threadshandler.h"
+#include <debugger/breakhandler.h>
+#include <debugger/debuggerengine.h>
+#include <debugger/disassemblerlines.h>
+#include <debugger/stackhandler.h>
+#include <debugger/threadshandler.h>
 
 #include <QQueue>
 #include <QThread>
diff --git a/src/plugins/debugger/lldblib/ipcenginehost.cpp b/src/plugins/debugger/lldblib/ipcenginehost.cpp
index 056293991637c55653c9812040cc57f6f3e24908..da48218ee3e86d0505770c9a761a3fce4aca9dca 100644
--- a/src/plugins/debugger/lldblib/ipcenginehost.cpp
+++ b/src/plugins/debugger/lldblib/ipcenginehost.cpp
@@ -30,20 +30,20 @@
 #include "ipcenginehost.h"
 
 #include "ipcengineguest.h"
-#include "debuggerstartparameters.h"
-#include "breakhandler.h"
-#include "breakpoint.h"
-#include "disassemblerlines.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
-#include "stackhandler.h"
-#include "watchhandler.h"
-#include "watchutils.h"
-#include "threadshandler.h"
-#include "disassembleragent.h"
-#include "memoryagent.h"
-#include "debuggerstreamops.h"
-#include "debuggercore.h"
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/breakhandler.h>
+#include <debugger/breakpoint.h>
+#include <debugger/disassemblerlines.h>
+#include <debugger/moduleshandler.h>
+#include <debugger/registerhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/watchhandler.h>
+#include <debugger/watchutils.h>
+#include <debugger/threadshandler.h>
+#include <debugger/disassembleragent.h>
+#include <debugger/memoryagent.h>
+#include <debugger/debuggerstreamops.h>
+#include <debugger/debuggercore.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/lldblib/ipcenginehost.h b/src/plugins/debugger/lldblib/ipcenginehost.h
index 8364d50657846d9a13b1fbfc9cb8bed4ce760b65..92f847ca445a251fc4e9cb5af9a9b7229dc1e511 100644
--- a/src/plugins/debugger/lldblib/ipcenginehost.h
+++ b/src/plugins/debugger/lldblib/ipcenginehost.h
@@ -30,11 +30,11 @@
 #ifndef DEBUGGER_IPCENGINE_HOST_H
 #define DEBUGGER_IPCENGINE_HOST_H
 
-#include "debuggerengine.h"
-#include "threadshandler.h"
-#include "stackhandler.h"
-#include "breakhandler.h"
-#include "sourceagent.h"
+#include <debugger/debuggerengine.h>
+#include <debugger/threadshandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/breakhandler.h>
+#include <debugger/sourceagent.h>
 
 #include <QQueue>
 #include <QVariant>
diff --git a/src/plugins/debugger/lldblib/lldbenginehost.cpp b/src/plugins/debugger/lldblib/lldbenginehost.cpp
index 9b622057b52cded37234da3e4af7105ee23aebae..538ba66e12828cb18d3b22358de4e930fe273371 100644
--- a/src/plugins/debugger/lldblib/lldbenginehost.cpp
+++ b/src/plugins/debugger/lldblib/lldbenginehost.cpp
@@ -29,23 +29,23 @@
 
 #include "lldbenginehost.h"
 
-#include "debuggerstartparameters.h"
-#include "debuggeractions.h"
-#include "debuggerconstants.h"
-#include "debuggerdialogs.h"
-#include "debuggerplugin.h"
-#include "debuggerstringutils.h"
-
-#include "breakhandler.h"
-#include "breakpoint.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
-#include "stackhandler.h"
-#include "watchhandler.h"
-#include "watchutils.h"
-#include "threadshandler.h"
-#include "disassembleragent.h"
-#include "memoryagent.h"
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggerconstants.h>
+#include <debugger/debuggerdialogs.h>
+#include <debugger/debuggerplugin.h>
+#include <debugger/debuggerstringutils.h>
+
+#include <debugger/breakhandler.h>
+#include <debugger/breakpoint.h>
+#include <debugger/moduleshandler.h>
+#include <debugger/registerhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/watchhandler.h>
+#include <debugger/watchutils.h>
+#include <debugger/threadshandler.h>
+#include <debugger/disassembleragent.h>
+#include <debugger/memoryagent.h>
 
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/lldblib/lldboptionspage.cpp b/src/plugins/debugger/lldblib/lldboptionspage.cpp
index 19b4591b84ba68b47b8d5901a24ac179edeceb9f..e774b9581f2f4f3bcccbff2138e3013fe6ae32fb 100644
--- a/src/plugins/debugger/lldblib/lldboptionspage.cpp
+++ b/src/plugins/debugger/lldblib/lldboptionspage.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #include "lldboptionspage.h"
-#include "debuggerconstants.h"
-#include "debuggerinternalconstants.h"
+#include <debugger/debuggerconstants.h>
+#include <debugger/debuggerinternalconstants.h>
 
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 8ff71c8d9e399d77aa2e1aae71879a46b1bb79cb..d244bd37399bc07b622f6ff4f7d88d4f2d4d6059 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -29,22 +29,22 @@
 
 #include "pdbengine.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerdialogs.h"
-#include "debuggerplugin.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "debuggerstringutils.h"
-#include "debuggertooltipmanager.h"
-
-#include "breakhandler.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
-#include "stackhandler.h"
-#include "sourceutils.h"
-#include "watchhandler.h"
-#include "watchutils.h"
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerdialogs.h>
+#include <debugger/debuggerplugin.h>
+#include <debugger/debuggerprotocol.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/debuggertooltipmanager.h>
+
+#include <debugger/breakhandler.h>
+#include <debugger/moduleshandler.h>
+#include <debugger/registerhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/sourceutils.h>
+#include <debugger/watchhandler.h>
+#include <debugger/watchutils.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h
index 356b38f7f3759a88002a088f23303dc529096b55..556729f6c7d0a142c96eeb539bf5237d59cc5928 100644
--- a/src/plugins/debugger/pdb/pdbengine.h
+++ b/src/plugins/debugger/pdb/pdbengine.h
@@ -30,7 +30,7 @@
 #ifndef DEBUGGER_PDBENGINE_H
 #define DEBUGGER_PDBENGINE_H
 
-#include "debuggerengine.h"
+#include <debugger/debuggerengine.h>
 
 #include <QProcess>
 #include <QQueue>
diff --git a/src/plugins/debugger/qml/baseqmldebuggerclient.h b/src/plugins/debugger/qml/baseqmldebuggerclient.h
index 9aa85a57f8a3cd5fb0ceda970c54dbd216182ad0..f356139e77d0697ff4d516ae309b0079d39394cd 100644
--- a/src/plugins/debugger/qml/baseqmldebuggerclient.h
+++ b/src/plugins/debugger/qml/baseqmldebuggerclient.h
@@ -30,7 +30,7 @@
 #ifndef BASEQMLDEBUGGERCLIENT_H
 #define BASEQMLDEBUGGERCLIENT_H
 
-#include "debuggerengine.h"
+#include <debugger/debuggerengine.h>
 #include <qmldebug/qmldebugclient.h>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index a5c5810c20c18ff0d75d9174d40d438ec6929c5c..ef7a7434d353c209bbfa264c56c4a74948f685c4 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -29,7 +29,7 @@
 
 #include "qmladapter.h"
 
-#include "debuggerstringutils.h"
+#include <debugger/debuggerstringutils.h>
 #include "qmlengine.h"
 #include "qmlv8debuggerclient.h"
 #include "qscriptdebuggerclient.h"
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 387548a156c908e2812dfbbc2f09b5f7cfa1979e..f473e55d87c36ef88e00b792c43afeddde8d505f 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 #include "qmlcppengine.h"
-#include "debuggerruncontrolfactory.h"
-#include "debuggerstartparameters.h"
-#include "stackhandler.h"
 #include "qmlengine.h"
-#include "watchhandler.h"
+#include <debugger/debuggerruncontrolfactory.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/stackhandler.h>
+#include <debugger/watchhandler.h>
 
 #include <utils/qtcassert.h>
 #include <texteditor/itexteditor.h>
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index c0a0226782d1e85206a28cdaa4456929a6dd3ac2..761194f74d0abe6bd506a17770a125285c2e0fc5 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -30,7 +30,7 @@
 #ifndef QMLCPPENGINE_H
 #define QMLCPPENGINE_H
 
-#include "debuggerengine.h"
+#include <debugger/debuggerengine.h>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index a4d62a3385398cc7002978285ff736d3775a3df5..7c33d83f5948efad3779f180b91a8a65bbb88310 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -31,21 +31,21 @@
 #include "baseqmldebuggerclient.h"
 #include "qmlinspectoragent.h"
 
-#include "debuggerstartparameters.h"
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerinternalconstants.h"
-#include "debuggermainwindow.h"
-#include "debuggerrunner.h"
-#include "debuggerstringutils.h"
-#include "debuggertooltipmanager.h"
-#include "localsandexpressionswindow.h"
-#include "watchwindow.h"
-
-#include "breakhandler.h"
-#include "stackhandler.h"
-#include "watchhandler.h"
-#include "sourcefileshandler.h"
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerinternalconstants.h>
+#include <debugger/debuggermainwindow.h>
+#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/debuggertooltipmanager.h>
+#include <debugger/localsandexpressionswindow.h>
+#include <debugger/watchwindow.h>
+
+#include <debugger/breakhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/watchhandler.h>
+#include <debugger/sourcefileshandler.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 4eb3807819a42b00e58683124b3378f944f035b3..d9b5cd0b84bcb68c9034f3198c4879f595224250 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -30,10 +30,10 @@
 #ifndef QMLENGINE_H
 #define QMLENGINE_H
 
-#include "debuggerengine.h"
 #include "interactiveinterpreter.h"
 #include "qmladapter.h"
 #include "qmlinspectoradapter.h"
+#include <debugger/debuggerengine.h>
 
 #include <projectexplorer/applicationlauncher.h>
 #include <qmldebug/qdebugmessageclient.h>
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.cpp b/src/plugins/debugger/qml/qmlinspectoradapter.cpp
index 37650cd8a7302eb7c4857da9738f1da61f9dbeba..57ddb45cb02314ad12436411b97934431bfc9ba5 100644
--- a/src/plugins/debugger/qml/qmlinspectoradapter.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoradapter.cpp
@@ -29,13 +29,13 @@
 
 #include "qmlinspectoradapter.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerstringutils.h"
 #include "qmladapter.h"
-#include "debuggerengine.h"
 #include "qmlinspectoragent.h"
 #include "qmllivetextpreview.h"
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/debuggerengine.h>
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h
index b94e37d542f0d1edb81072c19f269b9629755b45..1bdae26a76b74116f9e339c12cdf010a8b742260 100644
--- a/src/plugins/debugger/qml/qmlinspectoradapter.h
+++ b/src/plugins/debugger/qml/qmlinspectoradapter.h
@@ -30,7 +30,7 @@
 #ifndef QMLINSPECTORADAPTER_H
 #define QMLINSPECTORADAPTER_H
 
-#include "debuggerconstants.h"
+#include <debugger/debuggerconstants.h>
 
 #include <coreplugin/icontext.h>
 #include <qmldebug/qmldebugclient.h>
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp
index 8a65a59ab07fcb8881f4ad5edda1d5d9b05bfd3d..68974bf9d463595766115b49f9c14de0c42b492e 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp
@@ -29,11 +29,11 @@
 
 #include "qmlinspectoragent.h"
 
-#include "debuggeractions.h"
-#include "debuggercore.h"
-#include "debuggerengine.h"
-#include "debuggerstringutils.h"
-#include "watchhandler.h"
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerengine.h>
+#include <debugger/debuggerstringutils.h>
+#include <debugger/watchhandler.h>
 
 #include <qmldebug/qmldebugconstants.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index 52f1ce3a2cfefc5b799940065099b3a3b9d3a3eb..de8964a185fb898d95ada49f75b0f113883f6c81 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -29,14 +29,14 @@
 
 #include "qmlv8debuggerclient.h"
 #include "qmlv8debuggerclientconstants.h"
-#include "debuggerstringutils.h"
-
-#include "watchhandler.h"
-#include "breakhandler.h"
 #include "qmlengine.h"
-#include "stackhandler.h"
-#include "debuggercore.h"
-#include "debuggeractions.h"
+
+#include <debugger/debuggerstringutils.h>
+#include <debugger/watchhandler.h>
+#include <debugger/breakhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggeractions.h>
 
 #include <utils/qtcassert.h>
 #include <texteditor/basetexteditor.h>
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index 2910f895f3aefdea4c61e4e360e1c6ab61449e0e..e01d0e4f9c742df8f6b3a38feeda0613250bfe8d 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -28,12 +28,12 @@
 ****************************************************************************/
 #include "qscriptdebuggerclient.h"
 
-#include "watchhandler.h"
-#include "breakhandler.h"
 #include "qmlengine.h"
-#include "stackhandler.h"
-#include "debuggercore.h"
-#include "debuggerstringutils.h"
+#include <debugger/watchhandler.h>
+#include <debugger/breakhandler.h>
+#include <debugger/stackhandler.h>
+#include <debugger/debuggercore.h>
+#include <debugger/debuggerstringutils.h>
 
 #include <QFileInfo>
 #include <QMessageBox>
diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
index 617a7c2994d9f23f35af8aff92f1571ccc4af7e2..93e06d10b80e0349214c499596b3afa70ea2ac3a 100644
--- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
+++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
@@ -34,7 +34,7 @@
 #include <utils/pathchooser.h>
 #include <utils/checkablemessagebox.h>
 
-#include <symbolpathsdialog.h>
+#include "symbolpathsdialog.h"
 
 #include <QCheckBox>
 #include <QDir>
diff --git a/src/plugins/debugger/shared/shared.pri b/src/plugins/debugger/shared/shared.pri
index a0021f598bb640bc2d2ff467c24aa60b0c09347b..d4653455221da0884817ef61ad977a314baffdc6 100644
--- a/src/plugins/debugger/shared/shared.pri
+++ b/src/plugins/debugger/shared/shared.pri
@@ -10,8 +10,6 @@ HEADERS += $$PWD/backtrace.h \
            $$PWD/peutils.h \
     shared/symbolpathsdialog.h
 
-INCLUDEPATH += $$PWD
-
 win32-msvc* {
 #   For the Privilege manipulation functions in sharedlibraryinjector.cpp.
     LIBS += -ladvapi32
diff --git a/src/plugins/designer/cpp/cpp.pri b/src/plugins/designer/cpp/cpp.pri
index a30a79402287dc3ed2584fe1b080e0d9811d073c..690ca7fc9fff70185f69b4d6c690e9259429ee19 100644
--- a/src/plugins/designer/cpp/cpp.pri
+++ b/src/plugins/designer/cpp/cpp.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH+=$$PWD
-
 DEFINES+=CPP_ENABLED
 
 HEADERS+=$$PWD/formclasswizardpage.h \
diff --git a/src/plugins/designer/cpp/cppsettingspage.cpp b/src/plugins/designer/cpp/cppsettingspage.cpp
index 346c9167ca29954638f7190f0109d1d5e09fb3c2..cc24f2ca8984d514e41cf3692c83268feacfec30 100644
--- a/src/plugins/designer/cpp/cppsettingspage.cpp
+++ b/src/plugins/designer/cpp/cppsettingspage.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "cppsettingspage.h"
-#include "designerconstants.h"
+#include <designer/designerconstants.h>
 
 #include <QCoreApplication>
 #include <QTextStream>
diff --git a/src/plugins/designer/cpp/cppsettingspage.h b/src/plugins/designer/cpp/cppsettingspage.h
index 52fd6751cbe9f8c55ee37359fb3388d7dd1c4898..647c7d7d19e97cd09760d7d9dfb23f8f1696bacd 100644
--- a/src/plugins/designer/cpp/cppsettingspage.h
+++ b/src/plugins/designer/cpp/cppsettingspage.h
@@ -31,7 +31,7 @@
 #define CPPSETTINGSPAGE_H
 
 #include "ui_cppsettingspagewidget.h"
-#include "qtdesignerformclasscodegenerator.h"
+#include <designer/qtdesignerformclasscodegenerator.h>
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp
index 582318b54f5a407b87671b77dcf65150fc33ba59..2bc5fd27dde5b97523735ec0c2d124d71620e5be 100644
--- a/src/plugins/designer/cpp/formclasswizard.cpp
+++ b/src/plugins/designer/cpp/formclasswizard.cpp
@@ -29,8 +29,8 @@
 
 #include "formclasswizard.h"
 #include "formclasswizarddialog.h"
-#include "designerconstants.h"
-#include "qtdesignerformclasscodegenerator.h"
+#include <designer/designerconstants.h>
+#include <designer/qtdesignerformclasscodegenerator.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <cppeditor/cppeditorconstants.h>
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index 67c636044f72108fbf0bf8fbe03334367102d503..5d62e35ee9ad98802227bed98642fdb1aff0ff33 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -28,9 +28,9 @@
 ****************************************************************************/
 
 #include "formclasswizarddialog.h"
-#include "formtemplatewizardpage.h"
 #include "formclasswizardpage.h"
 #include "formclasswizardparameters.h"
+#include <designer/formtemplatewizardpage.h>
 
 #include <coreplugin/basefilewizard.h>
 
diff --git a/src/plugins/designer/cpp/formclasswizardparameters.cpp b/src/plugins/designer/cpp/formclasswizardparameters.cpp
index 78717c9b3d82b09acf9cbbf3a726a965a675d173..f64c097c95570bed03b6c4d9fa88263d6e242a0c 100644
--- a/src/plugins/designer/cpp/formclasswizardparameters.cpp
+++ b/src/plugins/designer/cpp/formclasswizardparameters.cpp
@@ -28,5 +28,5 @@
 ****************************************************************************/
 
 #include "formclasswizardparameters.h"
-#include "formtemplatewizardpage.h"
+#include <designer/formtemplatewizardpage.h>
 
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index 9ca41e110c5ed5b1894cef0aedf56fb6865e0b78..c0915e57fcc9385e85712348f8a5498e748835ce 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -4,8 +4,6 @@ include(../../qtcreatorplugin.pri)
 include(../../shared/designerintegrationv2/designerintegration.pri)
 include(cpp/cpp.pri)
 
-INCLUDEPATH += ../../tools/utils
-
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += printsupport designer designercomponents-private
 } else {
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index ee07ff326740c8e774ff9da7ec5c96ea75c4c226..e0d27b7a4a62ea84c9680e9ec60371fc6053d115 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -16,7 +16,6 @@ QtcPlugin {
 
     cpp.defines: base.concat(["CPP_ENABLED"])
     cpp.includePaths: base.concat([
-        cppGroup.prefix,
         sharedSources.prefix
     ])
 
@@ -63,7 +62,6 @@ QtcPlugin {
 
     Group {
         name: "cpp"
-        id: cppGroup
         prefix: "cpp/"
         files: [
             "cppsettingspage.cpp", "cppsettingspage.h",
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index ce8bb2df7b4e899f248ff16a914ec4ce026dd24a..cc831566863217e5f0f08c0c1d72ae7fa11bbc8a 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -33,8 +33,8 @@
 #include "formwizard.h"
 
 #ifdef CPP_ENABLED
-#  include "formclasswizard.h"
-#  include "cppsettingspage.h"
+#  include "cpp/formclasswizard.h"
+#  include "cpp/cppsettingspage.h"
 #endif
 
 #include "settingspage.h"
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 7e31fcd2b45f81dd821b6ef07b5b4334acaaa306..699d5cd46f00e5fc55db2d4011014fb595c39ae5 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -29,10 +29,10 @@
 
 #include "qtcreatorintegration.h"
 #include "formwindoweditor.h"
-#include "formclasswizardpage.h"
 #include "formeditorw.h"
 #include "editordata.h"
 #include <widgethost.h>
+#include <designer/cpp/formclasswizardpage.h>
 
 #include <cpptools/cppmodelmanagerinterface.h>
 #include <cpptools/cpptoolsconstants.h>
diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
index 3ba68a498abf2d79c28257a9848f80114f50a781..fb08bfb1d87063665632fafa951cacf575acb68f 100644
--- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
+++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #include "qtdesignerformclasscodegenerator.h"
-#include "formclasswizardparameters.h"
 #include "formtemplatewizardpage.h"
+#include <designer/cpp/formclasswizardparameters.h>
 
 #include <utils/codegeneration.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index bcc177d707fb65fe76f96d6b86f666257bfe8b98..d9f653ae43a1c72ff91c4285bc6f0981c64a3b5b 100644
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -8,13 +8,6 @@ QtcPlugin {
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
     Depends { name: "Core" }
 
-    cpp.includePaths: base.concat([
-        "generichighlighter",
-        "tooltip",
-        "snippets",
-        "codeassist"
-    ])
-
     files: [
         "basetextfind.cpp",
         "basetextfind.h",
diff --git a/src/plugins/git/gerrit/gerrit.pri b/src/plugins/git/gerrit/gerrit.pri
index b06518ec5b2734aea93e447146129bb8f8fe4ec4..617cd941bf4e020f9f978a5e5c33e1c10dd8080b 100644
--- a/src/plugins/git/gerrit/gerrit.pri
+++ b/src/plugins/git/gerrit/gerrit.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 SOURCES += $$PWD/gerritdialog.cpp \
     $$PWD/gerritmodel.cpp \
     $$PWD/gerritparameters.cpp \
diff --git a/src/plugins/git/gitorious/gitorious.pri b/src/plugins/git/gitorious/gitorious.pri
index 8678042a26276c4f31393af41f31e926c7a2a9d7..ec285ed15a57e94410f1df890141b5ce9d676227 100644
--- a/src/plugins/git/gitorious/gitorious.pri
+++ b/src/plugins/git/gitorious/gitorious.pri
@@ -1,5 +1,4 @@
 QT += network
-INCLUDEPATH+=$$PWD
 
 HEADERS += $$PWD/gitoriousclonewizard.h \
            $$PWD/gitorioushostwizardpage.h \
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 9c236b80cbfeb24f3f28b7c7d6346850ce504068..1d3cd481ef26a766f879c3f596a07f8ecb9264eb 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
     Depends { name: "Locator" }
     Depends { name: "app_version_header" }
 
-
     cpp.defines: {
         var list = base;
         if (qtcore.versionMajor >= 5)
@@ -29,7 +28,8 @@ QtcPlugin {
         return list;
     }
 
-    cpp.includePaths: base.concat(sharedSources.prefix)
+    // We include headers from src/shared/help, and their sources include headers from here...
+    cpp.includePaths: base.concat([sharedSources.prefix, path])
 
     Group {
         name: "Sources"
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index a40de132f260b7d7f083de82d00d9bd467b9d386..bf45c20b5aa71232bf2a09faac4afeaff4ee656a 100644
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -10,13 +10,6 @@ QtcPlugin {
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
     Depends { name: "Core" }
 
-    cpp.includePaths: base.concat([
-        "generichighlighter",
-        "tooltip",
-        "snippets",
-        "codeassist"
-    ])
-
     files: [
         "basefilefilter.cpp",
         "basefilefilter.h",
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index 8d4478d6263c2fef5bf84f674a799ff3e6b78f7d..b9dfe05c8b75d0d14bb4b02481901385c01f876d 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -30,9 +30,9 @@
 #include "customwizard.h"
 #include "customwizardparameters.h"
 #include "customwizardpage.h"
-#include "projectexplorer.h"
-#include "baseprojectwizarddialog.h"
 #include "customwizardscriptgenerator.h"
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/baseprojectwizarddialog.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.pri b/src/plugins/projectexplorer/customwizard/customwizard.pri
index 6b0066cbc650f2b0cb637f83ee3f5d9c468565b7..fa3cf931e250a09ef1d6d10281f8680b835833b0 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.pri
+++ b/src/plugins/projectexplorer/customwizard/customwizard.pri
@@ -1,4 +1,3 @@
-INCLUDEPATH *= $$PWD
 HEADERS += $$PWD/customwizard.h \
     $$PWD/customwizardparameters.h \
     $$PWD/customwizardpage.h \
diff --git a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
index 750ac8f32ffa04b5b97bbcb591f1b03bc254b372..01d90f53e45e5b4fe26b684ce03fe06511d0f78b 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
@@ -29,7 +29,7 @@
 
 #include "customwizardpreprocessor.h"
 #ifdef WITH_TESTS
-#  include "projectexplorer.h"
+#  include "../projectexplorer.h"
 #  include <QTest>
 #endif
 
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
index d0e7643e6d2d4907d6aca14cbe14782f217f8237..90c6aa8f20672621ad81adad9ca1345a5a831543 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 #include "desktopdevice.h"
-#include "projectexplorerconstants.h"
 #include "desktopdeviceprocess.h"
 #include "deviceprocesslist.h"
 #include "localprocesslist.h"
 #include "desktopdeviceconfigurationwidget.h"
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <ssh/sshconnection.h>
 #include <utils/portlist.h>
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
index 19120a46ef3effe4d427ccec66eaa27dd20c49b8..155f59e78dac88614aaa7ae0a09b60c939864c20 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
@@ -29,7 +29,7 @@
 
 #include "desktopdeviceconfigurationwidget.h"
 #include "ui_desktopdeviceconfigurationwidget.h"
-#include "projectexplorerconstants.h"
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp
index 24e01d9336396db94ae6c7964d7fa832c9be780b..ca2817dcb68ce9f8f85de44d18973028c9b704c3 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp
@@ -29,7 +29,7 @@
 
 #include "desktopdevicefactory.h"
 #include "desktopdevice.h"
-#include "projectexplorerconstants.h"
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 06cb6ecccf040006adaf6f9734cd32b609b304d1..4e9f139ba6aa9152fa6ed1f7825318d8d8fdd557 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -413,7 +413,7 @@ IDevice::ConstPtr DeviceManager::fromRawPointer(const IDevice *device) const
 
 
 #ifdef WITH_TESTS
-#include "projectexplorer.h"
+#include <projectexplorer/projectexplorer.h>
 #include <QSignalSpy>
 #include <QTest>
 #include <QUuid>
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
index fc94043b6f5465eff33f7d2745ed1b40d3a8ca45..1b13f5d561c8a00d49f1d4ea607e29c9f3fc3ddd 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#include "devicesupport/deviceprocessesdialog.h"
-#include "devicesupport/deviceprocesslist.h"
-#include "kitchooser.h"
-#include "kitinformation.h"
+#include "deviceprocessesdialog.h"
+#include "deviceprocesslist.h"
+#include <projectexplorer/kitchooser.h>
+#include <projectexplorer/kitinformation.h>
 
 #include <utils/filterlineedit.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
index 2679225e397b9b55b63bf1d2cd0267d17b3bcbe5..432cfb339f46f0783a4693275469637c22139bc1 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
@@ -29,7 +29,6 @@
 #include "devicesettingswidget.h"
 #include "ui_devicesettingswidget.h"
 
-#include "projectexplorerconstants.h"
 #include "devicefactoryselectiondialog.h"
 #include "devicemanager.h"
 #include "devicemanagermodel.h"
@@ -38,6 +37,7 @@
 #include "idevice.h"
 #include "idevicefactory.h"
 #include "idevicewidget.h"
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
index f6974831659f9ce82f5bf9de6129c6c810e44a83..c953fb9a959963434c483bbb0300dddc98b0f62f 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
@@ -30,7 +30,7 @@
 #ifndef DEVICESETTINGSWIDGET_H
 #define DEVICESETTINGSWIDGET_H
 
-#include "devicesupport/idevice.h"
+#include "idevice.h"
 
 #include <QList>
 #include <QString>
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 08cf75b64ec03db1d87c3ec832a39f1abb9c62b2..a8daf6ebba14901420df3942de71c41bd42419d7 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -61,7 +61,6 @@
 #include "appoutputpane.h"
 #include "pluginfilefactory.h"
 #include "processstep.h"
-#include "customwizard.h"
 #include "kitinformation.h"
 #include "projectfilewizardextension.h"
 #include "projecttreewidget.h"
@@ -77,6 +76,7 @@
 #include "miniprojecttargetselector.h"
 #include "taskhub.h"
 #include "customtoolchain.h"
+#include <projectexplorer/customwizard/customwizard.h>
 #include "devicesupport/desktopdevice.h"
 #include "devicesupport/desktopdevicefactory.h"
 #include "devicesupport/devicemanager.h"
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index e788917991ee48943d1fe90cfd8cee6e2352f4e0..9959bd3b13e41a9a6bbd20ad1e9226f8a3716f5a 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -14,10 +14,6 @@ QtcPlugin {
     Depends { name: "QtcSsh" }
 
     cpp.defines: base.concat("QTC_CPU=X86Architecture")
-    cpp.includePaths: base.concat([
-        customWizard.prefix,
-        publishing.prefix
-    ])
     Properties {
         condition: qbs.targetOS.contains("osx")
         cpp.frameworks: base.concat(["Carbon"])
@@ -145,7 +141,6 @@ QtcPlugin {
 
     Group {
         name: "CustomWizard"
-        id: customWizard
         prefix: "customwizard/"
         files: [
             "customwizard.cpp", "customwizard.h",
@@ -237,7 +232,6 @@ QtcPlugin {
 
     Group {
         name: "Publishing"
-        id: publishing
         prefix: "publishing/"
         files: [
             "ipublishingwizardfactory.h",
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index 3faa2c603c147ec9b3c1cbe38a86224d5c9e3fd5..c27d603ab4449495d127a363fb8ce44fd1427a19 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -40,7 +40,7 @@
 #include <coreplugin/dialogs/iwizard.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/projectexplorer.h>
-#include <sessiondialog.h>
+#include <projectexplorer/sessiondialog.h>
 
 #ifdef Q_OS_WIN
 #include <utils/winutils.h>
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
index c0284b631526378dc6969274cd26276f9a81895c..0533f059ec24a1d5b85f5760420a89ffdf14a6e3 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
+++ b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
@@ -168,7 +168,7 @@
   <customwidget>
    <class>QbsPropertyLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>qbspropertylineedit.h</header>
+   <header location="global">qbsprojectmanager/qbspropertylineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 8e61109c0d4c5948638e19b821a337d4bfe8ee67..3f0adb21bbe050d238f591b52d04084b9aa8e4ec 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -17,8 +17,6 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "QtSupport" }
 
-    cpp.includePaths: base.concat("../../libs/3rdparty")
-
     files: [
         "QmlJSTools.mimetypes.xml",
         "qmljsbundleprovider.cpp",
diff --git a/src/plugins/qmlprofiler/canvas/canvas.pri b/src/plugins/qmlprofiler/canvas/canvas.pri
index 8b5621fb44297377c787115c266cf9c1fca4ee20..2960e94527b36b7e9674189539066290071d1790 100644
--- a/src/plugins/qmlprofiler/canvas/canvas.pri
+++ b/src/plugins/qmlprofiler/canvas/canvas.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += $$PWD/qdeclarativecontext2d_p.h \
            $$PWD/qdeclarativecanvas_p.h \
            $$PWD/qmlprofilercanvas.h \
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 168c8d90131d29f7a8dcf470b9b1367c64952b3b..82bf351cf8193921151fe3c6efcd6830f4d9404b 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -19,8 +19,6 @@ QtcPlugin {
     Depends { name: "QmlJSTools" }
     Depends { name: "CPlusPlus" }
 
-    cpp.includePaths: base.concat(canvasGroup.prefix)
-
     Group {
         name: "General"
         files: [
@@ -58,7 +56,6 @@ QtcPlugin {
 
     Group {
         name: "Canvas"
-        id: canvasGroup
         prefix: "canvas/"
         files: [
             "qdeclarativecanvas.cpp", "qdeclarativecanvas_p.h",
diff --git a/src/plugins/qnx/blackberryconfiguration.h b/src/plugins/qnx/blackberryconfiguration.h
index 7e860be16d81c5199ddd7c53cb7eab6aab2e3cb4..115ec5d7ff935807d9f19bb9832cdf9db7f7f02d 100644
--- a/src/plugins/qnx/blackberryconfiguration.h
+++ b/src/plugins/qnx/blackberryconfiguration.h
@@ -32,7 +32,7 @@
 #ifndef BLACKBERRYCONFIGURATIONS_H
 #define BLACKBERRYCONFIGURATIONS_H
 
-#include <qnxconstants.h>
+#include "qnxconstants.h"
 
 #include <utils/environment.h>
 #include <utils/fileutils.h>
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index c5c750d8d3e63de8dadad4917a64ea68ca3da2e9..3106ba474c2b8c2567acd5c3ad3742d941cf5f55 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -17,8 +17,6 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
-    cpp.includePaths: base.concat("../../shared")
-
     files: [
         "bardescriptordocument.cpp",
         "bardescriptordocument.h",
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
index 7f48f5e36a4cfed9b6ef4c87f8dcb0b962285bab..568467950d1d3ab69915aebe4b24ed97daa980fe 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
@@ -94,7 +94,7 @@
   <customwidget>
    <class>Qt4ProjectManager::Internal::ClassList</class>
    <extends>QListWidget</extends>
-   <header>classlist.h</header>
+   <header location="global">qt4projectmanager/customwidgetwizard/classlist.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri
index 488f9c30fb3a41e86375477745dd5a521c60774b..0a48d5b4bd0f0a6c1e1546b9d2f4aeb5405e8903 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri
@@ -1,4 +1,3 @@
-INCLUDEPATH *= $$PWD
 SOURCES += \
  $$PWD/plugingenerator.cpp \
  $$PWD/classlist.cpp \
diff --git a/src/plugins/qt4projectmanager/librarydetailswidget.ui b/src/plugins/qt4projectmanager/librarydetailswidget.ui
index 70f0186c78b7676c7a28c4cef282b8c217fe4814..bc18a5e18c5484fd47dac44a23aae7d09937c3ad 100644
--- a/src/plugins/qt4projectmanager/librarydetailswidget.ui
+++ b/src/plugins/qt4projectmanager/librarydetailswidget.ui
@@ -244,7 +244,7 @@
   <customwidget>
    <class>Qt4ProjectManager::Internal::LibraryPathChooser</class>
    <extends>QWidget</extends>
-   <header>addlibrarywizard.h</header>
+   <header location="global">qt4projectmanager/addlibrarywizard.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
index 41044dba9caa5768755c949e5304b47766d51f24..1527a4b52407b62d3c021fd6dd2ca70e16ac9c20 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
@@ -30,7 +30,7 @@
 #ifndef QT4RUNCONFIGURATION_H
 #define QT4RUNCONFIGURATION_H
 
-#include "qmakerunconfigurationfactory.h"
+#include <qt4projectmanager/qmakerunconfigurationfactory.h>
 
 #include <projectexplorer/localapplicationrunconfiguration.h>
 
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 25952b4be23dba13dd1aa3008dadb636539501b9..ecbdeb3a54fa95cf85136a700d69979da0b1dfea 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -16,11 +16,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "QmlJSTools" }
 
-    cpp.includePaths: base.concat([
-        customWidgetWizard.prefix,
-        "../../shared",
-    ])
-
     pluginRecommends: [
         "Designer"
     ]
@@ -66,7 +61,6 @@ QtcPlugin {
 
     Group {
         name: "Custom Widget Wizard"
-        id: customWidgetWizard
         prefix: "customwidgetwizard/"
         files: [
             "classdefinition.cpp", "classdefinition.h", "classdefinition.ui",
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index ac53c77a285c53a6522ab012056c756323be8c05..4fde9c23f751047580b8cdcae60a36bd61a3aeda 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -32,7 +32,7 @@
 #include "html5app.h"
 #include "html5appwizardpages.h"
 #include "targetsetuppage.h"
-#include "qt4projectmanagerconstants.h"
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
 
 #include <qtsupport/baseqtversion.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
index 65a791dc583ffc3e74d75e75e70677d8090315b6..5c772618bf1a06c35b4a56e381ac5539c6e81a98 100644
--- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
@@ -29,7 +29,7 @@
 
 #include "modulespage.h"
 
-#include "qtmodulesinfo.h"
+#include <qt4projectmanager/qtmodulesinfo.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 57c95752fbe05ad2f60627d8c83d4933cd5801dc..db7a983da413e2aca8a2b3ec12c298923bc51e41 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -32,7 +32,7 @@
 #include "qtquickapp.h"
 #include "qtquickappwizardpages.h"
 #include "targetsetuppage.h"
-#include "qt4projectmanagerconstants.h"
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
 
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/baseqtversion.h>
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index c6866fb51cbfdc526bc566d9f2c94a598a9d3020..ab736d24b2a4200a70ea1df7b2cb751668e22622 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -29,12 +29,13 @@
 
 #include "qtwizard.h"
 
-#include "qt4project.h"
-#include "qt4projectmanager.h"
-#include "qt4projectmanagerconstants.h"
 #include "modulespage.h"
 #include "targetsetuppage.h"
 
+#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qt4projectmanager.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
+
 #include <coreplugin/icore.h>
 
 #include <cpptools/cpptoolsconstants.h>
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 60a8438f094bf9f4e284cc333285fff02836adc9..2e09450664b12243cce331163b940842f4ac10a2 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -31,10 +31,10 @@
 #include "importwidget.h"
 #include "../qt4targetsetupwidget.h"
 
-#include "buildconfigurationinfo.h"
-#include "qt4buildconfiguration.h"
-#include "qt4project.h"
-#include "qmakekitinformation.h"
+#include <qt4projectmanager/buildconfigurationinfo.h>
+#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakekitinformation.h>
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 5af20a4fdf02a9b7ba931cc72f9e7fe953b8ef42..e09ef1d726ba0f205d69248969c3527511cb0619 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -14,7 +14,6 @@ QtcPlugin {
 
     cpp.includePaths: base.concat([
         "../../shared",
-        "../../shared/proparser"
     ])
 
     cpp.defines: base.concat([
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index d10ddc591be0a86443ea9a7b5acd419f57d6a1d0..b71135955d2b2fa947a80847c926f7c5df240ba5 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -1,8 +1,6 @@
 include(../../qtcreatorplugin.pri)
 include(qrceditor/qrceditor.pri)
 
-INCLUDEPATH += $$PWD/../../tools/utils
-
 HEADERS += resourceeditorfactory.h \
 resourceeditorplugin.h \
 resourcewizard.h \
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index d433d883b150193e2a34bcb888c316e356475e98..479b4b655290fddb88116398809c408fcef4c4aa 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -9,8 +9,6 @@ QtcPlugin {
     Depends { name: "Find" }
     Depends { name: "Qt"; submodules: ["widgets", "xml"] }
 
-    cpp.includePaths: base.concat(qrcEdtitor.prefix)
-
     Group {
         name: "General"
         files: [
@@ -25,7 +23,6 @@ QtcPlugin {
 
     Group {
         name: "QRC Editor"
-        id: qrcEdtitor
         prefix: "qrceditor/"
         files: [
             "qrceditor.cpp", "qrceditor.h", "qrceditor.ui",
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 652c2a71812a3e71f264d66f633e63f4b6a069f7..f81f7b2a82480cf74e384a2ac20b4d920eff6db0 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -31,7 +31,7 @@
 #include "resourceeditorplugin.h"
 #include "resourceeditorconstants.h"
 
-#include <qrceditor.h>
+#include <resourceeditor/qrceditor/qrceditor.h>
 
 #include <aggregation/aggregate.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index ea86ec3a20e41be58c984ce2943bc2d6a9f54d6f..a21959cdd67c837dda2f5a55ab2331680bfd0217 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -42,14 +42,13 @@
 #include "syntaxhighlighter.h"
 #include "indenter.h"
 #include "autocompleter.h"
-#include "snippet.h"
-#include "codeassistant.h"
-#include "defaultassistinterface.h"
 #include "convenience.h"
 #include "texteditorsettings.h"
 #include "texteditoroverlay.h"
 #include "circularclipboard.h"
 #include "circularclipboardassist.h"
+#include <texteditor/codeassist/codeassistant.h>
+#include <texteditor/codeassist/defaultassistinterface.h>
 
 #include <aggregation/aggregate.h>
 #include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
index b6c479b9c89e08700b0fda27ad7842a181ece4df..bc0dff70416a7767ca1ecfb04101d472013b46d1 100644
--- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
+++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
@@ -29,8 +29,8 @@
 
 #include "basicproposalitemlistmodel.h"
 #include "basicproposalitem.h"
-#include "texteditorsettings.h"
-#include "completionsettings.h"
+#include <texteditor/texteditorsettings.h>
+#include <texteditor/completionsettings.h>
 
 #include <QDebug>
 #include <QRegExp>
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
index 0540fb3de68518686ae0e292af468efe9d951a23..96fdc71b12c2ca1e54e30d3a59201bb79fd05252 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
@@ -33,9 +33,9 @@
 #include <texteditor/codeassist/genericproposal.h>
 #include <texteditor/codeassist/functionhintproposal.h>
 #include <texteditor/codeassist/basicproposalitemlistmodel.h>
-#include "completionsettings.h"
-#include "texteditorsettings.h"
-#include "basetexteditor.h"
+#include <texteditor/completionsettings.h>
+#include <texteditor/texteditorsettings.h>
+#include <texteditor/basetexteditor.h>
 
 using namespace TextEditor;
 
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index 4e27fc00a6450a4fb2caeaafd59e0b610ff353ae..529deccde6efc8fe0488d8b81d0385e7a0337d34 100644
--- a/src/plugins/texteditor/fontsettingspage.ui
+++ b/src/plugins/texteditor/fontsettingspage.ui
@@ -200,7 +200,7 @@
   <customwidget>
    <class>TextEditor::Internal::ColorSchemeEdit</class>
    <extends>QWidget</extends>
-   <header>colorschemeedit.h</header>
+   <header location="global">texteditor/colorschemeedit.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp
index 52b04074de5d48f2f2e24fa12288a9ad81c9b644..1a57836234032762c20dd49129b52a444fb4ddd3 100644
--- a/src/plugins/texteditor/generichighlighter/manager.cpp
+++ b/src/plugins/texteditor/generichighlighter/manager.cpp
@@ -33,10 +33,10 @@
 #include "highlighterexception.h"
 #include "definitiondownloader.h"
 #include "highlightersettings.h"
-#include "plaintexteditorfactory.h"
-#include "texteditorconstants.h"
-#include "texteditorplugin.h"
-#include "texteditorsettings.h"
+#include <texteditor/plaintexteditorfactory.h>
+#include <texteditor/texteditorconstants.h>
+#include <texteditor/texteditorplugin.h>
+#include <texteditor/texteditorsettings.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index 126da8a7cb84a21171ae92506609983e04821b51..649b5f3bf615db0adbfd71313e71336021924c97 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -32,13 +32,13 @@
 #include "texteditorplugin.h"
 #include "texteditorsettings.h"
 #include "basetextdocument.h"
-#include "highlightdefinition.h"
-#include "highlighter.h"
-#include "highlightersettings.h"
-#include "manager.h"
-#include "context.h"
 #include "normalindenter.h"
 #include "generichighlighter/highlighterutils.h"
+#include <texteditor/generichighlighter/context.h>
+#include <texteditor/generichighlighter/highlightdefinition.h>
+#include <texteditor/generichighlighter/highlighter.h>
+#include <texteditor/generichighlighter/highlightersettings.h>
+#include <texteditor/generichighlighter/manager.h>
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp
index 23c94fa6f10b32ef443a2e9a5bf01ebd0c18aa79..45bf15fe95e4ea647f1a6123dc0a51ed00ccf22b 100644
--- a/src/plugins/texteditor/snippets/snippet.cpp
+++ b/src/plugins/texteditor/snippets/snippet.cpp
@@ -273,7 +273,7 @@ Snippet::ParsedSnippet Snippet::parse(const QString &snippet)
 #ifdef WITH_TESTS
 #   include <QTest>
 
-#   include "texteditorplugin.h"
+#   include "../texteditorplugin.h"
 
 void Internal::TextEditorPlugin::testSnippetParsing_data()
 {
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index 0d51c6e6a85148cf02b26d037193fce39e66043c..723dbda61348e7cf5328beda216275c3e883ab21 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -3,9 +3,6 @@ QT += xml network
 CONFIG += exceptions
 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
 include(../../qtcreatorplugin.pri)
-INCLUDEPATH += generichighlighter \
-    snippets \
-    codeassist
 SOURCES += texteditorplugin.cpp \
     textfilewizard.cpp \
     plaintexteditor.cpp \
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index c954746fced110b0f579f3ba11a1875da5e842e8..637b756fbc0b4f0dc58369b28667fa8da6618bcb 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -10,13 +10,6 @@ QtcPlugin {
     Depends { name: "Find" }
     Depends { name: "Locator" }
 
-    cpp.includePaths: base.concat([
-        "generichighlighter",
-        "snippets",
-        "codeassist",
-        "."
-    ])
-
     files: [
         "autocompleter.cpp",
         "autocompleter.h",
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 5bd897625eb422be9da9fe68ca5700b93c212c77..f1ab8582acb755ccf2b31ca3a5f2dd4f0f5cec8e 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -38,10 +38,10 @@
 #include "textfilewizard.h"
 #include "plaintexteditorfactory.h"
 #include "plaintexteditor.h"
-#include "manager.h"
 #include "outlinefactory.h"
 #include "snippets/plaintextsnippetprovider.h"
 #include "basetextmarkregistry.h"
+#include <texteditor/generichighlighter/manager.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/variablemanager.h>
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index cbdf32338798ce52bbe490328417c908ff5b6cca..f083d8b2f189f331bab8355e1cb41853f018e31b 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -40,10 +40,10 @@
 #include "storagesettings.h"
 #include "tabsettings.h"
 #include "extraencodingsettings.h"
-#include "highlightersettingspage.h"
-#include "snippetssettingspage.h"
 #include "icodestylepreferences.h"
 #include "icodestylepreferencesfactory.h"
+#include <texteditor/generichighlighter/highlightersettingspage.h>
+#include <texteditor/snippets/snippetssettingspage.h>
 
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index 0063247ce5ee539b699d1c2b2bd4a0d4e03f3ba6..a2e15ec828fcb7b6aaf571c800efadea513fdc1d 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -11,11 +11,6 @@ QtcPlugin {
     property bool enable: false
     pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")})
 
-    cpp.includePaths: [
-        "..",
-        buildDirectory,
-    ]
-
     files: [
         "updateinfobutton.cpp",
         "updateinfobutton.h",
diff --git a/src/plugins/valgrind/callgrind/callgrind.pri b/src/plugins/valgrind/callgrind/callgrind.pri
index 292f3a962fdd769a0f9d110d64b20ff0d3b8a3c9..2c93b7ee9de43c65807f0677a0bec87b05465cc0 100644
--- a/src/plugins/valgrind/callgrind/callgrind.pri
+++ b/src/plugins/valgrind/callgrind/callgrind.pri
@@ -1,7 +1,5 @@
 QT *= network
 
-INCLUDEPATH *= $$PWD
-
 HEADERS += \
     $$PWD/callgrindparser.h \
     $$PWD/callgrindparsedata.h \
diff --git a/src/plugins/valgrind/memcheck/memcheck.pri b/src/plugins/valgrind/memcheck/memcheck.pri
index facf1c4e1122c88a0312f85c057b9015a52cf2bf..b2d46a715f2eea55304df551947ac70a41bd6434 100644
--- a/src/plugins/valgrind/memcheck/memcheck.pri
+++ b/src/plugins/valgrind/memcheck/memcheck.pri
@@ -1,7 +1,5 @@
 QT *= network
 
-INCLUDEPATH *= $$PWD
-
 HEADERS += \
     $$PWD/memcheckrunner.h 
 
diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro
index 4ebf133ff1d308b74d39485678293cdee679ea58..188ac67ec7469b03297c02f6c730d90d8e6110aa 100644
--- a/src/plugins/valgrind/valgrind.pro
+++ b/src/plugins/valgrind/valgrind.pro
@@ -6,8 +6,6 @@ QT *= network
 
 CONFIG += exceptions
 
-INCLUDEPATH *= $$PWD
-
 HEADERS += \
     valgrindplugin.h \
     valgrindengine.h \
diff --git a/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri b/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri
index fe3fda438fa92a3ad5c96d098e8f771d20ed4c9a..d9e4262d2c4ae4870561cf57d925c5af82368add 100644
--- a/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri
+++ b/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri
@@ -1,7 +1,5 @@
 QT *= network
 
-INCLUDEPATH *= $$PWD
-
 HEADERS += \
     $$PWD/frame.h \
     $$PWD/parser.h \
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 2db71cde5d050c2ff32304c07927d42a92f88e05..20b0400f548666ffc25f3ac437bf645cf824a3c7 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -9,8 +9,6 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
 
-    cpp.includePaths: base.concat("../../shared/scriptwrapper")
-
     files: [
         "welcomeplugin.cpp",
         "welcomeplugin.h",
diff --git a/src/tools/qtcdebugger/main.cpp b/src/tools/qtcdebugger/main.cpp
index 23ea477ba59cc9d8bc25248b548d6cc7eaf676ad..5123ce9fb31072eec4a666a4cecc3d20a9bb6bb9 100644
--- a/src/tools/qtcdebugger/main.cpp
+++ b/src/tools/qtcdebugger/main.cpp
@@ -45,7 +45,7 @@
 #include <QProcess>
 #include <QPushButton>
 
-#include "registryaccess.h"
+#include <registryaccess.h>
 
 #include <windows.h>
 #include <psapi.h>
diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs
index 46990a36b65e22accfc54acd5bb6d9aa14dee3a0..284ad71118e20158edf50524c6cf11c7321bee9d 100644
--- a/src/tools/qtcdebugger/qtcdebugger.qbs
+++ b/src/tools/qtcdebugger/qtcdebugger.qbs
@@ -5,10 +5,7 @@ QtcTool {
     name: "qtcdebugger"
     condition: qbs.targetOS.contains("windows")
 
-    cpp.includePaths: [
-        buildDirectory,
-        "../../shared/registryaccess"
-    ]
+    cpp.includePaths: base.concat(["../../shared/registryaccess"])
     cpp.dynamicLibraries: [
         "psapi",
         "advapi32"
diff --git a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
index 47dad6e810e0d9fc132cdd6bd9a47d16ee603646..4b5a4910cc6f9b7ed0192af4e000e7d1a3ece21d 100644
--- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
+++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
@@ -5,11 +5,7 @@ QtcTool {
     name: "qtcreator_crash_handler"
     condition: qbs.targetOS.contains("linux") && qbs.buildVariant == "debug"
 
-    cpp.includePaths: [
-        buildDirectory,
-        "../../libs"
-    ]
-
+    Depends { name: "Utils" }
     Depends { name: "Qt.widgets" }
     Depends { name: "app_version_header" }
 
@@ -23,13 +19,4 @@ QtcTool {
             "utils.cpp", "utils.h"
         ]
     }
-
-    Group {
-        name: "Utils Sources"
-        prefix: "../../libs/utils/"
-        files: [
-            "checkablemessagebox.cpp", "checkablemessagebox.h",
-            "environment.cpp", "environment.h"
-        ]
-    }
 }
diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs
index e9510a4ee80326fa17ce953bc5400762bff75380..a8ea1aae1fb6e2aa8b768e4ca0939032b3fc9aa7 100644
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -8,7 +8,6 @@ QtcTool {
     Depends { name: "Utils" }
     Depends { name: "app_version_header" }
 
-    cpp.includePaths: "../../libs"
     cpp.defines: base.concat([qbs.targetOS.contains("osx")
             ? 'DATA_PATH="."' : 'DATA_PATH="../share/qtcreator"'])