diff --git a/qtcreator.qbp b/qtcreator.qbp
index 2eb441acf94270ec65886f81bd29668b1ebc2ee5..7ba51acdbded025ce2cbe45f8e0d9285a2710030 100644
--- a/qtcreator.qbp
+++ b/qtcreator.qbp
@@ -131,6 +131,11 @@ Project {
                 return cmd;
             }
         }
+
+        ProductModule {
+            Depends { name: "cpp" }
+            cpp.includePaths: product.buildDirectory
+        }
     }
 
     Product {
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index cf50a5729939ee54c4bd87676cb0f8ad0acd0c6a..3e08d3d70ecb3a10655be8f536e9e81494da206e 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -13,6 +13,7 @@ QtcPlugin {
     Depends { name: "Utils" }
     Depends { name: "ExtensionSystem" }
     Depends { name: "Aggregation" }
+    Depends { name: "app_version_header" }
 
     cpp.includePaths: [
         ".",
@@ -24,8 +25,7 @@ QtcPlugin {
         "editormanager",
         "progressmanager",
         "scriptmanager",
-        "actionmanager",
-         buildDirectory
+        "actionmanager"
     ]
 
     cpp.dynamicLibraries: {
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 15e8acd4e5c3c292c6bb495b691bfc292635b3f4..4deb59e091d4fb44f6d8859c1bae5fd66f3b006a 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -18,6 +18,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "Find" }
     Depends { name: "Locator" }
+    Depends { name: "app_version_header" }
 
     Depends { name: "cpp" }
     Properties {
@@ -30,8 +31,7 @@ QtcPlugin {
         ".",
         "..",
         "../..",
-        "../../libs",
-        buildDirectory
+        "../../libs"
     ]
 
     files: [
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 1712dc566136e0cf883262226e86e91a6e9c4564..40eb120dd971db4418a8c9e74d7c85ba99061952 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -10,13 +10,13 @@ QtcPlugin {
     Depends { name: "Locator" }
     Depends { name: "Find" }
     Depends { name: "TextEditor" }
+    Depends { name: "app_version_header" }
 
     Depends { name: "cpp" }
     cpp.includePaths: [
         "..",
         "../../libs",
-        "../..",
-        buildDirectory
+        "../.."
     ]
 
     files: [
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 9ac468e42c376bcebf204e3834b73200498ab11a..025861744fa6cbb001f2dfe191d9e37d4d985343 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -13,12 +13,12 @@ QtcPlugin {
     Depends { name: "QmlJS" }
     Depends { name: "Debugger" }
     Depends { name: "QtSupport" }
+    Depends { name: "app_version_header" }
 
     Depends { name: "cpp" }
     cpp.includePaths: [
         "..",
-        "../../libs",
-        buildDirectory
+        "../../libs"
     ]
 
     files: [