diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 663825f1e84..18e76f46d72 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14493,6 +14493,33 @@ namespace ts {
 
         // Emitter support
 
+        function moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean {
+            let moduleSymbol = resolveExternalModuleName(moduleReferenceExpression.parent, moduleReferenceExpression);
+            if (!moduleSymbol) {
+                // module not found - be conservative
+                return true;
+            }
+
+            const hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined;
+            moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
+
+            const symbolLinks = getSymbolLinks(moduleSymbol);
+            if (symbolLinks.exportsSomeValue == undefined) {
+                // for export assignments - check if resolved symbol for RHS is itself a value
+                // otherwise - check if at least one export is value
+                symbolLinks.exportsSomeValue = hasExportAssignment 
+                    ? !!(moduleSymbol.flags & SymbolFlags.Value) 
+                    : forEachValue(getExportsOfModule(moduleSymbol), isValue);
+            }
+
+            return symbolLinks.exportsSomeValue;
+
+            function isValue(s: Symbol): boolean {
+                s = resolveSymbol(s);
+                return s && !!(s.flags & SymbolFlags.Value);
+            }
+        }
+        
         // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
         // node of the exported entity's container. Otherwise, return undefined.
         function getReferencedExportContainer(node: Identifier): SourceFile | ModuleDeclaration | EnumDeclaration {
@@ -14823,7 +14850,8 @@ namespace ts {
                 getBlockScopedVariableId,
                 getReferencedValueDeclaration,
                 getTypeReferenceSerializationKind,
-                isOptionalParameter
+                isOptionalParameter,
+                moduleExportsSomeValue
             };
         }
 
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 11942562dcb..bf670bd2c42 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -406,7 +406,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
             let exportSpecifiers: Map<ExportSpecifier[]>;
             let exportEquals: ExportAssignment;
-            let hasExportStars: boolean;
+            let hasExportStarsToExportValues: boolean;
 
             /** Write emitted output to disk */
             let writeEmittedFiles = writeJavaScriptFile;
@@ -5892,15 +5892,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         }
                         else {
                             // export * from "foo"
-                            writeLine();
-                            write("__export(");
-                            if (modulekind !== ModuleKind.AMD) {
-                                emitRequire(getExternalModuleName(node));
+                            if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
+                                writeLine();
+                                write("__export(");
+                                if (modulekind !== ModuleKind.AMD) {
+                                    emitRequire(getExternalModuleName(node));
+                                }
+                                else {
+                                    write(generatedName);
+                                }
+                                write(");");
                             }
-                            else {
-                                write(generatedName);
-                            }
-                            write(");");
                         }
                         emitEnd(node);
                     }
@@ -5988,7 +5990,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 externalImports = [];
                 exportSpecifiers = {};
                 exportEquals = undefined;
