diff --git a/qtcreator.qbs b/qtcreator.qbs
index 80a1f5f902138e0f3c19e89d550d8875ac677735..945335d218e18f047fca14808b39e2701577b5cc 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -132,7 +132,7 @@ Project {
             }
         }
 
-        ProductModule {
+        Export {
             Depends { name: "cpp" }
             cpp.includePaths: product.buildDirectory
         }
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 3672957743b19baba5c4e4474642aa474ccdd51f..80056e520c51c8bfcc091d13a0206ed2cffdb5d6 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -15,7 +15,7 @@ DynamicLibrary {
     }
     cpp.includePaths: [ ".", ".." ]
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         cpp.includePaths: [ "." ]
     }
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 08213f11d601036fd70a13616c85d313d6116cfb..7b52710a34d815b6a79d9179242102b11a6064c2 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -168,7 +168,7 @@ QtcLibrary {
         "images/var_prot.png",
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         cpp.includePaths: [
             ".",
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index ec66195d53834dfcaa78f9b1fae372945383d9b9..10d5166345488ea2c0b6d9b2aa2128064498b49a 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -107,7 +107,7 @@ QtcLibrary {
         "iscriptevaluator.h"
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         Depends { name: "LanguageUtils" }
         cpp.defines: [
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index edc5663c914a3a189cc82d109bcee2a581687810..571821c22c93dc7a1164bd742477449a4479a429 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -114,7 +114,7 @@ QtcLibrary {
         ]
     }
 
-    ProductModule {
+    Export {
         Depends { name: "Qt"; submodules: ["widgets", "network"] }
     }
 }
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 4c1a220c4cffe44511d1f32fb0f627eec7290c53..3f5e8f9872c09041763965dbefb7f03887dc3952 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -211,8 +211,8 @@ QtcLibrary {
         ]
     }
 
-    ProductModule {
-        // ### [ remove, once qbs supports merging of ProductModule items in derived products
+    Export {
+        // ### [ remove, once qbs supports merging of Export items in derived products
         Depends { name: "cpp" }
         cpp.includePaths: [ ".." ]
         // ### ]
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 139b90794f091cb6805a04eda331e71b53786b1d..48278e76e9b806da14429fa8f3e18a02d7c35f34 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -47,7 +47,7 @@ Product {
         qbs.installDir: "lib/qtcreator/plugins/" + provider
     }
 
-    ProductModule {
+    Export {
         Depends { name: "ExtensionSystem" }
     }
 }
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 621bdd10d7d50c4f76d8922360868779a2e95118..26073fdbdda571cbd4d5b47a8f1fbe66f615d976 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -47,7 +47,7 @@ QtcPlugin {
         "images/analyzer_start_small.png",
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "CPlusPlus" }
     }
 }
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 8501f6940a77f9b704d63d2df9e65388317eac14..d8ebbd8b78f6618183e4f12f8ea649316701545e 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -251,7 +251,7 @@ QtcPlugin {
         ]
     }
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         Depends { name: "Aggregation" }
         Depends { name: "Utils" }
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index dc02251a1f2086e9292ab0e28b6b5f2869f19883..c010728d3a3c57d1b1943fd9c0b456d04f1c4f6a 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -119,7 +119,7 @@ QtcPlugin {
         cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
     }
 
-    ProductModule {
+    Export {
         Depends { name: "CPlusPlus" }
     }
 }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index b67ccd5811d405be65dc7cd05c1f77117cd5c33c..08e50e0622edf4c0d0f3f8a28875865fa32ffb5c 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -292,7 +292,7 @@ QtcPlugin {
         ]
     }
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         Depends { name: "QtcSsh" }
         cpp.includePaths: ["."]
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 136953d0d81d975ca7d116782e3268c3101a25d8..1dc3fc9d93ff1154fa7513683787dee5c4b92c30 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -345,7 +345,7 @@ QtcPlugin {
         files: ["outputparser_test.h", "outputparser_test.cpp"]
     }
 
-    ProductModule {
+    Export {
         Depends { name: "Qt.network" }
     }
 }
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 11d06ce5d7349d6fec7977a31c51747b3e29548f..f49470b8ab85c58edacbff4f8658841be26e0854 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -88,7 +88,7 @@ QtcPlugin {
         "images/qmlfile.png",
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "QmlJSTools" }
     }
 }
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index d787c842b1c45487d0cef255c228566ab1129473..3848531bd524699f4e449b00d4211cbb573db728 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -78,7 +78,7 @@ QtcPlugin {
         files: ["qmljstools_test.cpp"]
     }
 
-    ProductModule {
+    Export {
         Depends { name: "CppTools" }
         Depends { name: "QmlDebug" }
     }
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index cc30200f0f498fcbc56d4a559c69030bed7034bc..87549bb8ca6e317b7a544b6778e5bed5f675d966 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -100,7 +100,7 @@ QtcPlugin {
         "showbuildlog.ui",
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         cpp.includePaths: "../../shared"
         cpp.defines: [
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 79beba455932bc83138b2310b450c7609f2e17eb..8e3b4e3544a5a8a5d4708efc6181292f5f28fd3d 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -106,7 +106,7 @@ QtcPlugin {
         "images/embeddedtarget.png",
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "Core" }
         Depends { name: "QtcSsh" }
     }
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 0db0da5bebfdbaf2f8cccb0a91e2a8e8c31b7e25..ed32f2e26f73bf150491ba1b0819fba676af03b1 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -267,7 +267,7 @@ QtcPlugin {
         ]
     }
 
-    ProductModule {
+    Export {
         Depends { name: "Find" }
         Depends { name: "Locator" }
     }