Remove superfluous include paths from project files.

A lot of our build system files specify unneeded include
paths. These roughly fall into the following categories:
    a) Paths that are already set in more general files
       such as qtcreator.pri.
    b) Paths that serve no purpose at all, possibly
       left over from earlier versions of the project.
    c) Paths that act as workarounds for wrong include
       statements of the form '#include "xyz.h"', where
       xyz.h is not in the same directory as the including
      file.
This patch removes such path specifications and fixes the offending
include statements from case c).
Tested on Linux, Windows and OSX with qmake and qbs.

Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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" }

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>

src/libs/3rdparty/cplusplus/cplusplus.pri

@@ -1,7 +1,3 @@
-
-DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD
-
 HEADERS += \
     $$PWD/cppassert.h \
     $$PWD/CPlusPlus.h \

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 {

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 \

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"
     ])

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 \

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/>

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;
 

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>

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>

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 {

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>

src/libs/qmleditorwidgets/easingpane/easingpane.pri

@@ -1,5 +1,4 @@
 VPATH += $$PWD
-INCLUDEPATH += $$PWD
 SOURCES += $$PWD/easinggraph.cpp \
     $$PWD/easingcontextpane.cpp
 

src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri

@@ -1,7 +1,5 @@
 QT += script declarative
 
-INCLUDEPATH += $$PWD
-
 contains(CONFIG, dll) {
     DEFINES += BUILD_QMLEDITORWIDGETS_LIB
 } else {

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"

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 \

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"
     ])

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/*

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]
     }
 }

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: [

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>

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>
 

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>
 

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>

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>
 

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>
 

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 \

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",

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>
 

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>

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>

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>

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>

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>

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>
 

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>
 

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>

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>

src/plugins/coreplugin/editormanager/systemeditor.cpp

@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "systemeditor.h"
-#include "id.h"
+#include <coreplugin/id.h>
 
 #include <QStringList>
 #include <QUrl>

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>

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>

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 {

src/plugins/coreplugin/textdocument.cpp

@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "textdocument.h"
-#include "editormanager.h"
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <QDebug>
 #include <QTextCodec>

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>
 

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>

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",

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>

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",

src/plugins/debugger/cdb/cdb.pri

@@ -10,4 +10,3 @@ SOURCES += $$PWD/cdbengine.cpp \
 
 FORMS += cdb/cdboptionspagewidget.ui
 
-INCLUDEPATH*=$$PWD

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>

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>

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>
 

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>
 

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>
 

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: ["."]
     }
 }

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>

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"

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
 

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>
 

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>
 

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>

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>
 

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>

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>
 

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>
 

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>
 

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>

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 {

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>
 

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>

src/plugins/debugger/gdb/remoteplaingdbadapter.cpp

@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "remoteplaingdbadapter.h"
-#include "debuggerstartparameters.h"
+#include <debugger/debuggerstartparameters.h>
 
 #include <utils/qtcassert.h>
 

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>

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>

src/plugins/debugger/lldb/lldb.pri

@@ -1,5 +1,3 @@
 HEADERS += $$PWD/lldbengine.h
 
 SOURCES += $$PWD/lldbengine.cpp
-
-INCLUDEPATH *= $$PWD

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 <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 "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/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>

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>

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>

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>
 

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>

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 <debugger/debuggerstartparameters.h>
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggerconstants.h>
+#include <debugger/debuggerdialogs.h>
+#include <debugger/debuggerplugin.h>
+#include <debugger/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/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>

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>
 

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 <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 "breakhandler.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
-#include "stackhandler.h"
-#include "sourceutils.h"
-#include "watchhandler.h"
-#include "watchutils.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>
 

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>

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 {

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"

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>

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 {

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 <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 "breakhandler.h"
-#include "stackhandler.h"
-#include "watchhandler.h"
-#include "sourcefileshandler.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>

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>

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>

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>

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>

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>

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>

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>

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

src/plugins/designer/cpp/cpp.pri

@@ -1,5 +1,3 @@
-INCLUDEPATH+=$$PWD
-
 DEFINES+=CPP_ENABLED
 
 HEADERS+=$$PWD/formclasswizardpage.h \

src/plugins/designer/cpp/cppsettingspage.cpp

@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "cppsettingspage.h"
-#include "designerconstants.h"
+#include <designer/designerconstants.h>
 
 #include <QCoreApplication>
 #include <QTextStream>

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>