diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri
index 07e688609c8..85cb9720954 100644
--- a/src/libs/cplusplus/cplusplus.pri
+++ b/src/libs/cplusplus/cplusplus.pri
@@ -1,3 +1,5 @@
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
 DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
+DEPENDPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
 LIBS *= -l$$qtLibraryName(CPlusPlus)
diff --git a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
index a054ad99806..8169adfe916 100644
--- a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
+++ b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
@@ -1,7 +1,7 @@
 QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
-
+include(../../../qtcreator.pri)
 include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
diff --git a/tests/manual/preprocessor/preprocessor.pro b/tests/manual/preprocessor/preprocessor.pro
index 4f2ad5b6d32..8b17b43ceef 100644
--- a/tests/manual/preprocessor/preprocessor.pro
+++ b/tests/manual/preprocessor/preprocessor.pro
@@ -2,6 +2,7 @@ QT = core
 macx:CONFIG -= app_bundle
 TARGET = pp
 
+include(../../../qtcreator.pri)
 include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
diff --git a/tests/tools/cplusplus-dump/cplusplus-dump.pro b/tests/tools/cplusplus-dump/cplusplus-dump.pro
index a054ad99806..cd6525119e7 100644
--- a/tests/tools/cplusplus-dump/cplusplus-dump.pro
+++ b/tests/tools/cplusplus-dump/cplusplus-dump.pro
@@ -2,6 +2,7 @@ QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 
+include(../../../qtcreator.pri)
 include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
diff --git a/tests/tools/qml-ast2dot/qml-ast2dot.pro b/tests/tools/qml-ast2dot/qml-ast2dot.pro
index 074d1e95a57..dc83ce96863 100644
--- a/tests/tools/qml-ast2dot/qml-ast2dot.pro
+++ b/tests/tools/qml-ast2dot/qml-ast2dot.pro
@@ -3,7 +3,7 @@ QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = qml-ast2dot
 
-include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
+include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 # Input