diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 750b4525e74..07da91f04c3 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -339,37 +339,6 @@ namespace ts {
                 }
             }
 
-            for (const externalImport of moduleInfo.externalImports) {
-                if (externalImport.kind !== SyntaxKind.ExportDeclaration) {
-                    continue;
-                }
-
-                if (!externalImport.exportClause) {
-                    // export * from ...
-                    continue;
-                }
-
-                if (isNamedExports(externalImport.exportClause)) {
-                    for (const element of externalImport.exportClause.elements) {
-                        // write name of indirectly exported entry, i.e. 'export {x} from ...'
-                        exportedNames.push(
-                            createPropertyAssignment(
-                                createLiteral(idText(element.name || element.propertyName)),
-                                createTrue()
-                            )
-                        );
-                    }
-                }
-                else {
-                    exportedNames.push(
-                        createPropertyAssignment(
-                            createLiteral(idText(externalImport.exportClause.name)),
-                            createTrue()
-                        )
-                    );
-                }
-            }
-
             const exportedNamesStorageRef = createUniqueName("exportedNames");
             statements.push(
                 createVariableStatement(
diff --git a/src/compiler/transformers/utilities.ts b/src/compiler/transformers/utilities.ts
index 94c734d12ae..48939d2106f 100644
--- a/src/compiler/transformers/utilities.ts
+++ b/src/compiler/transformers/utilities.ts
@@ -112,26 +112,22 @@ namespace ts {
                             // export * as ns from "mod"
                             // export { x, y } from "mod"
                             externalImports.push(<ExportDeclaration>node);
+                            if (isNamedExports((node as ExportDeclaration).exportClause!)) {
+                                addExportedNamesForExportDeclaration(node as ExportDeclaration);
+                            }
+                            else {
+                                const name = ((node as ExportDeclaration).exportClause as NamespaceExport).name;
+                                if (!uniqueExports.get(idText(name))) {
+                                    multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), name);
+                                    uniqueExports.set(idText(name), true);
+                                    exportedNames = append(exportedNames, name);
+                                }
+                            }
                         }
                     }
                     else {
                         // export { x, y }
-                        for (const specifier of cast((<ExportDeclaration>node).exportClause, isNamedExports).elements) {
-                            if (!uniqueExports.get(idText(specifier.name))) {
-                                const name = specifier.propertyName || specifier.name;
-                                exportSpecifiers.add(idText(name), specifier);
-
-                                const decl = resolver.getReferencedImportDeclaration(name)
-                                    || resolver.getReferencedValueDeclaration(name);
-
-                                if (decl) {
-                                    multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
-                                }
-
-                                uniqueExports.set(idText(specifier.name), true);
-                                exportedNames = append(exportedNames, specifier.name);
-                            }
-                        }
+                        addExportedNamesForExportDeclaration(node as ExportDeclaration);
                     }
                     break;
 
@@ -200,6 +196,25 @@ namespace ts {
         }
 
         return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues, exportedBindings, exportedNames, externalHelpersImportDeclaration };