-                hasExportStars = false;
+                hasExportStarsToExportValues = false;
                 for (let node of sourceFile.statements) {
                     switch (node.kind) {
                         case SyntaxKind.ImportDeclaration:
@@ -6011,8 +6013,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             if ((<ExportDeclaration>node).moduleSpecifier) {
                                 if (!(<ExportDeclaration>node).exportClause) {
                                     // export * from "mod"
-                                    externalImports.push(<ExportDeclaration>node);
-                                    hasExportStars = true;
+                                    if (resolver.moduleExportsSomeValue((<ExportDeclaration>node).moduleSpecifier)) {
+                                        externalImports.push(<ExportDeclaration>node);
+                                        hasExportStarsToExportValues = true;
+                                    }
                                 }
                                 else if (resolver.isValueAliasDeclaration(node)) {
                                     // export { x, y } from "mod" where at least one export is a value symbol
@@ -6038,7 +6042,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitExportStarHelper() {
-                if (hasExportStars) {
+                if (hasExportStarsToExportValues) {
                     writeLine();
                     write("function __export(m) {");
                     increaseIndent();
@@ -6110,7 +6114,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // should always win over entries with similar names that were added via star exports
                 // to support this we store names of local/indirect exported entries in a set.
                 // this set is used to filter names brought by star expors.
-                if (!hasExportStars) {
+                if (!hasExportStarsToExportValues) {
                     // local names set is needed only in presence of star exports
                     return undefined;
                 }
@@ -6535,6 +6539,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                                     write("});");
                                 }
                                 else {
+                                    // collectExternalModuleInfo prefilters star exports to keep only ones that export values
+                                    // this means that check 'resolver.moduleExportsSomeValue' is redundant and can be omitted here
                                     writeLine();
                                     // export * from 'foo'
                                     // emit as:
@@ -6796,7 +6802,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 externalImports = undefined;
                 exportSpecifiers = undefined;
                 exportEquals = undefined;
-                hasExportStars = false;
+                hasExportStarsToExportValues = false;
                 emitEmitHelpers(node);
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
@@ -6996,7 +7002,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     externalImports = undefined;
                     exportSpecifiers = undefined;
                     exportEquals = undefined;
-                    hasExportStars = false;
+                    hasExportStarsToExportValues = false;
                     emitEmitHelpers(node);
                     emitCaptureThisForNodeIfNecessary(node);
                     emitLinesStartingAt(node.statements, startIndex);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 5979c4246b1..08dbd22ff7c 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1602,6 +1602,7 @@ namespace ts {
         getReferencedValueDeclaration(reference: Identifier): Declaration;
         getTypeReferenceSerializationKind(typeName: EntityName): TypeReferenceSerializationKind;
         isOptionalParameter(node: ParameterDeclaration): boolean;
+        moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean;
     }
 
     export const enum SymbolFlags {
@@ -1718,6 +1719,7 @@ namespace ts {
         exportsChecked?: boolean;           // True if exports of external module have been checked
         isNestedRedeclaration?: boolean;    // True if symbol is block scoped redeclaration
         bindingElement?: BindingElement;    // Binding element associated with property symbol
+        exportsSomeValue?: boolean;         // true if module exports some value (not just types)
     }
 
     /* @internal */
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 747b0b2beb8..3429b71b93c 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -289,7 +289,6 @@ exports.a8 = function_module_2.a;
 var class_module_2 = require("class-module");
 exports.a0 = class_module_2.a;
 // export-star
-__export(require("interface"));
 __export(require("variable"));
 __export(require("interface-variable"));
 __export(require("module"));
diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js
index 4a1ee9b739f..39c8123a1e7 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -53,7 +53,7 @@ var Bbb;
         return SomeType;
     })();
     Bbb.SomeType = SomeType;
-    __export(require()); // this line causes the nullref
+     // this line causes the nullref
 })(Bbb || (Bbb = {}));
 var a;
 
diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js
new file mode 100644
index 00000000000..bd82373d52a
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues.js
@@ -0,0 +1,17 @@
+//// [tests/cases/compiler/exportStarForValues.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export * from "file1"
+var x;
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file2.js]
+define(["require", "exports"], function (require, exports) {
+    var x;
+});
diff --git a/tests/baselines/reference/exportStarForValues.symbols b/tests/baselines/reference/exportStarForValues.symbols
new file mode 100644
index 00000000000..6694afecdc6
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+var x;
+>x : Symbol(x, Decl(file2.ts, 1, 3))
+
diff --git a/tests/baselines/reference/exportStarForValues.types b/tests/baselines/reference/exportStarForValues.types
new file mode 100644
index 00000000000..b326a7e7ff6
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+var x;
+>x : any
+
diff --git a/tests/baselines/reference/exportStarForValues10.js b/tests/baselines/reference/exportStarForValues10.js
new file mode 100644
index 00000000000..781316cb8f9
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues10.js
@@ -0,0 +1,52 @@
+//// [tests/cases/compiler/exportStarForValues10.ts] ////
+
+//// [file0.ts]
+
+export var v = 1;
+
+//// [file1.ts]
+export interface Foo { x }
+
+//// [file2.ts]
+export * from "file0";
+export * from "file1";
+var x = 1;
+
+//// [file0.js]
+System.register([], function(exports_1) {
+    var v;
+    return {
+        setters:[],
+        execute: function() {
+            exports_1("v", v = 1);
+        }
+    }
+});
+//// [file1.js]
+System.register([], function(exports_1) {
+    return {
+        setters:[],
+        execute: function() {
+        }
+    }
+});
+//// [file2.js]
+System.register(["file0"], function(exports_1) {
+    var x;
+    function exportStar_1(m) {
+        var exports = {};
+        for(var n in m) {
+            if (n !== "default") exports[n] = m[n];
+        }
+        exports_1(exports);
+    }
+    return {
+        setters:[
+            function (file0_1_1) {
+                exportStar_1(file0_1_1);
+            }],
+        execute: function() {
+            x = 1;
+        }
+    }
+});
diff --git a/tests/baselines/reference/exportStarForValues10.symbols b/tests/baselines/reference/exportStarForValues10.symbols
new file mode 100644
index 00000000000..2de35864d27
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues10.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/file0.ts ===
+
+export var v = 1;
+>v : Symbol(v, Decl(file0.ts, 1, 10))
+
+=== tests/cases/compiler/file1.ts ===
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 0, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file0";
+export * from "file1";
+var x = 1;
+>x : Symbol(x, Decl(file2.ts, 2, 3))
+
diff --git a/tests/baselines/reference/exportStarForValues10.types b/tests/baselines/reference/exportStarForValues10.types
new file mode 100644
index 00000000000..370f02318c1
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues10.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/file0.ts ===
+
+export var v = 1;
+>v : number
+>1 : number
+
+=== tests/cases/compiler/file1.ts ===
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file0";
+export * from "file1";
+var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js
new file mode 100644
index 00000000000..3d6b24ae433
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues2.js
@@ -0,0 +1,25 @@
+//// [tests/cases/compiler/exportStarForValues2.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export * from "file1"
+var x = 1;
+
+//// [file3.ts]
+export * from "file2"
+var x = 1;
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file2.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
+//// [file3.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
diff --git a/tests/baselines/reference/exportStarForValues2.symbols b/tests/baselines/reference/exportStarForValues2.symbols
new file mode 100644
index 00000000000..0fa739f5431
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues2.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+var x = 1;
+>x : Symbol(x, Decl(file2.ts, 1, 3))
+
+=== tests/cases/compiler/file3.ts ===
+export * from "file2"
+var x = 1;
+>x : Symbol(x, Decl(file3.ts, 1, 3))
+
diff --git a/tests/baselines/reference/exportStarForValues2.types b/tests/baselines/reference/exportStarForValues2.types
new file mode 100644
index 00000000000..f1de53bd7cf
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues2.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file3.ts ===
+export * from "file2"
+var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js
new file mode 100644
index 00000000000..c5136e57eef
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues3.js
@@ -0,0 +1,45 @@
+//// [tests/cases/compiler/exportStarForValues3.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export interface A { x }
+export * from "file1"
+var x = 1;
+
+//// [file3.ts]
+export interface B { x }
+export * from "file1"
+var x = 1;
+
+//// [file4.ts]
+export interface C { x }
+export * from "file2"
+export * from "file3"
+var x = 1;
+
+//// [file5.ts]
+export * from "file4"
+var x = 1;
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file2.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
+//// [file3.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
+//// [file4.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
+//// [file5.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
diff --git a/tests/baselines/reference/exportStarForValues3.symbols b/tests/baselines/reference/exportStarForValues3.symbols
new file mode 100644
index 00000000000..a79aeb36588
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues3.symbols
@@ -0,0 +1,39 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : Symbol(A, Decl(file2.ts, 0, 0))
+>x : Symbol(x, Decl(file2.ts, 0, 20))
+
+export * from "file1"
+var x = 1;
+>x : Symbol(x, Decl(file2.ts, 2, 3))
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : Symbol(B, Decl(file3.ts, 0, 0))
+>x : Symbol(x, Decl(file3.ts, 0, 20))
+
+export * from "file1"
+var x = 1;
+>x : Symbol(x, Decl(file3.ts, 2, 3))
+
+=== tests/cases/compiler/file4.ts ===
+export interface C { x }
+>C : Symbol(C, Decl(file4.ts, 0, 0))
+>x : Symbol(x, Decl(file4.ts, 0, 20))
+
+export * from "file2"
+export * from "file3"
+var x = 1;
+>x : Symbol(x, Decl(file4.ts, 3, 3))
+
+=== tests/cases/compiler/file5.ts ===
+export * from "file4"
+var x = 1;
+>x : Symbol(x, Decl(file5.ts, 1, 3))
+
diff --git a/tests/baselines/reference/exportStarForValues3.types b/tests/baselines/reference/exportStarForValues3.types
new file mode 100644
index 00000000000..d2ee5ebb1d4
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues3.types
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : A
+>x : any
+
+export * from "file1"
+var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : B
+>x : any
+
+export * from "file1"
+var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file4.ts ===
+export interface C { x }
+>C : C
+>x : any
+
+export * from "file2"
+export * from "file3"
+var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file5.ts ===
+export * from "file4"
+var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js
new file mode 100644
index 00000000000..2e7b84a6c2f
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues4.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/exportStarForValues4.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export interface A { x }
+export * from "file1"
+export * from "file3"
+var x = 1;
+
+//// [file3.ts]
+export interface B { x }
+export * from "file2"
+var x = 1;
+
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file3.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
+//// [file2.js]
+define(["require", "exports"], function (require, exports) {
+    var x = 1;
+});
diff --git a/tests/baselines/reference/exportStarForValues4.symbols b/tests/baselines/reference/exportStarForValues4.symbols
new file mode 100644
index 00000000000..465d6ed3237
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues4.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : Symbol(A, Decl(file2.ts, 0, 0))
+>x : Symbol(x, Decl(file2.ts, 0, 20))
+
+export * from "file1"
+export * from "file3"
+var x = 1;
+>x : Symbol(x, Decl(file2.ts, 3, 3))
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : Symbol(B, Decl(file3.ts, 0, 0))
+>x : Symbol(x, Decl(file3.ts, 0, 20))
+
+export * from "file2"
+var x = 1;
+>x : Symbol(x, Decl(file3.ts, 2, 3))
+
diff --git a/tests/baselines/reference/exportStarForValues4.types b/tests/baselines/reference/exportStarForValues4.types
new file mode 100644
index 00000000000..b381f9461e8
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues4.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : A
+>x : any
+
+export * from "file1"
+export * from "file3"
+var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : B
+>x : any
+
+export * from "file2"
+var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js
new file mode 100644
index 00000000000..48caf8bdb85
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues5.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/exportStarForValues5.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export * from "file1"
+export var x;
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file2.js]
+define(["require", "exports"], function (require, exports) {
+});
diff --git a/tests/baselines/reference/exportStarForValues5.symbols b/tests/baselines/reference/exportStarForValues5.symbols
new file mode 100644
index 00000000000..a2950afa73f
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues5.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+export var x;
+>x : Symbol(x, Decl(file2.ts, 1, 10))
+
diff --git a/tests/baselines/reference/exportStarForValues5.types b/tests/baselines/reference/exportStarForValues5.types
new file mode 100644
index 00000000000..9edfc88289a
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues5.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+export var x;
+>x : any
+
diff --git a/tests/baselines/reference/exportStarForValues6.js b/tests/baselines/reference/exportStarForValues6.js
new file mode 100644
index 00000000000..e393ad3fe7e
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues6.js
@@ -0,0 +1,28 @@
+//// [tests/cases/compiler/exportStarForValues6.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export * from "file1"
+export var x = 1;
+
+//// [file1.js]
+System.register([], function(exports_1) {
+    return {
+        setters:[],
+        execute: function() {
+        }
+    }
+});
+//// [file2.js]
+System.register([], function(exports_1) {
+    var x;
+    return {
+        setters:[],
+        execute: function() {
+            exports_1("x", x = 1);
+        }
+    }
+});
diff --git a/tests/baselines/reference/exportStarForValues6.symbols b/tests/baselines/reference/exportStarForValues6.symbols
new file mode 100644
index 00000000000..c57baf301dd
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues6.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+export var x = 1;
+>x : Symbol(x, Decl(file2.ts, 1, 10))
+
diff --git a/tests/baselines/reference/exportStarForValues6.types b/tests/baselines/reference/exportStarForValues6.types
new file mode 100644
index 00000000000..4fe38a45d02
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues6.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+export var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
new file mode 100644
index 00000000000..1e249f45906
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/exportStarForValues7.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export * from "file1"
+export var x = 1;
+
+//// [file3.ts]
+export * from "file2"
+export var x = 1;
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file2.js]
+define(["require", "exports"], function (require, exports) {
+    exports.x = 1;
+});
+//// [file3.js]
+define(["require", "exports", "file2"], function (require, exports, file2_1) {
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    __export(file2_1);
+    exports.x = 1;
+});
diff --git a/tests/baselines/reference/exportStarForValues7.symbols b/tests/baselines/reference/exportStarForValues7.symbols
new file mode 100644
index 00000000000..b59f2890047
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues7.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+export var x = 1;
+>x : Symbol(x, Decl(file2.ts, 1, 10))
+
+=== tests/cases/compiler/file3.ts ===
+export * from "file2"
+export var x = 1;
+>x : Symbol(x, Decl(file3.ts, 1, 10))
+
diff --git a/tests/baselines/reference/exportStarForValues7.types b/tests/baselines/reference/exportStarForValues7.types
new file mode 100644
index 00000000000..d37661320d6
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues7.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+export var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file3.ts ===
+export * from "file2"
+export var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
new file mode 100644
index 00000000000..aca678ddd17
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -0,0 +1,54 @@
+//// [tests/cases/compiler/exportStarForValues8.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export interface A { x }
+export * from "file1"
+export var x = 1;
+
+//// [file3.ts]
+export interface B { x }
+export * from "file1"
+export var x = 1;
+
+//// [file4.ts]
+export interface C { x }
+export * from "file2"
+export * from "file3"
+export var x = 1;
+
+//// [file5.ts]
+export * from "file4"
+export var x = 1;
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file2.js]
+define(["require", "exports"], function (require, exports) {
+    exports.x = 1;
+});
+//// [file3.js]
+define(["require", "exports"], function (require, exports) {
+    exports.x = 1;
+});
+//// [file4.js]
+define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    __export(file2_1);
+    __export(file3_1);
+    exports.x = 1;
+});
+//// [file5.js]
+define(["require", "exports", "file4"], function (require, exports, file4_1) {
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    __export(file4_1);
+    exports.x = 1;
+});
diff --git a/tests/baselines/reference/exportStarForValues8.symbols b/tests/baselines/reference/exportStarForValues8.symbols
new file mode 100644
index 00000000000..be958ecabe8
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues8.symbols
@@ -0,0 +1,39 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : Symbol(A, Decl(file2.ts, 0, 0))
+>x : Symbol(x, Decl(file2.ts, 0, 20))
+
+export * from "file1"
+export var x = 1;
+>x : Symbol(x, Decl(file2.ts, 2, 10))
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : Symbol(B, Decl(file3.ts, 0, 0))
+>x : Symbol(x, Decl(file3.ts, 0, 20))
+
+export * from "file1"
+export var x = 1;
+>x : Symbol(x, Decl(file3.ts, 2, 10))
+
+=== tests/cases/compiler/file4.ts ===
+export interface C { x }
+>C : Symbol(C, Decl(file4.ts, 0, 0))
+>x : Symbol(x, Decl(file4.ts, 0, 20))
+
+export * from "file2"
+export * from "file3"
+export var x = 1;
+>x : Symbol(x, Decl(file4.ts, 3, 10))
+
+=== tests/cases/compiler/file5.ts ===
+export * from "file4"
+export var x = 1;
+>x : Symbol(x, Decl(file5.ts, 1, 10))
+
diff --git a/tests/baselines/reference/exportStarForValues8.types b/tests/baselines/reference/exportStarForValues8.types
new file mode 100644
index 00000000000..9cc1484eecb
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues8.types
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : A
+>x : any
+
+export * from "file1"
+export var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : B
+>x : any
+
+export * from "file1"
+export var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file4.ts ===
+export interface C { x }
+>C : C
+>x : any
+
+export * from "file2"
+export * from "file3"
+export var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file5.ts ===
+export * from "file4"
+export var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
new file mode 100644
index 00000000000..76758d8a2a0
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -0,0 +1,37 @@
+//// [tests/cases/compiler/exportStarForValues9.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export interface A { x }
+export * from "file1"
+export * from "file3"
+export var x = 1;
+
+//// [file3.ts]
+export interface B { x }
+export * from "file2"
+export var x = 1;
+
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+});
+//// [file3.js]
+define(["require", "exports", "file2"], function (require, exports, file2_1) {
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    __export(file2_1);
+    exports.x = 1;
+});
+//// [file2.js]
+define(["require", "exports", "file3"], function (require, exports, file3_1) {
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    __export(file3_1);
+    exports.x = 1;
+});
diff --git a/tests/baselines/reference/exportStarForValues9.symbols b/tests/baselines/reference/exportStarForValues9.symbols
new file mode 100644
index 00000000000..0684c9e7b7c
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues9.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : Symbol(A, Decl(file2.ts, 0, 0))
+>x : Symbol(x, Decl(file2.ts, 0, 20))
+
+export * from "file1"
+export * from "file3"
+export var x = 1;
+>x : Symbol(x, Decl(file2.ts, 3, 10))
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : Symbol(B, Decl(file3.ts, 0, 0))
+>x : Symbol(x, Decl(file3.ts, 0, 20))
+
+export * from "file2"
+export var x = 1;
+>x : Symbol(x, Decl(file3.ts, 2, 10))
+
diff --git a/tests/baselines/reference/exportStarForValues9.types b/tests/baselines/reference/exportStarForValues9.types
new file mode 100644
index 00000000000..3cf250ec50b
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues9.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export interface A { x }
+>A : A
+>x : any
+
+export * from "file1"
+export * from "file3"
+export var x = 1;
+>x : number
+>1 : number
+
+=== tests/cases/compiler/file3.ts ===
+export interface B { x }
+>B : B
+>x : any
+
+export * from "file2"
+export var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/exportStarForValuesInSystem.js b/tests/baselines/reference/exportStarForValuesInSystem.js
new file mode 100644
index 00000000000..29b839731a8
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValuesInSystem.js
@@ -0,0 +1,28 @@
+//// [tests/cases/compiler/exportStarForValuesInSystem.ts] ////
+
+//// [file1.ts]
+
+export interface Foo { x }
+
+//// [file2.ts]
+export * from "file1"
+var x = 1;
+
+//// [file1.js]
+System.register([], function(exports_1) {
+    return {
+        setters:[],
+        execute: function() {
+        }
+    }
+});
+//// [file2.js]
+System.register([], function(exports_1) {
+    var x;
+    return {
+        setters:[],
+        execute: function() {
+            x = 1;
+        }
+    }
+});
diff --git a/tests/baselines/reference/exportStarForValuesInSystem.symbols b/tests/baselines/reference/exportStarForValuesInSystem.symbols
new file mode 100644
index 00000000000..c9ef9830c60
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValuesInSystem.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
+>x : Symbol(x, Decl(file1.ts, 1, 22))
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+var x = 1;
+>x : Symbol(x, Decl(file2.ts, 1, 3))
+
diff --git a/tests/baselines/reference/exportStarForValuesInSystem.types b/tests/baselines/reference/exportStarForValuesInSystem.types
new file mode 100644
index 00000000000..36d07741e10
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValuesInSystem.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/file1.ts ===
+
+export interface Foo { x }
+>Foo : Foo
+>x : any
+
+=== tests/cases/compiler/file2.ts ===
+export * from "file1"
+var x = 1;
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/moduleElementsInWrongContext.js b/tests/baselines/reference/moduleElementsInWrongContext.js
index 635da02bdf2..df4935f9e19 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext.js
@@ -34,7 +34,6 @@
 {
     var v;
     function foo() { }
-    __export(require("ambient"));
     exports["default"] = v;
     var C = (function () {
         function C() {
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.js b/tests/baselines/reference/moduleElementsInWrongContext2.js
index fdf1222e549..b923bc7861e 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.js
@@ -34,7 +34,6 @@ function blah () {
 function blah() {
     var v;
     function foo() { }
-    __export(require("ambient"));
     exports["default"] = v;
     var C = (function () {
         function C() {
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js
index d464d9d31b1..2fa0b60dce4 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.js
@@ -37,7 +37,6 @@ var P;
     {
         var v;
         function foo() { }
-        __export(require("ambient"));
         P["default"] = v;
         var C = (function () {
             function C() {
diff --git a/tests/cases/compiler/exportStarForValues.ts b/tests/cases/compiler/exportStarForValues.ts
new file mode 100644
index 00000000000..3432548c528
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues.ts
@@ -0,0 +1,8 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export * from "file1"
+var x;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues10.ts b/tests/cases/compiler/exportStarForValues10.ts
new file mode 100644
index 00000000000..82cee772b18
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues10.ts
@@ -0,0 +1,12 @@
+// @module: system
+
+// @filename: file0.ts
+export var v = 1;
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export * from "file0";
+export * from "file1";
+var x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues2.ts b/tests/cases/compiler/exportStarForValues2.ts
new file mode 100644
index 00000000000..63a880cce0a
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues2.ts
@@ -0,0 +1,12 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export * from "file1"
+var x = 1;
+
+// @filename: file3.ts
+export * from "file2"
+var x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues3.ts b/tests/cases/compiler/exportStarForValues3.ts
new file mode 100644
index 00000000000..f0c36db0bda
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues3.ts
@@ -0,0 +1,24 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export interface A { x }
+export * from "file1"
+var x = 1;
+
+// @filename: file3.ts
+export interface B { x }
+export * from "file1"
+var x = 1;
+
+// @filename: file4.ts
+export interface C { x }
+export * from "file2"
+export * from "file3"
+var x = 1;
+
+// @filename: file5.ts
+export * from "file4"
+var x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues4.ts b/tests/cases/compiler/exportStarForValues4.ts
new file mode 100644
index 00000000000..d685ba1c8a3
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues4.ts
@@ -0,0 +1,15 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export interface A { x }
+export * from "file1"
+export * from "file3"
+var x = 1;
+
+// @filename: file3.ts
+export interface B { x }
+export * from "file2"
+var x = 1;
diff --git a/tests/cases/compiler/exportStarForValues5.ts b/tests/cases/compiler/exportStarForValues5.ts
new file mode 100644
index 00000000000..cb716c72002
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues5.ts
@@ -0,0 +1,8 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export * from "file1"
+export var x;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues6.ts b/tests/cases/compiler/exportStarForValues6.ts
new file mode 100644
index 00000000000..a623e31f178
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues6.ts
@@ -0,0 +1,8 @@
+// @module: system
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export * from "file1"
+export var x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues7.ts b/tests/cases/compiler/exportStarForValues7.ts
new file mode 100644
index 00000000000..c1343a44119
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues7.ts
@@ -0,0 +1,12 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export * from "file1"
+export var x = 1;
+
+// @filename: file3.ts
+export * from "file2"
+export var x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues8.ts b/tests/cases/compiler/exportStarForValues8.ts
new file mode 100644
index 00000000000..0594f8b0877
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues8.ts
@@ -0,0 +1,24 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export interface A { x }
+export * from "file1"
+export var x = 1;
+
+// @filename: file3.ts
+export interface B { x }
+export * from "file1"
+export var x = 1;
+
+// @filename: file4.ts
+export interface C { x }
+export * from "file2"
+export * from "file3"
+export var x = 1;
+
+// @filename: file5.ts
+export * from "file4"
+export var x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportStarForValues9.ts b/tests/cases/compiler/exportStarForValues9.ts
new file mode 100644
index 00000000000..53ffb1b7954
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValues9.ts
@@ -0,0 +1,15 @@
+// @module: amd
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export interface A { x }
+export * from "file1"
+export * from "file3"
+export var x = 1;
+
+// @filename: file3.ts
+export interface B { x }
+export * from "file2"
+export var x = 1;
diff --git a/tests/cases/compiler/exportStarForValuesInSystem.ts b/tests/cases/compiler/exportStarForValuesInSystem.ts
new file mode 100644
index 00000000000..1f60e8dec6f
--- /dev/null
+++ b/tests/cases/compiler/exportStarForValuesInSystem.ts
@@ -0,0 +1,8 @@
+// @module: system
+
+// @filename: file1.ts
+export interface Foo { x }
+
+// @filename: file2.ts
+export * from "file1"
+var x = 1;
\ No newline at end of file