diff --git a/src/plugins/debugger/lldblib/guest/qtcreator-lldb.pro b/src/plugins/debugger/lldblib/guest/qtcreator-lldb.pro
index 847e31140c9..b6f54372840 100644
--- a/src/plugins/debugger/lldblib/guest/qtcreator-lldb.pro
+++ b/src/plugins/debugger/lldblib/guest/qtcreator-lldb.pro
@@ -10,8 +10,8 @@ TEMPLATE = app
 CONFIG  -= app_bundle
 CONFIG += debug
 TARGET = qtcreator-lldb
-DEPENDPATH += . .. ../.. ../../..  ../../../../libs
-INCLUDEPATH += . .. ../.. ../../.. ../../../../libs
+DEPENDPATH += . .. ../.. ../../..
+INCLUDEPATH += . .. ../.. ../../..
 DESTDIR  = $$IDE_LIBEXEC_PATH
 
 MOC_DIR=.tmp
diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro
index 73bbfd0cc8b..364e9490ebc 100644
--- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro
+++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro
@@ -5,7 +5,6 @@ TEMPLATE = app
 TARGET = cplusplus-update-frontend
 DESTDIR = ./
 DEFINES += QTCREATOR_UTILS_STATIC_LIB
-INCLUDEPATH += . ../../libs
 
 include(../../../qtcreator.pri)
 include(../../libs/cplusplus/cplusplus-lib.pri)
diff --git a/tests/auto/cplusplus/codeformatter/codeformatter.pro b/tests/auto/cplusplus/codeformatter/codeformatter.pro
index 37057eef999..a8a2c2d4376 100644
--- a/tests/auto/cplusplus/codeformatter/codeformatter.pro
+++ b/tests/auto/cplusplus/codeformatter/codeformatter.pro
@@ -1,6 +1,3 @@
 include(../../qttest.pri)
 include(../shared/shared.pri)
-
 SOURCES += tst_codeformatter.cpp
-
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins $$IDE_SOURCE_TREE/src/libs
diff --git a/tests/auto/cplusplus/misc/misc.pro b/tests/auto/cplusplus/misc/misc.pro
index 2816eac77d8..0b44a4f90c1 100644
--- a/tests/auto/cplusplus/misc/misc.pro
+++ b/tests/auto/cplusplus/misc/misc.pro
@@ -1,5 +1,4 @@
 include(../../qttest.pri)
 include(../shared/shared.pri)
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
 SOURCES += tst_misc.cpp
 
diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro
index 376ff17bfc4..8ba9dde886d 100644
--- a/tests/auto/debugger/gdb.pro
+++ b/tests/auto/debugger/gdb.pro
@@ -1,10 +1,9 @@
 include(../qttest.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
-UTILSDIR    = $$IDE_SOURCE_TREE/src/libs
 DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
 
-INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
+INCLUDEPATH += $$DEBUGGERDIR
 
 SOURCES += \
     tst_gdb.cpp \
diff --git a/tests/auto/diff/differ/differ.pro b/tests/auto/diff/differ/differ.pro
index bf1c5c8cf14..1859dd30d99 100644
--- a/tests/auto/diff/differ/differ.pro
+++ b/tests/auto/diff/differ/differ.pro
@@ -5,6 +5,3 @@ include($$IDE_SOURCE_TREE/src/plugins/diffeditor/diffeditor.pri)
 LIBS += -L$$IDE_PLUGIN_PATH/QtProject
 
 SOURCES += tst_differ.cpp
-
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins $$IDE_SOURCE_TREE/src/libs
-
diff --git a/tests/auto/generichighlighter/specificrules/specificrules.pro b/tests/auto/generichighlighter/specificrules/specificrules.pro
index be74ac85b3b..6c15e34bc9d 100644
--- a/tests/auto/generichighlighter/specificrules/specificrules.pro
+++ b/tests/auto/generichighlighter/specificrules/specificrules.pro
@@ -12,5 +12,3 @@ SOURCES += tst_specificrules.cpp \
     $$GENERICHIGHLIGHTERDIR/highlightdefinition.cpp \
     $$GENERICHIGHLIGHTERDIR/keywordlist.cpp \
     $$GENERICHIGHLIGHTERDIR/itemdata.cpp
-
-INCLUDEPATH += $$PLUGINSDIR
diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
index 323ae839135..19b4967aef9 100644
--- a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
+++ b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
@@ -10,7 +10,6 @@ include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
 include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
 HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h
 SOURCES+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.cpp
-INCLUDEPATH+=$$IDE_SOURCE_TREE/src/libs
 #DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
 
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro
index aa477ea5c98..e6a53e813af 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro
@@ -16,5 +16,3 @@ HEADERS += \
     $$SRCDIR/plugins/qmljstools/qmljsqtstylecodeformatter.h \
     $$SRCDIR/plugins/texteditor/basetextdocumentlayout.h \
     $$SRCDIR/plugins/texteditor/itextmark.h
-
-INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs
diff --git a/tests/auto/utils/fileutils/fileutils.pro b/tests/auto/utils/fileutils/fileutils.pro
index 5d2530d6689..8446d8ff324 100644
--- a/tests/auto/utils/fileutils/fileutils.pro
+++ b/tests/auto/utils/fileutils/fileutils.pro
@@ -4,7 +4,6 @@ include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 UTILSDIR = $$IDE_SOURCE_TREE/src/libs/
 
-INCLUDEPATH += $$UTILSDIR
 DEFINES += QTCREATOR_UTILS_LIB
 *-g++ {
     CONFIG -= warn_on
diff --git a/tests/manual/fakevim/fakevim.pro b/tests/manual/fakevim/fakevim.pro
index 1fefb16cb81..4fd23012d2a 100644
--- a/tests/manual/fakevim/fakevim.pro
+++ b/tests/manual/fakevim/fakevim.pro
@@ -16,4 +16,4 @@ HEADERS += $$FAKEVIMDIR/fakevimhandler.h \
             $$UTILSDIR/hostosinfo.h \
             $$UTILSDIR/qtcassert.h
 
-INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
+INCLUDEPATH += $$FAKEVIMDIR
diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri
index f4c70a5d745..5f1a146eb5e 100644
--- a/tests/manual/ssh/ssh.pri
+++ b/tests/manual/ssh/ssh.pri
@@ -4,7 +4,6 @@ include (../../../qtcreator.pri)
 include (../../../src/libs/ssh/ssh.pri)
 
 macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
-INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
 LIBS *= -L$$IDE_LIBRARY_PATH
 unix {
     QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_LIBRARY_PATH\"
diff --git a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro
index 158505521db..eeee158f69f 100644
--- a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro
+++ b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro
@@ -12,7 +12,6 @@ include(../../../../src/rpath.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 
-INCLUDEPATH += ../../../../src/libs
 UTILSDIR = ../../../../src/libs/utils
 
 DEFINES += QTCREATOR_UTILS_STATIC_LIB