+
+        function addExportedNamesForExportDeclaration(node: ExportDeclaration) {
+            for (const specifier of cast(node.exportClause, isNamedExports).elements) {
+                if (!uniqueExports.get(idText(specifier.name))) {
+                    const name = specifier.propertyName || specifier.name;
+                    exportSpecifiers.add(idText(name), specifier);
+
+                    const decl = resolver.getReferencedImportDeclaration(name)
+                        || resolver.getReferencedValueDeclaration(name);
+
+                    if (decl) {
+                        multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                    }
+
+                    uniqueExports.set(idText(specifier.name), true);
+                    exportedNames = append(exportedNames, specifier.name);
+                }
+            }
+        }
     }
 
     function collectExportedVariableInfo(decl: VariableDeclaration | BindingElement, uniqueExports: Map<boolean>, exportedNames: Identifier[] | undefined) {
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index 5d8b1ff9dfd..426b2a0d63c 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -26,6 +26,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.x = void 0;
 var jquery_1 = require("jquery");
 __createBinding(exports, jquery_1, "x");
 //// [reExportAll.js]
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
index 40619a2abff..a4406a120e8 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.js
+++ b/tests/baselines/reference/commentsOnRequireStatement.js
@@ -29,6 +29,7 @@ exports.subject1 = 10;
 //// [2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.subject1 = exports.subject = void 0;
 /* blah0 */
 // blah 
 // blah 
diff --git a/tests/baselines/reference/constEnumPreserveEmitReexport.js b/tests/baselines/reference/constEnumPreserveEmitReexport.js
index e045b5a2902..ac5e823d419 100644
--- a/tests/baselines/reference/constEnumPreserveEmitReexport.js
+++ b/tests/baselines/reference/constEnumPreserveEmitReexport.js
@@ -36,5 +36,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = void 0;
 var ConstEnum_1 = require("./ConstEnum");
 __createBinding(exports, ConstEnum_1, "MyConstEnum", "default");
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index a3824d0cf1a..d1a0c152e03 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -37,6 +37,7 @@ exports.x = 10;
 //// [client.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = exports.instantiatedModule = exports.c2 = exports.c = void 0;
 var server_1 = require("./server");
 Object.defineProperty(exports, "c", { enumerable: true, get: function () { return server_1.c; } });
 var server_2 = require("./server");
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 9e0caded280..6655aba4263 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -220,6 +220,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 exports.__esModule = true;
+exports.a0 = exports.a9 = exports.a8 = exports.a7 = exports.a6 = exports.a5 = exports.a4 = exports.a3 = exports.a2 = exports.a1 = void 0;
 var z2 = require("variable");
 var z3 = require("interface-variable");
 var z4 = require("module");
diff --git a/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js b/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js
index 262cc58e281..660a3f47df9 100644
--- a/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js
+++ b/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js
@@ -37,6 +37,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 exports.__esModule = true;
+exports.y = exports.x = void 0;
 var fs = __importStar(require("./fs"));
 fs;
 __exportStar(require("./fs"), exports);
diff --git a/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js b/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js
index 00600c6f31c..e76f08b133d 100644
--- a/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js
+++ b/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js
@@ -37,6 +37,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.y = exports.x = void 0;
 var fs = __importStar(require("./fs"));
 fs;
 __exportStar(require("./fs"), exports);
diff --git a/tests/baselines/reference/exportAsNamespace1(module=amd).js b/tests/baselines/reference/exportAsNamespace1(module=amd).js
index 8343fe9fc49..948e013f474 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=amd).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=amd).js
@@ -27,6 +27,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./0"], function (require, exports, ns) {
     "use strict";
     exports.__esModule = true;
+    exports.ns = void 0;
     exports.ns = ns;
     ns.a;
     ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace1(module=commonjs).js b/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
index 321c9e7c4e3..cdbc0999fb5 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
@@ -24,6 +24,7 @@ exports.b = 2;
 //// [1.js]
 "use strict";
 exports.__esModule = true;
+exports.ns = void 0;
 exports.ns = require("./0");
 ns.a;
 ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace1(module=umd).js b/tests/baselines/reference/exportAsNamespace1(module=umd).js
index 7e4f7792993..e9ad1fbd1f0 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=umd).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=umd).js
@@ -43,6 +43,7 @@ foo.ns.b;
 })(function (require, exports) {
     "use strict";
     exports.__esModule = true;
+    exports.ns = void 0;
     exports.ns = require("./0");
     ns.a;
     ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace2(module=amd).js b/tests/baselines/reference/exportAsNamespace2(module=amd).js
index e166d970e94..5ad91cd7b2d 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=amd).js
+++ b/tests/baselines/reference/exportAsNamespace2(module=amd).js
@@ -27,6 +27,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./0"], function (require, exports, ns) {
     "use strict";
     exports.__esModule = true;
+    exports.ns = void 0;
     exports.ns = ns;
     ns.a;
     ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace2(module=commonjs).js b/tests/baselines/reference/exportAsNamespace2(module=commonjs).js
index c258c022a22..501cacf8957 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=commonjs).js
+++ b/tests/baselines/reference/exportAsNamespace2(module=commonjs).js
@@ -43,6 +43,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 exports.__esModule = true;
+exports.ns = void 0;
 exports.ns = __importStar(require("./0"));
 ns.a;
 ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace2(module=umd).js b/tests/baselines/reference/exportAsNamespace2(module=umd).js
index 5985e966afc..b0ff51a1161 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=umd).js
+++ b/tests/baselines/reference/exportAsNamespace2(module=umd).js
@@ -62,6 +62,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 })(function (require, exports) {
     "use strict";
     exports.__esModule = true;
+    exports.ns = void 0;
     exports.ns = __importStar(require("./0"));
     ns.a;
     ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace3(module=amd).js b/tests/baselines/reference/exportAsNamespace3(module=amd).js
index ce2bc8d8a7a..131f15608e8 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=amd).js
+++ b/tests/baselines/reference/exportAsNamespace3(module=amd).js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./0"], function (require, exports, ns) {
     "use strict";
     exports.__esModule = true;
+    exports.ns = void 0;
     exports.ns = ns;
     ns.a;
     ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace3(module=commonjs).js b/tests/baselines/reference/exportAsNamespace3(module=commonjs).js
index a8c3811ae59..2312f9c6524 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=commonjs).js
+++ b/tests/baselines/reference/exportAsNamespace3(module=commonjs).js
@@ -46,6 +46,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 exports.__esModule = true;
+exports.ns = void 0;
 exports.ns = __importStar(require("./0"));
 ns.a;
 ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace3(module=umd).js b/tests/baselines/reference/exportAsNamespace3(module=umd).js
index 89c8e733974..33068de8d56 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=umd).js
+++ b/tests/baselines/reference/exportAsNamespace3(module=umd).js
@@ -65,6 +65,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 })(function (require, exports) {
     "use strict";
     exports.__esModule = true;
+    exports.ns = void 0;
     exports.ns = __importStar(require("./0"));
     ns.a;
     ns.b;
diff --git a/tests/baselines/reference/exportAsNamespace_exportAssignment.js b/tests/baselines/reference/exportAsNamespace_exportAssignment.js
index 08dce502bf4..71f1dcf31b5 100644
--- a/tests/baselines/reference/exportAsNamespace_exportAssignment.js
+++ b/tests/baselines/reference/exportAsNamespace_exportAssignment.js
@@ -32,4 +32,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 exports.__esModule = true;
+exports.ns = void 0;
 exports.ns = __importStar(require("./a"));
diff --git a/tests/baselines/reference/exportAsNamespace_missingEmitHelpers.js b/tests/baselines/reference/exportAsNamespace_missingEmitHelpers.js
index e7691f4d439..abeabc8d48d 100644
--- a/tests/baselines/reference/exportAsNamespace_missingEmitHelpers.js
+++ b/tests/baselines/reference/exportAsNamespace_missingEmitHelpers.js
@@ -13,4 +13,5 @@ exports.__esModule = true;
 //// [b.js]
 "use strict";
 exports.__esModule = true;
+exports.ns = void 0;
 exports.ns = require("./a"); // Error
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 297bfa13d13..eae506a0f95 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -34,6 +34,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.x = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "x");
 //// [t3.js]
@@ -49,6 +50,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.a = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "x", "a");
 //// [t5.js]
@@ -61,5 +63,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.a = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "x", "a");
diff --git a/tests/baselines/reference/exportDefaultDuplicateCrash.js b/tests/baselines/reference/exportDefaultDuplicateCrash.js
index f48897ba909..f61546f1854 100644
--- a/tests/baselines/reference/exportDefaultDuplicateCrash.js
+++ b/tests/baselines/reference/exportDefaultDuplicateCrash.js
@@ -17,6 +17,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = void 0;
 function default_1() { }
 exports["default"] = default_1;
 var hi_1 = require("./hi");
diff --git a/tests/baselines/reference/exportNamespace2.js b/tests/baselines/reference/exportNamespace2.js
index 81a6b6bde2b..14682542c8e 100644
--- a/tests/baselines/reference/exportNamespace2.js
+++ b/tests/baselines/reference/exportNamespace2.js
@@ -28,6 +28,7 @@ exports.A = A;
 //// [b.js]
 "use strict";
 exports.__esModule = true;
+exports.a = void 0;
 exports.a = require("./a");
 //// [c.js]
 "use strict";
diff --git a/tests/baselines/reference/exportNamespace3.js b/tests/baselines/reference/exportNamespace3.js
index de03081295d..8e459762848 100644
--- a/tests/baselines/reference/exportNamespace3.js
+++ b/tests/baselines/reference/exportNamespace3.js
@@ -30,6 +30,7 @@ exports.__esModule = true;
 //// [c.js]
 "use strict";
 exports.__esModule = true;
+exports.a = void 0;
 exports.a = require("./b");
 //// [d.js]
 "use strict";
diff --git a/tests/baselines/reference/exportStarNotElided.js b/tests/baselines/reference/exportStarNotElided.js
index 27a8616b32f..0b36837f6ea 100644
--- a/tests/baselines/reference/exportStarNotElided.js
+++ b/tests/baselines/reference/exportStarNotElided.js
@@ -35,6 +35,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 exports.__esModule = true;
+exports.aliased = void 0;
 __exportStar(require("./register"), exports);
 __exportStar(require("./data1"), exports);
 exports.aliased = require("./data1");
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index 0099f8564b0..f9ac05055dc 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -66,6 +66,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = exports.M = exports.E = exports.C = exports.f = exports.v = void 0;
     Object.defineProperty(exports, "v", { enumerable: true, get: function () { return t1_1.v; } });
     Object.defineProperty(exports, "f", { enumerable: true, get: function () { return t1_1.f; } });
     Object.defineProperty(exports, "C", { enumerable: true, get: function () { return t1_1.C; } });
diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js
index b5c6588e255..029cb429a97 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.js
+++ b/tests/baselines/reference/exportsAndImports1-es6.js
@@ -60,6 +60,7 @@ exports.a = a;
 //// [t2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = exports.M = exports.E = exports.C = exports.f = exports.v = void 0;
 var t1_1 = require("./t1");
 Object.defineProperty(exports, "v", { enumerable: true, get: function () { return t1_1.v; } });
 Object.defineProperty(exports, "f", { enumerable: true, get: function () { return t1_1.f; } });
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index ee9e06601c4..5c4b529131f 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -70,6 +70,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.a = exports.M = exports.E = exports.C = exports.f = exports.v = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "v");
 __createBinding(exports, t1_1, "f");
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index 86ce875d91b..fa22c2302db 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -24,6 +24,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = exports.y = void 0;
     Object.defineProperty(exports, "y", { enumerable: true, get: function () { return t1_1.x; } });
     Object.defineProperty(exports, "x", { enumerable: true, get: function () { return t1_1.y; } });
 });
diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js
index d2d800989b3..eb9283a2604 100644
--- a/tests/baselines/reference/exportsAndImports2-es6.js
+++ b/tests/baselines/reference/exportsAndImports2-es6.js
@@ -21,6 +21,7 @@ exports.y = "y";
 //// [t2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = exports.y = void 0;
 var t1_1 = require("./t1");
 Object.defineProperty(exports, "y", { enumerable: true, get: function () { return t1_1.x; } });
 Object.defineProperty(exports, "x", { enumerable: true, get: function () { return t1_1.y; } });
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 42437bae3cc..aaaed576b6a 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -28,6 +28,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.x = exports.y = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "x", "y");
 __createBinding(exports, t1_1, "y", "x");
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index 054aea54a83..7358285540d 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -68,6 +68,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = exports.M = exports.E = exports.C = exports.f = exports.v = void 0;
     Object.defineProperty(exports, "v", { enumerable: true, get: function () { return t1_1.v1; } });
     Object.defineProperty(exports, "f", { enumerable: true, get: function () { return t1_1.f1; } });
     Object.defineProperty(exports, "C", { enumerable: true, get: function () { return t1_1.C1; } });
diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js
index 5c8f8ebd578..f63d63418c9 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.js
+++ b/tests/baselines/reference/exportsAndImports3-es6.js
@@ -62,6 +62,7 @@ exports.a1 = exports.a;
 //// [t2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = exports.M = exports.E = exports.C = exports.f = exports.v = void 0;
 var t1_1 = require("./t1");
 Object.defineProperty(exports, "v", { enumerable: true, get: function () { return t1_1.v1; } });
 Object.defineProperty(exports, "f", { enumerable: true, get: function () { return t1_1.f1; } });
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index d482167a939..f0f53fc351d 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -72,6 +72,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.a = exports.M = exports.E = exports.C = exports.f = exports.v = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "v1", "v");
 __createBinding(exports, t1_1, "f1", "f");
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index ba817b92b82..04f74adbe4f 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.z = void 0;
+exports.z = exports.c1 = void 0;
 var module_1 = require("module");
 var module_2 = require("module");
 var ns = require("module");
diff --git a/tests/baselines/reference/isolatedModulesReExportType.js b/tests/baselines/reference/isolatedModulesReExportType.js
index 561edeb7229..9908e6701df 100644
--- a/tests/baselines/reference/isolatedModulesReExportType.js
+++ b/tests/baselines/reference/isolatedModulesReExportType.js
@@ -67,7 +67,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
-exports.NS = void 0;
+exports.NS = exports.C = void 0;
 // OK, has a value side
 var exportValue_1 = require("./exportValue");
 __createBinding(exports, exportValue_1, "C");
diff --git a/tests/baselines/reference/jsDeclarationsExportSpecifierNonlocal.js b/tests/baselines/reference/jsDeclarationsExportSpecifierNonlocal.js
index f8b91b0c8b5..2274b79e8db 100644
--- a/tests/baselines/reference/jsDeclarationsExportSpecifierNonlocal.js
+++ b/tests/baselines/reference/jsDeclarationsExportSpecifierNonlocal.js
@@ -26,6 +26,7 @@ exports.OtherThing = OtherThing;
 //// [index.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = exports.Thing = void 0;
 var source_1 = require("./source");
 Object.defineProperty(exports, "Thing", { enumerable: true, get: function () { return source_1.Thing; } });
 Object.defineProperty(exports, "default", { enumerable: true, get: function () { return source_1.OtherThing; } });
diff --git a/tests/baselines/reference/jsDeclarationsMultipleExportFromMerge.js b/tests/baselines/reference/jsDeclarationsMultipleExportFromMerge.js
index 73a326e4e54..0c0e9a1cab8 100644
--- a/tests/baselines/reference/jsDeclarationsMultipleExportFromMerge.js
+++ b/tests/baselines/reference/jsDeclarationsMultipleExportFromMerge.js
@@ -30,6 +30,7 @@ exports.c = 3;
 //// [justone.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.c = exports.b = exports.a = void 0;
 var items_1 = require("./items");
 Object.defineProperty(exports, "a", { enumerable: true, get: function () { return items_1.a; } });
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return items_1.b; } });
@@ -37,6 +38,7 @@ Object.defineProperty(exports, "c", { enumerable: true, get: function () { retur
 //// [two.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.c = exports.b = exports.a = void 0;
 var items_1 = require("./items");
 Object.defineProperty(exports, "a", { enumerable: true, get: function () { return items_1.a; } });
 var items_2 = require("./items");
@@ -45,6 +47,7 @@ Object.defineProperty(exports, "c", { enumerable: true, get: function () { retur
 //// [multiple.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cc = exports.c = exports.bb = exports.aa = exports.b = exports.a = void 0;
 var items_1 = require("./items");
 Object.defineProperty(exports, "a", { enumerable: true, get: function () { return items_1.a; } });
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return items_1.b; } });
diff --git a/tests/baselines/reference/jsDeclarationsReexportAliases.js b/tests/baselines/reference/jsDeclarationsReexportAliases.js
index 2195c58497b..b33fb47c67b 100644
--- a/tests/baselines/reference/jsDeclarationsReexportAliases.js
+++ b/tests/baselines/reference/jsDeclarationsReexportAliases.js
@@ -23,7 +23,7 @@ exports.default = Foo;
 //// [usage.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.x = void 0;
+exports.Foob = exports.x = void 0;
 var cls_1 = require("./cls");
 exports.x = new cls_1.default();
 var cls_2 = require("./cls");
diff --git a/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.js b/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.js
index 97da3d2ba3c..d08915482e5 100644
--- a/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.js
+++ b/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.js
@@ -25,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.x = void 0;
+exports.Foob = exports.x = void 0;
 var cls_1 = __importDefault(require("./cls"));
 exports.x = new cls_1.default();
 var cls_2 = require("./cls");
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 1a0b21438e2..93b5a363948 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -33,6 +33,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.Animals = void 0;
 var c_1 = require("./c");
 __createBinding(exports, c_1, "Animals");
 //// [a.js]
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
index a784acac5c0..94efed6f41d 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
@@ -22,6 +22,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 define(["require", "exports", "../file2"], function (require, exports, file2_1) {
     "use strict";
     exports.__esModule = true;
+    exports.x = void 0;
     __createBinding(exports, file2_1, "x");
 });
 //// [file1.js]
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
index 947ba915315..3facab66265 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
@@ -21,6 +21,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.x = void 0;
 var file2_1 = require("../file2");
 __createBinding(exports, file2_1, "x");
 //// [file1.js]
diff --git a/tests/baselines/reference/reexportMissingDefault.js b/tests/baselines/reference/reexportMissingDefault.js
index 62f7eb76b1c..9af5fe9b6f1 100644
--- a/tests/baselines/reference/reexportMissingDefault.js
+++ b/tests/baselines/reference/reexportMissingDefault.js
@@ -22,6 +22,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = exports.b = void 0;
 var b_1 = require("./b");
 __createBinding(exports, b_1, "b");
 var b_2 = require("./b");
diff --git a/tests/baselines/reference/reexportMissingDefault1.js b/tests/baselines/reference/reexportMissingDefault1.js
index cd359a722e4..fe5a3799287 100644
--- a/tests/baselines/reference/reexportMissingDefault1.js
+++ b/tests/baselines/reference/reexportMissingDefault1.js
@@ -23,6 +23,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = exports.b = void 0;
 var b_1 = require("./b");
 __createBinding(exports, b_1, "b");
 var b_2 = require("./b");
diff --git a/tests/baselines/reference/reexportMissingDefault2.js b/tests/baselines/reference/reexportMissingDefault2.js
index 1ff8d15f165..ca164d40aac 100644
--- a/tests/baselines/reference/reexportMissingDefault2.js
+++ b/tests/baselines/reference/reexportMissingDefault2.js
@@ -22,6 +22,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = exports.b = void 0;
 var b_1 = require("./b");
 __createBinding(exports, b_1, "b");
 var b_2 = require("./b");
diff --git a/tests/baselines/reference/reexportMissingDefault3.js b/tests/baselines/reference/reexportMissingDefault3.js
index 98228e880fa..fb170146c97 100644
--- a/tests/baselines/reference/reexportMissingDefault3.js
+++ b/tests/baselines/reference/reexportMissingDefault3.js
@@ -22,6 +22,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.a = exports.b = void 0;
 var b_1 = require("./b");
 __createBinding(exports, b_1, "b");
 var b_2 = require("./b");
diff --git a/tests/baselines/reference/reexportMissingDefault4.js b/tests/baselines/reference/reexportMissingDefault4.js
index c69377d3741..89491b838e1 100644
--- a/tests/baselines/reference/reexportMissingDefault4.js
+++ b/tests/baselines/reference/reexportMissingDefault4.js
@@ -18,6 +18,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = exports.b = void 0;
 var b_1 = require("./b");
 __createBinding(exports, b_1, "b");
 var b_2 = require("./b");
diff --git a/tests/baselines/reference/reexportMissingDefault6.js b/tests/baselines/reference/reexportMissingDefault6.js
index d0af9156ad9..d34d707852d 100644
--- a/tests/baselines/reference/reexportMissingDefault6.js
+++ b/tests/baselines/reference/reexportMissingDefault6.js
@@ -22,6 +22,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = exports.b = void 0;
 var b_1 = require("./b");
 __createBinding(exports, b_1, "b");
 var b_2 = require("./b");
diff --git a/tests/baselines/reference/reexportMissingDefault8.js b/tests/baselines/reference/reexportMissingDefault8.js
index 55703f24b30..64d559be6f0 100644
--- a/tests/baselines/reference/reexportMissingDefault8.js
+++ b/tests/baselines/reference/reexportMissingDefault8.js
@@ -21,5 +21,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = void 0;
 var b_1 = require("./b");
 __createBinding(exports, b_1, "default");
diff --git a/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js b/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js
index 4bd06a0f42e..607b15571d8 100644
--- a/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js
+++ b/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js
@@ -49,6 +49,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.ThingB = exports.ThingA = void 0;
 var ThingA_1 = require("./ThingA");
 __createBinding(exports, ThingA_1, "ThingA");
 var ThingB_1 = require("./ThingB");
diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js
index 7f04a9b7201..aeeee3466a0 100644
--- a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js
+++ b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js
@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Value = void 0;
+exports.Value = exports.Y = exports.X = void 0;
 /*comment*/
 var somewhere_1 = require("somewhere");
 Object.defineProperty(exports, "Value", { enumerable: true, get: function () { return somewhere_1.Value; } });
diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module-with-isolatedModules.js
index 2dba5700c2f..2e69e95f67e 100644
--- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module-with-isolatedModules.js
+++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module-with-isolatedModules.js
@@ -146,6 +146,7 @@ export { default as bar } from './bar';
 //// [/src/obj/lazyIndex.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.bar = void 0;
 var bar_1 = require("./bar");
 Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } });
 
diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module.js
index e2dfbce4ab8..3bcf8750cbc 100644
--- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module.js
+++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/inferred-type-from-transitive-module.js
@@ -146,6 +146,7 @@ export { default as bar } from './bar';
 //// [/src/obj/lazyIndex.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.bar = void 0;
 var bar_1 = require("./bar");
 Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } });
 
diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js
index 000e53f1e6c..18a8e4ac388 100644
--- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js
+++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-build/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js
@@ -148,6 +148,7 @@ export { default as bar } from './bar';
 //// [/src/obj/lazyIndex.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.bar = void 0;
 var bar_1 = require("./bar");
 Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } });
 var bar_2 = require("./bar");
diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js
index a1e02bb982d..2ed69f22b13 100644
--- a/tests/baselines/reference/unclosedExportClause01.js
+++ b/tests/baselines/reference/unclosedExportClause01.js
@@ -30,6 +30,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.from = exports.x = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "x");
 __createBinding(exports, t1_1, "from");
@@ -43,6 +44,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.from = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "from");
 //// [t4.js]
@@ -55,6 +57,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.from = exports.a = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "x", "a");
 __createBinding(exports, t1_1, "from");
@@ -68,6 +71,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.from = exports.a = void 0;
 var t1_1 = require("./t1");
 __createBinding(exports, t1_1, "x", "a");
 __createBinding(exports, t1_1, "from");