diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 62fc1a7cc418f..1ff692b088103 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2822,6 +2822,11 @@ namespace ts {
                         isDeclarationVisible(declaration.parent.parent.parent)) {
                         return addVisibleAlias(declaration, declaration.parent.parent);
                     }
+                    else if (isLateVisibilityPaintedStatement(declaration) // unexported top-level statement
+                        && !hasModifier(declaration, ModifierFlags.Export)
+                        && isDeclarationVisible(declaration.parent)) {
+                        return addVisibleAlias(declaration, declaration);
+                    }
 
                     // Declaration is not visible
                     return false;
@@ -3679,7 +3684,17 @@ namespace ts {
                 return typeParameterNodes;
             }
 
-            function symbolToTypeNode(symbol: Symbol, context: NodeBuilderContext, meaning: SymbolFlags): TypeQueryNode | TypeReferenceNode | ImportTypeNode {
+            /**
+             * Given A[B][C][D], finds A[B]
+             */
+            function getTopmostIndexedAccessType(top: IndexedAccessTypeNode): IndexedAccessTypeNode {
+                if (isIndexedAccessTypeNode(top.objectType)) {
+                    return getTopmostIndexedAccessType(top.objectType);
+                }
+                return top;
+            }
+
+            function symbolToTypeNode(symbol: Symbol, context: NodeBuilderContext, meaning: SymbolFlags): TypeNode {
                 const chain = lookupSymbolChain(symbol, context, meaning);
 
                 context.flags |= NodeBuilderFlags.InInitialEntityName;
@@ -3689,15 +3704,26 @@ namespace ts {
                 const isTypeOf = meaning === SymbolFlags.Value;
                 if (ambientModuleSymbolRegex.test(rootName)) {
                     // module is root, must use `ImportTypeNode`
-                    const nonRootParts = chain.length > 1 ? createEntityNameFromSymbolChain(chain, chain.length - 1, 1) : undefined;
+                    const nonRootParts = chain.length > 1 ? createAccessFromSymbolChain(chain, chain.length - 1, 1) : undefined;
                     const typeParameterNodes = lookupTypeParameterNodes(chain, 0, context);
-                    return createImportTypeNode(createLiteralTypeNode(createLiteral(rootName.substring(1, rootName.length - 1))), nonRootParts, typeParameterNodes as ReadonlyArray<TypeNode>, isTypeOf);
+                    const lit = createLiteralTypeNode(createLiteral(rootName.substring(1, rootName.length - 1)));
+                    if (!nonRootParts || isEntityName(nonRootParts)) {
+                        return createImportTypeNode(lit, nonRootParts as EntityName, typeParameterNodes as ReadonlyArray<TypeNode>, isTypeOf);
+                    }
+                    else {
+                        const splitNode = getTopmostIndexedAccessType(nonRootParts);
+                        const qualifier = (splitNode.objectType as TypeReferenceNode).typeName;
+                        return createIndexedAccessTypeNode(createImportTypeNode(lit, qualifier, typeParameterNodes as ReadonlyArray<TypeNode>, isTypeOf), splitNode.indexType);
+                    }
                 }
 
-                const entityName = createEntityNameFromSymbolChain(chain, chain.length - 1, 0);
+                const entityName = createAccessFromSymbolChain(chain, chain.length - 1, 0);
+                if (isIndexedAccessTypeNode(entityName)) {
+                    return entityName; // Indexed accesses can never be `typeof`
+                }
                 return isTypeOf ? createTypeQueryNode(entityName) : createTypeReferenceNode(entityName, /*typeArguments*/ undefined);
 
-                function createEntityNameFromSymbolChain(chain: Symbol[], index: number, stopper: number): EntityName {
+                function createAccessFromSymbolChain(chain: Symbol[], index: number, stopper: number): EntityName | IndexedAccessTypeNode {
                     const typeParameterNodes = lookupTypeParameterNodes(chain, index, context);
                     const symbol = chain[index];
 
@@ -3708,10 +3734,30 @@ namespace ts {
                     if (index === 0) {
                         context.flags ^= NodeBuilderFlags.InInitialEntityName;
                     }
+
+                    const parent = chain[index - 1];
+                    if (parent && getMembersOfSymbol(parent) && getMembersOfSymbol(parent).get(symbol.escapedName) === symbol) {
+                        // Should use an indexed access
+                        const LHS = createAccessFromSymbolChain(chain, index - 1, stopper);
+                        if (isIndexedAccessTypeNode(LHS)) {
+                            return createIndexedAccessTypeNode(LHS, createLiteralTypeNode(createLiteral(symbolName)));
+                        }
+                        else {
+                            return createIndexedAccessTypeNode(createTypeReferenceNode(LHS, typeParameterNodes as ReadonlyArray<TypeNode>), createLiteralTypeNode(createLiteral(symbolName)));
+                        }
+                    }
+
                     const identifier = setEmitFlags(createIdentifier(symbolName, typeParameterNodes), EmitFlags.NoAsciiEscaping);
                     identifier.symbol = symbol;
 
-                    return index > stopper ? createQualifiedName(createEntityNameFromSymbolChain(chain, index - 1, stopper), identifier) : identifier;
+                    if (index > stopper) {
+                        const LHS = createAccessFromSymbolChain(chain, index - 1, stopper);
+                        if (!isEntityName(LHS)) {
+                            return Debug.fail("Impossible construct - an export of an indexed access cannot be reachable");
+                        }
+                        return createQualifiedName(LHS, identifier);
+                    }
+                    return identifier;
                 }
             }
 
@@ -26566,7 +26612,22 @@ namespace ts {
                     const symbol = node && getSymbolOfNode(node);
                     return !!(symbol && getCheckFlags(symbol) & CheckFlags.Late);
                 },
-                getJsxFactoryEntity: location => location ? (getJsxNamespace(location), (getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity
+                getJsxFactoryEntity: location => location ? (getJsxNamespace(location), (getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity,
+                getAllAccessorDeclarations(accessor: AccessorDeclaration): AllAccessorDeclarations {
+                    accessor = getParseTreeNode(accessor, isGetOrSetAccessorDeclaration);
+                    const otherKind = accessor.kind === SyntaxKind.SetAccessor ? SyntaxKind.GetAccessor : SyntaxKind.SetAccessor;
+                    const otherAccessor = getDeclarationOfKind<AccessorDeclaration>(getSymbolOfNode(accessor), otherKind);
+                    const firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
+                    const secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
+                    const setAccessor = accessor.kind === SyntaxKind.SetAccessor ? accessor : otherAccessor;
+                    const getAccessor = accessor.kind === SyntaxKind.GetAccessor ? accessor : otherAccessor;
+                    return {
+                        firstAccessor,
+                        secondAccessor,
+                        setAccessor,
+                        getAccessor
+                    };
+                }
             };
 
             function isInHeritageClause(node: PropertyAccessEntityNameExpression) {
diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
index 67e4fa31cb249..5e37bc56eaa48 100644
--- a/src/compiler/transformers/declarations.ts
+++ b/src/compiler/transformers/declarations.ts
@@ -28,7 +28,7 @@ namespace ts {
         let enclosingDeclaration: Node;
         let necessaryTypeRefernces: Map<true>;
         let lateMarkedStatements: LateVisibilityPaintedStatement[];
-        let lateStatementReplacementMap: Map<LateVisibilityPaintedStatement | undefined>;
+        let lateStatementReplacementMap: Map<VisitResult<LateVisibilityPaintedStatement>>;
         let suppressNewDiagnosticContexts: boolean;
 
         const symbolTracker: SymbolTracker = {
@@ -155,13 +155,13 @@ namespace ts {
                                 [],
                                 [createModifier(SyntaxKind.DeclareKeyword)],
                                 createLiteral(getResolvedExternalModuleName(context.getEmitHost(), sourceFile)),
-                                createModuleBlock(setTextRange(createNodeArray(filterCandidateImports(statements)), sourceFile.statements))
+                                createModuleBlock(setTextRange(createNodeArray(transformAndReplaceLatePaintedStatements(statements)), sourceFile.statements))
                             )], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false);
                             return newFile;
                         }
                         needsDeclare = true;
                         const updated = visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        return updateSourceFileNode(sourceFile, filterCandidateImports(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false);
+                        return updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false);
                     }
                 ));
                 bundle.syntheticFileReferences = [];
@@ -192,7 +192,7 @@ namespace ts {
             const referenceVisitor = mapReferencesIntoArray(references, outputFilePath);
             refs.forEach(referenceVisitor);
             const statements = visitNodes(node.statements, visitDeclarationStatements);
-            let combinedStatements = setTextRange(createNodeArray(filterCandidateImports(statements)), node.statements);
+            let combinedStatements = setTextRange(createNodeArray(transformAndReplaceLatePaintedStatements(statements)), node.statements);
             const emittedImports = filter(combinedStatements, isAnyImportSyntax);
             if (isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
                 combinedStatements = setTextRange(createNodeArray([...combinedStatements, createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([]), /*moduleSpecifier*/ undefined)]), combinedStatements);
@@ -254,7 +254,7 @@ namespace ts {
             forEach(sourceFile.referencedFiles, f => {
                 const elem = tryResolveScriptReference(host, sourceFile, f);
                 if (elem) {
-                    ret.set("" + getNodeId(elem), elem);
+                    ret.set("" + getOriginalNodeId(elem), elem);
                 }
             });
             return ret;
@@ -534,7 +534,7 @@ namespace ts {
             // Nothing visible
         }
 
-        function filterCandidateImports(statements: NodeArray<Statement>): NodeArray<Statement> {
+        function transformAndReplaceLatePaintedStatements(statements: NodeArray<Statement>): NodeArray<Statement> {
             // This is a `while` loop because `handleSymbolAccessibilityError` can see additional import aliases marked as visible during
             // error handling which must now be included in the output and themselves checked for errors.
             // For example:
@@ -549,65 +549,50 @@ namespace ts {
             // In such a scenario, only Q and D are initially visible, but we don't consider imports as private names - instead we say they if they are referenced they must
             // be recorded. So while checking D's visibility we mark C as visible, then we must check C which in turn marks B, completing the chain of
             // dependent imports and allowing a valid declaration file output. Today, this dependent alias marking only happens for internal import aliases.
-            const unconsideredStatements: LateVisibilityPaintedStatement[] = [];
             while (length(lateMarkedStatements)) {
                 const i = lateMarkedStatements.shift();
-                if ((isSourceFile(i.parent) ? i.parent : i.parent.parent) !== enclosingDeclaration) { // Filter to only declarations in the current scope
-                    unconsideredStatements.push(i);
-                    continue;
-                }
                 if (!isLateVisibilityPaintedStatement(i)) {
-                    return Debug.fail(`Late replaced statement was foudn which is not handled by the declaration transformer!: ${(ts as any).SyntaxKind ? (ts as any).SyntaxKind[(i as any).kind] : (i as any).kind}`);
-                }
-                switch (i.kind) {
-                    case SyntaxKind.ImportEqualsDeclaration: {
-                        const result = transformImportEqualsDeclaration(i);
-                        lateStatementReplacementMap.set("" + getNodeId(i), result);
-                        break;
-                    }
-                    case SyntaxKind.ImportDeclaration: {
-                        const result = transformImportDeclaration(i);
-                        lateStatementReplacementMap.set("" + getNodeId(i), result);
-                        break;
-                    }
-                    case SyntaxKind.VariableStatement: {
-                        const result = transformVariableStatement(i, /*privateDeclaration*/ true); // Transform the statement (potentially again, possibly revealing more sub-nodes)
-                        lateStatementReplacementMap.set("" + getNodeId(i), result);
-                        break;
-                    }
-                    default: Debug.assertNever(i, "Unhandled late painted statement!");
+                    return Debug.fail(`Late replaced statement was found which is not handled by the declaration transformer!: ${(ts as any).SyntaxKind ? (ts as any).SyntaxKind[(i as any).kind] : (i as any).kind}`);
                 }
+                const result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                lateStatementReplacementMap.set("" + getOriginalNodeId(i), result);
             }
-            // Filtering available imports is the last thing done within a scope, so the possible set becomes those which could not
-            // be considered in the child scope
-            lateMarkedStatements = unconsideredStatements;
 
             // And lastly, we need to get the final form of all those indetermine import declarations from before and add them to the output list
             // (and remove them from the set to examine for outter declarations)
             return visitNodes(statements, visitLateVisibilityMarkedStatements);
-        }
 
-        function visitLateVisibilityMarkedStatements(statement: Statement) {
-            if (isLateVisibilityPaintedStatement(statement)) {
-                const key = "" + getNodeId(statement);
-                if (lateStatementReplacementMap.has(key)) {
-                    const result = lateStatementReplacementMap.get(key);
-                    lateStatementReplacementMap.delete(key);
-                    if (result && isSourceFile(statement.parent) && !isAnyImportOrReExport(result) && !isExportAssignment(result) && !hasModifier(result, ModifierFlags.Export)) {
-                        // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
-                        needsScopeFixMarker = true;
+            function visitLateVisibilityMarkedStatements(statement: Statement) {
+                if (isLateVisibilityPaintedStatement(statement)) {
+                    const key = "" + getOriginalNodeId(statement);
+                    if (lateStatementReplacementMap.has(key)) {
+                        const result = lateStatementReplacementMap.get(key);
+                        lateStatementReplacementMap.delete(key);
+                        if (result && isSourceFile(statement.parent)) {
+                            if (isArray(result) ? some(result, needsScopeMarker) : needsScopeMarker(result)) {
+                                // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
+                                needsScopeFixMarker = true;
+                            }
+                            if (isArray(result) ? some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                                resultHasExternalModuleIndicator = true;
+                            }
+                        }
+                        return result;
                     }
-                    return result;
                 }
-                else {
-                    return getParseTreeNode(statement) ? undefined : statement;
-                }
-            }
-            else {
                 return statement;
             }
         }
 
+        function isExternalModuleIndicator(result: LateVisibilityPaintedStatement) {
+            // Exported top-level member indicates moduleness
+            return isAnyImportOrReExport(result) || isExportAssignment(result) || hasModifier(result, ModifierFlags.Export);
+        }
+
+        function needsScopeMarker(result: LateVisibilityPaintedStatement) {
+            return !isAnyImportOrReExport(result) && !isExportAssignment(result) && !hasModifier(result, ModifierFlags.Export) && !isAmbientModule(result);
+        }
+
         function visitDeclarationSubtree(input: Node): VisitResult<Node> {
             if (shouldStripInternal(input)) return;
             if (isDeclaration(input)) {
@@ -862,13 +847,22 @@ namespace ts {
                         return [statement, updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
-                case SyntaxKind.ImportEqualsDeclaration:
+            }
+
+            const result = transformTopLevelDeclaration(input);
+            // Don't actually transform yet; just leave as original node - will be elided/swapped by late pass
+            lateStatementReplacementMap.set("" + getOriginalNodeId(input), result);
+            return input;
+        }
+
+        function transformTopLevelDeclaration(input: LateVisibilityPaintedStatement, isPrivate?: boolean) {
+            if (shouldStripInternal(input)) return;
+            switch (input.kind) {
+                case SyntaxKind.ImportEqualsDeclaration: {
+                    return transformImportEqualsDeclaration(input);
+                }
                 case SyntaxKind.ImportDeclaration: {
-                    // Different parts of the import may be marked visible at different times (via visibility checking), so we defer our first look until later
-                    // to reduce the likelihood we need to rewrite it
-                    lateMarkedStatements = lateMarkedStatements || [];
-                    pushIfUnique(lateMarkedStatements, input);
-                    return input;
+                    return transformImportDeclaration(input);
                 }
             }
             if (isDeclaration(input) && isDeclarationAndNotVisible(input)) return;
@@ -881,21 +875,20 @@ namespace ts {
                 previousEnclosingDeclaration = enclosingDeclaration;
                 enclosingDeclaration = input as Declaration;
             }
-            let previousNeedsDeclare: typeof needsDeclare;
 
             const canProdiceDiagnostic = canProduceDiagnostics(input);
             const oldDiag = getSymbolAccessibilityDiagnostic;
             if (canProdiceDiagnostic) {
                 getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(input as DeclarationDiagnosticProducing);
             }
-            let oldPossibleImports: typeof lateMarkedStatements;
 
+            const previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
                 case SyntaxKind.TypeAliasDeclaration: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(updateTypeAliasDeclaration(
                         input,
                         /*decorators*/ undefined,
-                        ensureModifiers(input),
+                        ensureModifiers(input, isPrivate),
                         input.name,
                         visitNodes(input.typeParameters, visitDeclarationSubtree, isTypeParameterDeclaration),
                         visitNode(input.type, visitDeclarationSubtree, isTypeNode)
@@ -904,7 +897,7 @@ namespace ts {
                     return cleanup(updateInterfaceDeclaration(
                         input,
                         /*decorators*/ undefined,
-                        ensureModifiers(input),
+                        ensureModifiers(input, isPrivate),
                         input.name,
                         ensureTypeParams(input, input.typeParameters),
                         transformHeritageClauses(input.heritageClauses),
@@ -916,7 +909,7 @@ namespace ts {
                     return cleanup(updateFunctionDeclaration(
                         input,
                         /*decorators*/ undefined,
-                        ensureModifiers(input),
+                        ensureModifiers(input, isPrivate),
                         /*asteriskToken*/ undefined,
                         input.name,
                         ensureTypeParams(input, input.typeParameters),
@@ -926,16 +919,13 @@ namespace ts {
                     ));
                 }
                 case SyntaxKind.ModuleDeclaration: {
-                    previousNeedsDeclare = needsDeclare;
                     needsDeclare = false;
-                    oldPossibleImports = lateMarkedStatements;
-                    lateMarkedStatements = undefined;
                     const inner = input.body;
                     if (inner && inner.kind === SyntaxKind.ModuleBlock) {
                         const statements = visitNodes(inner.statements, visitDeclarationStatements);
-                        const body = updateModuleBlock(inner, filterCandidateImports(statements));
+                        const body = updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
                         needsDeclare = previousNeedsDeclare;
-                        const mods = ensureModifiers(input);
+                        const mods = ensureModifiers(input, isPrivate);
                         return cleanup(updateModuleDeclaration(
                             input,
                             /*decorators*/ undefined,
@@ -946,19 +936,24 @@ namespace ts {
                     }
                     else {
                         needsDeclare = previousNeedsDeclare;
-                        const mods = ensureModifiers(input);
+                        const mods = ensureModifiers(input, isPrivate);
                         needsDeclare = false;
+                        visitNode(inner, visitDeclarationStatements);
+                        // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done)
+                        const id = "" + getOriginalNodeId(inner);
+                        const body = lateStatementReplacementMap.get(id);
+                        lateStatementReplacementMap.delete(id);
                         return cleanup(updateModuleDeclaration(
                             input,
                             /*decorators*/ undefined,
                             mods,
                             input.name,
-                            visitNode(inner, visitDeclarationStatements)
+                            body as ModuleBody
                         ));
                     }
                 }
                 case SyntaxKind.ClassDeclaration: {
-                    const modifiers = createNodeArray(ensureModifiers(input));
+                    const modifiers = createNodeArray(ensureModifiers(input, isPrivate));
                     const typeParameters = ensureTypeParams(input, input.typeParameters);
                     const ctor = getFirstConstructorWithBody(input);
                     let parameterProperties: PropertyDeclaration[];
@@ -1051,12 +1046,10 @@ namespace ts {
                     }
                 }
                 case SyntaxKind.VariableStatement: {
-                    const result = transformVariableStatement(input);
-                    lateStatementReplacementMap.set("" + getNodeId(input), result); // Don't actually elide yet; just leave as original node - will be elided/swapped by late pass
-                    return cleanup(input);
+                    return cleanup(transformVariableStatement(input, isPrivate));
                 }
                 case SyntaxKind.EnumDeclaration: {
-                    return cleanup(updateEnumDeclaration(input, /*decorators*/ undefined, createNodeArray(ensureModifiers(input)), input.name, createNodeArray(mapDefined(input.members, m => {
+                    return cleanup(updateEnumDeclaration(input, /*decorators*/ undefined, createNodeArray(ensureModifiers(input, isPrivate)), input.name, createNodeArray(mapDefined(input.members, m => {
                         if (shouldStripInternal(m)) return;
                         // Rewrite enum values to their constants, if available
                         const constValue = resolver.getConstantValue(m);
@@ -1064,31 +1057,23 @@ namespace ts {
                     }))));
                 }
             }
-
             // Anything left unhandled is an error, so this should be unreachable
             return Debug.assertNever(input, `Unhandled top-level node in declaration emit: ${(ts as any).SyntaxKind[(input as any).kind]}`);
 
-            function cleanup<T extends Node>(returnValue: T | undefined): T {
+            function cleanup<T extends Node>(node: T | undefined): T {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
                 }
-                if (input.kind === SyntaxKind.ModuleDeclaration) {
-                    needsDeclare = previousNeedsDeclare;
-                    lateMarkedStatements = concatenate(oldPossibleImports, lateMarkedStatements);
-                }
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (returnValue && (!isLateVisibilityPaintedStatement(input) || lateStatementReplacementMap.get("" + getNodeId(input)))) {
-                    if (!resultHasExternalModuleIndicator && hasModifier(input, ModifierFlags.Export) && isSourceFile(input.parent)) {
-                        // Exported top-level member indicates moduleness
-                        resultHasExternalModuleIndicator = true;
-                    }
+                if (input.kind === SyntaxKind.ModuleDeclaration) {
+                    needsDeclare = previousNeedsDeclare;
                 }
-                if (returnValue === input) {
-                    return returnValue;
+                if (node as Node === input) {
+                    return node;
                 }
-                return returnValue && setOriginalNode(preserveJsDoc(returnValue, input), input);
+                return node && setOriginalNode(preserveJsDoc(node, input), input);
             }
         }
 
@@ -1171,7 +1156,7 @@ namespace ts {
         }
 
         function ensureAccessor(node: AccessorDeclaration): PropertyDeclaration | undefined {
-            const accessors = getAllAccessorDeclarations((node.parent as ClassDeclaration).members, node);
+            const accessors = resolver.getAllAccessorDeclarations(node);
             if (node.kind !== accessors.firstAccessor.kind) {
                 return;
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index d59ea7dfbfd3b..064773e4b7126 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3220,7 +3220,15 @@ namespace ts {
     export type RequireOrImportCall = CallExpression & { arguments: [StringLiteralLike] };
 
     /* @internal */
-    export type LateVisibilityPaintedStatement = AnyImportSyntax | VariableStatement;
+    export type LateVisibilityPaintedStatement =
+        | AnyImportSyntax
+        | VariableStatement
+        | ClassDeclaration
+        | FunctionDeclaration
+        | ModuleDeclaration
+        | TypeAliasDeclaration
+        | InterfaceDeclaration
+        | EnumDeclaration;
 
     /* @internal */
     export interface SymbolVisibilityResult {
@@ -3235,6 +3243,14 @@ namespace ts {
         errorModuleName?: string; // If the symbol is not visible from module, module's name
     }
 
+    /* @internal */
+    export interface AllAccessorDeclarations {
+        firstAccessor: AccessorDeclaration;
+        secondAccessor: AccessorDeclaration;
+        getAccessor: AccessorDeclaration;
+        setAccessor: AccessorDeclaration;
+    }
+
     /** Indicates how to serialize the name for a TypeReferenceNode when emitting decorator metadata */
     /* @internal */
     export enum TypeReferenceSerializationKind {
@@ -3291,6 +3307,7 @@ namespace ts {
         getTypeReferenceDirectivesForSymbol(symbol: Symbol, meaning?: SymbolFlags): string[];
         isLiteralConstDeclaration(node: VariableDeclaration | PropertyDeclaration | PropertySignature | ParameterDeclaration): boolean;
         getJsxFactoryEntity(location?: Node): EntityName;
+        getAllAccessorDeclarations(declaration: AccessorDeclaration): AllAccessorDeclarations;
     }
 
     export const enum SymbolFlags {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index ae6bfb5ac135e..fc30081346fde 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -549,6 +549,12 @@ namespace ts {
             case SyntaxKind.ImportDeclaration:
             case SyntaxKind.ImportEqualsDeclaration:
             case SyntaxKind.VariableStatement:
+            case SyntaxKind.ClassDeclaration:
+            case SyntaxKind.FunctionDeclaration:
+            case SyntaxKind.ModuleDeclaration:
+            case SyntaxKind.TypeAliasDeclaration:
+            case SyntaxKind.InterfaceDeclaration:
+            case SyntaxKind.EnumDeclaration:
                 return true;
             default:
                 return false;
@@ -2983,13 +2989,6 @@ namespace ts {
         return id.originalKeywordKind === SyntaxKind.ThisKeyword;
     }
 
-    export interface AllAccessorDeclarations {
-        firstAccessor: AccessorDeclaration;
-        secondAccessor: AccessorDeclaration;
-        getAccessor: AccessorDeclaration;
-        setAccessor: AccessorDeclaration;
-    }
-
     export function getAllAccessorDeclarations(declarations: NodeArray<Declaration>, accessor: AccessorDeclaration): AllAccessorDeclarations {
         let firstAccessor: AccessorDeclaration;
         let secondAccessor: AccessorDeclaration;
@@ -4865,6 +4864,11 @@ namespace ts {
         return node.kind === SyntaxKind.IndexSignature;
     }
 
+    /* @internal */
+    export function isGetOrSetAccessorDeclaration(node: Node): node is AccessorDeclaration {
+        return node.kind === SyntaxKind.SetAccessor || node.kind === SyntaxKind.GetAccessor;
+    }
+
     // Type
 
     export function isTypePredicateNode(node: Node): node is TypePredicateNode {
diff --git a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.errors.txt b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.errors.txt
deleted file mode 100644
index 0a8f03a504a52..0000000000000
--- a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts(3,8): error TS4033: Property 'f' of exported interface has or is using private name 'T'.
-
-
-==== tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts (1 errors) ====
-    type T = { x : number }
-    export interface I {
-        f: T;   
-           ~
-!!! error TS4033: Property 'f' of exported interface has or is using private name 'T'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.js b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.js
new file mode 100644
index 0000000000000..73c312a018b95
--- /dev/null
+++ b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.js
@@ -0,0 +1,19 @@
+//// [DeclarationErrorsNoEmitOnError.ts]
+type T = { x : number }
+export interface I {
+    f: T;   
+}
+
+//// [DeclarationErrorsNoEmitOnError.js]
+"use strict";
+exports.__esModule = true;
+
+
+//// [DeclarationErrorsNoEmitOnError.d.ts]
+declare type T = {
+    x: number;
+};
+export interface I {
+    f: T;
+}
+export {};
diff --git a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types
index 08a65d9c146b8..d2598dfe7486a 100644
--- a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types
+++ b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts ===
 type T = { x : number }
->T : { x: number; }
+>T : T
 >x : number
 
 export interface I {
 >I : I
 
     f: T;   
->f : { x: number; }
->T : { x: number; }
+>f : T
+>T : T
 }
diff --git a/tests/baselines/reference/aliasInaccessibleModule.errors.txt b/tests/baselines/reference/aliasInaccessibleModule.errors.txt
deleted file mode 100644
index 3a9c64e50ab46..0000000000000
--- a/tests/baselines/reference/aliasInaccessibleModule.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/compiler/aliasInaccessibleModule.ts(4,23): error TS4000: Import declaration 'X' is using private name 'N'.
-
-
-==== tests/cases/compiler/aliasInaccessibleModule.ts (1 errors) ====
-    module M {
-        module N {
-        }
-        export import X = N;
-                          ~
-!!! error TS4000: Import declaration 'X' is using private name 'N'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasInaccessibleModule.js b/tests/baselines/reference/aliasInaccessibleModule.js
index a0ecf3361fc1f..66a59a9f0ee80 100644
--- a/tests/baselines/reference/aliasInaccessibleModule.js
+++ b/tests/baselines/reference/aliasInaccessibleModule.js
@@ -9,3 +9,11 @@ module M {
 var M;
 (function (M) {
 })(M || (M = {}));
+
+
+//// [aliasInaccessibleModule.d.ts]
+declare module M {
+    module N {
+    }
+    export import X = N;
+}
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt
deleted file mode 100644
index 03a37147aba10..0000000000000
--- a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-tests/cases/compiler/aliasInaccessibleModule2.ts(7,16): error TS4000: Import declaration 'R' is using private name 'N'.
-
-
-==== tests/cases/compiler/aliasInaccessibleModule2.ts (1 errors) ====
-    module M {
-        module N {
-            class C {
-            }
-            
-        }
-        import R = N;
-                   ~
-!!! error TS4000: Import declaration 'R' is using private name 'N'.
-        export import X = R;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.js b/tests/baselines/reference/aliasInaccessibleModule2.js
index be208c07ca275..324581ce62295 100644
--- a/tests/baselines/reference/aliasInaccessibleModule2.js
+++ b/tests/baselines/reference/aliasInaccessibleModule2.js
@@ -23,3 +23,12 @@ var M;
     var R = N;
     M.X = R;
 })(M || (M = {}));
+
+
+//// [aliasInaccessibleModule2.d.ts]
+declare module M {
+    module N {
+    }
+    import R = N;
+    export import X = R;
+}
diff --git a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
index 396cdd4445eeb..e1b331019bf1e 100644
--- a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
+++ b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
@@ -4,12 +4,12 @@ interface ComponentOptions<V> {
 >V : V
 
     watch: Record<string, WatchHandler<any>>;
->watch : Record<string, (val: any) => void>
+>watch : Record<string, WatchHandler<any>>
 >Record : Record<K, T>
->WatchHandler : (val: T) => void
+>WatchHandler : WatchHandler<T>
 }
 type WatchHandler<T> = (val: T) => void;
->WatchHandler : (val: T) => void
+>WatchHandler : WatchHandler<T>
 >T : T
 >val : T
 >T : T
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.types b/tests/baselines/reference/controlFlowBinaryOrExpression.types
index e843844ebf1e4..2cdf6b6bc19fb 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.types
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.types
@@ -62,21 +62,21 @@ declare function isHTMLCollection(sourceObj: any): sourceObj is HTMLCollection;
 >HTMLCollection : HTMLCollection
 
 type EventTargetLike = {a: string} | HTMLCollection | NodeList;
->EventTargetLike : NodeList | HTMLCollection | { a: string; }
+>EventTargetLike : EventTargetLike
 >a : string
 >HTMLCollection : HTMLCollection
 >NodeList : NodeList
 
 var sourceObj: EventTargetLike = <any>undefined;
->sourceObj : NodeList | HTMLCollection | { a: string; }
->EventTargetLike : NodeList | HTMLCollection | { a: string; }
+>sourceObj : EventTargetLike
+>EventTargetLike : EventTargetLike
 ><any>undefined : any
 >undefined : undefined
 
 if (isNodeList(sourceObj)) {
 >isNodeList(sourceObj) : boolean
 >isNodeList : (sourceObj: any) => sourceObj is NodeList
->sourceObj : NodeList | HTMLCollection | { a: string; }
+>sourceObj : EventTargetLike
 
     sourceObj.length;
 >sourceObj.length : number
@@ -87,7 +87,7 @@ if (isNodeList(sourceObj)) {
 if (isHTMLCollection(sourceObj)) {
 >isHTMLCollection(sourceObj) : boolean
 >isHTMLCollection : (sourceObj: any) => sourceObj is HTMLCollection
->sourceObj : NodeList | HTMLCollection | { a: string; }
+>sourceObj : EventTargetLike
 
     sourceObj.length;
 >sourceObj.length : number
@@ -99,7 +99,7 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
 >isNodeList(sourceObj) || isHTMLCollection(sourceObj) : boolean
 >isNodeList(sourceObj) : boolean
 >isNodeList : (sourceObj: any) => sourceObj is NodeList
->sourceObj : NodeList | HTMLCollection | { a: string; }
+>sourceObj : EventTargetLike
 >isHTMLCollection(sourceObj) : boolean
 >isHTMLCollection : (sourceObj: any) => sourceObj is HTMLCollection
 >sourceObj : { a: string; }
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.errors.txt
deleted file mode 100644
index 4ea18c1590100..0000000000000
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.errors.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(15,21): error TS4043: Return type of public getter 'foo1' from exported class has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(20,13): error TS4043: Return type of public getter 'foo2' from exported class has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(25,25): error TS4037: Parameter type of public setter 'foo3' from exported class has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(32,25): error TS4037: Parameter type of public setter 'foo4' from exported class has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(36,21): error TS4043: Return type of public getter 'foo5' from exported class has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(71,23): error TS4043: Return type of public getter 'foo111' from exported class has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(76,13): error TS4042: Return type of public getter 'foo112' from exported class has or is using name 'm2.public2' from private module 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(81,27): error TS4037: Parameter type of public setter 'foo113' from exported class has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(88,27): error TS4037: Parameter type of public setter 'foo114' from exported class has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(92,23): error TS4043: Return type of public getter 'foo115' from exported class has or is using private name 'm2'.
-
-
-==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts (10 errors) ====
-    module m {
-        class private1 {
-        }
-    
-        export class public1 {
-        }
-    
-        module m2 {
-            export class public2 {
-            }
-        }
-    
-        export class c {
-            // getter with annotation
-            get foo1(): private1 {
-                        ~~~~~~~~
-!!! error TS4043: Return type of public getter 'foo1' from exported class has or is using private name 'private1'.
-                return;
-            }
-    
-            // getter without annotation
-            get foo2() {
-                ~~~~
-!!! error TS4043: Return type of public getter 'foo2' from exported class has or is using private name 'private1'.
-                return new private1();
-            }
-    
-            // setter with annotation
-            set foo3(param: private1) {
-                            ~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'foo3' from exported class has or is using private name 'private1'.
-            }
-    
-            // Both - getter without annotation, setter with annotation
-            get foo4() {
-                return new private1();
-            }
-            set foo4(param: private1) {
-                            ~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'foo4' from exported class has or is using private name 'private1'.
-            }
-    
-            // Both - with annotation
-            get foo5(): private1 {
-                        ~~~~~~~~
-!!! error TS4043: Return type of public getter 'foo5' from exported class has or is using private name 'private1'.
-                return;
-            }
-            set foo5(param: private1) {
-            }
-    
-            // getter with annotation
-            get foo11(): public1 {
-                return;
-            }
-    
-            // getter without annotation
-            get foo12() {
-                return new public1();
-            }
-    
-            // setter with annotation
-            set foo13(param: public1) {
-            }
-    
-            // Both - getter without annotation, setter with annotation
-            get foo14() {
-                return new public1();
-            }
-            set foo14(param: public1) {
-            }
-    
-            // Both - with annotation
-            get foo15(): public1 {
-                return;
-            }
-            set foo15(param: public1) {
-            }
-    
-            // getter with annotation
-            get foo111(): m2.public2 {
-                          ~~
-!!! error TS4043: Return type of public getter 'foo111' from exported class has or is using private name 'm2'.
-                return;
-            }
-    
-            // getter without annotation
-            get foo112() {
-                ~~~~~~
-!!! error TS4042: Return type of public getter 'foo112' from exported class has or is using name 'm2.public2' from private module 'm2'.
-                return new m2.public2();
-            }
-    
-            // setter with annotation
-            set foo113(param: m2.public2) {
-                              ~~
-!!! error TS4037: Parameter type of public setter 'foo113' from exported class has or is using private name 'm2'.
-            }
-    
-            // Both - getter without annotation, setter with annotation
-            get foo114() {
-                return new m2.public2();
-            }
-            set foo114(param: m2.public2) {
-                              ~~
-!!! error TS4037: Parameter type of public setter 'foo114' from exported class has or is using private name 'm2'.
-            }
-    
-            // Both - with annotation
-            get foo115(): m2.public2 {
-                          ~~
-!!! error TS4043: Return type of public getter 'foo115' from exported class has or is using private name 'm2'.
-                return;
-            }
-            set foo115(param: m2.public2) {
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js
index c02807207ca63..20d784489d99a 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js
@@ -258,3 +258,33 @@ var m;
     }());
     m.c = c;
 })(m || (m = {}));
+
+
+//// [declFileTypeAnnotationVisibilityErrorAccessors.d.ts]
+declare module m {
+    class private1 {
+    }
+    class public1 {
+    }
+    module m2 {
+        class public2 {
+        }
+    }
+    class c {
+        readonly foo1: private1;
+        readonly foo2: private1;
+        foo3: private1;
+        foo4: private1;
+        foo5: private1;
+        readonly foo11: public1;
+        readonly foo12: public1;
+        foo13: public1;
+        foo14: public1;
+        foo15: public1;
+        readonly foo111: m2.public2;
+        readonly foo112: m2.public2;
+        foo113: m2.public2;
+        foo114: m2.public2;
+        foo115: m2.public2;
+    }
+}
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.errors.txt
deleted file mode 100644
index 339ae67eea4c1..0000000000000
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.errors.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(14,34): error TS4078: Parameter 'param' of exported function has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(16,26): error TS4078: Parameter 'param' of exported function has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(39,35): error TS4078: Parameter 'param' of exported function has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(41,28): error TS4077: Parameter 'param' of exported function has or is using name 'm2.public2' from private module 'm2'.
-
-
-==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts (4 errors) ====
-    module m {
-        class private1 {
-        }
-    
-        export class public1 {
-        }
-    
-        // Directly using names from this module
-        function foo1(param: private1) {
-        }
-        function foo2(param = new private1()) {
-        }
-    
-        export function foo3(param : private1) {
-                                     ~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'private1'.
-        }
-        export function foo4(param = new private1()) {
-                             ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'private1'.
-        }
-    
-        function foo11(param: public1) {
-        }
-        function foo12(param = new public1()) {
-        }
-    
-        export function foo13(param: public1) {
-        }
-        export function foo14(param = new public1()) {
-        }
-    
-        module m2 {
-            export class public2 {
-            }
-        }
-    
-        function foo111(param: m2.public2) {
-        }
-        function foo112(param = new m2.public2()) {
-        }
-    
-        export function foo113(param: m2.public2) {
-                                      ~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'm2'.
-        }
-        export function foo114(param = new m2.public2()) {
-                               ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4077: Parameter 'param' of exported function has or is using name 'm2.public2' from private module 'm2'.
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js
index 1c4a27cee6142..4e1edd7fe396e 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js
@@ -105,3 +105,22 @@ var m;
     }
     m.foo114 = foo114;
 })(m || (m = {}));
+
+
+//// [declFileTypeAnnotationVisibilityErrorParameterOfFunction.d.ts]
+declare module m {
+    class private1 {
+    }
+    class public1 {
+    }
+    function foo3(param: private1): void;
+    function foo4(param?: private1): void;
+    function foo13(param: public1): void;
+    function foo14(param?: public1): void;
+    module m2 {
+        class public2 {
+        }
+    }
+    function foo113(param: m2.public2): void;
+    function foo114(param?: m2.public2): void;
+}
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.errors.txt
deleted file mode 100644
index 492e6615efa15..0000000000000
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.errors.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(16,29): error TS4060: Return type of exported function has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(19,21): error TS4060: Return type of exported function has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(49,31): error TS4060: Return type of exported function has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(52,21): error TS4059: Return type of exported function has or is using name 'm2.public2' from private module 'm2'.
-
-
-==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts (4 errors) ====
-    module m {
-        class private1 {
-        }
-    
-        export class public1 {
-        }
-    
-        // Directly using names from this module
-        function foo1(): private1 {
-            return;
-        }
-        function foo2() {
-            return new private1();
-        }
-    
-        export function foo3(): private1 {
-                                ~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'private1'.
-            return;
-        }
-        export function foo4() {
-                        ~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'private1'.
-            return new private1();
-        }
-    
-        function foo11(): public1 {
-            return;
-        }
-        function foo12() {
-            return new public1();
-        }
-    
-        export function foo13(): public1 {
-            return;
-        }
-        export function foo14() {
-            return new public1();
-        }
-    
-        module m2 {
-            export class public2 {
-            }
-        }
-    
-        function foo111(): m2.public2 {
-            return;
-        }
-        function foo112() {
-            return new m2.public2();
-        }
-    
-        export function foo113(): m2.public2 {
-                                  ~~
-!!! error TS4060: Return type of exported function has or is using private name 'm2'.
-            return;
-        }
-        export function foo114() {
-                        ~~~~~~
-!!! error TS4059: Return type of exported function has or is using name 'm2.public2' from private module 'm2'.
-            return new m2.public2();
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js
index a0e43b6521dcd..8a2437a2ac41b 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js
@@ -123,3 +123,22 @@ var m;
     }
     m.foo114 = foo114;
 })(m || (m = {}));
+
+
+//// [declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.d.ts]
+declare module m {
+    class private1 {
+    }
+    class public1 {
+    }
+    function foo3(): private1;
+    function foo4(): private1;
+    function foo13(): public1;
+    function foo14(): public1;
+    module m2 {
+        class public2 {
+        }
+    }
+    function foo113(): m2.public2;
+    function foo114(): m2.public2;
+}
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.errors.txt
deleted file mode 100644
index 919fd5cd6571d..0000000000000
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.errors.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(9,23): error TS4025: Exported variable 'p' has or is using private name 'W'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(32,22): error TS4081: Exported type alias 't2' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(35,23): error TS4081: Exported type alias 't12' has or is using private name 'public1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(38,24): error TS4081: Exported type alias 't112' has or is using private name 'm3'.
-
-
-==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts (4 errors) ====
-    interface Window {
-        someMethod();
-    }
-    
-    module M {
-        type W = Window | string;
-        export module N {
-            export class Window { }
-            export var p: W; // Should report error that W is private
-                          ~
-!!! error TS4025: Exported variable 'p' has or is using private name 'W'.
-        }
-    }
-    
-    module M1 {
-        export type W = Window | string;
-        export module N {
-            export class Window { }
-            export var p: W; // No error
-        }
-    }
-    
-    module M2 {
-        class private1 {
-        }
-        class public1 {
-        }
-        module m3 {
-            export class public1 {
-            }
-        }
-    
-        type t1 = private1;
-        export type t2 = private1; // error
-                         ~~~~~~~~
-!!! error TS4081: Exported type alias 't2' has or is using private name 'private1'.
-    
-        type t11 = public1;
-        export type t12 = public1;
-                          ~~~~~~~
-!!! error TS4081: Exported type alias 't12' has or is using private name 'public1'.
-    
-        type t111 = m3.public1;
-        export type t112 = m3.public1; // error
-                           ~~
-!!! error TS4081: Exported type alias 't112' has or is using private name 'm3'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
index 2d1e3d1880eac..fd39a6e20d968 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
@@ -87,3 +87,38 @@ var M2;
         m3.public1 = public1;
     })(m3 || (m3 = {}));
 })(M2 || (M2 = {}));
+
+
+//// [declFileTypeAnnotationVisibilityErrorTypeAlias.d.ts]
+interface Window {
+    someMethod(): any;
+}
+declare module M {
+    type W = Window | string;
+    module N {
+        class Window {
+        }
+        var p: W;
+    }
+}
+declare module M1 {
+    type W = Window | string;
+    module N {
+        class Window {
+        }
+        var p: W;
+    }
+}
+declare module M2 {
+    class private1 {
+    }
+    class public1 {
+    }
+    module m3 {
+        class public1 {
+        }
+    }
+    type t2 = private1;
+    type t12 = public1;
+    type t112 = m3.public1;
+}
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types
index 5d467f07df4df..24911343beaa6 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types
@@ -10,7 +10,7 @@ module M {
 >M : typeof M
 
     type W = Window | string;
->W : string | Window
+>W : W
 >Window : Window
 
     export module N {
@@ -20,8 +20,8 @@ module M {
 >Window : Window
 
         export var p: W; // Should report error that W is private
->p : string | Window
->W : string | Window
+>p : W
+>W : W
     }
 }
 
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.errors.txt
deleted file mode 100644
index a8d8023e8304b..0000000000000
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.errors.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(10,12): error TS4025: Exported variable 'x' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(11,12): error TS4025: Exported variable 'x' has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(12,13): error TS4025: Exported variable 'x' has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(13,19): error TS4025: Exported variable 'x' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(14,22): error TS4025: Exported variable 'x' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(15,22): error TS4025: Exported variable 'x' has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(17,16): error TS4024: Exported variable 'x2' has or is using name 'm2.public1' from private module 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(17,16): error TS4025: Exported variable 'x2' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(24,16): error TS4024: Exported variable 'x3' has or is using name 'm2.public1' from private module 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(24,16): error TS4025: Exported variable 'x3' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(27,23): error TS4025: Exported variable 'y' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(27,36): error TS4025: Exported variable 'y' has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(28,16): error TS4024: Exported variable 'y2' has or is using name 'm2.public1' from private module 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(28,16): error TS4025: Exported variable 'y2' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(31,27): error TS4025: Exported variable 'z' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(31,40): error TS4025: Exported variable 'z' has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(32,16): error TS4024: Exported variable 'z2' has or is using name 'm2.public1' from private module 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(32,16): error TS4025: Exported variable 'z2' has or is using private name 'private1'.
-
-
-==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts (18 errors) ====
-    module m {
-        class private1 {
-        }
-        module m2 {
-            export class public1 {
-            }
-        }
-    
-        export var x: {
-            x: private1;
-               ~~~~~~~~
-!!! error TS4025: Exported variable 'x' has or is using private name 'private1'.
-            y: m2.public1;
-               ~~
-!!! error TS4025: Exported variable 'x' has or is using private name 'm2'.
-            (): m2.public1[];
-                ~~
-!!! error TS4025: Exported variable 'x' has or is using private name 'm2'.
-            method(): private1;
-                      ~~~~~~~~
-!!! error TS4025: Exported variable 'x' has or is using private name 'private1'.
-            [n: number]: private1;
-                         ~~~~~~~~
-!!! error TS4025: Exported variable 'x' has or is using private name 'private1'.
-            [s: string]: m2.public1;
-                         ~~
-!!! error TS4025: Exported variable 'x' has or is using private name 'm2'.
-        };
-        export var x2 = {
-                   ~~
-!!! error TS4024: Exported variable 'x2' has or is using name 'm2.public1' from private module 'm2'.
-                   ~~
-!!! error TS4025: Exported variable 'x2' has or is using private name 'private1'.
-            x: new private1(),
-            y: new m2.public1(),
-            method() {
-                return new private1();
-            }
-        };
-        export var x3 = x;
-                   ~~
-!!! error TS4024: Exported variable 'x3' has or is using name 'm2.public1' from private module 'm2'.
-                   ~~
-!!! error TS4025: Exported variable 'x3' has or is using private name 'private1'.
-    
-        // Function type
-        export var y: (a: private1) => m2.public1;
-                          ~~~~~~~~
-!!! error TS4025: Exported variable 'y' has or is using private name 'private1'.
-                                       ~~
-!!! error TS4025: Exported variable 'y' has or is using private name 'm2'.
-        export var y2 = y;
-                   ~~
-!!! error TS4024: Exported variable 'y2' has or is using name 'm2.public1' from private module 'm2'.
-                   ~~
-!!! error TS4025: Exported variable 'y2' has or is using private name 'private1'.
-    
-        // constructor type
-        export var z: new (a: private1) => m2.public1;
-                              ~~~~~~~~
-!!! error TS4025: Exported variable 'z' has or is using private name 'private1'.
-                                           ~~
-!!! error TS4025: Exported variable 'z' has or is using private name 'm2'.
-        export var z2 = z;
-                   ~~
-!!! error TS4024: Exported variable 'z2' has or is using name 'm2.public1' from private module 'm2'.
-                   ~~
-!!! error TS4025: Exported variable 'z2' has or is using private name 'private1'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
index 687ab02fdb6ac..ecb3e035e2a39 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
@@ -61,3 +61,39 @@ var m;
     m.y2 = m.y;
     m.z2 = m.z;
 })(m || (m = {}));
+
+
+//// [declFileTypeAnnotationVisibilityErrorTypeLiteral.d.ts]
+declare module m {
+    class private1 {
+    }
+    module m2 {
+        class public1 {
+        }
+    }
+    var x: {
+        x: private1;
+        y: m2.public1;
+        (): m2.public1[];
+        method(): private1;
+        [n: number]: private1;
+        [s: string]: m2.public1;
+    };
+    var x2: {
+        x: private1;
+        y: m2.public1;
+        method(): private1;
+    };
+    var x3: {
+        (): m2.public1[];
+        [s: string]: m2.public1;
+        [n: number]: private1;
+        x: private1;
+        y: m2.public1;
+        method(): private1;
+    };
+    var y: (a: private1) => m2.public1;
+    var y2: (a: private1) => m2.public1;
+    var z: new (a: private1) => m2.public1;
+    var z2: new (a: private1) => m2.public1;
+}
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.errors.txt
deleted file mode 100644
index 6a9e596183133..0000000000000
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.errors.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(12,19): error TS4025: Exported variable 'k' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(13,16): error TS4025: Exported variable 'l' has or is using private name 'private1'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(29,20): error TS4025: Exported variable 'k3' has or is using private name 'm2'.
-tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(30,16): error TS4024: Exported variable 'l3' has or is using name 'm2.public2' from private module 'm2'.
-
-
-==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts (4 errors) ====
-    module m {
-        class private1 {
-        }
-    
-        export class public1 {
-        }
-    
-        // Directly using names from this module
-        var x: private1;
-        var y = new private1();
-    
-        export var k: private1;
-                      ~~~~~~~~
-!!! error TS4025: Exported variable 'k' has or is using private name 'private1'.
-        export var l = new private1();
-                   ~
-!!! error TS4025: Exported variable 'l' has or is using private name 'private1'.
-    
-        var x2: public1;
-        var y2 = new public1();
-    
-        export var k2: public1;
-        export var l2 = new public1();
-    
-        module m2 {
-            export class public2 {
-            }
-        }
-    
-        var x3: m2.public2;
-        var y3 = new m2.public2();
-    
-        export var k3: m2.public2;
-                       ~~
-!!! error TS4025: Exported variable 'k3' has or is using private name 'm2'.
-        export var l3 = new m2.public2();
-                   ~~
-!!! error TS4024: Exported variable 'l3' has or is using name 'm2.public2' from private module 'm2'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js
index 56f959a135616..6bdcedae7d70c 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js
@@ -66,3 +66,22 @@ var m;
     var y3 = new m2.public2();
     m.l3 = new m2.public2();
 })(m || (m = {}));
+
+
+//// [declFileTypeAnnotationVisibilityErrorVariableDeclaration.d.ts]
+declare module m {
+    class private1 {
+    }
+    class public1 {
+    }
+    var k: private1;
+    var l: private1;
+    var k2: public1;
+    var l2: public1;
+    module m2 {
+        class public2 {
+        }
+    }
+    var k3: m2.public2;
+    var l3: m2.public2;
+}
diff --git a/tests/baselines/reference/declInput-2.errors.txt b/tests/baselines/reference/declInput-2.errors.txt
deleted file mode 100644
index f151f3e712205..0000000000000
--- a/tests/baselines/reference/declInput-2.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/compiler/declInput-2.ts(10,21): error TS4031: Public property 'm22' of exported class has or is using private name 'C'.
-tests/cases/compiler/declInput-2.ts(13,21): error TS4031: Public property 'm25' of exported class has or is using private name 'I2'.
-tests/cases/compiler/declInput-2.ts(16,24): error TS4055: Return type of public method from exported class has or is using private name 'I2'.
-tests/cases/compiler/declInput-2.ts(18,23): error TS4073: Parameter 'i' of public method from exported class has or is using private name 'I2'.
-tests/cases/compiler/declInput-2.ts(19,21): error TS4055: Return type of public method from exported class has or is using private name 'C'.
-
-
-==== tests/cases/compiler/declInput-2.ts (5 errors) ====
-    module M {
-        class C { }
-        export class E {}
-        export interface I1 {}
-        interface I2 {}
-        export class D {
-            private c: C; // don't generate
-            public m1: number;
-            public m2: string;
-            public m22: C; // don't generate
-                        ~
-!!! error TS4031: Public property 'm22' of exported class has or is using private name 'C'.
-            public m23: E;
-            public m24: I1;
-            public m25: I2; // don't generate
-                        ~~
-!!! error TS4031: Public property 'm25' of exported class has or is using private name 'I2'.
-            public m232(): E { return null;}
-            public m242(): I1 { return null; }
-            public m252(): I2 { return null; } // don't generate
-                           ~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'I2'.
-            public m26(i:I1) {}
-            public m262(i:I2) {}
-                          ~~
-!!! error TS4073: Parameter 'i' of public method from exported class has or is using private name 'I2'.
-            public m3():C { return new C(); }
-                        ~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'C'.
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js
index 02dc3cd281959..f1f23b7f22ef8 100644
--- a/tests/baselines/reference/declInput-2.js
+++ b/tests/baselines/reference/declInput-2.js
@@ -48,3 +48,31 @@ var M;
     }());
     M.D = D;
 })(M || (M = {}));
+
+
+//// [declInput-2.d.ts]
+declare module M {
+    class C {
+    }
+    class E {
+    }
+    interface I1 {
+    }
+    interface I2 {
+    }
+    class D {
+        private c;
+        m1: number;
+        m2: string;
+        m22: C;
+        m23: E;
+        m24: I1;
+        m25: I2;
+        m232(): E;
+        m242(): I1;
+        m252(): I2;
+        m26(i: I1): void;
+        m262(i: I2): void;
+        m3(): C;
+    }
+}
diff --git a/tests/baselines/reference/declarationEmitClassPrivateConstructor2.errors.txt b/tests/baselines/reference/declarationEmitClassPrivateConstructor2.errors.txt
deleted file mode 100644
index a31454a476037..0000000000000
--- a/tests/baselines/reference/declarationEmitClassPrivateConstructor2.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-tests/cases/compiler/declarationEmitClassPrivateConstructor2.ts(5,38): error TS4031: Public property 'data' of exported class has or is using private name 'PrivateInterface'.
-tests/cases/compiler/declarationEmitClassPrivateConstructor2.ts(10,33): error TS4063: Parameter 'data' of constructor from exported class has or is using private name 'PrivateInterface'.
-
-
-==== tests/cases/compiler/declarationEmitClassPrivateConstructor2.ts (2 errors) ====
-    interface PrivateInterface {
-    }
-    
-    export class ExportedClass1 {
-        private constructor(public data: PrivateInterface) { }
-                                         ~~~~~~~~~~~~~~~~
-!!! error TS4031: Public property 'data' of exported class has or is using private name 'PrivateInterface'.
-    }
-    
-    
-    export class ExportedClass2 {
-        protected constructor(data: PrivateInterface) { }
-                                    ~~~~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'data' of constructor from exported class has or is using private name 'PrivateInterface'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitClassPrivateConstructor2.js b/tests/baselines/reference/declarationEmitClassPrivateConstructor2.js
index 863b295751f0b..445270e00c533 100644
--- a/tests/baselines/reference/declarationEmitClassPrivateConstructor2.js
+++ b/tests/baselines/reference/declarationEmitClassPrivateConstructor2.js
@@ -27,3 +27,16 @@ var ExportedClass2 = /** @class */ (function () {
     return ExportedClass2;
 }());
 exports.ExportedClass2 = ExportedClass2;
+
+
+//// [declarationEmitClassPrivateConstructor2.d.ts]
+interface PrivateInterface {
+}
+export declare class ExportedClass1 {
+    data: PrivateInterface;
+    private constructor();
+}
+export declare class ExportedClass2 {
+    protected constructor(data: PrivateInterface);
+}
+export {};
diff --git a/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt b/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt
deleted file mode 100644
index f19766cbb0093..0000000000000
--- a/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/compiler/declarationEmitDefaultExport7.ts(2,1): error TS4082: Default export of the module has or is using private name 'A'.
-
-
-==== tests/cases/compiler/declarationEmitDefaultExport7.ts (1 errors) ====
-    class A {}
-    export default new A();
-    ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4082: Default export of the module has or is using private name 'A'.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDefaultExport7.js b/tests/baselines/reference/declarationEmitDefaultExport7.js
index 99751113dd66d..e0c72ee422555 100644
--- a/tests/baselines/reference/declarationEmitDefaultExport7.js
+++ b/tests/baselines/reference/declarationEmitDefaultExport7.js
@@ -7,3 +7,10 @@ export default new A();
 class A {
 }
 export default new A();
+
+
+//// [declarationEmitDefaultExport7.d.ts]
+declare class A {
+}
+declare const _default: A;
+export default _default;
diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.errors.txt b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.errors.txt
deleted file mode 100644
index e464b96a8bf77..0000000000000
--- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts(4,20): error TS4025: Exported variable 'y' has or is using private name 'c'.
-
-
-==== tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts (1 errors) ====
-    module m {
-        class c {
-        }
-        export var [x, y, z] = [10, new c(), 30];
-                       ~
-!!! error TS4025: Exported variable 'y' has or is using private name 'c'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js
index 23b93d14e15bc..0d1e16af79773 100644
--- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js
+++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js
@@ -16,3 +16,11 @@ var m;
     _a = [10, new c(), 30], m.x = _a[0], m.y = _a[1], m.z = _a[2];
     var _a;
 })(m || (m = {}));
+
+
+//// [declarationEmitDestructuringPrivacyError.d.ts]
+declare module m {
+    class c {
+    }
+    var x: number, y: c, z: number;
+}
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt b/tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt
deleted file mode 100644
index 4864a3bcdc22e..0000000000000
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-tests/cases/compiler/declarationEmitExpressionInExtends3.ts(28,30): error TS4020: 'extends' clause of exported class 'MyClass' has or is using private name 'LocalClass'.
-tests/cases/compiler/declarationEmitExpressionInExtends3.ts(36,75): error TS4020: 'extends' clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
-
-
-==== tests/cases/compiler/declarationEmitExpressionInExtends3.ts (2 errors) ====
-    export class ExportedClass<T> {
-    	x: T;
-    }
-    
-    class LocalClass<T, U> {
-        x: T;
-        y: U;
-    }
-    
-    export interface ExportedInterface {
-        x: number;
-    }
-    
-    interface LocalInterface {
-        x: number;
-    }
-    
-    function getLocalClass<T>(c: T) {
-        return LocalClass;
-    }
-    
-    function getExportedClass<T>(c: T) {
-        return ExportedClass;
-    }
-    
-    
-    
-    export class MyClass extends getLocalClass<LocalInterface>(undefined)<string, number> { // error LocalClass is inaccisible
-                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4020: 'extends' clause of exported class 'MyClass' has or is using private name 'LocalClass'.
-    }
-    
-    
-    export class MyClass2 extends getExportedClass<LocalInterface>(undefined)<string> { // OK
-    }
-    
-    
-    export class MyClass3 extends getExportedClass<LocalInterface>(undefined)<LocalInterface> { // Error LocalInterface is inaccisble
-                                                                              ~~~~~~~~~~~~~~
-!!! error TS4020: 'extends' clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
-    }
-    
-    
-    export class MyClass4 extends getExportedClass<LocalInterface>(undefined)<ExportedInterface> { // OK
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index c97587620fd7e..c73268f7c55cd 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -104,3 +104,32 @@ var MyClass4 = /** @class */ (function (_super) {
     return MyClass4;
 }(getExportedClass(undefined)));
 exports.MyClass4 = MyClass4;
+
+
+//// [declarationEmitExpressionInExtends3.d.ts]
+export declare class ExportedClass<T> {
+    x: T;
+}
+declare class LocalClass<T, U> {
+    x: T;
+    y: U;
+}
+export interface ExportedInterface {
+    x: number;
+}
+interface LocalInterface {
+    x: number;
+}
+declare const MyClass_base: typeof LocalClass;
+export declare class MyClass extends MyClass_base<string, number> {
+}
+declare const MyClass2_base: typeof ExportedClass;
+export declare class MyClass2 extends MyClass2_base<string> {
+}
+declare const MyClass3_base: typeof ExportedClass;
+export declare class MyClass3 extends MyClass3_base<LocalInterface> {
+}
+declare const MyClass4_base: typeof ExportedClass;
+export declare class MyClass4 extends MyClass4_base<ExportedInterface> {
+}
+export {};
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.errors.txt b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.errors.txt
deleted file mode 100644
index 37a4853b6496f..0000000000000
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts(5,33): error TS4060: Return type of exported function has or is using private name 'I'.
-
-
-==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts (1 errors) ====
-    interface I {
-        a: number;
-    }
-    
-    export function f(x: any): x is I {
-                                    ~
-!!! error TS4060: Return type of exported function has or is using private name 'I'.
-        return typeof x.a === "number";
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
index 74da01ce683ca..1531d09a88f63 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -14,3 +14,11 @@ function f(x) {
     return typeof x.a === "number";
 }
 exports.f = f;
+
+
+//// [declarationEmitIdentifierPredicatesWithPrivateName01.d.ts]
+interface I {
+    a: number;
+}
+export declare function f(x: any): x is I;
+export {};
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias9.js b/tests/baselines/reference/declarationEmitInferredTypeAlias9.js
index 8d03c6b70d2d1..8539cfaf03e50 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias9.js
@@ -17,6 +17,8 @@ exports.returnSomeGlobalValue = returnSomeGlobalValue;
 
 
 //// [declarationEmitInferredTypeAlias9.d.ts]
-export declare function returnSomeGlobalValue(): number[] | {
-    x: number[] | any;
+declare type Foo<T> = T | {
+    x: Foo<T>;
 };
+export declare function returnSomeGlobalValue(): Foo<number[]>;
+export {};
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias9.types b/tests/baselines/reference/declarationEmitInferredTypeAlias9.types
index 30a15aff6fb72..ab03db6da4f2f 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias9.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias9.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/declarationEmitInferredTypeAlias9.ts ===
 type Foo<T> = T | { x: Foo<T> };
->Foo : T | { x: T | any; }
+>Foo : Foo<T>
 >T : T
 >T : T
->x : T | { x: T | any; }
->Foo : T | { x: T | any; }
+>x : Foo<T>
+>Foo : Foo<T>
 >T : T
 
 var x: Foo<number[]>;
->x : number[] | { x: number[] | any; }
->Foo : T | { x: T | any; }
+>x : Foo<number[]>
+>Foo : Foo<T>
 
 export function returnSomeGlobalValue() {
->returnSomeGlobalValue : () => number[] | { x: number[] | any; }
+>returnSomeGlobalValue : () => Foo<number[]>
 
     return x;
->x : number[] | { x: number[] | any; }
+>x : Foo<number[]>
 }
diff --git a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
index 352520ff575e6..3cbbc0e076361 100644
--- a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
+++ b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
@@ -107,3 +107,4 @@ declare const FilteredThing_base: {
 export declare class FilteredThing extends FilteredThing_base {
     match(path: string): boolean;
 }
+export {};
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.errors.txt b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.errors.txt
deleted file mode 100644
index ea59c8fa9e8aa..0000000000000
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01.ts(2,18): error TS4055: Return type of public method from exported class has or is using private name 'D'.
-
-
-==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01.ts (1 errors) ====
-    export class C {
-        m(): this is D {
-                     ~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'D'.
-            return this instanceof D;
-        }
-    }
-    
-    class D extends C {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index 5bb662b5907c3..10305b8ed6431 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -37,3 +37,12 @@ var D = /** @class */ (function (_super) {
     }
     return D;
 }(C));
+
+
+//// [declarationEmitThisPredicatesWithPrivateName01.d.ts]
+export declare class C {
+    m(): this is D;
+}
+declare class D extends C {
+}
+export {};
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.errors.txt b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.errors.txt
index f80c2bd0d6fd0..a01ebbb486466 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.errors.txt
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.errors.txt
@@ -1,8 +1,7 @@
-tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts(7,14): error TS4025: Exported variable 'obj' has or is using private name 'Foo'.
 tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts(8,10): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
 
 
-==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts (2 errors) ====
+==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts (1 errors) ====
     interface Foo {
         a: string;
         b: number;
@@ -10,8 +9,6 @@ tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredic
     }
     
     export const obj = {
-                 ~~~
-!!! error TS4025: Exported variable 'obj' has or is using private name 'Foo'.
         m(): this is Foo {
              ~~~~
 !!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
index 86fb2e0560711..96b580a68b9e1 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -21,3 +21,15 @@ exports.obj = {
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
+
+
+//// [declarationEmitThisPredicatesWithPrivateName02.d.ts]
+interface Foo {
+    a: string;
+    b: number;
+    c: boolean;
+}
+export declare const obj: {
+    m(): this is Foo;
+};
+export {};
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.errors.txt b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.errors.txt
deleted file mode 100644
index 9552adfc0af98..0000000000000
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts(4,25): error TS4081: Exported type alias 'SubFoo' has or is using private name 'Foo'.
-
-
-==== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts (1 errors) ====
-    type Foo<T, Y> = {
-        foo<U, J>(): Foo<U, J>
-    };
-    export type SubFoo<R> = Foo<string, R>;
-                            ~~~
-!!! error TS4081: Exported type alias 'SubFoo' has or is using private name 'Foo'.
-    
-    function foo() {
-        return {} as SubFoo<number>;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
index cee701c045588..1b29acc164e70 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -15,3 +15,11 @@ exports.__esModule = true;
 function foo() {
     return {};
 }
+
+
+//// [declarationEmitTypeAliasWithTypeParameters5.d.ts]
+declare type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>;
+};
+export declare type SubFoo<R> = Foo<string, R>;
+export {};
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types
index 18ef901dbdc94..cd98b3706f687 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types
@@ -1,30 +1,30 @@
 === tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts ===
 type Foo<T, Y> = {
->Foo : { foo<U, J>(): Foo; }
+>Foo : Foo<T, Y>
 >T : T
 >Y : Y
 
     foo<U, J>(): Foo<U, J>
->foo : <U, J>() => { foo<U, J>(): Foo; }
+>foo : <U, J>() => Foo<U, J>
 >U : U
 >J : J
->Foo : { foo<U, J>(): Foo; }
+>Foo : Foo<T, Y>
 >U : U
 >J : J
 
 };
 export type SubFoo<R> = Foo<string, R>;
->SubFoo : { foo<U, J>(): Foo; }
+>SubFoo : Foo<string, R>
 >R : R
->Foo : { foo<U, J>(): Foo; }
+>Foo : Foo<T, Y>
 >R : R
 
 function foo() {
->foo : () => { foo<U, J>(): Foo; }
+>foo : () => Foo<string, number>
 
     return {} as SubFoo<number>;
->{} as SubFoo<number> : { foo<U, J>(): Foo; }
+>{} as SubFoo<number> : Foo<string, number>
 >{} : {}
->SubFoo : { foo<U, J>(): Foo; }
+>SubFoo : Foo<string, R>
 }
 
diff --git a/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js b/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js
index 6faa0bfca6039..88343a7d08e5c 100644
--- a/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js
+++ b/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js
@@ -20,7 +20,8 @@ var foo;
 
 //// [declarationFunctionTypeNonlocalShouldNotBeAnError.d.ts]
 declare namespace foo {
+    function bar(): void;
     const obj: {
-        bar: () => void;
+        bar: typeof bar;
     };
 }
diff --git a/tests/baselines/reference/declarationNoDanglingGenerics.js b/tests/baselines/reference/declarationNoDanglingGenerics.js
index 9045be6827bdb..fdd7f05564a7f 100644
--- a/tests/baselines/reference/declarationNoDanglingGenerics.js
+++ b/tests/baselines/reference/declarationNoDanglingGenerics.js
@@ -123,3 +123,4 @@ declare const CKind_base: {
 };
 export declare class CKind extends CKind_base {
 }
+export {};
diff --git a/tests/baselines/reference/dynamicNames.types b/tests/baselines/reference/dynamicNames.types
index 8535d7454a1dc..174aff77424c9 100644
--- a/tests/baselines/reference/dynamicNames.types
+++ b/tests/baselines/reference/dynamicNames.types
@@ -213,7 +213,7 @@ declare class T10 extends T9 {
 >T9 : T9
 }
 declare type T11 = {
->T11 : { [c4]: number; [c5]: string; [s2]: boolean; }
+>T11 : T11
 
     [c4]: number;
 >[c4] : number
@@ -261,7 +261,7 @@ declare class T14 extends T13 {
 >T13 : T13
 }
 declare type T15 = {
->T15 : { a: number; 1: string; [s2]: boolean; }
+>T15 : T15
 
     a: number;
 >a : number
@@ -341,9 +341,9 @@ let t6: N.T6;
 >T6 : N.T6
 
 let t7: N.T7;
->t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t7 : N.T7
 >N : any
->T7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>T7 : N.T7
 
 let t8: T8;
 >t8 : T8
@@ -358,8 +358,8 @@ let t10: T10;
 >T10 : T10
 
 let t11: T11;
->t11 : { [c4]: number; [c5]: string; [s2]: boolean; }
->T11 : { [c4]: number; [c5]: string; [s2]: boolean; }
+>t11 : T11
+>T11 : T11
 
 let t12: T12;
 >t12 : T12
@@ -374,8 +374,8 @@ let t14: T14;
 >T14 : T14
 
 let t15: T15;
->t15 : { a: number; 1: string; [s2]: boolean; }
->T15 : { a: number; 1: string; [s2]: boolean; }
+>t15 : T15
+>T15 : T15
 
 // assignability
 t0 = t1, t0 = t2, t0 = t3, t1 = t0, t1 = t2, t1 = t3, t2 = t0, t2 = t1, t2 = t3, t3 = t0, t3 = t1, t3 = t2;
@@ -431,13 +431,13 @@ t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7,
 >t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7, t7 = t4, t7 = t5, t7 = t6 : N.T6
 >t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7, t7 = t4, t7 = t5 : N.T5
 >t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7, t7 = t4 : N.T4
->t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7 : N.T7
 >t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5 : N.T5
 >t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4 : N.T4
->t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7 : N.T7
 >t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6 : N.T6
 >t4 = t5, t4 = t6, t4 = t7, t5 = t4 : N.T4
->t4 = t5, t4 = t6, t4 = t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t4 = t5, t4 = t6, t4 = t7 : N.T7
 >t4 = t5, t4 = t6 : N.T6
 >t4 = t5 : N.T5
 >t4 : N.T4
@@ -445,35 +445,35 @@ t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7,
 >t4 = t6 : N.T6
 >t4 : N.T4
 >t6 : N.T6
->t4 = t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t4 = t7 : N.T7
 >t4 : N.T4
->t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t7 : N.T7
 >t5 = t4 : N.T4
 >t5 : N.T5
 >t4 : N.T4
 >t5 = t6 : N.T6
 >t5 : N.T5
 >t6 : N.T6
->t5 = t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t5 = t7 : N.T7
 >t5 : N.T5
->t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t7 : N.T7
 >t6 = t4 : N.T4
 >t6 : N.T6
 >t4 : N.T4
 >t6 = t5 : N.T5
 >t6 : N.T6
 >t5 : N.T5
->t6 = t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t6 = t7 : N.T7
 >t6 : N.T6
->t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t7 : N.T7
 >t7 = t4 : N.T4
->t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t7 : N.T7
 >t4 : N.T4
 >t7 = t5 : N.T5
->t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t7 : N.T7
 >t5 : N.T5
 >t7 = t6 : N.T6
->t7 : { [N.c2]: number; [N.c3]: string; [N.s1]: boolean; }
+>t7 : N.T7
 >t6 : N.T6
 
 t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0, t14 = t0, t15 = t0;
@@ -481,7 +481,7 @@ t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0, t14 = t0, t15 = t0;
 >t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0, t14 = t0 : T0
 >t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0 : T0
 >t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0 : T0
->t0 = t12, t0 = t13, t0 = t14, t0 = t15 : { a: number; 1: string; [s2]: boolean; }
+>t0 = t12, t0 = t13, t0 = t14, t0 = t15 : T15
 >t0 = t12, t0 = t13, t0 = t14 : T14
 >t0 = t12, t0 = t13 : T13
 >t0 = t12 : T12
@@ -493,9 +493,9 @@ t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0, t14 = t0, t15 = t0;
 >t0 = t14 : T14
 >t0 : T0
 >t14 : T14
->t0 = t15 : { a: number; 1: string; [s2]: boolean; }
+>t0 = t15 : T15
 >t0 : T0
->t15 : { a: number; 1: string; [s2]: boolean; }
+>t15 : T15
 >t12 = t0 : T0
 >t12 : T12
 >t0 : T0
@@ -506,7 +506,7 @@ t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0, t14 = t0, t15 = t0;
 >t14 : T14
 >t0 : T0
 >t15 = t0 : T0
->t15 : { a: number; 1: string; [s2]: boolean; }
+>t15 : T15
 >t0 : T0
 
 t0 = C; // static side
diff --git a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
index 53fead2d9879e..cc8848a1a2012 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
@@ -130,3 +130,4 @@ declare const Test_base: {
 } & typeof FooItem;
 export declare class Test extends Test_base {
 }
+export {};
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.js b/tests/baselines/reference/exportClassExtendingIntersection.js
index 9b99e90d511c7..70ea0b3b53a11 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.js
+++ b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -118,5 +118,6 @@ declare const MyExtendedClass_base: typeof MyBaseClass & (new (...args: any[]) =
 export declare class MyExtendedClass extends MyExtendedClass_base<string> {
     extendedClassProperty: number;
 }
+export {};
 //// [Main.d.ts]
 export {};
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
index e21f677a7eab6..d2b26ca48c89b 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
@@ -1,6 +1,4 @@
-EmitSkipped: true
-Diagnostics:
-  Exported variable 'foo' has or is using private name 'C'.
+EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile.js
 var M;
 (function (M) {
@@ -11,4 +9,10 @@ var M;
     }());
     M.foo = new C();
 })(M || (M = {}));
+FileName : /tests/cases/fourslash/inputFile.d.ts
+declare module M {
+    class C {
+    }
+    var foo: C;
+}
 
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index 5cc4df243d07f..77131f89dd5ef 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -1,6 +1,4 @@
-EmitSkipped: true
-Diagnostics:
-  Exported variable 'foo' has or is using private name 'C'.
+EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile.js
 define(["require", "exports"], function (require, exports) {
     "use strict";
@@ -15,4 +13,11 @@ define(["require", "exports"], function (require, exports) {
         M.foo = new C();
     })(M = exports.M || (exports.M = {}));
 });
+FileName : /tests/cases/fourslash/inputFile.d.ts
+class C {
+}
+export declare module M {
+    var foo: C;
+}
+export {};
 
diff --git a/tests/baselines/reference/indexedAccessTypeConstraints.types b/tests/baselines/reference/indexedAccessTypeConstraints.types
index dad5fd7d61710..f2002aff90095 100644
--- a/tests/baselines/reference/indexedAccessTypeConstraints.types
+++ b/tests/baselines/reference/indexedAccessTypeConstraints.types
@@ -11,7 +11,7 @@ interface IData<T> {
 }
 
 type Data<T> = {
->Data : { get: <K extends keyof T>(prop: K) => T[K]; }
+>Data : Data<T>
 >T : T
 
     get: <K extends keyof T>(prop: K) => T[K];
@@ -30,19 +30,19 @@ class Parent<M> {
 >M : M
 
     constructor(private data: Data<M>) {}
->data : { get: <K extends keyof M>(prop: K) => M[K]; }
->Data : { get: <K extends keyof T>(prop: K) => T[K]; }
+>data : Data<M>
+>Data : Data<T>
 >M : M
 
     getData(): Data<M> {
->getData : () => { get: <K extends keyof M>(prop: K) => M[K]; }
->Data : { get: <K extends keyof T>(prop: K) => T[K]; }
+>getData : () => Data<M>
+>Data : Data<T>
 >M : M
 
         return this.data;
->this.data : { get: <K extends keyof M>(prop: K) => M[K]; }
+>this.data : Data<M>
 >this : this
->data : { get: <K extends keyof M>(prop: K) => M[K]; }
+>data : Data<M>
     }
 }
 
@@ -60,10 +60,10 @@ export class Foo<C> extends Parent<IData<C>> {
         return this.getData().get('content');
 >this.getData().get('content') : C
 >this.getData().get : <K extends "content">(prop: K) => IData<C>[K]
->this.getData() : { get: <K extends "content">(prop: K) => IData<C>[K]; }
->this.getData : () => { get: <K extends "content">(prop: K) => IData<C>[K]; }
+>this.getData() : Data<IData<C>>
+>this.getData : () => Data<IData<C>>
 >this : this
->getData : () => { get: <K extends "content">(prop: K) => IData<C>[K]; }
+>getData : () => Data<IData<C>>
 >get : <K extends "content">(prop: K) => IData<C>[K]
 >'content' : "content"
     }
@@ -85,10 +85,10 @@ export class Bar<C, T extends IData<C>> extends Parent<T> {
         return this.getData().get('content');
 >this.getData().get('content') : T["content"]
 >this.getData().get : <K extends keyof T>(prop: K) => T[K]
->this.getData() : { get: <K extends keyof T>(prop: K) => T[K]; }
->this.getData : () => { get: <K extends keyof T>(prop: K) => T[K]; }
+>this.getData() : Data<T>
+>this.getData : () => Data<T>
 >this : this
->getData : () => { get: <K extends keyof T>(prop: K) => T[K]; }
+>getData : () => Data<T>
 >get : <K extends keyof T>(prop: K) => T[K]
 >'content' : "content"
     }
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
index d96c88d1c410b..0e97c588a643f 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
@@ -3,7 +3,7 @@ import React from "react";
 >React : typeof React
 
 type InfoProps =
->InfoProps : { status: "hidden"; } | { status: "visible"; content: string; }
+>InfoProps : InfoProps
 
 | { status: "hidden" }
 >status : "hidden"
@@ -13,16 +13,16 @@ type InfoProps =
 >content : string
 
 const Info = (props: InfoProps) =>
->Info : (props: { status: "hidden"; } | { status: "visible"; content: string; }) => JSX.Element
->(props: InfoProps) =>props.status === "hidden"  ? <noscript />  : <div>{props.content}</div> : (props: { status: "hidden"; } | { status: "visible"; content: string; }) => JSX.Element
->props : { status: "hidden"; } | { status: "visible"; content: string; }
->InfoProps : { status: "hidden"; } | { status: "visible"; content: string; }
+>Info : (props: InfoProps) => JSX.Element
+>(props: InfoProps) =>props.status === "hidden"  ? <noscript />  : <div>{props.content}</div> : (props: InfoProps) => JSX.Element
+>props : InfoProps
+>InfoProps : InfoProps
 
 props.status === "hidden"
 >props.status === "hidden"  ? <noscript />  : <div>{props.content}</div> : JSX.Element
 >props.status === "hidden" : boolean
 >props.status : "hidden" | "visible"
->props : { status: "hidden"; } | { status: "visible"; content: string; }
+>props : InfoProps
 >status : "hidden" | "visible"
 >"hidden" : "hidden"
 
@@ -41,23 +41,23 @@ props.status === "hidden"
 const a = <Info status="hidden" />;
 >a : JSX.Element
 ><Info status="hidden" /> : JSX.Element
->Info : (props: { status: "hidden"; } | { status: "visible"; content: string; }) => JSX.Element
+>Info : (props: InfoProps) => JSX.Element
 >status : "hidden"
 
 const b = <Info status="visible" content="hello world" />;
 >b : JSX.Element
 ><Info status="visible" content="hello world" /> : JSX.Element
->Info : (props: { status: "hidden"; } | { status: "visible"; content: string; }) => JSX.Element
+>Info : (props: InfoProps) => JSX.Element
 >status : "visible"
 >content : string
 
 declare const infoProps: InfoProps;
->infoProps : { status: "hidden"; } | { status: "visible"; content: string; }
->InfoProps : { status: "hidden"; } | { status: "visible"; content: string; }
+>infoProps : InfoProps
+>InfoProps : InfoProps
 
 const c = <Info {...infoProps} />;
 >c : JSX.Element
 ><Info {...infoProps} /> : JSX.Element
->Info : (props: { status: "hidden"; } | { status: "visible"; content: string; }) => JSX.Element
->infoProps : { status: "hidden"; } | { status: "visible"; content: string; }
+>Info : (props: InfoProps) => JSX.Element
+>infoProps : InfoProps
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt b/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt
index 5f57081357e8a..a3e41fa38e72a 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt
@@ -4,9 +4,7 @@ tests/cases/compiler/f3.ts(11,21): error TS2307: Cannot find module './f2'.
 tests/cases/compiler/f3.ts(12,5): error TS2666: Exports and export assignments are not permitted in module augmentations.
 tests/cases/compiler/f3.ts(12,21): error TS2307: Cannot find module './f2'.
 tests/cases/compiler/f3.ts(13,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-tests/cases/compiler/f3.ts(13,16): error TS4000: Import declaration 'I' is using private name 'N'.
 tests/cases/compiler/f3.ts(14,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-tests/cases/compiler/f3.ts(14,16): error TS4000: Import declaration 'C' is using private name 'N'.
 tests/cases/compiler/f4.ts(5,11): error TS2339: Property 'foo' does not exist on type 'A'.
 
 
@@ -18,7 +16,7 @@ tests/cases/compiler/f4.ts(5,11): error TS2339: Property 'foo' does not exist on
         n: number;
     }
     
-==== tests/cases/compiler/f3.ts (9 errors) ====
+==== tests/cases/compiler/f3.ts (7 errors) ====
     import {A} from "./f1";
     
     A.prototype.foo = function () { return undefined; }
@@ -44,13 +42,9 @@ tests/cases/compiler/f4.ts(5,11): error TS2339: Property 'foo' does not exist on
         import I = N.Ifc;
         ~~~~~~
 !!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-                   ~
-!!! error TS4000: Import declaration 'I' is using private name 'N'.
         import C = N.Cls;
         ~~~~~~
 !!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-                   ~
-!!! error TS4000: Import declaration 'C' is using private name 'N'.
         // should have explicit export
         interface A {
             foo(): B;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index fa5e1a2f1d7c0..fcb68f78c15ba 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -76,5 +76,26 @@ export declare class A {
 export declare class B {
     n: number;
 }
+//// [f3.d.ts]
+namespace N {
+    interface Ifc {
+        a: any;
+    }
+    interface Cls {
+        a: any;
+    }
+}
+declare module "./f1" {
+    import { B } from "./f2";
+    export { B } from "./f2";
+    import I = N.Ifc;
+    import C = N.Cls;
+    interface A {
+        foo(): B;
+        bar(): I;
+        baz(): C;
+    }
+}
+export {};
 //// [f4.d.ts]
 import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt b/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt
index 33732c0552f34..3018d72f1b76f 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt
@@ -1,9 +1,7 @@
 tests/cases/compiler/f3.ts(11,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
 tests/cases/compiler/f3.ts(11,21): error TS2307: Cannot find module './f2'.
 tests/cases/compiler/f3.ts(12,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-tests/cases/compiler/f3.ts(12,16): error TS4000: Import declaration 'I' is using private name 'N'.
 tests/cases/compiler/f3.ts(13,5): error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-tests/cases/compiler/f3.ts(13,16): error TS4000: Import declaration 'C' is using private name 'N'.
 
 
 ==== tests/cases/compiler/f1.ts (0 errors) ====
@@ -14,7 +12,7 @@ tests/cases/compiler/f3.ts(13,16): error TS4000: Import declaration 'C' is using
         n: number;
     }
     
-==== tests/cases/compiler/f3.ts (6 errors) ====
+==== tests/cases/compiler/f3.ts (4 errors) ====
     import {A} from "./f1";
     
     A.prototype.foo = function () { return undefined; }
@@ -33,13 +31,9 @@ tests/cases/compiler/f3.ts(13,16): error TS4000: Import declaration 'C' is using
         import I = N.Ifc;
         ~~~~~~
 !!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-                   ~
-!!! error TS4000: Import declaration 'I' is using private name 'N'.
         import C = N.Cls;
         ~~~~~~
 !!! error TS2667: Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.
-                   ~
-!!! error TS4000: Import declaration 'C' is using private name 'N'.
         interface A {
             foo(): B;
             bar(): I;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index a55d0e6facb14..abfccd0d42489 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -74,5 +74,25 @@ export declare class A {
 export declare class B {
     n: number;
 }
+//// [f3.d.ts]
+namespace N {
+    interface Ifc {
+        a: any;
+    }
+    interface Cls {
+        a: any;
+    }
+}
+declare module "./f1" {
+    import { B } from "./f2";
+    import I = N.Ifc;
+    import C = N.Cls;
+    interface A {
+        foo(): B;
+        bar(): I;
+        baz(): C;
+    }
+}
+export {};
 //// [f4.d.ts]
 import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.errors.txt b/tests/baselines/reference/moduleAugmentationImportsAndExports5.errors.txt
deleted file mode 100644
index 962386c730adb..0000000000000
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.errors.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-tests/cases/compiler/f3.ts(10,12): error TS4000: Import declaration 'I' is using private name 'N'.
-tests/cases/compiler/f3.ts(11,12): error TS4000: Import declaration 'C' is using private name 'N'.
-
-
-==== tests/cases/compiler/f1.ts (0 errors) ====
-    export class A {}
-    
-==== tests/cases/compiler/f2.ts (0 errors) ====
-    export class B {
-        n: number;
-    }
-    
-==== tests/cases/compiler/f3.ts (2 errors) ====
-    import {A} from "./f1";
-    import {B} from "./f2";
-    
-    A.prototype.foo = function () { return undefined; }
-    
-    namespace N {
-        export interface Ifc { a: number; }
-        export interface Cls { b: number; }
-    }
-    import I = N.Ifc;
-               ~
-!!! error TS4000: Import declaration 'I' is using private name 'N'.
-    import C = N.Cls;
-               ~
-!!! error TS4000: Import declaration 'C' is using private name 'N'.
-    
-    declare module "./f1" {
-        interface A {
-            foo(): B;
-            bar(): I;
-            baz(): C;
-        }
-    }
-    
-==== tests/cases/compiler/f4.ts (0 errors) ====
-    import {A} from "./f1";
-    import "./f3";
-    
-    let a: A;
-    let b = a.foo().n;
-    let c = a.bar().a;
-    let d = a.baz().b;
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index 56f73234af222..a1e63f7463cbc 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -78,5 +78,68 @@ export declare class A {
 export declare class B {
     n: number;
 }
+//// [f3.d.ts]
+import { B } from "./f2";
+namespace N {
+    interface Ifc {
+        a: number;
+    }
+    interface Cls {
+        b: number;
+    }
+}
+import I = N.Ifc;
+import C = N.Cls;
+declare module "./f1" {
+    interface A {
+        foo(): B;
+        bar(): I;
+        baz(): C;
+    }
+}
+export {};
 //// [f4.d.ts]
 import "./f3";
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/f3.d.ts(2,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/f1.d.ts (0 errors) ====
+    export declare class A {
+    }
+    
+==== tests/cases/compiler/f2.d.ts (0 errors) ====
+    export declare class B {
+        n: number;
+    }
+    
+==== tests/cases/compiler/f3.d.ts (1 errors) ====
+    import { B } from "./f2";
+    namespace N {
+    ~~~~~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+        interface Ifc {
+            a: number;
+        }
+        interface Cls {
+            b: number;
+        }
+    }
+    import I = N.Ifc;
+    import C = N.Cls;
+    declare module "./f1" {
+        interface A {
+            foo(): B;
+            bar(): I;
+            baz(): C;
+        }
+    }
+    export {};
+    
+==== tests/cases/compiler/f4.d.ts (0 errors) ====
+    import "./f3";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
index eb16207afeda8..d7e75b11d1709 100644
--- a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/noImplicitAnyDestructuringInPrivateMethod.ts ===
 type Arg = {
->Arg : { a: number; }
+>Arg : Arg
 
     a: number;
 >a : number
@@ -10,9 +10,9 @@ export class Bar {
 >Bar : Bar
 
     private bar({ a, }: Arg): number {
->bar : ({ a, }: { a: number; }) => number
+>bar : ({ a, }: Arg) => number
 >a : number
->Arg : { a: number; }
+>Arg : Arg
 
         return a;
 >a : number
diff --git a/tests/baselines/reference/noUnusedLocals_selfReference.types b/tests/baselines/reference/noUnusedLocals_selfReference.types
index de904d98513fd..cec1780ec6566 100644
--- a/tests/baselines/reference/noUnusedLocals_selfReference.types
+++ b/tests/baselines/reference/noUnusedLocals_selfReference.types
@@ -36,9 +36,9 @@ interface I { x: I };
 >I : I
 
 type T = { x: T };
->T : { x: T; }
->x : { x: T; }
->T : { x: T; }
+>T : T
+>x : T
+>T : T
 
 namespace N { N; }
 >N : typeof N
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt
deleted file mode 100644
index 92ce3d5c5353e..0000000000000
--- a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt
+++ /dev/null
@@ -1,1167 +0,0 @@
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(253,44): error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(259,31): error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(265,20): error TS4040: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(271,13): error TS4043: Return type of public getter 'myPublicMethod1' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(361,48): error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(365,35): error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(405,44): error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(408,31): error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(411,20): error TS4039: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(414,13): error TS4042: Return type of public getter 'myPublicMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(420,48): error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(422,35): error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(8,40): error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(14,27): error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(20,16): error TS4040: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(26,9): error TS4043: Return type of public getter 'myPublicMethod1' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(116,44): error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(120,31): error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(160,40): error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(163,27): error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(166,16): error TS4039: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(169,9): error TS4042: Return type of public getter 'myPublicMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(175,44): error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(177,31): error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(210,44): error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(216,31): error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(222,20): error TS4040: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(228,13): error TS4043: Return type of public getter 'myPublicMethod1' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(318,48): error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(322,35): error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(362,44): error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(365,31): error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(368,20): error TS4039: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(371,13): error TS4042: Return type of public getter 'myPublicMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(377,48): error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(379,35): error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts (24 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { // Error
-                                           ~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { // Error
-                              ~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod1' from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { // Error
-                                               ~~~~~~~~~~~~
-!!! error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { // Error
-                                  ~~~~~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-    
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-    
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { 
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-    
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-    
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { // Error
-                                           ~~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { // Error
-                              ~~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4039: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! error TS4042: Return type of public getter 'myPublicMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-    }
-    
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                               ~~~~~~~~~~~~~
-!!! error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-        }
-        set myPublicMethod(param: privateModule.publicClass) { // Error
-                                  ~~~~~~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-        }
-    }
-    
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass { // Error
-                                               ~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass { // Error
-                                  ~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod1' from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) { // Error
-                                                   ~~~~~~~~~~~~
-!!! error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) { // Error
-                                      ~~~~~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass { // Error
-                                               ~~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass { // Error
-                                  ~~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4039: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! error TS4042: Return type of public getter 'myPublicMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-    
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                                   ~~~~~~~~~~~~~
-!!! error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-            }
-            set myPublicMethod(param: privateModule.publicClass) { // Error
-                                      ~~~~~~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-            }
-        }
-    
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-    
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass { 
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass { 
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() { 
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() { 
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) { 
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) { 
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass { 
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass { 
-                return null;
-            }
-            static get myPublicStaticMethod1() { 
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() { 
-                return new privateModule.publicClass();
-            }
-        }
-    
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) { 
-            }
-            set myPublicMethod(param: privateModule.publicClass) { 
-            }
-        }
-    
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-    
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
-    
-==== tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts (12 errors) ====
-    class publicClassInGlobal {
-    }
-    
-    class publicClassInGlobalWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        get myPublicMethod(): publicClassInGlobal {
-            return null;
-        }
-        private get myPrivateMethod(): publicClassInGlobal {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        get myPublicMethod1() {
-            return new publicClassInGlobal();
-        }
-        private get myPrivateMethod1() {
-            return new publicClassInGlobal();
-        }
-    }
-    
-    class publicClassInGlobalWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClassInGlobal) {
-        }
-        private static set myPrivateStaticMethod(param: publicClassInGlobal) {
-        }
-        set myPublicMethod(param: publicClassInGlobal) {
-        }
-        private set myPrivateMethod(param: publicClassInGlobal) {
-        }
-    }
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-            export class publicClassWithWithPrivateGetAccessorTypes {
-                static get myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                get myPublicMethod(): privateClass {
-                    return null;
-                }
-                private get myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                get myPublicMethod1() {
-                    return new privateClass();
-                }
-                private get myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            export class publicClassWithWithPublicGetAccessorTypes {
-                static get myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                get myPublicMethod(): publicClass {
-                    return null;
-                }
-                private get myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                get myPublicMethod1() {
-                    return new publicClass();
-                }
-                private get myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            class privateClassWithWithPrivateGetAccessorTypes {
-                static get myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                get myPublicMethod(): privateClass {
-                    return null;
-                }
-                private get myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                get myPublicMethod1() {
-                    return new privateClass();
-                }
-                private get myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            class privateClassWithWithPublicGetAccessorTypes {
-                static get myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                get myPublicMethod(): publicClass {
-                    return null;
-                }
-                private get myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                get myPublicMethod1() {
-                    return new publicClass();
-                }
-                private get myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            export class publicClassWithWithPrivateSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateClass) {
-                }
-                private static set myPrivateStaticMethod(param: privateClass) {
-                }
-                set myPublicMethod(param: privateClass) {
-                }
-                private set myPrivateMethod(param: privateClass) {
-                }
-            }
-    
-            export class publicClassWithWithPublicSetAccessorTypes {
-                static set myPublicStaticMethod(param: publicClass) {
-                }
-                private static set myPrivateStaticMethod(param: publicClass) {
-                }
-                set myPublicMethod(param: publicClass) {
-                }
-                private set myPrivateMethod(param: publicClass) {
-                }
-            }
-    
-            class privateClassWithWithPrivateSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateClass) {
-                }
-                private static set myPrivateStaticMethod(param: privateClass) {
-                }
-                set myPublicMethod(param: privateClass) {
-                }
-                private set myPrivateMethod(param: privateClass) {
-                }
-            }
-    
-            class privateClassWithWithPublicSetAccessorTypes {
-                static set myPublicStaticMethod(param: publicClass) {
-                }
-                private static set myPrivateStaticMethod(param: publicClass) {
-                }
-                set myPublicMethod(param: publicClass) {
-                }
-                private set myPrivateMethod(param: publicClass) {
-                }
-            }
-    
-            export class publicClassWithPrivateModuleGetAccessorTypes {
-                static get myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                get myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                get myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-    
-            export class publicClassWithPrivateModuleSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                set myPublicMethod(param: privateModule.publicClass) {
-                }
-            }
-    
-            class privateClassWithPrivateModuleGetAccessorTypes {
-                static get myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                get myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                get myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-    
-            class privateClassWithPrivateModuleSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                set myPublicMethod(param: privateModule.publicClass) {
-                }
-            }
-        }
-    
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass { // Error
-                                               ~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass { // Error
-                                  ~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod1' from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) { // Error
-                                                   ~~~~~~~~~~~~
-!!! error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateClass'.
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) { // Error
-                                      ~~~~~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateClass'.
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass { // Error
-                                               ~~~~~~~~~~~~~
-!!! error TS4040: Return type of public static getter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass { // Error
-                                  ~~~~~~~~~~~~~
-!!! error TS4043: Return type of public getter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4039: Return type of public static getter 'myPublicStaticMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! error TS4042: Return type of public getter 'myPublicMethod1' from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-    
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                                   ~~~~~~~~~~~~~
-!!! error TS4035: Parameter type of public static setter 'myPublicStaticMethod' from exported class has or is using private name 'privateModule'.
-            }
-            set myPublicMethod(param: privateModule.publicClass) { // Error
-                                      ~~~~~~~~~~~~~
-!!! error TS4037: Parameter type of public setter 'myPublicMethod' from exported class has or is using private name 'privateModule'.
-            }
-        }
-    
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-    
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js
index 57dbd8b494732..0edef02a54dfd 100644
--- a/tests/baselines/reference/privacyAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyAccessorDeclFile.js
@@ -3554,3 +3554,535 @@ var publicModuleInGlobal;
         return privateClassWithPrivateModuleSetAccessorTypes;
     }());
 })(publicModuleInGlobal || (publicModuleInGlobal = {}));
+
+
+//// [privacyAccessorDeclFile_externalModule.d.ts]
+class privateClass {
+}
+export declare class publicClass {
+}
+export declare class publicClassWithWithPrivateGetAccessorTypes {
+    static readonly myPublicStaticMethod: privateClass;
+    private static readonly myPrivateStaticMethod;
+    readonly myPublicMethod: privateClass;
+    private readonly myPrivateMethod;
+    static readonly myPublicStaticMethod1: privateClass;
+    private static readonly myPrivateStaticMethod1;
+    readonly myPublicMethod1: privateClass;
+    private readonly myPrivateMethod1;
+}
+export declare class publicClassWithWithPublicGetAccessorTypes {
+    static readonly myPublicStaticMethod: publicClass;
+    private static readonly myPrivateStaticMethod;
+    readonly myPublicMethod: publicClass;
+    private readonly myPrivateMethod;
+    static readonly myPublicStaticMethod1: publicClass;
+    private static readonly myPrivateStaticMethod1;
+    readonly myPublicMethod1: publicClass;
+    private readonly myPrivateMethod1;
+}
+export declare class publicClassWithWithPrivateSetAccessorTypes {
+    static myPublicStaticMethod: privateClass;
+    private static myPrivateStaticMethod;
+    myPublicMethod: privateClass;
+    private myPrivateMethod;
+}
+export declare class publicClassWithWithPublicSetAccessorTypes {
+    static myPublicStaticMethod: publicClass;
+    private static myPrivateStaticMethod;
+    myPublicMethod: publicClass;
+    private myPrivateMethod;
+}
+export declare class publicClassWithPrivateModuleGetAccessorTypes {
+    static readonly myPublicStaticMethod: privateModule.publicClass;
+    readonly myPublicMethod: privateModule.publicClass;
+    static readonly myPublicStaticMethod1: privateModule.publicClass;
+    readonly myPublicMethod1: privateModule.publicClass;
+}
+export declare class publicClassWithPrivateModuleSetAccessorTypes {
+    static myPublicStaticMethod: privateModule.publicClass;
+    myPublicMethod: privateModule.publicClass;
+}
+export declare module publicModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    class publicClassWithWithPrivateGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: privateClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: privateClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: privateClass;
+        private readonly myPrivateMethod1;
+    }
+    class publicClassWithWithPublicGetAccessorTypes {
+        static readonly myPublicStaticMethod: publicClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: publicClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: publicClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: publicClass;
+        private readonly myPrivateMethod1;
+    }
+    class publicClassWithWithPrivateSetAccessorTypes {
+        static myPublicStaticMethod: privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: privateClass;
+        private myPrivateMethod;
+    }
+    class publicClassWithWithPublicSetAccessorTypes {
+        static myPublicStaticMethod: publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: publicClass;
+        private myPrivateMethod;
+    }
+    class publicClassWithPrivateModuleGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateModule.publicClass;
+        readonly myPublicMethod: privateModule.publicClass;
+        static readonly myPublicStaticMethod1: privateModule.publicClass;
+        readonly myPublicMethod1: privateModule.publicClass;
+    }
+    class publicClassWithPrivateModuleSetAccessorTypes {
+        static myPublicStaticMethod: privateModule.publicClass;
+        myPublicMethod: privateModule.publicClass;
+    }
+}
+declare module privateModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    class publicClassWithWithPrivateGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: privateClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: privateClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: privateClass;
+        private readonly myPrivateMethod1;
+    }
+    class publicClassWithWithPublicGetAccessorTypes {
+        static readonly myPublicStaticMethod: publicClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: publicClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: publicClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: publicClass;
+        private readonly myPrivateMethod1;
+    }
+    class publicClassWithWithPrivateSetAccessorTypes {
+        static myPublicStaticMethod: privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: privateClass;
+        private myPrivateMethod;
+    }
+    class publicClassWithWithPublicSetAccessorTypes {
+        static myPublicStaticMethod: publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: publicClass;
+        private myPrivateMethod;
+    }
+    class publicClassWithPrivateModuleGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateModule.publicClass;
+        readonly myPublicMethod: privateModule.publicClass;
+        static readonly myPublicStaticMethod1: publicClass;
+        readonly myPublicMethod1: publicClass;
+    }
+    class publicClassWithPrivateModuleSetAccessorTypes {
+        static myPublicStaticMethod: privateModule.publicClass;
+        myPublicMethod: privateModule.publicClass;
+    }
+}
+export {};
+//// [privacyAccessorDeclFile_GlobalFile.d.ts]
+declare class publicClassInGlobal {
+}
+declare class publicClassInGlobalWithPublicGetAccessorTypes {
+    static readonly myPublicStaticMethod: publicClassInGlobal;
+    private static readonly myPrivateStaticMethod;
+    readonly myPublicMethod: publicClassInGlobal;
+    private readonly myPrivateMethod;
+    static readonly myPublicStaticMethod1: publicClassInGlobal;
+    private static readonly myPrivateStaticMethod1;
+    readonly myPublicMethod1: publicClassInGlobal;
+    private readonly myPrivateMethod1;
+}
+declare class publicClassInGlobalWithWithPublicSetAccessorTypes {
+    static myPublicStaticMethod: publicClassInGlobal;
+    private static myPrivateStaticMethod;
+    myPublicMethod: publicClassInGlobal;
+    private myPrivateMethod;
+}
+declare module publicModuleInGlobal {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        class publicClassWithWithPrivateGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: privateClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: privateClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: privateClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPublicGetAccessorTypes {
+            static readonly myPublicStaticMethod: publicClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: publicClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: publicClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: publicClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPrivateSetAccessorTypes {
+            static myPublicStaticMethod: privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: privateClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithWithPublicSetAccessorTypes {
+            static myPublicStaticMethod: publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: publicClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithPrivateModuleGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateModule.publicClass;
+            readonly myPublicMethod: privateModule.publicClass;
+            static readonly myPublicStaticMethod1: publicClass;
+            readonly myPublicMethod1: publicClass;
+        }
+        class publicClassWithPrivateModuleSetAccessorTypes {
+            static myPublicStaticMethod: privateModule.publicClass;
+            myPublicMethod: privateModule.publicClass;
+        }
+    }
+    class publicClassWithWithPrivateGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: privateClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: privateClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: privateClass;
+        private readonly myPrivateMethod1;
+    }
+    class publicClassWithWithPublicGetAccessorTypes {
+        static readonly myPublicStaticMethod: publicClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: publicClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: publicClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: publicClass;
+        private readonly myPrivateMethod1;
+    }
+    class publicClassWithWithPrivateSetAccessorTypes {
+        static myPublicStaticMethod: privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: privateClass;
+        private myPrivateMethod;
+    }
+    class publicClassWithWithPublicSetAccessorTypes {
+        static myPublicStaticMethod: publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: publicClass;
+        private myPrivateMethod;
+    }
+    class publicClassWithPrivateModuleGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateModule.publicClass;
+        readonly myPublicMethod: privateModule.publicClass;
+        static readonly myPublicStaticMethod1: privateModule.publicClass;
+        readonly myPublicMethod1: privateModule.publicClass;
+    }
+    class publicClassWithPrivateModuleSetAccessorTypes {
+        static myPublicStaticMethod: privateModule.publicClass;
+        myPublicMethod: privateModule.publicClass;
+    }
+}
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyAccessorDeclFile_externalModule.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyAccessorDeclFile_externalModule.d.ts (1 errors) ====
+    class privateClass {
+    ~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+    }
+    export declare class publicClass {
+    }
+    export declare class publicClassWithWithPrivateGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: privateClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: privateClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: privateClass;
+        private readonly myPrivateMethod1;
+    }
+    export declare class publicClassWithWithPublicGetAccessorTypes {
+        static readonly myPublicStaticMethod: publicClass;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: publicClass;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: publicClass;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: publicClass;
+        private readonly myPrivateMethod1;
+    }
+    export declare class publicClassWithWithPrivateSetAccessorTypes {
+        static myPublicStaticMethod: privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: privateClass;
+        private myPrivateMethod;
+    }
+    export declare class publicClassWithWithPublicSetAccessorTypes {
+        static myPublicStaticMethod: publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod: publicClass;
+        private myPrivateMethod;
+    }
+    export declare class publicClassWithPrivateModuleGetAccessorTypes {
+        static readonly myPublicStaticMethod: privateModule.publicClass;
+        readonly myPublicMethod: privateModule.publicClass;
+        static readonly myPublicStaticMethod1: privateModule.publicClass;
+        readonly myPublicMethod1: privateModule.publicClass;
+    }
+    export declare class publicClassWithPrivateModuleSetAccessorTypes {
+        static myPublicStaticMethod: privateModule.publicClass;
+        myPublicMethod: privateModule.publicClass;
+    }
+    export declare module publicModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        class publicClassWithWithPrivateGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: privateClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: privateClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: privateClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPublicGetAccessorTypes {
+            static readonly myPublicStaticMethod: publicClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: publicClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: publicClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: publicClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPrivateSetAccessorTypes {
+            static myPublicStaticMethod: privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: privateClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithWithPublicSetAccessorTypes {
+            static myPublicStaticMethod: publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: publicClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithPrivateModuleGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateModule.publicClass;
+            readonly myPublicMethod: privateModule.publicClass;
+            static readonly myPublicStaticMethod1: privateModule.publicClass;
+            readonly myPublicMethod1: privateModule.publicClass;
+        }
+        class publicClassWithPrivateModuleSetAccessorTypes {
+            static myPublicStaticMethod: privateModule.publicClass;
+            myPublicMethod: privateModule.publicClass;
+        }
+    }
+    declare module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        class publicClassWithWithPrivateGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: privateClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: privateClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: privateClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPublicGetAccessorTypes {
+            static readonly myPublicStaticMethod: publicClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: publicClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: publicClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: publicClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPrivateSetAccessorTypes {
+            static myPublicStaticMethod: privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: privateClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithWithPublicSetAccessorTypes {
+            static myPublicStaticMethod: publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: publicClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithPrivateModuleGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateModule.publicClass;
+            readonly myPublicMethod: privateModule.publicClass;
+            static readonly myPublicStaticMethod1: publicClass;
+            readonly myPublicMethod1: publicClass;
+        }
+        class publicClassWithPrivateModuleSetAccessorTypes {
+            static myPublicStaticMethod: privateModule.publicClass;
+            myPublicMethod: privateModule.publicClass;
+        }
+    }
+    export {};
+    
+==== tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.d.ts (0 errors) ====
+    declare class publicClassInGlobal {
+    }
+    declare class publicClassInGlobalWithPublicGetAccessorTypes {
+        static readonly myPublicStaticMethod: publicClassInGlobal;
+        private static readonly myPrivateStaticMethod;
+        readonly myPublicMethod: publicClassInGlobal;
+        private readonly myPrivateMethod;
+        static readonly myPublicStaticMethod1: publicClassInGlobal;
+        private static readonly myPrivateStaticMethod1;
+        readonly myPublicMethod1: publicClassInGlobal;
+        private readonly myPrivateMethod1;
+    }
+    declare class publicClassInGlobalWithWithPublicSetAccessorTypes {
+        static myPublicStaticMethod: publicClassInGlobal;
+        private static myPrivateStaticMethod;
+        myPublicMethod: publicClassInGlobal;
+        private myPrivateMethod;
+    }
+    declare module publicModuleInGlobal {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        module privateModule {
+            class privateClass {
+            }
+            class publicClass {
+            }
+            class publicClassWithWithPrivateGetAccessorTypes {
+                static readonly myPublicStaticMethod: privateClass;
+                private static readonly myPrivateStaticMethod;
+                readonly myPublicMethod: privateClass;
+                private readonly myPrivateMethod;
+                static readonly myPublicStaticMethod1: privateClass;
+                private static readonly myPrivateStaticMethod1;
+                readonly myPublicMethod1: privateClass;
+                private readonly myPrivateMethod1;
+            }
+            class publicClassWithWithPublicGetAccessorTypes {
+                static readonly myPublicStaticMethod: publicClass;
+                private static readonly myPrivateStaticMethod;
+                readonly myPublicMethod: publicClass;
+                private readonly myPrivateMethod;
+                static readonly myPublicStaticMethod1: publicClass;
+                private static readonly myPrivateStaticMethod1;
+                readonly myPublicMethod1: publicClass;
+                private readonly myPrivateMethod1;
+            }
+            class publicClassWithWithPrivateSetAccessorTypes {
+                static myPublicStaticMethod: privateClass;
+                private static myPrivateStaticMethod;
+                myPublicMethod: privateClass;
+                private myPrivateMethod;
+            }
+            class publicClassWithWithPublicSetAccessorTypes {
+                static myPublicStaticMethod: publicClass;
+                private static myPrivateStaticMethod;
+                myPublicMethod: publicClass;
+                private myPrivateMethod;
+            }
+            class publicClassWithPrivateModuleGetAccessorTypes {
+                static readonly myPublicStaticMethod: privateModule.publicClass;
+                readonly myPublicMethod: privateModule.publicClass;
+                static readonly myPublicStaticMethod1: publicClass;
+                readonly myPublicMethod1: publicClass;
+            }
+            class publicClassWithPrivateModuleSetAccessorTypes {
+                static myPublicStaticMethod: privateModule.publicClass;
+                myPublicMethod: privateModule.publicClass;
+            }
+        }
+        class publicClassWithWithPrivateGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: privateClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: privateClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: privateClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPublicGetAccessorTypes {
+            static readonly myPublicStaticMethod: publicClass;
+            private static readonly myPrivateStaticMethod;
+            readonly myPublicMethod: publicClass;
+            private readonly myPrivateMethod;
+            static readonly myPublicStaticMethod1: publicClass;
+            private static readonly myPrivateStaticMethod1;
+            readonly myPublicMethod1: publicClass;
+            private readonly myPrivateMethod1;
+        }
+        class publicClassWithWithPrivateSetAccessorTypes {
+            static myPublicStaticMethod: privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: privateClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithWithPublicSetAccessorTypes {
+            static myPublicStaticMethod: publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod: publicClass;
+            private myPrivateMethod;
+        }
+        class publicClassWithPrivateModuleGetAccessorTypes {
+            static readonly myPublicStaticMethod: privateModule.publicClass;
+            readonly myPublicMethod: privateModule.publicClass;
+            static readonly myPublicStaticMethod1: privateModule.publicClass;
+            readonly myPublicMethod1: privateModule.publicClass;
+        }
+        class publicClassWithPrivateModuleSetAccessorTypes {
+            static myPublicStaticMethod: privateModule.publicClass;
+            myPublicMethod: privateModule.publicClass;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
deleted file mode 100644
index f901d08b4620a..0000000000000
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/compiler/privacyCheckTypeOfFunction.ts(3,22): error TS4025: Exported variable 'x' has or is using private name 'foo'.
-
-
-==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (1 errors) ====
-    function foo() {
-    }
-    export var x: typeof foo;
-                         ~~~
-!!! error TS4025: Exported variable 'x' has or is using private name 'foo'.
-    export var b = foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js
index 614bcedebe0de..ca9878c67276a 100644
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.js
+++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js
@@ -11,3 +11,10 @@ exports.__esModule = true;
 function foo() {
 }
 exports.b = foo;
+
+
+//// [privacyCheckTypeOfFunction.d.ts]
+declare function foo(): void;
+export declare var x: typeof foo;
+export declare var b: typeof foo;
+export {};
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
deleted file mode 100644
index e8accf360dc96..0000000000000
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts(6,26): error TS4025: Exported variable 'f' has or is using private name 'Inner'.
-
-
-==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts (1 errors) ====
-    module Outer {
-        module Inner {
-            export var m: typeof Inner;
-        }
-    
-        export var f: typeof Inner;
-                             ~~~~~
-!!! error TS4025: Exported variable 'f' has or is using private name 'Inner'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js
index e2ee218de06a2..ae3e7f350b0c6 100644
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js
+++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js
@@ -15,3 +15,12 @@ var Outer;
     (function (Inner) {
     })(Inner || (Inner = {}));
 })(Outer || (Outer = {}));
+
+
+//// [privacyCheckTypeOfInvisibleModuleError.d.ts]
+declare module Outer {
+    module Inner {
+        var m: typeof Inner;
+    }
+    var f: typeof Inner;
+}
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt
deleted file mode 100644
index bbc8954cff10c..0000000000000
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts(6,26): error TS4025: Exported variable 'f' has or is using private name 'Inner'.
-
-
-==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts (1 errors) ====
-    module Outer {
-        module Inner {
-            export var m: number;
-        }
-    
-        export var f: typeof Inner; // Since we dont unwind inner any more, it is error here
-                             ~~~~~
-!!! error TS4025: Exported variable 'f' has or is using private name 'Inner'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
index 6dd486e87d2cc..4a3a1bb08bc83 100644
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
+++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
@@ -15,3 +15,12 @@ var Outer;
     (function (Inner) {
     })(Inner || (Inner = {}));
 })(Outer || (Outer = {}));
+
+
+//// [privacyCheckTypeOfInvisibleModuleNoError.d.ts]
+declare module Outer {
+    module Inner {
+        var m: number;
+    }
+    var f: typeof Inner;
+}
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
index 23559cd9a3c18..62b3b2d2c22d6 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
@@ -1,13 +1,8 @@
-tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts(16,67): error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(16,67): error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
 tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(19,77): error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
-tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(21,69): error TS4020: 'extends' clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'.
 tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(21,83): error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
-tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(63,55): error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClass' has or is using private name 'privateClass'.
-tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(68,65): error TS4020: 'extends' clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'.
 
 
-==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts (6 errors) ====
+==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts (2 errors) ====
     export module publicModule {
         export class publicClassInPublicModule {
             private f1() {
@@ -24,8 +19,6 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(68,65):
         export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
         }
         export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
         }
     
         class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
@@ -33,8 +26,6 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(68,65):
 !!! error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
         }
         export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-                                                                        ~~~~~~~~~~~~~
-!!! error TS4020: 'extends' clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'.
                                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
         }
@@ -79,18 +70,14 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(68,65):
     export class publicClassExtendingPublicClass extends publicClass {
     }
     export class publicClassExtendingPrivateClass extends privateClass { // Should error
-                                                          ~~~~~~~~~~~~
-!!! error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClass' has or is using private name 'privateClass'.
     }
     
     class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
     }
     export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-                                                                    ~~~~~~~~~~~~~
-!!! error TS4020: 'extends' clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'.
     }
     
-==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts (1 errors) ====
+==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts (0 errors) ====
     module publicModuleInGlobal {
         export class publicClassInPublicModule {
             private f1() {
@@ -107,8 +94,6 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(68,65):
         export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
         }
         export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
         }
     }
     class publicClassInGlobal {
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
index d98f39479f154..6ede49fbc6c37 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -358,3 +358,60 @@ var publicClassExtendingPublicClassInGlobal = /** @class */ (function (_super) {
     }
     return publicClassExtendingPublicClassInGlobal;
 }(publicClassInGlobal));
+
+
+//// [privacyClassExtendsClauseDeclFile_externalModule.d.ts]
+export declare module publicModule {
+    class publicClassInPublicModule {
+        private f1;
+    }
+    class privateClassInPublicModule {
+    }
+    class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+    }
+    class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+}
+declare module privateModule {
+    class publicClassInPrivateModule {
+        private f1;
+    }
+    class privateClassInPrivateModule {
+    }
+    class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule {
+    }
+    class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule {
+    }
+    class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+}
+export declare class publicClass {
+    private f1;
+}
+declare class privateClass {
+}
+export declare class publicClassExtendingPublicClass extends publicClass {
+}
+export declare class publicClassExtendingPrivateClass extends privateClass {
+}
+export declare class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+}
+export {};
+//// [privacyClassExtendsClauseDeclFile_GlobalFile.d.ts]
+declare module publicModuleInGlobal {
+    class publicClassInPublicModule {
+        private f1;
+    }
+    class privateClassInPublicModule {
+    }
+    class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+    }
+}
+declare class publicClassInGlobal {
+}
+declare class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal {
+}
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
deleted file mode 100644
index 586d4530c8e7e..0000000000000
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts(14,77): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(14,77): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(19,79): error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(22,78): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
-tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(62,65): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterface' has or is using private name 'privateInterface'.
-tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(67,75): error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts (5 errors) ====
-    export module publicModule {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    
-        class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                                  ~~~~~~~~~~~~~
-!!! error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-        }
-    
-        export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    
-    module privateModule {
-        export interface publicInterfaceInPrivateModule {
-    
-        }
-    
-        interface privateInterfaceInPrivateModule {
-        }
-    
-        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-        }
-        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
-        }
-    
-        class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-        }
-    }
-    
-    export interface publicInterface {
-    
-    }
-    
-    interface privateInterface {
-    }
-    
-    class privateClassImplementingPublicInterface implements publicInterface {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
-    }
-    export class publicClassImplementingPublicInterface implements publicInterface {
-    }
-    export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
-                                                                    ~~~~~~~~~~~~~~~~
-!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterface' has or is using private name 'privateInterface'.
-    }
-    
-    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                              ~~~~~~~~~~~~~
-!!! error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-    }
-    
-==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts (1 errors) ====
-    module publicModuleInGlobal {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    interface publicInterfaceInGlobal {
-    }
-    class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
index 9dc455bdc10f9..615a03fe07d4b 100644
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
@@ -238,3 +238,58 @@ var publicClassImplementingPublicInterfaceInGlobal = /** @class */ (function ()
     }
     return publicClassImplementingPublicInterfaceInGlobal;
 }());
+
+
+//// [privacyClassImplementsClauseDeclFile_externalModule.d.ts]
+export declare module publicModule {
+    interface publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceInPublicModule {
+    }
+    class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+    }
+    class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+    class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule {
+    }
+}
+declare module privateModule {
+    interface publicInterfaceInPrivateModule {
+    }
+    interface privateInterfaceInPrivateModule {
+    }
+    class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
+    }
+    class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
+    }
+    class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+}
+export interface publicInterface {
+}
+interface privateInterface {
+}
+export declare class publicClassImplementingPublicInterface implements publicInterface {
+}
+export declare class publicClassImplementingPrivateInterface implements privateInterface {
+}
+export declare class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+}
+export {};
+//// [privacyClassImplementsClauseDeclFile_GlobalFile.d.ts]
+declare module publicModuleInGlobal {
+    interface publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceInPublicModule {
+    }
+    class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+    }
+}
+interface publicInterfaceInGlobal {
+}
+declare class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
+}
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
deleted file mode 100644
index 8367483ca979f..0000000000000
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
+++ /dev/null
@@ -1,866 +0,0 @@
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(164,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(165,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(166,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(188,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(192,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,58): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,87): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(239,67): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(248,82): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(254,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(255,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(256,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(259,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(261,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,71): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,113): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(266,74): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(268,89): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(8,17): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(9,13): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(10,21): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(32,40): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(36,27): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(40,24): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(40,54): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(40,83): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(83,63): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(92,78): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(98,17): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(99,13): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(100,21): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(103,40): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(105,27): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(107,24): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(107,67): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(107,109): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(110,70): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(112,85): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(140,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(141,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(142,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(164,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(168,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(172,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(172,58): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(172,87): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(215,67): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(224,82): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(230,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(231,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(232,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(235,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(237,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(239,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(239,71): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(239,113): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(242,74): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(244,89): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts (40 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass; // Error
-                    ~~~~~~~~~~~~
-!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-        (param: privateClass): publicClass; // Error
-                ~~~~~~~~~~~~
-!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-        myMethod(param: privateClass): void; // Error
-                        ~~~~~~~~~~~~
-!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-    
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-    
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-    
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) { // Error
-                                           ~~~~~~~~~~~~
-!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { // Error
-                              ~~~~~~~~~~~~
-!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-                           ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-                                                         ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-                                                                                      ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-        }
-    }
-    
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-    
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { 
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-    
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-    
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-                                                                  ~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-                                                                                 ~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass; // Error
-                    ~~~~~~~~~~~~~
-!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'.
-        (param: privateModule.publicClass): publicClass; // Error
-                ~~~~~~~~~~~~~
-!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'.
-        myMethod(param: privateModule.publicClass): void; // Error
-                        ~~~~~~~~~~~~~
-!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'.
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                           ~~~~~~~~~~~~~
-!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'.
-        }
-        myPublicMethod(param: privateModule.publicClass) { // Error
-                              ~~~~~~~~~~~~~
-!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'.
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-                           ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'.
-                                                                      ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'.
-                                                                                                                ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'.
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-                                                                         ~~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-                                                                                        ~~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-    
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass; // Error
-                        ~~~~~~~~~~~~
-!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-            (param: privateClass): publicClass; // Error
-                    ~~~~~~~~~~~~
-!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-            myMethod(param: privateClass): void; // Error
-                            ~~~~~~~~~~~~
-!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) { // Error
-                                               ~~~~~~~~~~~~
-!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) { // Error
-                                  ~~~~~~~~~~~~
-!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-                               ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-                                                             ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-                                                                                          ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-                                                                      ~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-                                                                                     ~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass; // Error
-                        ~~~~~~~~~~~~~
-!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'.
-            (param: privateModule.publicClass): publicClass; // Error
-                    ~~~~~~~~~~~~~
-!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'.
-            myMethod(param: privateModule.publicClass): void; // Error
-                            ~~~~~~~~~~~~~
-!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                               ~~~~~~~~~~~~~
-!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'.
-            }
-            myPublicMethod(param: privateModule.publicClass) { // Error
-                                  ~~~~~~~~~~~~~
-!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'.
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-                               ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'.
-                                                                          ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'.
-                                                                                                                    ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'.
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-                                                                             ~~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-                                                                                            ~~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass;
-            (param: privateClass): publicClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    }
-    
-==== tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts (20 errors) ====
-    class publicClassInGlobal {
-    }
-    interface publicInterfaceWithPublicParmeterTypesInGlobal {
-        new (param: publicClassInGlobal): publicClassInGlobal;
-        (param: publicClassInGlobal): publicClassInGlobal;
-        myMethod(param: publicClassInGlobal): void;
-    }
-    class publicClassWithWithPublicParmeterTypesInGlobal {
-        static myPublicStaticMethod(param: publicClassInGlobal) {
-        }
-        private static myPrivateStaticMethod(param: publicClassInGlobal) {
-        }
-        myPublicMethod(param: publicClassInGlobal) {
-        }
-        private myPrivateMethod(param: publicClassInGlobal) {
-        }
-        constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
-        }
-    }
-    function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
-    }
-    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-    
-            export interface publicInterfaceWithPrivateParmeterTypes {
-                new (param: privateClass): publicClass;
-                (param: privateClass): publicClass;
-                myMethod(param: privateClass): void;
-            }
-    
-            export interface publicInterfaceWithPublicParmeterTypes {
-                new (param: publicClass): publicClass;
-                (param: publicClass): publicClass;
-                myMethod(param: publicClass): void;
-            }
-    
-            interface privateInterfaceWithPrivateParmeterTypes {
-                new (param: privateClass): privateClass;
-                (param: privateClass): privateClass;
-                myMethod(param: privateClass): void;
-            }
-    
-            interface privateInterfaceWithPublicParmeterTypes {
-                new (param: publicClass): publicClass;
-                (param: publicClass): publicClass;
-                myMethod(param: publicClass): void;
-            }
-    
-            export class publicClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(param: privateClass) {
-                }
-                private static myPrivateStaticMethod(param: privateClass) {
-                }
-                myPublicMethod(param: privateClass) {
-                }
-                private myPrivateMethod(param: privateClass) {
-                }
-                constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-                }
-            }
-    
-            export class publicClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(param: publicClass) {
-                }
-                private static myPrivateStaticMethod(param: publicClass) {
-                }
-                myPublicMethod(param: publicClass) {
-                }
-                private myPrivateMethod(param: publicClass) {
-                }
-                constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-                }
-            }
-    
-            class privateClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(param: privateClass) {
-                }
-                private static myPrivateStaticMethod(param: privateClass) {
-                }
-                myPublicMethod(param: privateClass) {
-                }
-                private myPrivateMethod(param: privateClass) {
-                }
-                constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-                }
-            }
-    
-            class privateClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(param: publicClass) {
-                }
-                private static myPrivateStaticMethod(param: publicClass) {
-                }
-                myPublicMethod(param: publicClass) {
-                }
-                private myPrivateMethod(param: publicClass) {
-                }
-                constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-                }
-            }
-    
-            export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-            }
-            export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-            }
-            function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-            }
-            function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-            }
-    
-            export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-            export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-            declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-            declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-            export interface publicInterfaceWithPrivateModuleParameterTypes {
-                new (param: privateModule.publicClass): publicClass;
-                (param: privateModule.publicClass): publicClass;
-                myMethod(param: privateModule.publicClass): void;
-            }
-            export class publicClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                myPublicMethod(param: privateModule.publicClass) {
-                }
-                constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-                }
-            }
-            export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-            }
-            export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-            interface privateInterfaceWithPrivateModuleParameterTypes {
-                new (param: privateModule.publicClass): publicClass;
-                (param: privateModule.publicClass): publicClass;
-                myMethod(param: privateModule.publicClass): void;
-            }
-            class privateClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                myPublicMethod(param: privateModule.publicClass) {
-                }
-                constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-                }
-            }
-            function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-            }
-            declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass; // Error
-                        ~~~~~~~~~~~~
-!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-            (param: privateClass): publicClass; // Error
-                    ~~~~~~~~~~~~
-!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-            myMethod(param: privateClass): void; // Error
-                            ~~~~~~~~~~~~
-!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) { // Error
-                                               ~~~~~~~~~~~~
-!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) { // Error
-                                  ~~~~~~~~~~~~
-!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-                               ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-                                                             ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-                                                                                          ~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-                                                                      ~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-                                                                                     ~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass; // Error
-                        ~~~~~~~~~~~~~
-!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'.
-            (param: privateModule.publicClass): publicClass; // Error
-                    ~~~~~~~~~~~~~
-!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'.
-            myMethod(param: privateModule.publicClass): void; // Error
-                            ~~~~~~~~~~~~~
-!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                               ~~~~~~~~~~~~~
-!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'.
-            }
-            myPublicMethod(param: privateModule.publicClass) { // Error
-                                  ~~~~~~~~~~~~~
-!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'.
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-                               ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'.
-                                                                          ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'.
-                                                                                                                    ~~~~~~~~~~~~~
-!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'.
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-                                                                             ~~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-                                                                                            ~~~~~~~~~~~~~
-!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
index 82051ecffe89d..b6827934bf2ab 100644
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
@@ -1278,3 +1278,575 @@ var publicModuleInGlobal;
     function privateFunctionWithPrivateModuleParameterTypes(param) {
     }
 })(publicModuleInGlobal || (publicModuleInGlobal = {}));
+
+
+//// [privacyFunctionParameterDeclFile_externalModule.d.ts]
+class privateClass {
+}
+export declare class publicClass {
+}
+export interface publicInterfaceWithPrivateParmeterTypes {
+    new (param: privateClass): publicClass;
+    (param: privateClass): publicClass;
+    myMethod(param: privateClass): void;
+}
+export interface publicInterfaceWithPublicParmeterTypes {
+    new (param: publicClass): publicClass;
+    (param: publicClass): publicClass;
+    myMethod(param: publicClass): void;
+}
+export declare class publicClassWithWithPrivateParmeterTypes {
+    private param1;
+    param2: privateClass;
+    static myPublicStaticMethod(param: privateClass): void;
+    private static myPrivateStaticMethod;
+    myPublicMethod(param: privateClass): void;
+    private myPrivateMethod;
+    constructor(param: privateClass, param1: privateClass, param2: privateClass);
+}
+export declare class publicClassWithWithPublicParmeterTypes {
+    private param1;
+    param2: publicClass;
+    static myPublicStaticMethod(param: publicClass): void;
+    private static myPrivateStaticMethod;
+    myPublicMethod(param: publicClass): void;
+    private myPrivateMethod;
+    constructor(param: publicClass, param1: publicClass, param2: publicClass);
+}
+export declare function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+export declare function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+export interface publicInterfaceWithPrivateModuleParameterTypes {
+    new (param: privateModule.publicClass): publicClass;
+    (param: privateModule.publicClass): publicClass;
+    myMethod(param: privateModule.publicClass): void;
+}
+export declare class publicClassWithPrivateModuleParameterTypes {
+    private param1;
+    param2: privateModule.publicClass;
+    static myPublicStaticMethod(param: privateModule.publicClass): void;
+    myPublicMethod(param: privateModule.publicClass): void;
+    constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+}
+export declare function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+export declare module publicModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass;
+        (param: privateClass): publicClass;
+        myMethod(param: privateClass): void;
+    }
+    interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+    class publicClassWithWithPrivateParmeterTypes {
+        private param1;
+        param2: privateClass;
+        static myPublicStaticMethod(param: privateClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: privateClass): void;
+        private myPrivateMethod;
+        constructor(param: privateClass, param1: privateClass, param2: privateClass);
+    }
+    class publicClassWithWithPublicParmeterTypes {
+        private param1;
+        param2: publicClass;
+        static myPublicStaticMethod(param: publicClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: publicClass): void;
+        private myPrivateMethod;
+        constructor(param: publicClass, param1: publicClass, param2: publicClass);
+    }
+    function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+    function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class publicClassWithPrivateModuleParameterTypes {
+        private param1;
+        param2: privateModule.publicClass;
+        static myPublicStaticMethod(param: privateModule.publicClass): void;
+        myPublicMethod(param: privateModule.publicClass): void;
+        constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+    }
+    function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+}
+declare module privateModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass;
+        (param: privateClass): publicClass;
+        myMethod(param: privateClass): void;
+    }
+    interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+    class publicClassWithWithPrivateParmeterTypes {
+        private param1;
+        param2: privateClass;
+        static myPublicStaticMethod(param: privateClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: privateClass): void;
+        private myPrivateMethod;
+        constructor(param: privateClass, param1: privateClass, param2: privateClass);
+    }
+    class publicClassWithWithPublicParmeterTypes {
+        private param1;
+        param2: publicClass;
+        static myPublicStaticMethod(param: publicClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: publicClass): void;
+        private myPrivateMethod;
+        constructor(param: publicClass, param1: publicClass, param2: publicClass);
+    }
+    function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+    function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class publicClassWithPrivateModuleParameterTypes {
+        private param1;
+        param2: privateModule.publicClass;
+        static myPublicStaticMethod(param: privateModule.publicClass): void;
+        myPublicMethod(param: privateModule.publicClass): void;
+        constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+    }
+    function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+}
+export {};
+//// [privacyFunctionParameterDeclFile_GlobalFile.d.ts]
+declare class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicParmeterTypesInGlobal {
+    new (param: publicClassInGlobal): publicClassInGlobal;
+    (param: publicClassInGlobal): publicClassInGlobal;
+    myMethod(param: publicClassInGlobal): void;
+}
+declare class publicClassWithWithPublicParmeterTypesInGlobal {
+    private param1;
+    param2: publicClassInGlobal;
+    static myPublicStaticMethod(param: publicClassInGlobal): void;
+    private static myPrivateStaticMethod;
+    myPublicMethod(param: publicClassInGlobal): void;
+    private myPrivateMethod;
+    constructor(param: publicClassInGlobal, param1: publicClassInGlobal, param2: publicClassInGlobal);
+}
+declare function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
+declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
+declare module publicModuleInGlobal {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass;
+            (param: privateClass): publicClass;
+            myMethod(param: privateClass): void;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            private param1;
+            param2: privateClass;
+            static myPublicStaticMethod(param: privateClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: privateClass): void;
+            private myPrivateMethod;
+            constructor(param: privateClass, param1: privateClass, param2: privateClass);
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            private param1;
+            param2: publicClass;
+            static myPublicStaticMethod(param: publicClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: publicClass): void;
+            private myPrivateMethod;
+            constructor(param: publicClass, param1: publicClass, param2: publicClass);
+        }
+        function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+        function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            private param1;
+            param2: privateModule.publicClass;
+            static myPublicStaticMethod(param: privateModule.publicClass): void;
+            myPublicMethod(param: privateModule.publicClass): void;
+            constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
+    interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass;
+        (param: privateClass): publicClass;
+        myMethod(param: privateClass): void;
+    }
+    interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+    class publicClassWithWithPrivateParmeterTypes {
+        private param1;
+        param2: privateClass;
+        static myPublicStaticMethod(param: privateClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: privateClass): void;
+        private myPrivateMethod;
+        constructor(param: privateClass, param1: privateClass, param2: privateClass);
+    }
+    class publicClassWithWithPublicParmeterTypes {
+        private param1;
+        param2: publicClass;
+        static myPublicStaticMethod(param: publicClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: publicClass): void;
+        private myPrivateMethod;
+        constructor(param: publicClass, param1: publicClass, param2: publicClass);
+    }
+    function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+    function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class publicClassWithPrivateModuleParameterTypes {
+        private param1;
+        param2: privateModule.publicClass;
+        static myPublicStaticMethod(param: privateModule.publicClass): void;
+        myPublicMethod(param: privateModule.publicClass): void;
+        constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+    }
+    function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+}
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.d.ts (1 errors) ====
+    class privateClass {
+    ~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+    }
+    export declare class publicClass {
+    }
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass;
+        (param: privateClass): publicClass;
+        myMethod(param: privateClass): void;
+    }
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+    export declare class publicClassWithWithPrivateParmeterTypes {
+        private param1;
+        param2: privateClass;
+        static myPublicStaticMethod(param: privateClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: privateClass): void;
+        private myPrivateMethod;
+        constructor(param: privateClass, param1: privateClass, param2: privateClass);
+    }
+    export declare class publicClassWithWithPublicParmeterTypes {
+        private param1;
+        param2: publicClass;
+        static myPublicStaticMethod(param: publicClass): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: publicClass): void;
+        private myPrivateMethod;
+        constructor(param: publicClass, param1: publicClass, param2: publicClass);
+    }
+    export declare function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    export declare function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    export declare class publicClassWithPrivateModuleParameterTypes {
+        private param1;
+        param2: privateModule.publicClass;
+        static myPublicStaticMethod(param: privateModule.publicClass): void;
+        myPublicMethod(param: privateModule.publicClass): void;
+        constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+    }
+    export declare function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    export declare module publicModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass;
+            (param: privateClass): publicClass;
+            myMethod(param: privateClass): void;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            private param1;
+            param2: privateClass;
+            static myPublicStaticMethod(param: privateClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: privateClass): void;
+            private myPrivateMethod;
+            constructor(param: privateClass, param1: privateClass, param2: privateClass);
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            private param1;
+            param2: publicClass;
+            static myPublicStaticMethod(param: publicClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: publicClass): void;
+            private myPrivateMethod;
+            constructor(param: publicClass, param1: publicClass, param2: publicClass);
+        }
+        function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+        function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            private param1;
+            param2: privateModule.publicClass;
+            static myPublicStaticMethod(param: privateModule.publicClass): void;
+            myPublicMethod(param: privateModule.publicClass): void;
+            constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
+    declare module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass;
+            (param: privateClass): publicClass;
+            myMethod(param: privateClass): void;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            private param1;
+            param2: privateClass;
+            static myPublicStaticMethod(param: privateClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: privateClass): void;
+            private myPrivateMethod;
+            constructor(param: privateClass, param1: privateClass, param2: privateClass);
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            private param1;
+            param2: publicClass;
+            static myPublicStaticMethod(param: publicClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: publicClass): void;
+            private myPrivateMethod;
+            constructor(param: publicClass, param1: publicClass, param2: publicClass);
+        }
+        function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+        function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            private param1;
+            param2: privateModule.publicClass;
+            static myPublicStaticMethod(param: privateModule.publicClass): void;
+            myPublicMethod(param: privateModule.publicClass): void;
+            constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
+    export {};
+    
+==== tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.d.ts (0 errors) ====
+    declare class publicClassInGlobal {
+    }
+    interface publicInterfaceWithPublicParmeterTypesInGlobal {
+        new (param: publicClassInGlobal): publicClassInGlobal;
+        (param: publicClassInGlobal): publicClassInGlobal;
+        myMethod(param: publicClassInGlobal): void;
+    }
+    declare class publicClassWithWithPublicParmeterTypesInGlobal {
+        private param1;
+        param2: publicClassInGlobal;
+        static myPublicStaticMethod(param: publicClassInGlobal): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod(param: publicClassInGlobal): void;
+        private myPrivateMethod;
+        constructor(param: publicClassInGlobal, param1: publicClassInGlobal, param2: publicClassInGlobal);
+    }
+    declare function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
+    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
+    declare module publicModuleInGlobal {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        module privateModule {
+            class privateClass {
+            }
+            class publicClass {
+            }
+            interface publicInterfaceWithPrivateParmeterTypes {
+                new (param: privateClass): publicClass;
+                (param: privateClass): publicClass;
+                myMethod(param: privateClass): void;
+            }
+            interface publicInterfaceWithPublicParmeterTypes {
+                new (param: publicClass): publicClass;
+                (param: publicClass): publicClass;
+                myMethod(param: publicClass): void;
+            }
+            class publicClassWithWithPrivateParmeterTypes {
+                private param1;
+                param2: privateClass;
+                static myPublicStaticMethod(param: privateClass): void;
+                private static myPrivateStaticMethod;
+                myPublicMethod(param: privateClass): void;
+                private myPrivateMethod;
+                constructor(param: privateClass, param1: privateClass, param2: privateClass);
+            }
+            class publicClassWithWithPublicParmeterTypes {
+                private param1;
+                param2: publicClass;
+                static myPublicStaticMethod(param: publicClass): void;
+                private static myPrivateStaticMethod;
+                myPublicMethod(param: publicClass): void;
+                private myPrivateMethod;
+                constructor(param: publicClass, param1: publicClass, param2: publicClass);
+            }
+            function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+            function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+            function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+            function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+            interface publicInterfaceWithPrivateModuleParameterTypes {
+                new (param: privateModule.publicClass): publicClass;
+                (param: privateModule.publicClass): publicClass;
+                myMethod(param: privateModule.publicClass): void;
+            }
+            class publicClassWithPrivateModuleParameterTypes {
+                private param1;
+                param2: privateModule.publicClass;
+                static myPublicStaticMethod(param: privateModule.publicClass): void;
+                myPublicMethod(param: privateModule.publicClass): void;
+                constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+            }
+            function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+            function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass;
+            (param: privateClass): publicClass;
+            myMethod(param: privateClass): void;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            private param1;
+            param2: privateClass;
+            static myPublicStaticMethod(param: privateClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: privateClass): void;
+            private myPrivateMethod;
+            constructor(param: privateClass, param1: privateClass, param2: privateClass);
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            private param1;
+            param2: publicClass;
+            static myPublicStaticMethod(param: publicClass): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod(param: publicClass): void;
+            private myPrivateMethod;
+            constructor(param: publicClass, param1: publicClass, param2: publicClass);
+        }
+        function publicFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicFunctionWithPublicParmeterTypes(param: publicClass): void;
+        function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            private param1;
+            param2: privateModule.publicClass;
+            static myPublicStaticMethod(param: privateModule.publicClass): void;
+            myPublicMethod(param: privateModule.publicClass): void;
+            constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass);
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
deleted file mode 100644
index 94c8b20311ca4..0000000000000
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
+++ /dev/null
@@ -1,1391 +0,0 @@
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(281,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(282,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(283,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(284,21): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(309,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(315,27): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(321,16): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(327,9): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(416,63): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(428,21): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(441,78): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(447,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(448,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(449,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(450,21): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(453,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(456,27): error TS4055: Return type of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(459,16): error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(462,9): error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(466,70): error TS4060: Return type of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(469,21): error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(472,85): error TS4060: Return type of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(8,13): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(9,9): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(10,18): error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(11,17): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(36,36): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(42,23): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(48,12): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(54,5): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(143,59): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(155,17): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(168,74): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(174,13): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(175,9): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(176,18): error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(177,17): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(180,36): error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(183,23): error TS4055: Return type of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(186,12): error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(189,5): error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(193,66): error TS4060: Return type of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(196,17): error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(199,81): error TS4060: Return type of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(237,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(238,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(239,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(240,21): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(265,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(271,27): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(277,16): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(283,9): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(372,63): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(384,21): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(397,78): error TS4060: Return type of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(403,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(404,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(405,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(406,21): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(409,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(412,27): error TS4055: Return type of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(415,16): error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(418,9): error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(422,70): error TS4060: Return type of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(425,21): error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(428,85): error TS4060: Return type of exported function has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts (44 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; // Error
-                ~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-        (): privateClass; // Error
-            ~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-        [x: number]: privateClass; // Error
-                     ~~~~~~~~~~~~
-!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'.
-        myMethod(): privateClass; // Error
-                    ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-    
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-    
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-    
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { // Error
-                                       ~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { // Error
-                          ~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-               ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { // Error
-        ~~~~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass { 
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass { 
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() { 
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-                                                              ~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-                                                                             ~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; // Error
-                ~~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-        (): privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-        [x: number]: privateModule.publicClass // Error
-                     ~~~~~~~~~~~~~
-!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'.
-        myMethod(): privateModule.publicClass; // Error
-                    ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { // Error
-                                       ~~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'.
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { // Error
-                          ~~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateModule'.
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-               ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { // Error
-        ~~~~~~~~~~~~~~~
-!!! error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-                                                                     ~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateModule'.
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-                                                                                    ~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateModule'.
-    
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; 
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { 
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { 
-            return null;
-        }
-        static myPublicStaticMethod1() { 
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { 
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() { 
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass; // Error
-                    ~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-            (): privateClass; // Error
-                ~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-            [x: number]: privateClass; // Error
-                         ~~~~~~~~~~~~
-!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'.
-            myMethod(): privateClass; // Error
-                        ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass { // Error
-                                           ~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass { // Error
-                              ~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-                                                                  ~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-                                                                                 ~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass; // Error
-                    ~~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-            (): privateModule.publicClass; // Error
-                ~~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-            [x: number]: privateModule.publicClass; // Error
-                         ~~~~~~~~~~~~~
-!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'.
-            myMethod(): privateModule.publicClass; // Error
-                        ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass { // Error
-                                           ~~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass { // Error
-                              ~~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-                                                                         ~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateModule'.
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-                                                                                        ~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass; 
-            (): privateClass; 
-            [x: number]: privateClass; 
-            myMethod(): privateClass; 
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass { 
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass { 
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() { 
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() { 
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() { 
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass { 
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass { 
-                return null;
-            }
-            static myPublicStaticMethod1() { 
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() { 
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() { 
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    }
-    
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts (22 errors) ====
-    class publicClassInGlobal {
-    }
-    interface publicInterfaceWithPublicParmeterTypesInGlobal {
-        new (): publicClassInGlobal;
-        (): publicClassInGlobal;
-        [x: number]: publicClassInGlobal;
-        myMethod(): publicClassInGlobal;
-    }
-    class publicClassWithWithPublicParmeterTypesInGlobal {
-        static myPublicStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        myPublicMethod(): publicClassInGlobal {
-            return null;
-        }
-        private myPrivateMethod(): publicClassInGlobal {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        myPublicMethod1() {
-            return new publicClassInGlobal();
-        }
-        private myPrivateMethod1() {
-            return new publicClassInGlobal();
-        }
-    }
-    function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
-        return null;
-    }
-    function publicFunctionWithPublicParmeterTypesInGlobal1() {
-        return new publicClassInGlobal();
-    }
-    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-    
-            export interface publicInterfaceWithPrivateParmeterTypes {
-                new (): privateClass;
-                (): privateClass;
-                [x: number]: privateClass;
-                myMethod(): privateClass;
-            }
-    
-            export interface publicInterfaceWithPublicParmeterTypes {
-                new (): publicClass;
-                (): publicClass;
-                [x: number]: publicClass;
-                myMethod(): publicClass;
-            }
-    
-            interface privateInterfaceWithPrivateParmeterTypes {
-                new (): privateClass;
-                (): privateClass;
-                [x: number]: privateClass;
-                myMethod(): privateClass;
-            }
-    
-            interface privateInterfaceWithPublicParmeterTypes {
-                new (): publicClass;
-                (): publicClass;
-                [x: number]: publicClass;
-                myMethod(): publicClass;
-            }
-    
-            export class publicClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                myPublicMethod(): privateClass {
-                    return null;
-                }
-                private myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                myPublicMethod1() {
-                    return new privateClass();
-                }
-                private myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            export class publicClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                myPublicMethod(): publicClass {
-                    return null;
-                }
-                private myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                myPublicMethod1() {
-                    return new publicClass();
-                }
-                private myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            class privateClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                myPublicMethod(): privateClass {
-                    return null;
-                }
-                private myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                myPublicMethod1() {
-                    return new privateClass();
-                }
-                private myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            class privateClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                myPublicMethod(): publicClass {
-                    return null;
-                }
-                private myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                myPublicMethod1() {
-                    return new publicClass();
-                }
-                private myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            export function publicFunctionWithPrivateParmeterTypes(): privateClass {
-                return null;
-            }
-            export function publicFunctionWithPublicParmeterTypes(): publicClass {
-                return null;
-            }
-            function privateFunctionWithPrivateParmeterTypes(): privateClass {
-                return null;
-            }
-            function privateFunctionWithPublicParmeterTypes(): publicClass {
-                return null;
-            }
-            export function publicFunctionWithPrivateParmeterTypes1() {
-                return new privateClass();
-            }
-            export function publicFunctionWithPublicParmeterTypes1() {
-                return new publicClass();
-            }
-            function privateFunctionWithPrivateParmeterTypes1() {
-                return new privateClass();
-            }
-            function privateFunctionWithPublicParmeterTypes1() {
-                return new publicClass();
-            }
-    
-            export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-            export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-            declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-            declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-            export interface publicInterfaceWithPrivateModuleParameterTypes {
-                new (): privateModule.publicClass;
-                (): privateModule.publicClass;
-                [x: number]: privateModule.publicClass;
-                myMethod(): privateModule.publicClass;
-            }
-            export class publicClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-            export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-                return null;
-            }
-            export function publicFunctionWithPrivateModuleParameterTypes1() {
-                return new privateModule.publicClass();
-            }
-            export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-    
-            interface privateInterfaceWithPrivateModuleParameterTypes {
-                new (): privateModule.publicClass;
-                (): privateModule.publicClass;
-                [x: number]: privateModule.publicClass;
-                myMethod(): privateModule.publicClass;
-            }
-            class privateClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-            function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-                return null;
-            }
-            function privateFunctionWithPrivateModuleParameterTypes1() {
-                return new privateModule.publicClass();
-            }
-            declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass; // Error
-                    ~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-            (): privateClass; // Error
-                ~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-            [x: number]: privateClass; // Error
-                         ~~~~~~~~~~~~
-!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'.
-            myMethod(): privateClass; // Error
-                        ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass { // Error
-                                           ~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass { // Error
-                              ~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-                                                                  ~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-                                                                                 ~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass; // Error
-                    ~~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-            (): privateModule.publicClass; // Error
-                ~~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-            [x: number]: privateModule.publicClass; // Error
-                         ~~~~~~~~~~~~~
-!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'.
-            myMethod(): privateModule.publicClass; // Error
-                        ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass { // Error
-                                           ~~~~~~~~~~~~~
-!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass { // Error
-                              ~~~~~~~~~~~~~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'privateModule'.
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-                                                                         ~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateModule'.
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-                                                                                        ~~~~~~~~~~~~~
-!!! error TS4060: Return type of exported function has or is using private name 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
index b0bada4bc3676..1d10cb2083a88 100644
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
@@ -2278,3 +2278,651 @@ var publicModuleInGlobal;
         return new privateModule.publicClass();
     }
 })(publicModuleInGlobal || (publicModuleInGlobal = {}));
+
+
+//// [privacyFunctionReturnTypeDeclFile_externalModule.d.ts]
+class privateClass {
+}
+export declare class publicClass {
+}
+export interface publicInterfaceWithPrivateParmeterTypes {
+    new (): privateClass;
+    (): privateClass;
+    [x: number]: privateClass;
+    myMethod(): privateClass;
+}
+export interface publicInterfaceWithPublicParmeterTypes {
+    new (): publicClass;
+    (): publicClass;
+    [x: number]: publicClass;
+    myMethod(): publicClass;
+}
+export declare class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(): privateClass;
+    private static myPrivateStaticMethod;
+    myPublicMethod(): privateClass;
+    private myPrivateMethod;
+    static myPublicStaticMethod1(): privateClass;
+    private static myPrivateStaticMethod1;
+    myPublicMethod1(): privateClass;
+    private myPrivateMethod1;
+}
+export declare class publicClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(): publicClass;
+    private static myPrivateStaticMethod;
+    myPublicMethod(): publicClass;
+    private myPrivateMethod;
+    static myPublicStaticMethod1(): publicClass;
+    private static myPrivateStaticMethod1;
+    myPublicMethod1(): publicClass;
+    private myPrivateMethod1;
+}
+export declare function publicFunctionWithPrivateParmeterTypes(): privateClass;
+export declare function publicFunctionWithPublicParmeterTypes(): publicClass;
+export declare function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+export declare function publicFunctionWithPublicParmeterTypes1(): publicClass;
+export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+export interface publicInterfaceWithPrivateModuleParameterTypes {
+    new (): privateModule.publicClass;
+    (): privateModule.publicClass;
+    [x: number]: privateModule.publicClass;
+    myMethod(): privateModule.publicClass;
+}
+export declare class publicClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(): privateModule.publicClass;
+    myPublicMethod(): privateModule.publicClass;
+    static myPublicStaticMethod1(): privateModule.publicClass;
+    myPublicMethod1(): privateModule.publicClass;
+}
+export declare function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+export declare function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass;
+export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+export declare module publicModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+    interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+    class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): privateClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): privateClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): privateClass;
+        private myPrivateMethod1;
+    }
+    class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): publicClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): publicClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): publicClass;
+        private myPrivateMethod1;
+    }
+    function publicFunctionWithPrivateParmeterTypes(): privateClass;
+    function publicFunctionWithPublicParmeterTypes(): publicClass;
+    function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+    function publicFunctionWithPublicParmeterTypes1(): publicClass;
+    function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass;
+        myPublicMethod(): privateModule.publicClass;
+        static myPublicStaticMethod1(): privateModule.publicClass;
+        myPublicMethod1(): privateModule.publicClass;
+    }
+    function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass;
+    function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+}
+declare module privateModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+    interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+    class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): privateClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): privateClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): privateClass;
+        private myPrivateMethod1;
+    }
+    class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): publicClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): publicClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): publicClass;
+        private myPrivateMethod1;
+    }
+    function publicFunctionWithPrivateParmeterTypes(): privateClass;
+    function publicFunctionWithPublicParmeterTypes(): publicClass;
+    function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+    function publicFunctionWithPublicParmeterTypes1(): publicClass;
+    function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass;
+        myPublicMethod(): privateModule.publicClass;
+        static myPublicStaticMethod1(): publicClass;
+        myPublicMethod1(): publicClass;
+    }
+    function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    function publicFunctionWithPrivateModuleParameterTypes1(): publicClass;
+    function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+}
+export {};
+//// [privacyFunctionReturnTypeDeclFile_GlobalFile.d.ts]
+declare class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicParmeterTypesInGlobal {
+    new (): publicClassInGlobal;
+    (): publicClassInGlobal;
+    [x: number]: publicClassInGlobal;
+    myMethod(): publicClassInGlobal;
+}
+declare class publicClassWithWithPublicParmeterTypesInGlobal {
+    static myPublicStaticMethod(): publicClassInGlobal;
+    private static myPrivateStaticMethod;
+    myPublicMethod(): publicClassInGlobal;
+    private myPrivateMethod;
+    static myPublicStaticMethod1(): publicClassInGlobal;
+    private static myPrivateStaticMethod1;
+    myPublicMethod1(): publicClassInGlobal;
+    private myPrivateMethod1;
+}
+declare function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
+declare function publicFunctionWithPublicParmeterTypesInGlobal1(): publicClassInGlobal;
+declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
+declare module publicModuleInGlobal {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): privateClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): privateClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): privateClass;
+            private myPrivateMethod1;
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): publicClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): publicClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): publicClass;
+            private myPrivateMethod1;
+        }
+        function publicFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicFunctionWithPublicParmeterTypes(): publicClass;
+        function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+        function publicFunctionWithPublicParmeterTypes1(): publicClass;
+        function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass;
+            myPublicMethod(): privateModule.publicClass;
+            static myPublicStaticMethod1(): publicClass;
+            myPublicMethod1(): publicClass;
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+        function publicFunctionWithPrivateModuleParameterTypes1(): publicClass;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    }
+    interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+    interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+    class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): privateClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): privateClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): privateClass;
+        private myPrivateMethod1;
+    }
+    class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): publicClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): publicClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): publicClass;
+        private myPrivateMethod1;
+    }
+    function publicFunctionWithPrivateParmeterTypes(): privateClass;
+    function publicFunctionWithPublicParmeterTypes(): publicClass;
+    function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+    function publicFunctionWithPublicParmeterTypes1(): publicClass;
+    function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass;
+        myPublicMethod(): privateModule.publicClass;
+        static myPublicStaticMethod1(): privateModule.publicClass;
+        myPublicMethod1(): privateModule.publicClass;
+    }
+    function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass;
+    function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+}
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.d.ts (1 errors) ====
+    class privateClass {
+    ~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+    }
+    export declare class publicClass {
+    }
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+    export declare class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): privateClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): privateClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): privateClass;
+        private myPrivateMethod1;
+    }
+    export declare class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): publicClass;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): publicClass;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): publicClass;
+        private myPrivateMethod1;
+    }
+    export declare function publicFunctionWithPrivateParmeterTypes(): privateClass;
+    export declare function publicFunctionWithPublicParmeterTypes(): publicClass;
+    export declare function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+    export declare function publicFunctionWithPublicParmeterTypes1(): publicClass;
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    export declare class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass;
+        myPublicMethod(): privateModule.publicClass;
+        static myPublicStaticMethod1(): privateModule.publicClass;
+        myPublicMethod1(): privateModule.publicClass;
+    }
+    export declare function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    export declare function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass;
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    export declare module publicModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): privateClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): privateClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): privateClass;
+            private myPrivateMethod1;
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): publicClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): publicClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): publicClass;
+            private myPrivateMethod1;
+        }
+        function publicFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicFunctionWithPublicParmeterTypes(): publicClass;
+        function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+        function publicFunctionWithPublicParmeterTypes1(): publicClass;
+        function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass;
+            myPublicMethod(): privateModule.publicClass;
+            static myPublicStaticMethod1(): privateModule.publicClass;
+            myPublicMethod1(): privateModule.publicClass;
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+        function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    }
+    declare module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): privateClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): privateClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): privateClass;
+            private myPrivateMethod1;
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): publicClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): publicClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): publicClass;
+            private myPrivateMethod1;
+        }
+        function publicFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicFunctionWithPublicParmeterTypes(): publicClass;
+        function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+        function publicFunctionWithPublicParmeterTypes1(): publicClass;
+        function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass;
+            myPublicMethod(): privateModule.publicClass;
+            static myPublicStaticMethod1(): publicClass;
+            myPublicMethod1(): publicClass;
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+        function publicFunctionWithPrivateModuleParameterTypes1(): publicClass;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    }
+    export {};
+    
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.d.ts (0 errors) ====
+    declare class publicClassInGlobal {
+    }
+    interface publicInterfaceWithPublicParmeterTypesInGlobal {
+        new (): publicClassInGlobal;
+        (): publicClassInGlobal;
+        [x: number]: publicClassInGlobal;
+        myMethod(): publicClassInGlobal;
+    }
+    declare class publicClassWithWithPublicParmeterTypesInGlobal {
+        static myPublicStaticMethod(): publicClassInGlobal;
+        private static myPrivateStaticMethod;
+        myPublicMethod(): publicClassInGlobal;
+        private myPrivateMethod;
+        static myPublicStaticMethod1(): publicClassInGlobal;
+        private static myPrivateStaticMethod1;
+        myPublicMethod1(): publicClassInGlobal;
+        private myPrivateMethod1;
+    }
+    declare function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
+    declare function publicFunctionWithPublicParmeterTypesInGlobal1(): publicClassInGlobal;
+    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
+    declare module publicModuleInGlobal {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        module privateModule {
+            class privateClass {
+            }
+            class publicClass {
+            }
+            interface publicInterfaceWithPrivateParmeterTypes {
+                new (): privateClass;
+                (): privateClass;
+                [x: number]: privateClass;
+                myMethod(): privateClass;
+            }
+            interface publicInterfaceWithPublicParmeterTypes {
+                new (): publicClass;
+                (): publicClass;
+                [x: number]: publicClass;
+                myMethod(): publicClass;
+            }
+            class publicClassWithWithPrivateParmeterTypes {
+                static myPublicStaticMethod(): privateClass;
+                private static myPrivateStaticMethod;
+                myPublicMethod(): privateClass;
+                private myPrivateMethod;
+                static myPublicStaticMethod1(): privateClass;
+                private static myPrivateStaticMethod1;
+                myPublicMethod1(): privateClass;
+                private myPrivateMethod1;
+            }
+            class publicClassWithWithPublicParmeterTypes {
+                static myPublicStaticMethod(): publicClass;
+                private static myPrivateStaticMethod;
+                myPublicMethod(): publicClass;
+                private myPrivateMethod;
+                static myPublicStaticMethod1(): publicClass;
+                private static myPrivateStaticMethod1;
+                myPublicMethod1(): publicClass;
+                private myPrivateMethod1;
+            }
+            function publicFunctionWithPrivateParmeterTypes(): privateClass;
+            function publicFunctionWithPublicParmeterTypes(): publicClass;
+            function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+            function publicFunctionWithPublicParmeterTypes1(): publicClass;
+            function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+            function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+            interface publicInterfaceWithPrivateModuleParameterTypes {
+                new (): privateModule.publicClass;
+                (): privateModule.publicClass;
+                [x: number]: privateModule.publicClass;
+                myMethod(): privateModule.publicClass;
+            }
+            class publicClassWithPrivateModuleParameterTypes {
+                static myPublicStaticMethod(): privateModule.publicClass;
+                myPublicMethod(): privateModule.publicClass;
+                static myPublicStaticMethod1(): publicClass;
+                myPublicMethod1(): publicClass;
+            }
+            function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+            function publicFunctionWithPrivateModuleParameterTypes1(): publicClass;
+            function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+        }
+        interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+        interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+        class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): privateClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): privateClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): privateClass;
+            private myPrivateMethod1;
+        }
+        class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass;
+            private static myPrivateStaticMethod;
+            myPublicMethod(): publicClass;
+            private myPrivateMethod;
+            static myPublicStaticMethod1(): publicClass;
+            private static myPrivateStaticMethod1;
+            myPublicMethod1(): publicClass;
+            private myPrivateMethod1;
+        }
+        function publicFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicFunctionWithPublicParmeterTypes(): publicClass;
+        function publicFunctionWithPrivateParmeterTypes1(): privateClass;
+        function publicFunctionWithPublicParmeterTypes1(): publicClass;
+        function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass;
+            myPublicMethod(): privateModule.publicClass;
+            static myPublicStaticMethod1(): privateModule.publicClass;
+            myPublicMethod1(): privateModule.publicClass;
+        }
+        function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+        function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass;
+        function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloImport.errors.txt b/tests/baselines/reference/privacyGloImport.errors.txt
deleted file mode 100644
index 933af3315a7af..0000000000000
--- a/tests/baselines/reference/privacyGloImport.errors.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-tests/cases/compiler/privacyGloImport.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
-tests/cases/compiler/privacyGloImport.ts(80,35): error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
-
-
-==== tests/cases/compiler/privacyGloImport.ts (2 errors) ====
-    module m1 {
-        export module m1_M1_public {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        module m1_M2_private {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        //export declare module "m1_M3_public" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
-    
-        //declare module "m1_M4_private" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
-    
-        import m1_im1_private = m1_M1_public;
-        export var m1_im1_private_v1_public = m1_im1_private.c1;
-        export var m1_im1_private_v2_public = new m1_im1_private.c1();
-        export var m1_im1_private_v3_public = m1_im1_private.f1;
-        export var m1_im1_private_v4_public = m1_im1_private.f1();
-        var m1_im1_private_v1_private = m1_im1_private.c1;
-        var m1_im1_private_v2_private = new m1_im1_private.c1();
-        var m1_im1_private_v3_private = m1_im1_private.f1;
-        var m1_im1_private_v4_private = m1_im1_private.f1();
-    
-    
-        import m1_im2_private = m1_M2_private;
-                                ~~~~~~~~~~~~~
-!!! error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
-        export var m1_im2_private_v1_public = m1_im2_private.c1;
-        export var m1_im2_private_v2_public = new m1_im2_private.c1();
-        export var m1_im2_private_v3_public = m1_im2_private.f1;
-        export var m1_im2_private_v4_public = m1_im2_private.f1();
-        var m1_im2_private_v1_private = m1_im2_private.c1;
-        var m1_im2_private_v2_private = new m1_im2_private.c1();
-        var m1_im2_private_v3_private = m1_im2_private.f1;
-        var m1_im2_private_v4_private = m1_im2_private.f1();
-    
-        //import m1_im3_private = require("m1_M3_public");
-        //export var m1_im3_private_v1_public = m1_im3_private.c1;
-        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        //export var m1_im3_private_v3_public = m1_im3_private.f1;
-        //export var m1_im3_private_v4_public = m1_im3_private.f1();
-        //var m1_im3_private_v1_private = m1_im3_private.c1;
-        //var m1_im3_private_v2_private = new m1_im3_private.c1();
-        //var m1_im3_private_v3_private = m1_im3_private.f1;
-        //var m1_im3_private_v4_private = m1_im3_private.f1();
-    
-        //import m1_im4_private = require("m1_M4_private");
-        //export var m1_im4_private_v1_public = m1_im4_private.c1;
-        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        //export var m1_im4_private_v3_public = m1_im4_private.f1;
-        //export var m1_im4_private_v4_public = m1_im4_private.f1();
-        //var m1_im4_private_v1_private = m1_im4_private.c1;
-        //var m1_im4_private_v2_private = new m1_im4_private.c1();
-        //var m1_im4_private_v3_private = m1_im4_private.f1;
-        //var m1_im4_private_v4_private = m1_im4_private.f1();
-    
-        export import m1_im1_public = m1_M1_public;
-        export import m1_im2_public = m1_M2_private;
-                                      ~~~~~~~~~~~~~
-!!! error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
-        //export import m1_im3_public = require("m1_M3_public");
-        //export import m1_im4_public = require("m1_M4_private");
-    }
-    
-    module glo_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-    
-    declare module "glo_M2_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-    
-    declare module "use_glo_M1_public" {
-        import use_glo_M1_public = glo_M1_public;
-        export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-        export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
-        export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
-        var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-        var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
-        var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-    
-        import use_glo_M2_public = require("glo_M2_public");
-        export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-        export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
-        export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-        var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-        var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
-        var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-    
-        module m2 {
-            //import errorImport = require("glo_M2_public");
-            import nonerrorImport = glo_M1_public;
-    
-            module m5 {
-                //import m5_errorImport = require("glo_M2_public");
-                import m5_nonerrorImport = glo_M1_public;
-            }
-        }
-    }
-    
-    declare module "anotherParseError" {
-        module m2 {
-            //declare module "abc" {
-            //}
-        }
-    
-        module m2 {
-            //module "abc2" {
-            //}
-        }
-        //module "abc3" {
-        //}
-    }
-    
-    module m2 {
-        //import m3 = require("use_glo_M1_public");
-        module m4 {
-            var a = 10;
-            //import m2 = require("use_glo_M1_public");
-        }
-    
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js
index befc5b953f53f..3ca1bf812d3bf 100644
--- a/tests/baselines/reference/privacyGloImport.js
+++ b/tests/baselines/reference/privacyGloImport.js
@@ -261,3 +261,86 @@ var m2;
         //import m2 = require("use_glo_M1_public");
     })(m4 || (m4 = {}));
 })(m2 || (m2 = {}));
+
+
+//// [privacyGloImport.d.ts]
+declare module m1 {
+    module m1_M1_public {
+        class c1 {
+        }
+        function f1(): c1;
+        var v1: typeof c1;
+        var v2: c1;
+    }
+    module m1_M2_private {
+        class c1 {
+        }
+        function f1(): c1;
+        var v1: typeof c1;
+        var v2: c1;
+    }
+    import m1_im1_private = m1_M1_public;
+    var m1_im1_private_v1_public: typeof m1_im1_private.c1;
+    var m1_im1_private_v2_public: m1_im1_private.c1;
+    var m1_im1_private_v3_public: typeof m1_im1_private.f1;
+    var m1_im1_private_v4_public: m1_im1_private.c1;
+    import m1_im2_private = m1_M2_private;
+    var m1_im2_private_v1_public: typeof m1_im2_private.c1;
+    var m1_im2_private_v2_public: m1_im2_private.c1;
+    var m1_im2_private_v3_public: typeof m1_im2_private.f1;
+    var m1_im2_private_v4_public: m1_im2_private.c1;
+    export import m1_im1_public = m1_M1_public;
+    export import m1_im2_public = m1_M2_private;
+}
+declare module glo_M1_public {
+    class c1 {
+    }
+    function f1(): c1;
+    var v1: typeof c1;
+    var v2: c1;
+}
+declare module "glo_M2_public" {
+    function f1(): any;
+    class c1 {
+    }
+    var v1: {
+        new (): c1;
+    };
+    var v2: c1;
+}
+declare module "use_glo_M1_public" {
+    import use_glo_M1_public = glo_M1_public;
+    var use_glo_M1_public_v1_public: {
+        new (): use_glo_M1_public.c1;
+    };
+    var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
+    var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+    var use_glo_M1_public_v1_private: {
+        new (): use_glo_M1_public.c1;
+    };
+    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
+    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+    import use_glo_M2_public = require("glo_M2_public");
+    var use_glo_M2_public_v1_public: {
+        new (): use_glo_M2_public.c1;
+    };
+    var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
+    var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+    var use_glo_M2_public_v1_private: {
+        new (): use_glo_M2_public.c1;
+    };
+    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
+    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+    module m2 {
+        module m5 {
+        }
+    }
+}
+declare module "anotherParseError" {
+    module m2 {
+    }
+    module m2 {
+    }
+}
+declare module m2 {
+}
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
index 6f6c2e5f865cf..5118c9012e4cb 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
+++ b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
@@ -1,12 +1,10 @@
 tests/cases/compiler/privacyGloImportParseErrors.ts(22,5): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
 tests/cases/compiler/privacyGloImportParseErrors.ts(22,27): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
 tests/cases/compiler/privacyGloImportParseErrors.ts(30,20): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
-tests/cases/compiler/privacyGloImportParseErrors.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
 tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS1147: Import declarations in a namespace cannot reference a module.
 tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS2307: Cannot find module 'm1_M3_public'.
 tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS1147: Import declarations in a namespace cannot reference a module.
 tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS2307: Cannot find module 'm1_M4_private'.
-tests/cases/compiler/privacyGloImportParseErrors.ts(80,35): error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
 tests/cases/compiler/privacyGloImportParseErrors.ts(81,43): error TS1147: Import declarations in a namespace cannot reference a module.
 tests/cases/compiler/privacyGloImportParseErrors.ts(82,43): error TS1147: Import declarations in a namespace cannot reference a module.
 tests/cases/compiler/privacyGloImportParseErrors.ts(121,38): error TS1147: Import declarations in a namespace cannot reference a module.
@@ -18,7 +16,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(146,25): error TS1147: Impor
 tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a namespace cannot reference a module.
 
 
-==== tests/cases/compiler/privacyGloImportParseErrors.ts (18 errors) ====
+==== tests/cases/compiler/privacyGloImportParseErrors.ts (16 errors) ====
     module m1 {
         export module m1_M1_public {
             export class c1 {
@@ -74,8 +72,6 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
     
     
         import m1_im2_private = m1_M2_private;
-                                ~~~~~~~~~~~~~
-!!! error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
         export var m1_im2_private_v1_public = m1_im2_private.c1;
         export var m1_im2_private_v2_public = new m1_im2_private.c1();
         export var m1_im2_private_v3_public = m1_im2_private.f1;
@@ -115,8 +111,6 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
     
         export import m1_im1_public = m1_M1_public;
         export import m1_im2_public = m1_M2_private;
-                                      ~~~~~~~~~~~~~
-!!! error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
         export import m1_im3_public = require("m1_M3_public");
                                               ~~~~~~~~~~~~~~
 !!! error TS1147: Import declarations in a namespace cannot reference a module.
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js
index cf45803b51dde..bdf8025a5edac 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.js
+++ b/tests/baselines/reference/privacyGloImportParseErrors.js
@@ -241,3 +241,111 @@ var m2;
         var a = 10;
     })(m4 || (m4 = {}));
 })(m2 || (m2 = {}));
+
+
+//// [privacyGloImportParseErrors.d.ts]
+declare module m1 {
+    module m1_M1_public {
+        class c1 {
+        }
+        function f1(): c1;
+        var v1: typeof c1;
+        var v2: c1;
+    }
+    module m1_M2_private {
+        class c1 {
+        }
+        function f1(): c1;
+        var v1: typeof c1;
+        var v2: c1;
+    }
+    module "m1_M3_public" {
+        function f1(): any;
+        class c1 {
+        }
+        var v1: {
+            new (): c1;
+        };
+        var v2: c1;
+    }
+    import m1_im1_private = m1_M1_public;
+    var m1_im1_private_v1_public: typeof m1_im1_private.c1;
+    var m1_im1_private_v2_public: m1_im1_private.c1;
+    var m1_im1_private_v3_public: typeof m1_im1_private.f1;
+    var m1_im1_private_v4_public: m1_im1_private.c1;
+    import m1_im2_private = m1_M2_private;
+    var m1_im2_private_v1_public: typeof m1_im2_private.c1;
+    var m1_im2_private_v2_public: m1_im2_private.c1;
+    var m1_im2_private_v3_public: typeof m1_im2_private.f1;
+    var m1_im2_private_v4_public: m1_im2_private.c1;
+    var m1_im3_private_v1_public: any;
+    var m1_im3_private_v2_public: any;
+    var m1_im3_private_v3_public: any;
+    var m1_im3_private_v4_public: any;
+    var m1_im4_private_v1_public: any;
+    var m1_im4_private_v2_public: any;
+    var m1_im4_private_v3_public: any;
+    var m1_im4_private_v4_public: any;
+    export import m1_im1_public = m1_M1_public;
+    export import m1_im2_public = m1_M2_private;
+    export import m1_im3_public = require("m1_M3_public");
+    export import m1_im4_public = require("m1_M4_private");
+}
+declare module glo_M1_public {
+    class c1 {
+    }
+    function f1(): c1;
+    var v1: typeof c1;
+    var v2: c1;
+}
+declare module "glo_M2_public" {
+    function f1(): any;
+    class c1 {
+    }
+    var v1: {
+        new (): c1;
+    };
+    var v2: c1;
+}
+declare module "use_glo_M1_public" {
+    import use_glo_M1_public = glo_M1_public;
+    var use_glo_M1_public_v1_public: {
+        new (): use_glo_M1_public.c1;
+    };
+    var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
+    var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+    var use_glo_M1_public_v1_private: {
+        new (): use_glo_M1_public.c1;
+    };
+    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
+    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+    import use_glo_M2_public = require("glo_M2_public");
+    var use_glo_M2_public_v1_public: {
+        new (): use_glo_M2_public.c1;
+    };
+    var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
+    var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+    var use_glo_M2_public_v1_private: {
+        new (): use_glo_M2_public.c1;
+    };
+    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
+    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+    module m2 {
+        module m5 {
+        }
+    }
+}
+declare module "anotherParseError" {
+    module m2 {
+        module "abc" {
+        }
+    }
+    module m2 {
+        module "abc2" {
+        }
+    }
+    module "abc3" {
+    }
+}
+declare module m2 {
+}
diff --git a/tests/baselines/reference/privacyImport.errors.txt b/tests/baselines/reference/privacyImport.errors.txt
deleted file mode 100644
index d5cb61d99b5f4..0000000000000
--- a/tests/baselines/reference/privacyImport.errors.txt
+++ /dev/null
@@ -1,365 +0,0 @@
-tests/cases/compiler/privacyImport.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
-tests/cases/compiler/privacyImport.ts(80,35): error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
-
-
-==== tests/cases/compiler/privacyImport.ts (2 errors) ====
-    export module m1 {
-        export module m1_M1_public {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        module m1_M2_private {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        //export declare module "m1_M3_public" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
-    
-        //declare module "m1_M4_private" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
-    
-        import m1_im1_private = m1_M1_public;
-        export var m1_im1_private_v1_public = m1_im1_private.c1;
-        export var m1_im1_private_v2_public = new m1_im1_private.c1();
-        export var m1_im1_private_v3_public = m1_im1_private.f1;
-        export var m1_im1_private_v4_public = m1_im1_private.f1();
-        var m1_im1_private_v1_private = m1_im1_private.c1;
-        var m1_im1_private_v2_private = new m1_im1_private.c1();
-        var m1_im1_private_v3_private = m1_im1_private.f1;
-        var m1_im1_private_v4_private = m1_im1_private.f1();
-    
-    
-        import m1_im2_private = m1_M2_private;
-                                ~~~~~~~~~~~~~
-!!! error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
-        export var m1_im2_private_v1_public = m1_im2_private.c1;
-        export var m1_im2_private_v2_public = new m1_im2_private.c1();
-        export var m1_im2_private_v3_public = m1_im2_private.f1;
-        export var m1_im2_private_v4_public = m1_im2_private.f1();
-        var m1_im2_private_v1_private = m1_im2_private.c1;
-        var m1_im2_private_v2_private = new m1_im2_private.c1();
-        var m1_im2_private_v3_private = m1_im2_private.f1;
-        var m1_im2_private_v4_private = m1_im2_private.f1();
-    
-        //import m1_im3_private = require("m1_M3_public");
-        //export var m1_im3_private_v1_public = m1_im3_private.c1;
-        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        //export var m1_im3_private_v3_public = m1_im3_private.f1;
-        //export var m1_im3_private_v4_public = m1_im3_private.f1();
-        //var m1_im3_private_v1_private = m1_im3_private.c1;
-        //var m1_im3_private_v2_private = new m1_im3_private.c1();
-        //var m1_im3_private_v3_private = m1_im3_private.f1;
-        //var m1_im3_private_v4_private = m1_im3_private.f1();
-    
-        //import m1_im4_private = require("m1_M4_private");
-        //export var m1_im4_private_v1_public = m1_im4_private.c1;
-        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        //export var m1_im4_private_v3_public = m1_im4_private.f1;
-        //export var m1_im4_private_v4_public = m1_im4_private.f1();
-        //var m1_im4_private_v1_private = m1_im4_private.c1;
-        //var m1_im4_private_v2_private = new m1_im4_private.c1();
-        //var m1_im4_private_v3_private = m1_im4_private.f1;
-        //var m1_im4_private_v4_private = m1_im4_private.f1();
-    
-        export import m1_im1_public = m1_M1_public;
-        export import m1_im2_public = m1_M2_private;
-                                      ~~~~~~~~~~~~~
-!!! error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
-        //export import m1_im3_public = require("m1_M3_public");
-        //export import m1_im4_public = require("m1_M4_private");
-    }
-    
-    module m2 {
-        export module m2_M1_public {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        module m2_M2_private {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        //export declare module "m2_M3_public" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
-    
-        //declare module "m2_M4_private" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
-    
-        import m1_im1_private = m2_M1_public;
-        export var m1_im1_private_v1_public = m1_im1_private.c1;
-        export var m1_im1_private_v2_public = new m1_im1_private.c1();
-        export var m1_im1_private_v3_public = m1_im1_private.f1;
-        export var m1_im1_private_v4_public = m1_im1_private.f1();
-        var m1_im1_private_v1_private = m1_im1_private.c1;
-        var m1_im1_private_v2_private = new m1_im1_private.c1();
-        var m1_im1_private_v3_private = m1_im1_private.f1;
-        var m1_im1_private_v4_private = m1_im1_private.f1();
-    
-    
-        import m1_im2_private = m2_M2_private;
-        export var m1_im2_private_v1_public = m1_im2_private.c1;
-        export var m1_im2_private_v2_public = new m1_im2_private.c1();
-        export var m1_im2_private_v3_public = m1_im2_private.f1;
-        export var m1_im2_private_v4_public = m1_im2_private.f1();
-        var m1_im2_private_v1_private = m1_im2_private.c1;
-        var m1_im2_private_v2_private = new m1_im2_private.c1();
-        var m1_im2_private_v3_private = m1_im2_private.f1;
-        var m1_im2_private_v4_private = m1_im2_private.f1();
-    
-        //import m1_im3_private = require("m2_M3_public");
-        //export var m1_im3_private_v1_public = m1_im3_private.c1;
-        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        //export var m1_im3_private_v3_public = m1_im3_private.f1;
-        //export var m1_im3_private_v4_public = m1_im3_private.f1();
-        //var m1_im3_private_v1_private = m1_im3_private.c1;
-        //var m1_im3_private_v2_private = new m1_im3_private.c1();
-        //var m1_im3_private_v3_private = m1_im3_private.f1;
-        //var m1_im3_private_v4_private = m1_im3_private.f1();
-    
-        //import m1_im4_private = require("m2_M4_private");
-        //export var m1_im4_private_v1_public = m1_im4_private.c1;
-        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        //export var m1_im4_private_v3_public = m1_im4_private.f1;
-        //export var m1_im4_private_v4_public = m1_im4_private.f1();
-        //var m1_im4_private_v1_private = m1_im4_private.c1;
-        //var m1_im4_private_v2_private = new m1_im4_private.c1();
-        //var m1_im4_private_v3_private = m1_im4_private.f1;
-        //var m1_im4_private_v4_private = m1_im4_private.f1();
-    
-        // Parse error to export module
-        export import m1_im1_public = m2_M1_public;
-        export import m1_im2_public = m2_M2_private;
-        //export import m1_im3_public = require("m2_M3_public");
-        //export import m1_im4_public = require("m2_M4_private");
-    }
-    
-    export module glo_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-    
-    //export declare module "glo_M2_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    
-    export module glo_M3_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-    
-    //export declare module "glo_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    
-    
-    import glo_im1_private = glo_M1_public;
-    export var glo_im1_private_v1_public = glo_im1_private.c1;
-    export var glo_im1_private_v2_public = new glo_im1_private.c1();
-    export var glo_im1_private_v3_public = glo_im1_private.f1;
-    export var glo_im1_private_v4_public = glo_im1_private.f1();
-    var glo_im1_private_v1_private = glo_im1_private.c1;
-    var glo_im1_private_v2_private = new glo_im1_private.c1();
-    var glo_im1_private_v3_private = glo_im1_private.f1;
-    var glo_im1_private_v4_private = glo_im1_private.f1();
-    
-    
-    //import glo_im2_private = require("glo_M2_public");
-    //export var glo_im2_private_v1_public = glo_im2_private.c1;
-    //export var glo_im2_private_v2_public = new glo_im2_private.c1();
-    //export var glo_im2_private_v3_public = glo_im2_private.f1;
-    //export var glo_im2_private_v4_public = glo_im2_private.f1();
-    //var glo_im2_private_v1_private = glo_im2_private.c1;
-    //var glo_im2_private_v2_private = new glo_im2_private.c1();
-    //var glo_im2_private_v3_private = glo_im2_private.f1;
-    //var glo_im2_private_v4_private = glo_im2_private.f1();
-    
-    import glo_im3_private = glo_M3_private;
-    export var glo_im3_private_v1_public = glo_im3_private.c1;
-    export var glo_im3_private_v2_public = new glo_im3_private.c1();
-    export var glo_im3_private_v3_public = glo_im3_private.f1;
-    export var glo_im3_private_v4_public = glo_im3_private.f1();
-    var glo_im3_private_v1_private = glo_im3_private.c1;
-    var glo_im3_private_v2_private = new glo_im3_private.c1();
-    var glo_im3_private_v3_private = glo_im3_private.f1;
-    var glo_im3_private_v4_private = glo_im3_private.f1();
-    
-    //import glo_im4_private = require("glo_M4_private");
-    //export var glo_im4_private_v1_public = glo_im4_private.c1;
-    //export var glo_im4_private_v2_public = new glo_im4_private.c1();
-    //export var glo_im4_private_v3_public = glo_im4_private.f1;
-    //export var glo_im4_private_v4_public = glo_im4_private.f1();
-    //var glo_im4_private_v1_private = glo_im4_private.c1;
-    //var glo_im4_private_v2_private = new glo_im4_private.c1();
-    //var glo_im4_private_v3_private = glo_im4_private.f1;
-    //var glo_im4_private_v4_private = glo_im4_private.f1();
-    
-    // Parse error to export module
-    export import glo_im1_public = glo_M1_public;
-    export import glo_im2_public = glo_M3_private;
-    //export import glo_im3_public = require("glo_M2_public");
-    //export import glo_im4_public = require("glo_M4_private");
-    
-    
-    //export declare module "use_glo_M1_public" {
-    //    import use_glo_M1_public = glo_M1_public;
-    //    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    //    export var use_glo_M1_public_v2_public: use_glo_M1_public;
-    //    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-    //    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    //    var use_glo_M1_public_v2_private: use_glo_M1_public;
-    //    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-    
-    //    import use_glo_M2_public = require("glo_M2_public");
-    //    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    //    export var use_glo_M2_public_v2_public: use_glo_M2_public;
-    //    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-    //    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    //    var use_glo_M2_public_v2_private: use_glo_M2_public;
-    //    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-    
-    //    module m2 {
-    //        import errorImport = require("glo_M2_public");
-    //        import nonerrorImport = glo_M1_public;
-    
-    //        module m5 {
-    //            import m5_errorImport = require("glo_M2_public");
-    //            import m5_nonerrorImport = glo_M1_public;
-    //        }
-    //    }
-    //}
-    
-    
-    //declare module "use_glo_M3_private" {
-    //    import use_glo_M3_private = glo_M3_private;
-    //    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-    //    export var use_glo_M3_private_v2_public: use_glo_M3_private;
-    //    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-    //    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-    //    var use_glo_M3_private_v2_private: use_glo_M3_private;
-    //    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
-    
-    //    import use_glo_M4_private = require("glo_M4_private");
-    //    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-    //    export var use_glo_M4_private_v2_public: use_glo_M4_private;
-    //    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-    //    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-    //    var use_glo_M4_private_v2_private: use_glo_M4_private;
-    //    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
-    
-    //    module m2 {
-    //        import errorImport = require("glo_M4_private");
-    //        import nonerrorImport = glo_M3_private;
-    
-    //        module m5 {
-    //            import m5_errorImport = require("glo_M4_private");
-    //            import m5_nonerrorImport = glo_M3_private;
-    //        }
-    //    }
-    //}
-    
-    //declare module "anotherParseError" {
-    //    module m2 {
-    //        declare module "abc" {
-    //        }
-    //    }
-    
-    //    module m2 {
-    //        module "abc2" {
-    //        }
-    //    }
-    //    module "abc3" {
-    //    }
-    //}
-    
-    //declare export module "anotherParseError2" {
-    //    module m2 {
-    //        declare module "abc" {
-    //        }
-    //    }
-    
-    //    module m2 {
-    //        module "abc2" {
-    //        }
-    //    }
-    //    module "abc3" {
-    //    }
-    //}
-    
-    module m2 {
-        //import m3 = require("use_glo_M1_public");
-        module m4 {
-            var a = 10;
-            //import m2 = require("use_glo_M1_public");
-        }
-    
-    }
-    
-    export module m3 {
-        //import m3 = require("use_glo_M1_public");
-        module m4 {
-            var a = 10;
-            //import m2 = require("use_glo_M1_public");
-        }
-    
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
index 99175e8d57d85..0915fc9983b3c 100644
--- a/tests/baselines/reference/privacyImport.js
+++ b/tests/baselines/reference/privacyImport.js
@@ -702,3 +702,62 @@ var m3;
         //import m2 = require("use_glo_M1_public");
     })(m4 || (m4 = {}));
 })(m3 = exports.m3 || (exports.m3 = {}));
+
+
+//// [privacyImport.d.ts]
+export declare module m1 {
+    module m1_M1_public {
+        class c1 {
+        }
+        function f1(): c1;
+        var v1: typeof c1;
+        var v2: c1;
+    }
+    module m1_M2_private {
+        class c1 {
+        }
+        function f1(): c1;
+        var v1: typeof c1;
+        var v2: c1;
+    }
+    import m1_im1_private = m1_M1_public;
+    var m1_im1_private_v1_public: typeof m1_im1_private.c1;
+    var m1_im1_private_v2_public: m1_im1_private.c1;
+    var m1_im1_private_v3_public: typeof m1_im1_private.f1;
+    var m1_im1_private_v4_public: m1_im1_private.c1;
+    import m1_im2_private = m1_M2_private;
+    var m1_im2_private_v1_public: typeof m1_im2_private.c1;
+    var m1_im2_private_v2_public: m1_im2_private.c1;
+    var m1_im2_private_v3_public: typeof m1_im2_private.f1;
+    var m1_im2_private_v4_public: m1_im2_private.c1;
+    export import m1_im1_public = m1_M1_public;
+    export import m1_im2_public = m1_M2_private;
+}
+export declare module glo_M1_public {
+    class c1 {
+    }
+    function f1(): c1;
+    var v1: typeof c1;
+    var v2: c1;
+}
+export declare module glo_M3_private {
+    class c1 {
+    }
+    function f1(): c1;
+    var v1: typeof c1;
+    var v2: c1;
+}
+import glo_im1_private = glo_M1_public;
+export declare var glo_im1_private_v1_public: typeof glo_im1_private.c1;
+export declare var glo_im1_private_v2_public: glo_im1_private.c1;
+export declare var glo_im1_private_v3_public: typeof glo_im1_private.f1;
+export declare var glo_im1_private_v4_public: glo_im1_private.c1;
+import glo_im3_private = glo_M3_private;
+export declare var glo_im3_private_v1_public: typeof glo_im3_private.c1;
+export declare var glo_im3_private_v2_public: glo_im3_private.c1;
+export declare var glo_im3_private_v3_public: typeof glo_im3_private.f1;
+export declare var glo_im3_private_v4_public: glo_im3_private.c1;
+export import glo_im1_public = glo_M1_public;
+export import glo_im2_public = glo_M3_private;
+export declare module m3 {
+}
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
deleted file mode 100644
index 0669d3c3d2647..0000000000000
--- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts(14,82): error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(14,82): error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(19,84): error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(22,83): error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
-tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(62,70): error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateInterface' has or is using private name 'privateInterface'.
-tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(67,80): error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts (5 errors) ====
-    export module publicModule {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    
-        interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                                       ~~~~~~~~~~~~~
-!!! error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-        }
-    
-        export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-                                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    
-    module privateModule {
-        export interface publicInterfaceInPrivateModule {
-    
-        }
-    
-        interface privateInterfaceInPrivateModule {
-        }
-    
-        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-        }
-        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-        }
-    
-        interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-        }
-    }
-    
-    export interface publicInterface {
-    
-    }
-    
-    interface privateInterface {
-    }
-    
-    interface privateInterfaceImplementingPublicInterface extends publicInterface {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
-    }
-    export interface publicInterfaceImplementingPublicInterface extends publicInterface {
-    }
-    export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
-                                                                         ~~~~~~~~~~~~~~~~
-!!! error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateInterface' has or is using private name 'privateInterface'.
-    }
-    
-    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                                   ~~~~~~~~~~~~~
-!!! error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'.
-    }
-    
-==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts (1 errors) ====
-    module publicModuleInGlobal {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4022: 'extends' clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    interface publicInterfaceInGlobal {
-    }
-    interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
index cb25b2b5ff93b..f6d0278e0bd07 100644
--- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
@@ -97,3 +97,58 @@ interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInter
 "use strict";
 exports.__esModule = true;
 //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.js]
+
+
+//// [privacyInterfaceExtendsClauseDeclFile_externalModule.d.ts]
+export declare module publicModule {
+    interface publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceInPublicModule {
+    }
+    interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+    }
+    interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+    interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule {
+    }
+}
+declare module privateModule {
+    interface publicInterfaceInPrivateModule {
+    }
+    interface privateInterfaceInPrivateModule {
+    }
+    interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
+    }
+    interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
+    }
+    interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+}
+export interface publicInterface {
+}
+interface privateInterface {
+}
+export interface publicInterfaceImplementingPublicInterface extends publicInterface {
+}
+export interface publicInterfaceImplementingPrivateInterface extends privateInterface {
+}
+export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+}
+export {};
+//// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.d.ts]
+declare module publicModuleInGlobal {
+    interface publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceInPublicModule {
+    }
+    interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+    }
+}
+interface publicInterfaceInGlobal {
+}
+interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
+}
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
deleted file mode 100644
index 45dbc77e7a0a3..0000000000000
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(51,41): error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(52,41): error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(53,41): error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(54,41): error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(55,41): error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(56,42): error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(57,42): error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'.
-
-
-==== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts (7 errors) ====
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    export module import_public {
-        // Privacy errors - importing private elements
-        export import im_public_c_private = m_private.c_private;
-                                            ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'.
-        export import im_public_e_private = m_private.e_private;
-                                            ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'.
-        export import im_public_f_private = m_private.f_private;
-                                            ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'.
-        export import im_public_v_private = m_private.v_private;
-                                            ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'.
-        export import im_public_i_private = m_private.i_private;
-                                            ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'.
-        export import im_public_mi_private = m_private.mi_private;
-                                             ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'.
-        export import im_public_mu_private = m_private.mu_private;
-                                             ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'.
-    
-        // Usage of privacy error imports
-        var privateUse_im_public_c_private = new im_public_c_private();
-        export var publicUse_im_public_c_private = new im_public_c_private();
-        var privateUse_im_public_e_private = im_public_e_private.Happy;
-        export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
-        var privateUse_im_public_f_private = im_public_f_private();
-        export var publicUse_im_public_f_private = im_public_f_private();
-        var privateUse_im_public_v_private = im_public_v_private;
-        export var publicUse_im_public_v_private = im_public_v_private;
-        var privateUse_im_public_i_private: im_public_i_private;
-        export var publicUse_im_public_i_private: im_public_i_private;
-        var privateUse_im_public_mi_private = new im_public_mi_private.c();
-        export var publicUse_im_public_mi_private = new im_public_mi_private.c();
-        var privateUse_im_public_mu_private: im_public_mu_private.i;
-        export var publicUse_im_public_mu_private: im_public_mu_private.i;
-    
-    
-        // No Privacy errors - importing public elements
-        export import im_public_c_public = m_public.c_public;
-        export import im_public_e_public = m_public.e_public;
-        export import im_public_f_public = m_public.f_public;
-        export import im_public_v_public = m_public.v_public;
-        export import im_public_i_public = m_public.i_public;
-        export import im_public_mi_public = m_public.mi_public;
-        export import im_public_mu_public = m_public.mu_public;
-    
-        // Usage of above
-        var privateUse_im_public_c_public = new im_public_c_public();
-        export var publicUse_im_public_c_public = new im_public_c_public();
-        var privateUse_im_public_e_public = im_public_e_public.Happy;
-        export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
-        var privateUse_im_public_f_public = im_public_f_public();
-        export var publicUse_im_public_f_public = im_public_f_public();
-        var privateUse_im_public_v_public = im_public_v_public;
-        export var publicUse_im_public_v_public = im_public_v_public;
-        var privateUse_im_public_i_public: im_public_i_public;
-        export var publicUse_im_public_i_public: im_public_i_public;
-        var privateUse_im_public_mi_public = new im_public_mi_public.c();
-        export var publicUse_im_public_mi_public = new im_public_mi_public.c();
-        var privateUse_im_public_mu_public: im_public_mu_public.i;
-        export var publicUse_im_public_mu_public: im_public_mu_public.i;
-    }
-    
-    module import_private {
-        // No Privacy errors - importing private elements
-        export import im_private_c_private = m_private.c_private;
-        export import im_private_e_private = m_private.e_private;
-        export import im_private_f_private = m_private.f_private;
-        export import im_private_v_private = m_private.v_private;
-        export import im_private_i_private = m_private.i_private;
-        export import im_private_mi_private = m_private.mi_private;
-        export import im_private_mu_private = m_private.mu_private;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-        // No privacy Error - importing public elements
-        export import im_private_c_public = m_public.c_public;
-        export import im_private_e_public = m_public.e_public;
-        export import im_private_f_public = m_public.f_public;
-        export import im_private_v_public = m_public.v_public;
-        export import im_private_i_public = m_public.i_public;
-        export import im_private_mi_public = m_public.mi_public;
-        export import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of no privacy error imports
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
index d70c34f9814f9..5edf0f819b1c2 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
@@ -295,3 +295,160 @@ var import_private;
     import_private.publicUse_im_private_mi_public = new import_private.im_private_mi_public.c();
     var privateUse_im_private_mu_public;
 })(import_private || (import_private = {}));
+
+
+//// [privacyLocalInternalReferenceImportWithExport.d.ts]
+module m_private {
+    class c_private {
+    }
+    enum e_private {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_private(): c_private;
+    var v_private: c_private;
+    interface i_private {
+    }
+    module mi_private {
+        class c {
+        }
+    }
+    module mu_private {
+        interface i {
+        }
+    }
+}
+export declare module m_public {
+    class c_public {
+    }
+    enum e_public {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_public(): c_public;
+    var v_public: number;
+    interface i_public {
+    }
+    module mi_public {
+        class c {
+        }
+    }
+    module mu_public {
+        interface i {
+        }
+    }
+}
+export declare module import_public {
+    export import im_public_c_private = m_private.c_private;
+    export import im_public_e_private = m_private.e_private;
+    export import im_public_f_private = m_private.f_private;
+    export import im_public_v_private = m_private.v_private;
+    export import im_public_i_private = m_private.i_private;
+    export import im_public_mi_private = m_private.mi_private;
+    export import im_public_mu_private = m_private.mu_private;
+    var publicUse_im_public_c_private: im_public_c_private;
+    var publicUse_im_public_e_private: im_public_e_private;
+    var publicUse_im_public_f_private: im_public_c_private;
+    var publicUse_im_public_v_private: im_public_c_private;
+    var publicUse_im_public_i_private: im_public_i_private;
+    var publicUse_im_public_mi_private: im_public_mi_private.c;
+    var publicUse_im_public_mu_private: im_public_mu_private.i;
+    export import im_public_c_public = m_public.c_public;
+    export import im_public_e_public = m_public.e_public;
+    export import im_public_f_public = m_public.f_public;
+    export import im_public_v_public = m_public.v_public;
+    export import im_public_i_public = m_public.i_public;
+    export import im_public_mi_public = m_public.mi_public;
+    export import im_public_mu_public = m_public.mu_public;
+    var publicUse_im_public_c_public: im_public_c_public;
+    var publicUse_im_public_e_public: im_public_e_public;
+    var publicUse_im_public_f_public: im_public_c_public;
+    var publicUse_im_public_v_public: number;
+    var publicUse_im_public_i_public: im_public_i_public;
+    var publicUse_im_public_mi_public: im_public_mi_public.c;
+    var publicUse_im_public_mu_public: im_public_mu_public.i;
+}
+export {};
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.d.ts (1 errors) ====
+    module m_private {
+    ~~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+        class c_private {
+        }
+        enum e_private {
+            Happy = 0,
+            Grumpy = 1
+        }
+        function f_private(): c_private;
+        var v_private: c_private;
+        interface i_private {
+        }
+        module mi_private {
+            class c {
+            }
+        }
+        module mu_private {
+            interface i {
+            }
+        }
+    }
+    export declare module m_public {
+        class c_public {
+        }
+        enum e_public {
+            Happy = 0,
+            Grumpy = 1
+        }
+        function f_public(): c_public;
+        var v_public: number;
+        interface i_public {
+        }
+        module mi_public {
+            class c {
+            }
+        }
+        module mu_public {
+            interface i {
+            }
+        }
+    }
+    export declare module import_public {
+        export import im_public_c_private = m_private.c_private;
+        export import im_public_e_private = m_private.e_private;
+        export import im_public_f_private = m_private.f_private;
+        export import im_public_v_private = m_private.v_private;
+        export import im_public_i_private = m_private.i_private;
+        export import im_public_mi_private = m_private.mi_private;
+        export import im_public_mu_private = m_private.mu_private;
+        var publicUse_im_public_c_private: im_public_c_private;
+        var publicUse_im_public_e_private: im_public_e_private;
+        var publicUse_im_public_f_private: im_public_c_private;
+        var publicUse_im_public_v_private: im_public_c_private;
+        var publicUse_im_public_i_private: im_public_i_private;
+        var publicUse_im_public_mi_private: im_public_mi_private.c;
+        var publicUse_im_public_mu_private: im_public_mu_private.i;
+        export import im_public_c_public = m_public.c_public;
+        export import im_public_e_public = m_public.e_public;
+        export import im_public_f_public = m_public.f_public;
+        export import im_public_v_public = m_public.v_public;
+        export import im_public_i_public = m_public.i_public;
+        export import im_public_mi_public = m_public.mi_public;
+        export import im_public_mu_public = m_public.mu_public;
+        var publicUse_im_public_c_public: im_public_c_public;
+        var publicUse_im_public_e_public: im_public_e_public;
+        var publicUse_im_public_f_public: im_public_c_public;
+        var publicUse_im_public_v_public: number;
+        var publicUse_im_public_i_public: im_public_i_public;
+        var publicUse_im_public_mi_public: im_public_mi_public.c;
+        var publicUse_im_public_mu_public: im_public_mu_public.i;
+    }
+    export {};
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
deleted file mode 100644
index 12fd1927660fc..0000000000000
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
+++ /dev/null
@@ -1,170 +0,0 @@
-tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(51,35): error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(52,35): error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(55,35): error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(56,36): error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'.
-tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(57,36): error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'.
-
-
-==== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts (5 errors) ====
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    export module import_public {
-        // No Privacy errors - importing private elements
-        import im_private_c_private = m_private.c_private;
-                                      ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'.
-        import im_private_e_private = m_private.e_private;
-                                      ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'.
-        import im_private_f_private = m_private.f_private;
-        import im_private_v_private = m_private.v_private;
-        import im_private_i_private = m_private.i_private;
-                                      ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'.
-        import im_private_mi_private = m_private.mi_private;
-                                       ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'.
-        import im_private_mu_private = m_private.mu_private;
-                                       ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'.
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-    
-        // No Privacy errors - importing public elements
-        import im_private_c_public = m_public.c_public;
-        import im_private_e_public = m_public.e_public;
-        import im_private_f_public = m_public.f_public;
-        import im_private_v_public = m_public.v_public;
-        import im_private_i_public = m_public.i_public;
-        import im_private_mi_public = m_public.mi_public;
-        import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
-    
-    module import_private {
-        // No Privacy errors - importing private elements
-        import im_private_c_private = m_private.c_private;
-        import im_private_e_private = m_private.e_private;
-        import im_private_f_private = m_private.f_private;
-        import im_private_v_private = m_private.v_private;
-        import im_private_i_private = m_private.i_private;
-        import im_private_mi_private = m_private.mi_private;
-        import im_private_mu_private = m_private.mu_private;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-        // No privacy Error - importing public elements
-        import im_private_c_public = m_public.c_public;
-        import im_private_e_public = m_public.e_public;
-        import im_private_f_public = m_public.f_public;
-        import im_private_v_public = m_public.v_public;
-        import im_private_i_public = m_public.i_public;
-        import im_private_mi_public = m_public.mi_public;
-        import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
index ae0079459187c..73266bc1d024c 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
@@ -297,3 +297,152 @@ define(["require", "exports"], function (require, exports) {
         var privateUse_im_private_mu_public;
     })(import_private || (import_private = {}));
 });
+
+
+//// [privacyLocalInternalReferenceImportWithoutExport.d.ts]
+module m_private {
+    class c_private {
+    }
+    enum e_private {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_private(): c_private;
+    var v_private: c_private;
+    interface i_private {
+    }
+    module mi_private {
+        class c {
+        }
+    }
+    module mu_private {
+        interface i {
+        }
+    }
+}
+export declare module m_public {
+    class c_public {
+    }
+    enum e_public {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_public(): c_public;
+    var v_public: number;
+    interface i_public {
+    }
+    module mi_public {
+        class c {
+        }
+    }
+    module mu_public {
+        interface i {
+        }
+    }
+}
+export declare module import_public {
+    import im_private_c_private = m_private.c_private;
+    import im_private_e_private = m_private.e_private;
+    import im_private_i_private = m_private.i_private;
+    import im_private_mi_private = m_private.mi_private;
+    import im_private_mu_private = m_private.mu_private;
+    var publicUse_im_private_c_private: im_private_c_private;
+    var publicUse_im_private_e_private: im_private_e_private;
+    var publicUse_im_private_f_private: im_private_c_private;
+    var publicUse_im_private_v_private: im_private_c_private;
+    var publicUse_im_private_i_private: im_private_i_private;
+    var publicUse_im_private_mi_private: im_private_mi_private.c;
+    var publicUse_im_private_mu_private: im_private_mu_private.i;
+    import im_private_c_public = m_public.c_public;
+    import im_private_e_public = m_public.e_public;
+    import im_private_i_public = m_public.i_public;
+    import im_private_mi_public = m_public.mi_public;
+    import im_private_mu_public = m_public.mu_public;
+    var publicUse_im_private_c_public: im_private_c_public;
+    var publicUse_im_private_e_public: im_private_e_public;
+    var publicUse_im_private_f_public: im_private_c_public;
+    var publicUse_im_private_v_public: number;
+    var publicUse_im_private_i_public: im_private_i_public;
+    var publicUse_im_private_mi_public: im_private_mi_public.c;
+    var publicUse_im_private_mu_public: im_private_mu_public.i;
+}
+export {};
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.d.ts (1 errors) ====
+    module m_private {
+    ~~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+        class c_private {
+        }
+        enum e_private {
+            Happy = 0,
+            Grumpy = 1
+        }
+        function f_private(): c_private;
+        var v_private: c_private;
+        interface i_private {
+        }
+        module mi_private {
+            class c {
+            }
+        }
+        module mu_private {
+            interface i {
+            }
+        }
+    }
+    export declare module m_public {
+        class c_public {
+        }
+        enum e_public {
+            Happy = 0,
+            Grumpy = 1
+        }
+        function f_public(): c_public;
+        var v_public: number;
+        interface i_public {
+        }
+        module mi_public {
+            class c {
+            }
+        }
+        module mu_public {
+            interface i {
+            }
+        }
+    }
+    export declare module import_public {
+        import im_private_c_private = m_private.c_private;
+        import im_private_e_private = m_private.e_private;
+        import im_private_i_private = m_private.i_private;
+        import im_private_mi_private = m_private.mi_private;
+        import im_private_mu_private = m_private.mu_private;
+        var publicUse_im_private_c_private: im_private_c_private;
+        var publicUse_im_private_e_private: im_private_e_private;
+        var publicUse_im_private_f_private: im_private_c_private;
+        var publicUse_im_private_v_private: im_private_c_private;
+        var publicUse_im_private_i_private: im_private_i_private;
+        var publicUse_im_private_mi_private: im_private_mi_private.c;
+        var publicUse_im_private_mu_private: im_private_mu_private.i;
+        import im_private_c_public = m_public.c_public;
+        import im_private_e_public = m_public.e_public;
+        import im_private_i_public = m_public.i_public;
+        import im_private_mi_public = m_public.mi_public;
+        import im_private_mu_public = m_public.mu_public;
+        var publicUse_im_private_c_public: im_private_c_public;
+        var publicUse_im_private_e_public: im_private_e_public;
+        var publicUse_im_private_f_public: im_private_c_public;
+        var publicUse_im_private_v_public: number;
+        var publicUse_im_private_i_public: im_private_i_public;
+        var publicUse_im_private_mi_public: im_private_mi_public.c;
+        var publicUse_im_private_mu_public: im_private_mu_public.i;
+    }
+    export {};
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
deleted file mode 100644
index d3715af1d5493..0000000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(50,37): error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(51,37): error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(52,37): error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(53,37): error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(54,37): error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(55,38): error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(56,38): error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'.
-
-
-==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts (7 errors) ====
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    // Privacy errors - importing private elements
-    export import im_public_c_private = m_private.c_private;
-                                        ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'.
-    export import im_public_e_private = m_private.e_private;
-                                        ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'.
-    export import im_public_f_private = m_private.f_private;
-                                        ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'.
-    export import im_public_v_private = m_private.v_private;
-                                        ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'.
-    export import im_public_i_private = m_private.i_private;
-                                        ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'.
-    export import im_public_mi_private = m_private.mi_private;
-                                         ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'.
-    export import im_public_mu_private = m_private.mu_private;
-                                         ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'.
-    
-    // Usage of privacy error imports
-    var privateUse_im_public_c_private = new im_public_c_private();
-    export var publicUse_im_public_c_private = new im_public_c_private();
-    var privateUse_im_public_e_private = im_public_e_private.Happy;
-    export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
-    var privateUse_im_public_f_private = im_public_f_private();
-    export var publicUse_im_public_f_private = im_public_f_private();
-    var privateUse_im_public_v_private = im_public_v_private;
-    export var publicUse_im_public_v_private = im_public_v_private;
-    var privateUse_im_public_i_private: im_public_i_private;
-    export var publicUse_im_public_i_private: im_public_i_private;
-    var privateUse_im_public_mi_private = new im_public_mi_private.c();
-    export var publicUse_im_public_mi_private = new im_public_mi_private.c();
-    var privateUse_im_public_mu_private: im_public_mu_private.i;
-    export var publicUse_im_public_mu_private: im_public_mu_private.i;
-    
-    
-    // No Privacy errors - importing public elements
-    export import im_public_c_public = m_public.c_public;
-    export import im_public_e_public = m_public.e_public;
-    export import im_public_f_public = m_public.f_public;
-    export import im_public_v_public = m_public.v_public;
-    export import im_public_i_public = m_public.i_public;
-    export import im_public_mi_public = m_public.mi_public;
-    export import im_public_mu_public = m_public.mu_public;
-    
-    // Usage of above decls
-    var privateUse_im_public_c_public = new im_public_c_public();
-    export var publicUse_im_public_c_public = new im_public_c_public();
-    var privateUse_im_public_e_public = im_public_e_public.Happy;
-    export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
-    var privateUse_im_public_f_public = im_public_f_public();
-    export var publicUse_im_public_f_public = im_public_f_public();
-    var privateUse_im_public_v_public = im_public_v_public;
-    export var publicUse_im_public_v_public = im_public_v_public;
-    var privateUse_im_public_i_public: im_public_i_public;
-    export var publicUse_im_public_i_public: im_public_i_public;
-    var privateUse_im_public_mi_public = new im_public_mi_public.c();
-    export var publicUse_im_public_mi_public = new im_public_mi_public.c();
-    var privateUse_im_public_mu_public: im_public_mu_public.i;
-    export var publicUse_im_public_mu_public: im_public_mu_public.i;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
index dd95476a3e296..b2da49d083ea7 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
@@ -200,3 +200,75 @@ define(["require", "exports"], function (require, exports) {
     exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c();
     var privateUse_im_public_mu_public;
 });
+
+
+//// [privacyTopLevelInternalReferenceImportWithExport.d.ts]
+declare module m_private {
+    class c_private {
+    }
+    enum e_private {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_private(): c_private;
+    var v_private: c_private;
+    interface i_private {
+    }
+    module mi_private {
+        class c {
+        }
+    }
+    module mu_private {
+        interface i {
+        }
+    }
+}
+export declare module m_public {
+    class c_public {
+    }
+    enum e_public {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_public(): c_public;
+    var v_public: number;
+    interface i_public {
+    }
+    module mi_public {
+        class c {
+        }
+    }
+    module mu_public {
+        interface i {
+        }
+    }
+}
+export import im_public_c_private = m_private.c_private;
+export import im_public_e_private = m_private.e_private;
+export import im_public_f_private = m_private.f_private;
+export import im_public_v_private = m_private.v_private;
+export import im_public_i_private = m_private.i_private;
+export import im_public_mi_private = m_private.mi_private;
+export import im_public_mu_private = m_private.mu_private;
+export declare var publicUse_im_public_c_private: im_public_c_private;
+export declare var publicUse_im_public_e_private: im_public_e_private;
+export declare var publicUse_im_public_f_private: im_public_c_private;
+export declare var publicUse_im_public_v_private: im_public_c_private;
+export declare var publicUse_im_public_i_private: im_public_i_private;
+export declare var publicUse_im_public_mi_private: im_public_mi_private.c;
+export declare var publicUse_im_public_mu_private: im_public_mu_private.i;
+export import im_public_c_public = m_public.c_public;
+export import im_public_e_public = m_public.e_public;
+export import im_public_f_public = m_public.f_public;
+export import im_public_v_public = m_public.v_public;
+export import im_public_i_public = m_public.i_public;
+export import im_public_mi_public = m_public.mi_public;
+export import im_public_mu_public = m_public.mu_public;
+export declare var publicUse_im_public_c_public: im_public_c_public;
+export declare var publicUse_im_public_e_public: im_public_e_public;
+export declare var publicUse_im_public_f_public: im_public_c_public;
+export declare var publicUse_im_public_v_public: number;
+export declare var publicUse_im_public_i_public: im_public_i_public;
+export declare var publicUse_im_public_mi_public: im_public_mi_public.c;
+export declare var publicUse_im_public_mu_public: im_public_mu_public.i;
+export {};
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
deleted file mode 100644
index d7f8e5abc0100..0000000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(50,31): error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(51,31): error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(54,31): error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(55,32): error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'.
-tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(56,32): error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'.
-
-
-==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts (5 errors) ====
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    // No Privacy errors - importing private elements
-    import im_private_c_private = m_private.c_private;
-                                  ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'.
-    import im_private_e_private = m_private.e_private;
-                                  ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'.
-    import im_private_f_private = m_private.f_private;
-    import im_private_v_private = m_private.v_private;
-    import im_private_i_private = m_private.i_private;
-                                  ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'.
-    import im_private_mi_private = m_private.mi_private;
-                                   ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'.
-    import im_private_mu_private = m_private.mu_private;
-                                   ~~~~~~~~~
-!!! error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'.
-    
-    // Usage of above decls
-    var privateUse_im_private_c_private = new im_private_c_private();
-    export var publicUse_im_private_c_private = new im_private_c_private();
-    var privateUse_im_private_e_private = im_private_e_private.Happy;
-    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-    var privateUse_im_private_f_private = im_private_f_private();
-    export var publicUse_im_private_f_private = im_private_f_private();
-    var privateUse_im_private_v_private = im_private_v_private;
-    export var publicUse_im_private_v_private = im_private_v_private;
-    var privateUse_im_private_i_private: im_private_i_private;
-    export var publicUse_im_private_i_private: im_private_i_private;
-    var privateUse_im_private_mi_private = new im_private_mi_private.c();
-    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-    var privateUse_im_private_mu_private: im_private_mu_private.i;
-    export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-    
-    // No Privacy errors - importing public elements
-    import im_private_c_public = m_public.c_public;
-    import im_private_e_public = m_public.e_public;
-    import im_private_f_public = m_public.f_public;
-    import im_private_v_public = m_public.v_public;
-    import im_private_i_public = m_public.i_public;
-    import im_private_mi_public = m_public.mi_public;
-    import im_private_mu_public = m_public.mu_public;
-    
-    // Usage of above decls
-    var privateUse_im_private_c_public = new im_private_c_public();
-    export var publicUse_im_private_c_public = new im_private_c_public();
-    var privateUse_im_private_e_public = im_private_e_public.Happy;
-    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-    var privateUse_im_private_f_public = im_private_f_public();
-    export var publicUse_im_private_f_public = im_private_f_public();
-    var privateUse_im_private_v_public = im_private_v_public;
-    export var publicUse_im_private_v_public = im_private_v_public;
-    var privateUse_im_private_i_public: im_private_i_public;
-    export var publicUse_im_private_i_public: im_private_i_public;
-    var privateUse_im_private_mi_public = new im_private_mi_public.c();
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-    var privateUse_im_private_mu_public: im_private_mu_public.i;
-    export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
index d69ab4a8113eb..eefb1a7627fc5 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
@@ -200,3 +200,71 @@ define(["require", "exports"], function (require, exports) {
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c();
     var privateUse_im_private_mu_public;
 });
+
+
+//// [privacyTopLevelInternalReferenceImportWithoutExport.d.ts]
+declare module m_private {
+    class c_private {
+    }
+    enum e_private {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_private(): c_private;
+    var v_private: c_private;
+    interface i_private {
+    }
+    module mi_private {
+        class c {
+        }
+    }
+    module mu_private {
+        interface i {
+        }
+    }
+}
+export declare module m_public {
+    class c_public {
+    }
+    enum e_public {
+        Happy = 0,
+        Grumpy = 1
+    }
+    function f_public(): c_public;
+    var v_public: number;
+    interface i_public {
+    }
+    module mi_public {
+        class c {
+        }
+    }
+    module mu_public {
+        interface i {
+        }
+    }
+}
+import im_private_c_private = m_private.c_private;
+import im_private_e_private = m_private.e_private;
+import im_private_i_private = m_private.i_private;
+import im_private_mi_private = m_private.mi_private;
+import im_private_mu_private = m_private.mu_private;
+export declare var publicUse_im_private_c_private: im_private_c_private;
+export declare var publicUse_im_private_e_private: im_private_e_private;
+export declare var publicUse_im_private_f_private: im_private_c_private;
+export declare var publicUse_im_private_v_private: im_private_c_private;
+export declare var publicUse_im_private_i_private: im_private_i_private;
+export declare var publicUse_im_private_mi_private: im_private_mi_private.c;
+export declare var publicUse_im_private_mu_private: im_private_mu_private.i;
+import im_private_c_public = m_public.c_public;
+import im_private_e_public = m_public.e_public;
+import im_private_i_public = m_public.i_public;
+import im_private_mi_public = m_public.mi_public;
+import im_private_mu_public = m_public.mu_public;
+export declare var publicUse_im_private_c_public: im_private_c_public;
+export declare var publicUse_im_private_e_public: im_private_e_public;
+export declare var publicUse_im_private_f_public: im_private_c_public;
+export declare var publicUse_im_private_v_public: number;
+export declare var publicUse_im_private_i_public: im_private_i_public;
+export declare var publicUse_im_private_mi_public: im_private_mi_public.c;
+export declare var publicUse_im_private_mu_public: im_private_mu_public.i;
+export {};
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
deleted file mode 100644
index 663025ee72286..0000000000000
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
+++ /dev/null
@@ -1,549 +0,0 @@
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(8,20): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(8,37): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(9,16): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(9,33): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(10,24): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(10,41): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(32,43): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(36,30): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(75,67): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(127,20): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(127,50): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(128,16): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(128,46): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(129,24): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(129,54): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(132,43): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(134,30): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(137,74): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(164,24): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(164,41): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(165,20): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(165,37): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(166,28): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(166,45): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(188,47): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(192,34): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(231,71): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(283,24): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(283,54): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(284,20): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(284,50): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(285,28): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(285,58): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(288,47): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(290,34): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts (36 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;  // Error
-                       ~~~~~~~~~~~~
-!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
-                                        ~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-        <T extends privateClass>(): privateClass;  // Error
-                   ~~~~~~~~~~~~
-!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
-                                    ~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-        myMethod<T extends privateClass>(): privateClass;  // Error
-                           ~~~~~~~~~~~~
-!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
-                                            ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-    
-    interface privateInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass;
-    }
-    
-    interface privateInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-    
-    export class publicClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {  // Error
-                                              ~~~~~~~~~~~~
-!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {  // Error
-                                 ~~~~~~~~~~~~
-!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-    
-    export class publicClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() { 
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-    
-    class privateClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-    
-    class privateClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-    
-    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-                                                                      ~~~~~~~~~~~~
-!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'.
-    }
-    
-    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-    
-    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-    
-    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-    
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-    
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-    
-    export class publicClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    class privateClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    
-    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-    
-    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-    
-    export interface publicInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-                       ~~~~~~~~~~~~~
-!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'.
-                                                     ~~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-        <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-                   ~~~~~~~~~~~~~
-!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'.
-                                                 ~~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-                           ~~~~~~~~~~~~~
-!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'.
-                                                         ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-    }
-    export class publicClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-                                              ~~~~~~~~~~~~~
-!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'.
-        }
-        myPublicMethod<T extends privateModule.publicClass>() {  // Error
-                                 ~~~~~~~~~~~~~
-!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'.
-        }
-    }
-    export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-                                                                             ~~~~~~~~~~~~~
-!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'.
-    }
-    
-    
-    interface privateInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;
-        <T extends privateModule.publicClass>(): privateModule.publicClass;
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
-    }
-    class privateClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {
-        }
-        myPublicMethod<T extends privateModule.publicClass>() {
-        }
-    }
-    function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
-    }
-    
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass;  // Error
-                           ~~~~~~~~~~~~
-!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
-                                            ~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-            <T extends privateClass>(): privateClass;  // Error
-                       ~~~~~~~~~~~~
-!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
-                                        ~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'.
-            myMethod<T extends privateClass>(): privateClass;  // Error
-                               ~~~~~~~~~~~~
-!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
-                                                ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass;
-            <T extends privateClass>(): privateClass;
-            myMethod<T extends privateClass>(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() {  // Error
-                                                  ~~~~~~~~~~~~
-!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {  // Error
-                                     ~~~~~~~~~~~~
-!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        export class publicClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        class privateClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() {
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        class privateClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-                                                                          ~~~~~~~~~~~~
-!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'.
-        }
-    
-        export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-        }
-    
-        function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        export class publicClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-        class privateClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-    
-        export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    
-        function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    
-        export interface publicInterfaceWithPrivatModuleTypeParameters {
-            new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-                           ~~~~~~~~~~~~~
-!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'.
-                                                         ~~~~~~~~~~~~~
-!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'.
-            <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-                       ~~~~~~~~~~~~~
-!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'.
-                                                     ~~~~~~~~~~~~~
-!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'.
-            myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-                               ~~~~~~~~~~~~~
-!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'.
-                                                             ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'.
-        }
-        export class publicClassWithWithPrivateModuleTypeParameters {
-            static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-                                                  ~~~~~~~~~~~~~
-!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'.
-            }
-            myPublicMethod<T extends privateModule.publicClass>() {  // Error
-                                     ~~~~~~~~~~~~~
-!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'.
-            }
-        }
-        export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-                                                                                 ~~~~~~~~~~~~~
-!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'.
-        }
-    
-    
-        interface privateInterfaceWithPrivatModuleTypeParameters {
-            new <T extends privateModule.publicClass>(): privateModule.publicClass;  
-            <T extends privateModule.publicClass>(): privateModule.publicClass;  
-            myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
-        }
-        class privateClassWithWithPrivateModuleTypeParameters {
-            static myPublicStaticMethod<T extends privateModule.publicClass>() {  
-            }
-            myPublicMethod<T extends privateModule.publicClass>() { 
-            }
-        }
-        function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
-        }
-    
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass; 
-            <T extends privateClass>(): privateClass;
-            myMethod<T extends privateClass>(): privateClass; 
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass;
-            <T extends privateClass>(): privateClass;
-            myMethod<T extends privateClass>(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() { 
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {  
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        export class publicClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        class privateClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() {
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        class privateClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
-        }
-    
-        export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-        }
-    
-        function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        export class publicClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-        class privateClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-    
-        export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    
-        function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
index ce80dcbae1e7a..840255f7648c7 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
@@ -816,3 +816,308 @@ var privateModule;
     function privateFunctionWithPublicTypeParametersWithoutExtends() {
     }
 })(privateModule || (privateModule = {}));
+
+
+//// [privacyTypeParameterOfFunctionDeclFile.d.ts]
+class privateClass {
+}
+export declare class publicClass {
+}
+export interface publicInterfaceWithPrivateTypeParameters {
+    new <T extends privateClass>(): privateClass;
+    <T extends privateClass>(): privateClass;
+    myMethod<T extends privateClass>(): privateClass;
+}
+export interface publicInterfaceWithPublicTypeParameters {
+    new <T extends publicClass>(): publicClass;
+    <T extends publicClass>(): publicClass;
+    myMethod<T extends publicClass>(): publicClass;
+}
+export declare class publicClassWithWithPrivateTypeParameters {
+    static myPublicStaticMethod<T extends privateClass>(): void;
+    private static myPrivateStaticMethod;
+    myPublicMethod<T extends privateClass>(): void;
+    private myPrivateMethod;
+}
+export declare class publicClassWithWithPublicTypeParameters {
+    static myPublicStaticMethod<T extends publicClass>(): void;
+    private static myPrivateStaticMethod;
+    myPublicMethod<T extends publicClass>(): void;
+    private myPrivateMethod;
+}
+export declare function publicFunctionWithPrivateTypeParameters<T extends privateClass>(): void;
+export declare function publicFunctionWithPublicTypeParameters<T extends publicClass>(): void;
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+    new <T>(): publicClass;
+    <T>(): publicClass;
+    myMethod<T>(): publicClass;
+}
+export declare class publicClassWithWithPublicTypeParametersWithoutExtends {
+    static myPublicStaticMethod<T>(): void;
+    private static myPrivateStaticMethod;
+    myPublicMethod<T>(): void;
+    private myPrivateMethod;
+}
+export declare function publicFunctionWithPublicTypeParametersWithoutExtends<T>(): void;
+export interface publicInterfaceWithPrivatModuleTypeParameters {
+    new <T extends privateModule.publicClass>(): privateModule.publicClass;
+    <T extends privateModule.publicClass>(): privateModule.publicClass;
+    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
+}
+export declare class publicClassWithWithPrivateModuleTypeParameters {
+    static myPublicStaticMethod<T extends privateModule.publicClass>(): void;
+    myPublicMethod<T extends privateModule.publicClass>(): void;
+}
+export declare function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>(): void;
+export declare module publicModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+    interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+    class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T extends privateClass>(): void;
+        private myPrivateMethod;
+    }
+    class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T extends publicClass>(): void;
+        private myPrivateMethod;
+    }
+    function publicFunctionWithPrivateTypeParameters<T extends privateClass>(): void;
+    function publicFunctionWithPublicTypeParameters<T extends publicClass>(): void;
+    interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+    class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T>(): void;
+        private myPrivateMethod;
+    }
+    function publicFunctionWithPublicTypeParametersWithoutExtends<T>(): void;
+    interface publicInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;
+        <T extends privateModule.publicClass>(): privateModule.publicClass;
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
+    }
+    class publicClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>(): void;
+        myPublicMethod<T extends privateModule.publicClass>(): void;
+    }
+    function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>(): void;
+}
+declare module privateModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+    interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+    class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T extends privateClass>(): void;
+        private myPrivateMethod;
+    }
+    class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T extends publicClass>(): void;
+        private myPrivateMethod;
+    }
+    function publicFunctionWithPrivateTypeParameters<T extends privateClass>(): void;
+    function publicFunctionWithPublicTypeParameters<T extends publicClass>(): void;
+    interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+    class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T>(): void;
+        private myPrivateMethod;
+    }
+    function publicFunctionWithPublicTypeParametersWithoutExtends<T>(): void;
+}
+export {};
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.d.ts (1 errors) ====
+    class privateClass {
+    ~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+    }
+    export declare class publicClass {
+    }
+    export interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+    export interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+    export declare class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T extends privateClass>(): void;
+        private myPrivateMethod;
+    }
+    export declare class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T extends publicClass>(): void;
+        private myPrivateMethod;
+    }
+    export declare function publicFunctionWithPrivateTypeParameters<T extends privateClass>(): void;
+    export declare function publicFunctionWithPublicTypeParameters<T extends publicClass>(): void;
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+    export declare class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>(): void;
+        private static myPrivateStaticMethod;
+        myPublicMethod<T>(): void;
+        private myPrivateMethod;
+    }
+    export declare function publicFunctionWithPublicTypeParametersWithoutExtends<T>(): void;
+    export interface publicInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;
+        <T extends privateModule.publicClass>(): privateModule.publicClass;
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
+    }
+    export declare class publicClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>(): void;
+        myPublicMethod<T extends privateModule.publicClass>(): void;
+    }
+    export declare function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>(): void;
+    export declare module publicModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateTypeParameters {
+            new <T extends privateClass>(): privateClass;
+            <T extends privateClass>(): privateClass;
+            myMethod<T extends privateClass>(): privateClass;
+        }
+        interface publicInterfaceWithPublicTypeParameters {
+            new <T extends publicClass>(): publicClass;
+            <T extends publicClass>(): publicClass;
+            myMethod<T extends publicClass>(): publicClass;
+        }
+        class publicClassWithWithPrivateTypeParameters {
+            static myPublicStaticMethod<T extends privateClass>(): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod<T extends privateClass>(): void;
+            private myPrivateMethod;
+        }
+        class publicClassWithWithPublicTypeParameters {
+            static myPublicStaticMethod<T extends publicClass>(): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod<T extends publicClass>(): void;
+            private myPrivateMethod;
+        }
+        function publicFunctionWithPrivateTypeParameters<T extends privateClass>(): void;
+        function publicFunctionWithPublicTypeParameters<T extends publicClass>(): void;
+        interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+            new <T>(): publicClass;
+            <T>(): publicClass;
+            myMethod<T>(): publicClass;
+        }
+        class publicClassWithWithPublicTypeParametersWithoutExtends {
+            static myPublicStaticMethod<T>(): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod<T>(): void;
+            private myPrivateMethod;
+        }
+        function publicFunctionWithPublicTypeParametersWithoutExtends<T>(): void;
+        interface publicInterfaceWithPrivatModuleTypeParameters {
+            new <T extends privateModule.publicClass>(): privateModule.publicClass;
+            <T extends privateModule.publicClass>(): privateModule.publicClass;
+            myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
+        }
+        class publicClassWithWithPrivateModuleTypeParameters {
+            static myPublicStaticMethod<T extends privateModule.publicClass>(): void;
+            myPublicMethod<T extends privateModule.publicClass>(): void;
+        }
+        function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>(): void;
+    }
+    declare module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivateTypeParameters {
+            new <T extends privateClass>(): privateClass;
+            <T extends privateClass>(): privateClass;
+            myMethod<T extends privateClass>(): privateClass;
+        }
+        interface publicInterfaceWithPublicTypeParameters {
+            new <T extends publicClass>(): publicClass;
+            <T extends publicClass>(): publicClass;
+            myMethod<T extends publicClass>(): publicClass;
+        }
+        class publicClassWithWithPrivateTypeParameters {
+            static myPublicStaticMethod<T extends privateClass>(): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod<T extends privateClass>(): void;
+            private myPrivateMethod;
+        }
+        class publicClassWithWithPublicTypeParameters {
+            static myPublicStaticMethod<T extends publicClass>(): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod<T extends publicClass>(): void;
+            private myPrivateMethod;
+        }
+        function publicFunctionWithPrivateTypeParameters<T extends privateClass>(): void;
+        function publicFunctionWithPublicTypeParameters<T extends publicClass>(): void;
+        interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+            new <T>(): publicClass;
+            <T>(): publicClass;
+            myMethod<T>(): publicClass;
+        }
+        class publicClassWithWithPublicTypeParametersWithoutExtends {
+            static myPublicStaticMethod<T>(): void;
+            private static myPrivateStaticMethod;
+            myPublicMethod<T>(): void;
+            private myPrivateMethod;
+        }
+        function publicFunctionWithPublicTypeParametersWithoutExtends<T>(): void;
+    }
+    export {};
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
deleted file mode 100644
index a6ae0fdcc0148..0000000000000
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(7,61): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(43,71): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(62,65): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(98,75): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts (4 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
-                                                                ~~~~~~~~~~~~
-!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClass'.
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    export class publicClassWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    class privateClassWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    class privateClassWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T { 
-            return val;
-        }
-    }
-    
-    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T { 
-            return val;
-        }
-    }
-    
-    class privateClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T { 
-            return val;
-        }
-    }
-    
-    export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                          ~~~~~~~~~~~~~
-!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'.
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    export module publicModule {
-        class privateClassInPublicModule {
-        }
-    
-        export class publicClassInPublicModule {
-        }
-    
-        export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClassInPublicModule'.
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                              ~~~~~~~~~~~~~
-!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'.
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    }
-    
-    module privateModule {
-        class privateClassInPrivateModule {
-        }
-    
-        export class publicClassInPrivateModule {
-        }
-    
-        export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
index e8ec8606bc57c..b0dfadfce12fc 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
@@ -383,3 +383,118 @@ var privateModule;
         return privateClassWithPublicTypeParametersWithoutExtends;
     }());
 })(privateModule || (privateModule = {}));
+
+
+//// [privacyTypeParametersOfClassDeclFile.d.ts]
+class privateClass {
+}
+export declare class publicClass {
+}
+export declare class publicClassWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T;
+}
+export declare class publicClassWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T;
+}
+export declare class publicClassWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T;
+}
+export declare class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+    myMethod(val: T): T;
+}
+export declare module publicModule {
+    class privateClassInPublicModule {
+    }
+    class publicClassInPublicModule {
+    }
+    class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+        myMethod(val: T): T;
+    }
+    class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T;
+    }
+    class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+    }
+    class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+        myMethod(val: T): T;
+    }
+}
+declare module privateModule {
+    class privateClassInPrivateModule {
+    }
+    class publicClassInPrivateModule {
+    }
+    class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T;
+    }
+    class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T;
+    }
+    class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+    }
+}
+export {};
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyTypeParametersOfClassDeclFile.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyTypeParametersOfClassDeclFile.d.ts (1 errors) ====
+    class privateClass {
+    ~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+    }
+    export declare class publicClass {
+    }
+    export declare class publicClassWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T;
+    }
+    export declare class publicClassWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T;
+    }
+    export declare class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+    }
+    export declare class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+        myMethod(val: T): T;
+    }
+    export declare module publicModule {
+        class privateClassInPublicModule {
+        }
+        class publicClassInPublicModule {
+        }
+        class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+            myMethod(val: T): T;
+        }
+        class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+            myMethod(val: T): T;
+        }
+        class publicClassWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+        }
+        class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+            myMethod(val: T): T;
+        }
+    }
+    declare module privateModule {
+        class privateClassInPrivateModule {
+        }
+        class publicClassInPrivateModule {
+        }
+        class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+            myMethod(val: T): T;
+        }
+        class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+            myMethod(val: T): T;
+        }
+        class publicClassWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+        }
+    }
+    export {};
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
deleted file mode 100644
index eb6bb3ea73421..0000000000000
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(13,69): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(16,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(16,32): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(17,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(18,31): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(25,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(25,32): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(26,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(27,31): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(60,85): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(79,73): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(82,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(82,50): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(83,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(84,49): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(91,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(91,50): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(92,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(93,49): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts (20 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    class privateClassT<T> {
-    }
-    
-    export class publicClassT<T> {
-    }
-    
-    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
-                                                                        ~~~~~~~~~~~~
-!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClass'.
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-        myMethod1(): privateClassT<privateClass>; 
-                     ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-                                   ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-        myMethod2(): privateClassT<publicClass>;
-                     ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-        myMethod3(): publicClassT<privateClass>;
-                                  ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-        myMethod4(): publicClassT<publicClass>; 
-    }
-    
-    export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>
-        myMethod1(): privateClassT<privateClass>;
-                     ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-                                   ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-        myMethod2(): privateClassT<publicClass>;
-                     ~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'.
-        myMethod3(): publicClassT<privateClass>;
-                                  ~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'.
-        myMethod4(): publicClassT<publicClass>;
-    }
-    
-    interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-        myMethod1(): privateClassT<privateClass>;
-        myMethod2(): privateClassT<publicClass>;
-        myMethod3(): publicClassT<privateClass>;
-        myMethod4(): publicClassT<publicClass>;
-    }
-    
-    interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-        myMethod1(): privateClassT<privateClass>;
-        myMethod2(): privateClassT<publicClass>;
-        myMethod3(): publicClassT<privateClass>;
-        myMethod4(): publicClassT<publicClass>;
-    }
-    
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-    }
-    
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-    }
-    
-    
-    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                                        ~~~~~~~~~~~~~
-!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'.
-    }
-    
-    interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-    }
-    
-    export module publicModule {
-        class privateClassInPublicModule {
-        }
-    
-        export class publicClassInPublicModule {
-        }
-    
-        class privateClassInPublicModuleT<T> {
-        }
-    
-        export class publicClassInPublicModuleT<T> {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-                                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-        }
-    
-        export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                                            ~~~~~~~~~~~~~
-!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'.
-        }
-    
-        interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-        }
-    }
-    
-    module privateModule {
-        class privateClassInPrivateModule {
-        }
-    
-        export class publicClassInPrivateModule {
-        }
-    
-        class privateClassInPrivateModuleT<T> {
-        }
-    
-        export class publicClassInPrivateModuleT<T> {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
index bb73f447dd6b5..25e327c42aa35 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
@@ -265,3 +265,204 @@ var privateModule;
     }());
     privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT;
 })(privateModule || (privateModule = {}));
+
+
+//// [privacyTypeParametersOfInterfaceDeclFile.d.ts]
+class privateClass {
+}
+export declare class publicClass {
+}
+class privateClassT<T> {
+}
+export declare class publicClassT<T> {
+}
+export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+}
+export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> {
+}
+export declare module publicModule {
+    class privateClassInPublicModule {
+    }
+    class publicClassInPublicModule {
+    }
+    class privateClassInPublicModuleT<T> {
+    }
+    class publicClassInPublicModuleT<T> {
+    }
+    interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+    interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+    interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+    }
+    interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> {
+    }
+}
+declare module privateModule {
+    class privateClassInPrivateModule {
+    }
+    class publicClassInPrivateModule {
+    }
+    class privateClassInPrivateModuleT<T> {
+    }
+    class publicClassInPrivateModuleT<T> {
+    }
+    interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+    interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+    interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+    }
+}
+export {};
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.d.ts (1 errors) ====
+    class privateClass {
+    ~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+    }
+    export declare class publicClass {
+    }
+    class privateClassT<T> {
+    }
+    export declare class publicClassT<T> {
+    }
+    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+        myMethod1(): privateClassT<privateClass>;
+        myMethod2(): privateClassT<publicClass>;
+        myMethod3(): publicClassT<privateClass>;
+        myMethod4(): publicClassT<publicClass>;
+    }
+    export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+        myMethod1(): privateClassT<privateClass>;
+        myMethod2(): privateClassT<publicClass>;
+        myMethod3(): publicClassT<privateClass>;
+        myMethod4(): publicClassT<publicClass>;
+    }
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+    }
+    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> {
+    }
+    export declare module publicModule {
+        class privateClassInPublicModule {
+        }
+        class publicClassInPublicModule {
+        }
+        class privateClassInPublicModuleT<T> {
+        }
+        class publicClassInPublicModuleT<T> {
+        }
+        interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+        }
+        interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+        }
+        interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+        }
+        interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> {
+        }
+    }
+    declare module privateModule {
+        class privateClassInPrivateModule {
+        }
+        class publicClassInPrivateModule {
+        }
+        class privateClassInPrivateModuleT<T> {
+        }
+        class publicClassInPrivateModuleT<T> {
+        }
+        interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+        }
+        interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+        }
+        interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+        }
+    }
+    export {};
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyVarDeclFile.errors.txt b/tests/baselines/reference/privacyVarDeclFile.errors.txt
deleted file mode 100644
index c6ee30d663070..0000000000000
--- a/tests/baselines/reference/privacyVarDeclFile.errors.txt
+++ /dev/null
@@ -1,515 +0,0 @@
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(105,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(121,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(123,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(148,51): error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(153,66): error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(159,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(162,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(163,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(165,57): error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(166,72): error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(8,17): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(24,36): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(26,23): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(51,47): error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(56,62): error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(62,17): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(65,36): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(66,23): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(68,53): error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(69,68): error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(89,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(105,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(107,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(132,51): error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(137,66): error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(143,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(146,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(147,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(149,57): error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyVarDeclFile_externalModule.ts(150,72): error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-
-
-==== tests/cases/compiler/privacyVarDeclFile_externalModule.ts (20 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  // Error
-                    ~~~~~~~~~~~~
-!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-    
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-    
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-    
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; // Error
-                                       ~~~~~~~~~~~~
-!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; // Error
-                          ~~~~~~~~~~~~
-!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-        private myPrivateProperty: privateClass;
-    }
-    
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-    
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-    
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-    
-    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-                                                  ~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-    
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-                                                                 ~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; // Error
-                    ~~~~~~~~~~~~~
-!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'.
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; // Error
-                                       ~~~~~~~~~~~~~
-!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'.
-        myPublicProperty: privateModule.publicClass; // Error
-                          ~~~~~~~~~~~~~
-!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'.
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                                                        ~~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                                                                       ~~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-    
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;  // Error
-                        ~~~~~~~~~~~~
-!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-    
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass; // Error
-                                           ~~~~~~~~~~~~
-!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass; // Error
-                              ~~~~~~~~~~~~
-!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-            private myPrivateProperty: privateClass;
-        }
-    
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-    
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-                                                      ~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-    
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-                                                                     ~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass; // Error
-                        ~~~~~~~~~~~~~
-!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'.
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass; // Error
-                                           ~~~~~~~~~~~~~
-!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'.
-            myPublicProperty: privateModule.publicClass; // Error
-                              ~~~~~~~~~~~~~
-!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'.
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                                                            ~~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                                                                           ~~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;  
-        }
-    
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-    
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass; 
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass; 
-            private myPrivateProperty: privateClass;
-        }
-    
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-    
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        export var publicVarWithPrivatePropertyTypes: privateClass; 
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-    
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass; 
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass; 
-            myPublicProperty: privateModule.publicClass; 
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
-    
-==== tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts (10 errors) ====
-    class publicClassInGlobal {
-    }
-    interface publicInterfaceWithPublicPropertyTypesInGlobal {
-        myProperty: publicClassInGlobal;
-    }
-    class publicClassWithWithPublicPropertyTypesInGlobal {
-        static myPublicStaticProperty: publicClassInGlobal;
-        private static myPrivateStaticProperty: publicClassInGlobal;
-        myPublicProperty: publicClassInGlobal;
-        private myPrivateProperty: publicClassInGlobal;
-    }
-    var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-    declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-    
-            export interface publicInterfaceWithPrivatePropertyTypes {
-                myProperty: privateClass;
-            }
-    
-            export interface publicInterfaceWithPublicPropertyTypes {
-                myProperty: publicClass;
-            }
-    
-            interface privateInterfaceWithPrivatePropertyTypes {
-                myProperty: privateClass;
-            }
-    
-            interface privateInterfaceWithPublicPropertyTypes {
-                myProperty: publicClass;
-            }
-    
-            export class publicClassWithWithPrivatePropertyTypes {
-                static myPublicStaticProperty: privateClass;
-                private static myPrivateStaticProperty: privateClass;
-                myPublicProperty: privateClass;
-                private myPrivateProperty: privateClass;
-            }
-    
-            export class publicClassWithWithPublicPropertyTypes {
-                static myPublicStaticProperty: publicClass;
-                private static myPrivateStaticProperty: publicClass;
-                myPublicProperty: publicClass;
-                private myPrivateProperty: publicClass;
-            }
-    
-            class privateClassWithWithPrivatePropertyTypes {
-                static myPublicStaticProperty: privateClass;
-                private static myPrivateStaticProperty: privateClass;
-                myPublicProperty: privateClass;
-                private myPrivateProperty: privateClass;
-            }
-    
-            class privateClassWithWithPublicPropertyTypes {
-                static myPublicStaticProperty: publicClass;
-                private static myPrivateStaticProperty: publicClass;
-                myPublicProperty: publicClass;
-                private myPrivateProperty: publicClass;
-            }
-    
-            export var publicVarWithPrivatePropertyTypes: privateClass;
-            export var publicVarWithPublicPropertyTypes: publicClass;
-            var privateVarWithPrivatePropertyTypes: privateClass;
-            var privateVarWithPublicPropertyTypes: publicClass;
-    
-            export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
-            export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-            declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-            declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-            export interface publicInterfaceWithPrivateModulePropertyTypes {
-                myProperty: privateModule.publicClass;
-            }
-            export class publicClassWithPrivateModulePropertyTypes {
-                static myPublicStaticProperty: privateModule.publicClass;
-                myPublicProperty: privateModule.publicClass;
-            }
-            export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-            export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    
-            interface privateInterfaceWithPrivateModulePropertyTypes {
-                myProperty: privateModule.publicClass;
-            }
-            class privateClassWithPrivateModulePropertyTypes {
-                static myPublicStaticProperty: privateModule.publicClass;
-                myPublicProperty: privateModule.publicClass;
-            }
-            var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-            declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        }
-    
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;  // Error
-                        ~~~~~~~~~~~~
-!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-    
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass; // Error
-                                           ~~~~~~~~~~~~
-!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass; // Error
-                              ~~~~~~~~~~~~
-!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-            private myPrivateProperty: privateClass;
-        }
-    
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-    
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-                                                      ~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-    
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-                                                                     ~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass; // Error
-                        ~~~~~~~~~~~~~
-!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'.
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass; // Error
-                                           ~~~~~~~~~~~~~
-!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'.
-            myPublicProperty: privateModule.publicClass; // Error
-                              ~~~~~~~~~~~~~
-!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'.
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                                                            ~~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                                                                           ~~~~~~~~~~~~~
-!!! error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
index 82f3529f41bb7..016ccda1de708 100644
--- a/tests/baselines/reference/privacyVarDeclFile.js
+++ b/tests/baselines/reference/privacyVarDeclFile.js
@@ -686,3 +686,415 @@ var publicModuleInGlobal;
     }());
     var privateVarWithPrivateModulePropertyTypes;
 })(publicModuleInGlobal || (publicModuleInGlobal = {}));
+
+
+//// [privacyVarDeclFile_externalModule.d.ts]
+class privateClass {
+}
+export declare class publicClass {
+}
+export interface publicInterfaceWithPrivatePropertyTypes {
+    myProperty: privateClass;
+}
+export interface publicInterfaceWithPublicPropertyTypes {
+    myProperty: publicClass;
+}
+export declare class publicClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty: privateClass;
+    private static myPrivateStaticProperty;
+    myPublicProperty: privateClass;
+    private myPrivateProperty;
+}
+export declare class publicClassWithWithPublicPropertyTypes {
+    static myPublicStaticProperty: publicClass;
+    private static myPrivateStaticProperty;
+    myPublicProperty: publicClass;
+    private myPrivateProperty;
+}
+export declare var publicVarWithPrivatePropertyTypes: privateClass;
+export declare var publicVarWithPublicPropertyTypes: publicClass;
+export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+export interface publicInterfaceWithPrivateModulePropertyTypes {
+    myProperty: privateModule.publicClass;
+}
+export declare class publicClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty: privateModule.publicClass;
+    myPublicProperty: privateModule.publicClass;
+}
+export declare var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+export declare module publicModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+    interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+    class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: privateClass;
+        private myPrivateProperty;
+    }
+    class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: publicClass;
+        private myPrivateProperty;
+    }
+    var publicVarWithPrivatePropertyTypes: privateClass;
+    var publicVarWithPublicPropertyTypes: publicClass;
+    var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+    var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+declare module privateModule {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+    interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+    class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: privateClass;
+        private myPrivateProperty;
+    }
+    class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: publicClass;
+        private myPrivateProperty;
+    }
+    var publicVarWithPrivatePropertyTypes: privateClass;
+    var publicVarWithPublicPropertyTypes: publicClass;
+    var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+    var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+export {};
+//// [privacyVarDeclFile_GlobalFile.d.ts]
+declare class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicPropertyTypesInGlobal {
+    myProperty: publicClassInGlobal;
+}
+declare class publicClassWithWithPublicPropertyTypesInGlobal {
+    static myPublicStaticProperty: publicClassInGlobal;
+    private static myPrivateStaticProperty;
+    myPublicProperty: publicClassInGlobal;
+    private myPrivateProperty;
+}
+declare var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+declare module publicModuleInGlobal {
+    class privateClass {
+    }
+    class publicClass {
+    }
+    module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+        interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+        class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: privateClass;
+            private myPrivateProperty;
+        }
+        class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: publicClass;
+            private myPrivateProperty;
+        }
+        var publicVarWithPrivatePropertyTypes: privateClass;
+        var publicVarWithPublicPropertyTypes: publicClass;
+        var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+        var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+    interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+    interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+    class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: privateClass;
+        private myPrivateProperty;
+    }
+    class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: publicClass;
+        private myPrivateProperty;
+    }
+    var publicVarWithPrivatePropertyTypes: privateClass;
+    var publicVarWithPublicPropertyTypes: publicClass;
+    var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+    var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/compiler/privacyVarDeclFile_externalModule.d.ts(1,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+
+
+==== tests/cases/compiler/privacyVarDeclFile_externalModule.d.ts (1 errors) ====
+    class privateClass {
+    ~~~~~
+!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
+    }
+    export declare class publicClass {
+    }
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+    export declare class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: privateClass;
+        private myPrivateProperty;
+    }
+    export declare class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty;
+        myPublicProperty: publicClass;
+        private myPrivateProperty;
+    }
+    export declare var publicVarWithPrivatePropertyTypes: privateClass;
+    export declare var publicVarWithPublicPropertyTypes: publicClass;
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    export declare class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    export declare var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    export declare module publicModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+        interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+        class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: privateClass;
+            private myPrivateProperty;
+        }
+        class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: publicClass;
+            private myPrivateProperty;
+        }
+        var publicVarWithPrivatePropertyTypes: privateClass;
+        var publicVarWithPublicPropertyTypes: publicClass;
+        var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+        var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+    declare module privateModule {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+        interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+        class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: privateClass;
+            private myPrivateProperty;
+        }
+        class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: publicClass;
+            private myPrivateProperty;
+        }
+        var publicVarWithPrivatePropertyTypes: privateClass;
+        var publicVarWithPublicPropertyTypes: publicClass;
+        var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+        var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+    export {};
+    
+==== tests/cases/compiler/privacyVarDeclFile_GlobalFile.d.ts (0 errors) ====
+    declare class publicClassInGlobal {
+    }
+    interface publicInterfaceWithPublicPropertyTypesInGlobal {
+        myProperty: publicClassInGlobal;
+    }
+    declare class publicClassWithWithPublicPropertyTypesInGlobal {
+        static myPublicStaticProperty: publicClassInGlobal;
+        private static myPrivateStaticProperty;
+        myPublicProperty: publicClassInGlobal;
+        private myPrivateProperty;
+    }
+    declare var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+    declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+    declare module publicModuleInGlobal {
+        class privateClass {
+        }
+        class publicClass {
+        }
+        module privateModule {
+            class privateClass {
+            }
+            class publicClass {
+            }
+            interface publicInterfaceWithPrivatePropertyTypes {
+                myProperty: privateClass;
+            }
+            interface publicInterfaceWithPublicPropertyTypes {
+                myProperty: publicClass;
+            }
+            class publicClassWithWithPrivatePropertyTypes {
+                static myPublicStaticProperty: privateClass;
+                private static myPrivateStaticProperty;
+                myPublicProperty: privateClass;
+                private myPrivateProperty;
+            }
+            class publicClassWithWithPublicPropertyTypes {
+                static myPublicStaticProperty: publicClass;
+                private static myPrivateStaticProperty;
+                myPublicProperty: publicClass;
+                private myPrivateProperty;
+            }
+            var publicVarWithPrivatePropertyTypes: privateClass;
+            var publicVarWithPublicPropertyTypes: publicClass;
+            var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+            var publicAmbientVarWithPublicPropertyTypes: publicClass;
+            interface publicInterfaceWithPrivateModulePropertyTypes {
+                myProperty: privateModule.publicClass;
+            }
+            class publicClassWithPrivateModulePropertyTypes {
+                static myPublicStaticProperty: privateModule.publicClass;
+                myPublicProperty: privateModule.publicClass;
+            }
+            var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+            var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        }
+        interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+        interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+        class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: privateClass;
+            private myPrivateProperty;
+        }
+        class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty;
+            myPublicProperty: publicClass;
+            private myPrivateProperty;
+        }
+        var publicVarWithPrivatePropertyTypes: privateClass;
+        var publicVarWithPublicPropertyTypes: publicClass;
+        var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+        var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index f3d56637b181c..c7a42b2f309bc 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -2,7 +2,7 @@
 // Repro from #14896
 
 type Attributes<Keys extends keyof any> = {
->Attributes : { [Key in Keys]: string; }
+>Attributes : Attributes<Keys>
 >Keys : Keys
 
     [Key in Keys]: string;
@@ -13,13 +13,13 @@ type Attributes<Keys extends keyof any> = {
 class Query<A extends Attributes<keyof A>> {
 >Query : Query<A>
 >A : A
->Attributes : { [Key in Keys]: string; }
+>Attributes : Attributes<Keys>
 >A : A
 
     multiply<B extends Attributes<keyof B>>(x: B): Query<A & B>;
->multiply : <B extends { [Key in keyof B]: string; }>(x: B) => Query<A & B>
+>multiply : <B extends Attributes<keyof B>>(x: B) => Query<A & B>
 >B : B
->Attributes : { [Key in Keys]: string; }
+>Attributes : Attributes<Keys>
 >B : B
 >x : B
 >B : B
@@ -36,48 +36,48 @@ type ClassName<S> = keyof S;
 >S : S
 
 type ClassNameMap<S> = { [K in keyof S]?: boolean }
->ClassNameMap : { [K in keyof S]?: boolean; }
+>ClassNameMap : ClassNameMap<S>
 >S : S
 >K : K
 >S : S
 
 type ClassNameObjectMap<S> = object & ClassNameMap<S>;
->ClassNameObjectMap : object & { [K in keyof S]?: boolean; }
+>ClassNameObjectMap : ClassNameObjectMap<S>
 >S : S
->ClassNameMap : { [K in keyof S]?: boolean; }
+>ClassNameMap : ClassNameMap<S>
 >S : S
 
 type ClassNameArg<S> = ClassName<S> | ClassNameObjectMap<S>;
->ClassNameArg : keyof S | (object & { [K in keyof S]?: boolean; })
+>ClassNameArg : ClassNameArg<S>
 >S : S
 >ClassName : keyof S
 >S : S
->ClassNameObjectMap : object & { [K in keyof S]?: boolean; }
+>ClassNameObjectMap : ClassNameObjectMap<S>
 >S : S
 
 export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNames: ClassNameArg<S>[]): string {
->css : <S extends { [K in keyof S]: string; }>(styles: S, ...classNames: (keyof S | (object & { [K in keyof S]?: boolean; }))[]) => string
+>css : <S extends { [K in keyof S]: string; }>(styles: S, ...classNames: ClassNameArg<S>[]) => string
 >S : S
 >K : K
 >S : S
 >styles : S
 >S : S
->classNames : (keyof S | (object & { [K in keyof S]?: boolean; }))[]
->ClassNameArg : keyof S | (object & { [K in keyof S]?: boolean; })
+>classNames : ClassNameArg<S>[]
+>ClassNameArg : ClassNameArg<S>
 >S : S
 
   const args = classNames.map(arg => {
 >args : any[]
 >classNames.map(arg => {    if (arg == null) {      return null;    }    if (typeof arg == "string") {      return styles[arg];    }    if (typeof arg == "object") {      return Object.keys(arg).reduce<ClassNameObject>((obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      }, {});    }  }) : any[]
->classNames.map : <U>(callbackfn: (value: keyof S | (object & { [K in keyof S]?: boolean; }), index: number, array: (keyof S | (object & { [K in keyof S]?: boolean; }))[]) => U, thisArg?: any) => U[]
->classNames : (keyof S | (object & { [K in keyof S]?: boolean; }))[]
->map : <U>(callbackfn: (value: keyof S | (object & { [K in keyof S]?: boolean; }), index: number, array: (keyof S | (object & { [K in keyof S]?: boolean; }))[]) => U, thisArg?: any) => U[]
->arg => {    if (arg == null) {      return null;    }    if (typeof arg == "string") {      return styles[arg];    }    if (typeof arg == "object") {      return Object.keys(arg).reduce<ClassNameObject>((obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      }, {});    }  } : (arg: keyof S | (object & { [K in keyof S]?: boolean; })) => any
->arg : keyof S | (object & { [K in keyof S]?: boolean; })
+>classNames.map : <U>(callbackfn: (value: ClassNameArg<S>, index: number, array: ClassNameArg<S>[]) => U, thisArg?: any) => U[]
+>classNames : ClassNameArg<S>[]
+>map : <U>(callbackfn: (value: ClassNameArg<S>, index: number, array: ClassNameArg<S>[]) => U, thisArg?: any) => U[]
+>arg => {    if (arg == null) {      return null;    }    if (typeof arg == "string") {      return styles[arg];    }    if (typeof arg == "object") {      return Object.keys(arg).reduce<ClassNameObject>((obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      }, {});    }  } : (arg: ClassNameArg<S>) => any
+>arg : ClassNameArg<S>
 
     if (arg == null) {
 >arg == null : boolean
->arg : keyof S | (object & { [K in keyof S]?: boolean; })
+>arg : ClassNameArg<S>
 >null : null
 
       return null;
@@ -86,7 +86,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
     if (typeof arg == "string") {
 >typeof arg == "string" : boolean
 >typeof arg : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
->arg : keyof S | (object & { [K in keyof S]?: boolean; })
+>arg : ClassNameArg<S>
 >"string" : "string"
 
       return styles[arg];
@@ -97,7 +97,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
     if (typeof arg == "object") {
 >typeof arg == "object" : boolean
 >typeof arg : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
->arg : keyof S | (object & { [K in keyof S]?: boolean; })
+>arg : ClassNameArg<S>
 >"object" : "object"
 
       return Object.keys(arg).reduce<ClassNameObject>((obj: ClassNameObject, key: keyof S) => {
@@ -107,7 +107,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >Object.keys : (o: {}) => string[]
 >Object : ObjectConstructor
 >keys : (o: {}) => string[]
->arg : object & { [K in keyof S]?: boolean; }
+>arg : ClassNameObjectMap<S>
 >reduce : { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; <U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U; }
 >ClassNameObject : No type information available!
 >(obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      } : (obj: any, key: keyof S) => any
@@ -123,15 +123,15 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >key : keyof S
 
         obj[exportedClassName] = (arg as ClassNameMap<S>)[key]; 
->obj[exportedClassName] = (arg as ClassNameMap<S>)[key] : { [K in keyof S]?: boolean; }[keyof S]
+>obj[exportedClassName] = (arg as ClassNameMap<S>)[key] : ClassNameMap<S>[keyof S]
 >obj[exportedClassName] : any
 >obj : any
 >exportedClassName : S[keyof S]
->(arg as ClassNameMap<S>)[key] : { [K in keyof S]?: boolean; }[keyof S]
->(arg as ClassNameMap<S>) : { [K in keyof S]?: boolean; }
->arg as ClassNameMap<S> : { [K in keyof S]?: boolean; }
->arg : object & { [K in keyof S]?: boolean; }
->ClassNameMap : { [K in keyof S]?: boolean; }
+>(arg as ClassNameMap<S>)[key] : ClassNameMap<S>[keyof S]
+>(arg as ClassNameMap<S>) : ClassNameMap<S>
+>arg as ClassNameMap<S> : ClassNameMap<S>
+>arg : ClassNameObjectMap<S>
+>ClassNameMap : ClassNameMap<S>
 >S : S
 >key : keyof S
 
diff --git a/tests/baselines/reference/strictFunctionTypesErrors.types b/tests/baselines/reference/strictFunctionTypesErrors.types
index 1890279258ca9..89d70f3f3d72f 100644
--- a/tests/baselines/reference/strictFunctionTypesErrors.types
+++ b/tests/baselines/reference/strictFunctionTypesErrors.types
@@ -83,7 +83,7 @@ f4 = f3;  // Error
 >f3 : (x: string) => Object
 
 type Func<T, U> = (x: T) => U;
->Func : (x: T) => U
+>Func : Func<T, U>
 >T : T
 >U : U
 >x : T
@@ -91,252 +91,252 @@ type Func<T, U> = (x: T) => U;
 >U : U
 
 declare let g1: Func<Object, Object>;
->g1 : (x: Object) => Object
->Func : (x: T) => U
+>g1 : Func<Object, Object>
+>Func : Func<T, U>
 >Object : Object
 >Object : Object
 
 declare let g2: Func<Object, string>;
->g2 : (x: Object) => string
->Func : (x: T) => U
+>g2 : Func<Object, string>
+>Func : Func<T, U>
 >Object : Object
 
 declare let g3: Func<string, Object>;
->g3 : (x: string) => Object
->Func : (x: T) => U
+>g3 : Func<string, Object>
+>Func : Func<T, U>
 >Object : Object
 
 declare let g4: Func<string, string>;
->g4 : (x: string) => string
->Func : (x: T) => U
+>g4 : Func<string, string>
+>Func : Func<T, U>
 
 g1 = g2;  // Ok
->g1 = g2 : (x: Object) => string
->g1 : (x: Object) => Object
->g2 : (x: Object) => string
+>g1 = g2 : Func<Object, string>
+>g1 : Func<Object, Object>
+>g2 : Func<Object, string>
 
 g1 = g3;  // Error
->g1 = g3 : (x: string) => Object
->g1 : (x: Object) => Object
->g3 : (x: string) => Object
+>g1 = g3 : Func<string, Object>
+>g1 : Func<Object, Object>
+>g3 : Func<string, Object>
 
 g1 = g4;  // Error
->g1 = g4 : (x: string) => string
->g1 : (x: Object) => Object
->g4 : (x: string) => string
+>g1 = g4 : Func<string, string>
+>g1 : Func<Object, Object>
+>g4 : Func<string, string>
 
 g2 = g1;  // Error
->g2 = g1 : (x: Object) => Object
->g2 : (x: Object) => string
->g1 : (x: Object) => Object
+>g2 = g1 : Func<Object, Object>
+>g2 : Func<Object, string>
+>g1 : Func<Object, Object>
 
 g2 = g3;  // Error
->g2 = g3 : (x: string) => Object
->g2 : (x: Object) => string
->g3 : (x: string) => Object
+>g2 = g3 : Func<string, Object>
+>g2 : Func<Object, string>
+>g3 : Func<string, Object>
 
 g2 = g4;  // Error
->g2 = g4 : (x: string) => string
->g2 : (x: Object) => string
->g4 : (x: string) => string
+>g2 = g4 : Func<string, string>
+>g2 : Func<Object, string>
+>g4 : Func<string, string>
 
 g3 = g1;  // Ok
->g3 = g1 : (x: Object) => Object
->g3 : (x: string) => Object
->g1 : (x: Object) => Object
+>g3 = g1 : Func<Object, Object>
+>g3 : Func<string, Object>
+>g1 : Func<Object, Object>
 
 g3 = g2;  // Ok
->g3 = g2 : (x: Object) => string
->g3 : (x: string) => Object
->g2 : (x: Object) => string
+>g3 = g2 : Func<Object, string>
+>g3 : Func<string, Object>
+>g2 : Func<Object, string>
 
 g3 = g4;  // Ok
->g3 = g4 : (x: string) => string
->g3 : (x: string) => Object
->g4 : (x: string) => string
+>g3 = g4 : Func<string, string>
+>g3 : Func<string, Object>
+>g4 : Func<string, string>
 
 g4 = g1;  // Error
->g4 = g1 : (x: Object) => Object
->g4 : (x: string) => string
->g1 : (x: Object) => Object
+>g4 = g1 : Func<Object, Object>
+>g4 : Func<string, string>
+>g1 : Func<Object, Object>
 
 g4 = g2;  // Ok
->g4 = g2 : (x: Object) => string
->g4 : (x: string) => string
->g2 : (x: Object) => string
+>g4 = g2 : Func<Object, string>
+>g4 : Func<string, string>
+>g2 : Func<Object, string>
 
 g4 = g3;  // Error
->g4 = g3 : (x: string) => Object
->g4 : (x: string) => string
->g3 : (x: string) => Object
+>g4 = g3 : Func<string, Object>
+>g4 : Func<string, string>
+>g3 : Func<string, Object>
 
 declare let h1: Func<Func<Object, void>, Object>;
->h1 : (x: Func) => Object
->Func : (x: T) => U
->Func : (x: T) => U
+>h1 : Func<Func<Object, void>, Object>
+>Func : Func<T, U>
+>Func : Func<T, U>
 >Object : Object
 >Object : Object
 
 declare let h2: Func<Func<Object, void>, string>;
->h2 : (x: Func) => string
->Func : (x: T) => U
->Func : (x: T) => U
+>h2 : Func<Func<Object, void>, string>
+>Func : Func<T, U>
+>Func : Func<T, U>
 >Object : Object
 
 declare let h3: Func<Func<string, void>, Object>;
->h3 : (x: Func) => Object
->Func : (x: T) => U
->Func : (x: T) => U
+>h3 : Func<Func<string, void>, Object>
+>Func : Func<T, U>
+>Func : Func<T, U>
 >Object : Object
 
 declare let h4: Func<Func<string, void>, string>;
->h4 : (x: Func) => string
->Func : (x: T) => U
->Func : (x: T) => U
+>h4 : Func<Func<string, void>, string>
+>Func : Func<T, U>
+>Func : Func<T, U>
 
 h1 = h2;  // Ok
->h1 = h2 : (x: Func) => string
->h1 : (x: Func) => Object
->h2 : (x: Func) => string
+>h1 = h2 : Func<Func<Object, void>, string>
+>h1 : Func<Func<Object, void>, Object>
+>h2 : Func<Func<Object, void>, string>
 
 h1 = h3;  // Ok
->h1 = h3 : (x: Func) => Object
->h1 : (x: Func) => Object
->h3 : (x: Func) => Object
+>h1 = h3 : Func<Func<string, void>, Object>
+>h1 : Func<Func<Object, void>, Object>
+>h3 : Func<Func<string, void>, Object>
 
 h1 = h4;  // Ok
->h1 = h4 : (x: Func) => string
->h1 : (x: Func) => Object
->h4 : (x: Func) => string
+>h1 = h4 : Func<Func<string, void>, string>
+>h1 : Func<Func<Object, void>, Object>
+>h4 : Func<Func<string, void>, string>
 
 h2 = h1;  // Error
->h2 = h1 : (x: Func) => Object
->h2 : (x: Func) => string
->h1 : (x: Func) => Object
+>h2 = h1 : Func<Func<Object, void>, Object>
+>h2 : Func<Func<Object, void>, string>
+>h1 : Func<Func<Object, void>, Object>
 
 h2 = h3;  // Error
->h2 = h3 : (x: Func) => Object
->h2 : (x: Func) => string
->h3 : (x: Func) => Object
+>h2 = h3 : Func<Func<string, void>, Object>
+>h2 : Func<Func<Object, void>, string>
+>h3 : Func<Func<string, void>, Object>
 
 h2 = h4;  // Ok
->h2 = h4 : (x: Func) => string
->h2 : (x: Func) => string
->h4 : (x: Func) => string
+>h2 = h4 : Func<Func<string, void>, string>
+>h2 : Func<Func<Object, void>, string>
+>h4 : Func<Func<string, void>, string>
 
 h3 = h1;  // Error
->h3 = h1 : (x: Func) => Object
->h3 : (x: Func) => Object
->h1 : (x: Func) => Object
+>h3 = h1 : Func<Func<Object, void>, Object>
+>h3 : Func<Func<string, void>, Object>
+>h1 : Func<Func<Object, void>, Object>
 
 h3 = h2;  // Error
->h3 = h2 : (x: Func) => string
->h3 : (x: Func) => Object
->h2 : (x: Func) => string
+>h3 = h2 : Func<Func<Object, void>, string>
+>h3 : Func<Func<string, void>, Object>
+>h2 : Func<Func<Object, void>, string>
 
 h3 = h4;  // Ok
->h3 = h4 : (x: Func) => string
->h3 : (x: Func) => Object
->h4 : (x: Func) => string
+>h3 = h4 : Func<Func<string, void>, string>
+>h3 : Func<Func<string, void>, Object>
+>h4 : Func<Func<string, void>, string>
 
 h4 = h1;  // Error
->h4 = h1 : (x: Func) => Object
->h4 : (x: Func) => string
->h1 : (x: Func) => Object
+>h4 = h1 : Func<Func<Object, void>, Object>
+>h4 : Func<Func<string, void>, string>
+>h1 : Func<Func<Object, void>, Object>
 
 h4 = h2;  // Error
->h4 = h2 : (x: Func) => string
->h4 : (x: Func) => string
->h2 : (x: Func) => string
+>h4 = h2 : Func<Func<Object, void>, string>
+>h4 : Func<Func<string, void>, string>
+>h2 : Func<Func<Object, void>, string>
 
 h4 = h3;  // Error
->h4 = h3 : (x: Func) => Object
->h4 : (x: Func) => string
->h3 : (x: Func) => Object
+>h4 = h3 : Func<Func<string, void>, Object>
+>h4 : Func<Func<string, void>, string>
+>h3 : Func<Func<string, void>, Object>
 
 declare let i1: Func<Object, Func<Object, void>>;
->i1 : (x: Object) => Func
->Func : (x: T) => U
+>i1 : Func<Object, Func<Object, void>>
+>Func : Func<T, U>
 >Object : Object
->Func : (x: T) => U
+>Func : Func<T, U>
 >Object : Object
 
 declare let i2: Func<Object, Func<string, void>>;
->i2 : (x: Object) => Func
->Func : (x: T) => U
+>i2 : Func<Object, Func<string, void>>
+>Func : Func<T, U>
 >Object : Object
->Func : (x: T) => U
+>Func : Func<T, U>
 
 declare let i3: Func<string, Func<Object, void>>;
->i3 : (x: string) => Func
->Func : (x: T) => U
->Func : (x: T) => U
+>i3 : Func<string, Func<Object, void>>
+>Func : Func<T, U>
+>Func : Func<T, U>
 >Object : Object
 
 declare let i4: Func<string, Func<string, void>>;
->i4 : (x: string) => Func
->Func : (x: T) => U
->Func : (x: T) => U
+>i4 : Func<string, Func<string, void>>
+>Func : Func<T, U>
+>Func : Func<T, U>
 
 i1 = i2;  // Error
->i1 = i2 : (x: Object) => Func
->i1 : (x: Object) => Func
->i2 : (x: Object) => Func
+>i1 = i2 : Func<Object, Func<string, void>>
+>i1 : Func<Object, Func<Object, void>>
+>i2 : Func<Object, Func<string, void>>
 
 i1 = i3;  // Error
->i1 = i3 : (x: string) => Func
->i1 : (x: Object) => Func
->i3 : (x: string) => Func
+>i1 = i3 : Func<string, Func<Object, void>>
+>i1 : Func<Object, Func<Object, void>>
+>i3 : Func<string, Func<Object, void>>
 
 i1 = i4;  // Error
->i1 = i4 : (x: string) => Func
->i1 : (x: Object) => Func
->i4 : (x: string) => Func
+>i1 = i4 : Func<string, Func<string, void>>
+>i1 : Func<Object, Func<Object, void>>
+>i4 : Func<string, Func<string, void>>
 
 i2 = i1;  // Ok
->i2 = i1 : (x: Object) => Func
->i2 : (x: Object) => Func
->i1 : (x: Object) => Func
+>i2 = i1 : Func<Object, Func<Object, void>>
+>i2 : Func<Object, Func<string, void>>
+>i1 : Func<Object, Func<Object, void>>
 
 i2 = i3;  // Error
->i2 = i3 : (x: string) => Func
->i2 : (x: Object) => Func
->i3 : (x: string) => Func
+>i2 = i3 : Func<string, Func<Object, void>>
+>i2 : Func<Object, Func<string, void>>
+>i3 : Func<string, Func<Object, void>>
 
 i2 = i4;  // Error
->i2 = i4 : (x: string) => Func
->i2 : (x: Object) => Func
->i4 : (x: string) => Func
+>i2 = i4 : Func<string, Func<string, void>>
+>i2 : Func<Object, Func<string, void>>
+>i4 : Func<string, Func<string, void>>
 
 i3 = i1;  // Ok
->i3 = i1 : (x: Object) => Func
->i3 : (x: string) => Func
->i1 : (x: Object) => Func
+>i3 = i1 : Func<Object, Func<Object, void>>
+>i3 : Func<string, Func<Object, void>>
+>i1 : Func<Object, Func<Object, void>>
 
 i3 = i2;  // Error
->i3 = i2 : (x: Object) => Func
->i3 : (x: string) => Func
->i2 : (x: Object) => Func
+>i3 = i2 : Func<Object, Func<string, void>>
+>i3 : Func<string, Func<Object, void>>
+>i2 : Func<Object, Func<string, void>>
 
 i3 = i4;  // Error
->i3 = i4 : (x: string) => Func
->i3 : (x: string) => Func
->i4 : (x: string) => Func
+>i3 = i4 : Func<string, Func<string, void>>
+>i3 : Func<string, Func<Object, void>>
+>i4 : Func<string, Func<string, void>>
 
 i4 = i1;  // Ok
->i4 = i1 : (x: Object) => Func
->i4 : (x: string) => Func
->i1 : (x: Object) => Func
+>i4 = i1 : Func<Object, Func<Object, void>>
+>i4 : Func<string, Func<string, void>>
+>i1 : Func<Object, Func<Object, void>>
 
 i4 = i2;  // Ok
->i4 = i2 : (x: Object) => Func
->i4 : (x: string) => Func
->i2 : (x: Object) => Func
+>i4 = i2 : Func<Object, Func<string, void>>
+>i4 : Func<string, Func<string, void>>
+>i2 : Func<Object, Func<string, void>>
 
 i4 = i3;  // Ok
->i4 = i3 : (x: string) => Func
->i4 : (x: string) => Func
->i3 : (x: string) => Func
+>i4 = i3 : Func<string, Func<Object, void>>
+>i4 : Func<string, Func<string, void>>
+>i3 : Func<string, Func<Object, void>>
 
 interface Animal { animal: void }
 >Animal : Animal
diff --git a/tests/baselines/reference/symbolDeclarationEmit12.errors.txt b/tests/baselines/reference/symbolDeclarationEmit12.errors.txt
index 3052065ebe63a..d9759c00f6de2 100644
--- a/tests/baselines/reference/symbolDeclarationEmit12.errors.txt
+++ b/tests/baselines/reference/symbolDeclarationEmit12.errors.txt
@@ -1,27 +1,17 @@
-tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(4,28): error TS4031: Public property '[Symbol.iterator]' of exported class has or is using private name 'I'.
 tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(5,9): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
-tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(5,33): error TS4073: Parameter 'x' of public method from exported class has or is using private name 'I'.
-tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(6,40): error TS4055: Return type of public method from exported class has or is using private name 'I'.
 tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(9,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
 tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
-tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,37): error TS4037: Parameter type of public setter '[Symbol.toPrimitive]' from exported class has or is using private name 'I'.
 
 
-==== tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts (7 errors) ====
+==== tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts (3 errors) ====
     module M {
         interface I { }
         export class C {
             [Symbol.iterator]: I;
-                               ~
-!!! error TS4031: Public property '[Symbol.iterator]' of exported class has or is using private name 'I'.
             [Symbol.toPrimitive](x: I) { }
             ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
-                                    ~
-!!! error TS4073: Parameter 'x' of public method from exported class has or is using private name 'I'.
             [Symbol.isConcatSpreadable](): I {
-                                           ~
-!!! error TS4055: Return type of public method from exported class has or is using private name 'I'.
                 return undefined
             }
             get [Symbol.toPrimitive]() { return undefined; }
@@ -30,7 +20,5 @@ tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,37): error TS4
             set [Symbol.toPrimitive](x: I) { }
                 ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
-                                        ~
-!!! error TS4037: Parameter type of public setter '[Symbol.toPrimitive]' from exported class has or is using private name 'I'.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js
index bd50f6566acca..d700f9ac51092 100644
--- a/tests/baselines/reference/symbolDeclarationEmit12.js
+++ b/tests/baselines/reference/symbolDeclarationEmit12.js
@@ -25,3 +25,17 @@ var M;
     }
     M.C = C;
 })(M || (M = {}));
+
+
+//// [symbolDeclarationEmit12.d.ts]
+declare module M {
+    interface I {
+    }
+    class C {
+        [Symbol.iterator]: I;
+        [Symbol.toPrimitive](x: I): void;
+        [Symbol.isConcatSpreadable](): I;
+        readonly [Symbol.toPrimitive]: any;
+        [Symbol.toPrimitive]: I;
+    }
+}
diff --git a/tests/baselines/reference/tsxAttributeResolution16.types b/tests/baselines/reference/tsxAttributeResolution16.types
index c7f13ca509691..77037e166dc5b 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.types
+++ b/tests/baselines/reference/tsxAttributeResolution16.types
@@ -29,16 +29,16 @@ interface AmericanAddress extends Address {
 }
 
 type Properties = CanadianAddress | AmericanAddress;
->Properties : CanadianAddress | AmericanAddress
+>Properties : Properties
 >CanadianAddress : CanadianAddress
 >AmericanAddress : AmericanAddress
 
 export class AddressComp extends React.Component<Properties, void> {
 >AddressComp : AddressComp
->React.Component : React.Component<CanadianAddress | AmericanAddress, void>
+>React.Component : React.Component<Properties, void>
 >React : typeof React
 >Component : typeof React.Component
->Properties : CanadianAddress | AmericanAddress
+>Properties : Properties
 
   public render() {
 >render : () => any
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.types b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
index d5e40bdf278d8..b622b301a9e8c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
@@ -3,7 +3,7 @@ import React = require('react');
 >React : typeof React
 
 type TextProps = { editable: false }
->TextProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
+>TextProps : TextProps
 >editable : false
 >false : false
 
@@ -15,10 +15,10 @@ type TextProps = { editable: false }
 
 class TextComponent extends React.Component<TextProps, {}> {
 >TextComponent : TextComponent
->React.Component : React.Component<{ editable: false; } | { editable: true; onEdit: (newText: string) => void; }, {}>
+>React.Component : React.Component<TextProps, {}>
 >React : typeof React
 >Component : typeof React.Component
->TextProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
+>TextProps : TextProps
 
     render() {
 >render : () => JSX.Element
@@ -39,8 +39,8 @@ let x = <TextComponent editable={true} />
 >true : true
 
 const textProps: TextProps = {
->textProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
->TextProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
+>textProps : TextProps
+>TextProps : TextProps
 >{    editable: false} : { editable: false; }
 
     editable: false
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.types b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
index 4275b5301f8aa..507740864006d 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
@@ -3,7 +3,7 @@ import React = require('react');
 >React : typeof React
 
 type TextProps = { editable: false }
->TextProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
+>TextProps : TextProps
 >editable : false
 >false : false
 
@@ -15,10 +15,10 @@ type TextProps = { editable: false }
 
 class TextComponent extends React.Component<TextProps, {}> {
 >TextComponent : TextComponent
->React.Component : React.Component<{ editable: false; } | { editable: true; onEdit: (newText: string) => void; }, {}>
+>React.Component : React.Component<TextProps, {}>
 >React : typeof React
 >Component : typeof React.Component
->TextProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
+>TextProps : TextProps
 
     render() {
 >render : () => JSX.Element
@@ -32,8 +32,8 @@ class TextComponent extends React.Component<TextProps, {}> {
 
 // OK
 const textPropsFalse: TextProps = {
->textPropsFalse : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
->TextProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
+>textPropsFalse : TextProps
+>TextProps : TextProps
 >{    editable: false} : { editable: false; }
 
     editable: false
@@ -49,8 +49,8 @@ let y1 = <TextComponent {...textPropsFalse} />
 >textPropsFalse : { editable: false; }
 
 const textPropsTrue: TextProps = {
->textPropsTrue : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
->TextProps : { editable: false; } | { editable: true; onEdit: (newText: string) => void; }
+>textPropsTrue : TextProps
+>TextProps : TextProps
 >{    editable: true,    onEdit: () => {}} : { editable: true; onEdit: () => void; }
 
     editable: true,
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.types b/tests/baselines/reference/tsxUnionTypeComponent2.types
index 9a0bcc5bd887f..140ac094a0606 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.types
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.types
@@ -3,13 +3,13 @@ import React = require('react');
 >React : typeof React
 
 type Invalid1 = React.ComponentClass<any> | number;
->Invalid1 : number | React.ComponentClass<any>
+>Invalid1 : Invalid1
 >React : any
 >ComponentClass : React.ComponentClass<P>
 
 const X: Invalid1 = 1;
->X : number | React.ComponentClass<any>
->Invalid1 : number | React.ComponentClass<any>
+>X : Invalid1
+>Invalid1 : Invalid1
 >1 : 1
 
 <X />;
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.errors.txt b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.errors.txt
deleted file mode 100644
index a9ac1bc824e89..0000000000000
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.errors.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsErrors.ts(6,14): error TS2527: The inferred type of 'obj' references an inaccessible 'unique symbol' type. A type annotation is necessary.
-tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsErrors.ts(15,14): error TS2527: The inferred type of 'classExpression' references an inaccessible 'unique symbol' type. A type annotation is necessary.
-
-
-==== tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsErrors.ts (2 errors) ====
-    declare const s: unique symbol;
-    interface I { readonly readonlyType: unique symbol; }
-    
-    // not allowed when emitting declarations
-    
-    export const obj = {
-                 ~~~
-!!! error TS2527: The inferred type of 'obj' references an inaccessible 'unique symbol' type. A type annotation is necessary.
-        method1(p: typeof s): typeof s {
-            return p;
-        },
-        method2(p: I["readonlyType"]): I["readonlyType"] {
-            return p;
-        }
-    };
-    
-    export const classExpression = class {
-                 ~~~~~~~~~~~~~~~
-!!! error TS2527: The inferred type of 'classExpression' references an inaccessible 'unique symbol' type. A type annotation is necessary.
-        method1(p: typeof s): typeof s {
-            return p;
-        }
-        method2(p: I["readonlyType"]): I["readonlyType"] {
-            return p;
-        }
-    };
-    
-    export function funcInferredReturnType(obj: { method(p: typeof s): void }) {
-        return obj;
-    }
-    
-    export interface InterfaceWithPrivateNamedProperties {
-        [s]: any;
-    }
-    
-    export interface InterfaceWithPrivateNamedMethods {
-        [s](): any;
-    }
-    
-    export type TypeLiteralWithPrivateNamedProperties = {
-        [s]: any;
-    }
-    
-    export type TypeLiteralWithPrivateNamedMethods = {
-        [s](): any;
-    }
-    
-    export class ClassWithPrivateNamedProperties {
-        [s]: any;
-        static [s]: any;
-    }
-    
-    export class ClassWithPrivateNamedMethods {
-        [s]() {}
-        static [s]() {}
-    }
-    
-    export class ClassWithPrivateNamedAccessors {
-        get [s](): any { return undefined; }
-        set [s](v: any) { }
-        static get [s](): any { return undefined; }
-        static set [s](v: any) { }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js
index a446a6712a4d0..871d8977a9de2 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js
@@ -98,3 +98,50 @@ class ClassWithPrivateNamedAccessors {
     static set [s](v) { }
 }
 exports.ClassWithPrivateNamedAccessors = ClassWithPrivateNamedAccessors;
+
+
+//// [uniqueSymbolsDeclarationsErrors.d.ts]
+declare const s: unique symbol;
+interface I {
+    readonly readonlyType: unique symbol;
+}
+export declare const obj: {
+    method1(p: typeof s): typeof s;
+    method2(p: I["readonlyType"]): I["readonlyType"];
+};
+export declare const classExpression: {
+    new (): {
+        method1(p: typeof s): typeof s;
+        method2(p: I["readonlyType"]): I["readonlyType"];
+    };
+};
+export declare function funcInferredReturnType(obj: {
+    method(p: typeof s): void;
+}): {
+    method(p: typeof s): void;
+};
+export interface InterfaceWithPrivateNamedProperties {
+    [s]: any;
+}
+export interface InterfaceWithPrivateNamedMethods {
+    [s](): any;
+}
+export declare type TypeLiteralWithPrivateNamedProperties = {
+    [s]: any;
+};
+export declare type TypeLiteralWithPrivateNamedMethods = {
+    [s](): any;
+};
+export declare class ClassWithPrivateNamedProperties {
+    [s]: any;
+    static [s]: any;
+}
+export declare class ClassWithPrivateNamedMethods {
+    [s](): void;
+    static [s](): void;
+}
+export declare class ClassWithPrivateNamedAccessors {
+    [s]: any;
+    static [s]: any;
+}
+export {};
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types
index e0c93dc2adfc0..763bb02575e82 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/unusedLocalsAndParametersTypeAliases.ts ===
 // used in a declaration
 type handler1 = () => void;
->handler1 : () => void
+>handler1 : handler1
 
 export interface I1 {
 >I1 : I1
 
     getHandler: handler1;
->getHandler : () => void
->handler1 : () => void
+>getHandler : handler1
+>handler1 : handler1
 }
 
 // exported
@@ -17,12 +17,12 @@ export type handler2 = () => void;
 
 // used in extends clause
 type handler3 = () => void;
->handler3 : () => void
+>handler3 : handler3
 
 export interface I3<T extends handler3> {
 >I3 : I3<T>
 >T : T
->handler3 : () => void
+>handler3 : handler3
 
     getHandler: T;
 >getHandler : T
@@ -31,32 +31,32 @@ export interface I3<T extends handler3> {
 
 // used in another type alias declaration
 type handler4 = () => void;
->handler4 : () => void
+>handler4 : handler4
 
 type handler5 = handler4 | (()=>number);
->handler5 : (() => void) | (() => number)
->handler4 : () => void
+>handler5 : handler5
+>handler4 : handler4
 
 var x: handler5;
->x : (() => void) | (() => number)
->handler5 : (() => void) | (() => number)
+>x : handler5
+>handler5 : handler5
 
 x();
 >x() : number | void
->x : (() => void) | (() => number)
+>x : handler5
 
 // used as type argument
 type handler6 = () => void;
->handler6 : () => void
+>handler6 : handler6
 
 var y: Array<handler6>;
->y : (() => void)[]
+>y : handler6[]
 >Array : T[]
->handler6 : () => void
+>handler6 : handler6
 
 y[0]();
 >y[0]() : void
->y[0] : () => void
->y : (() => void)[]
+>y[0] : handler6
+>y : handler6[]
 >0 : 0
     
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.types b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.types
index 3ad121bedf49e..182cbc614a82f 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.types
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts ===
 // unused
 type handler1 = () => void;
->handler1 : () => void
+>handler1 : handler1
 
 
 function foo() {
diff --git a/tests/cases/fourslash/getDeclarationDiagnostics.ts b/tests/cases/fourslash/getDeclarationDiagnostics.ts
index 0dcc9fea6a692..c8c379bc3e47f 100644
--- a/tests/cases/fourslash/getDeclarationDiagnostics.ts
+++ b/tests/cases/fourslash/getDeclarationDiagnostics.ts
@@ -5,8 +5,11 @@
 
 // @Filename: inputFile1.ts
 //// module m {
-////    export class C implements I { }
-////    interface I { }
+////    export function foo() {
+////        class C implements I { }
+////        interface I { }
+////        return C;
+////    }
 //// } /*1*/
 
 // @Filename: input2.ts
diff --git a/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts b/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts
index 804abbde33bb7..7317def0a9a92 100644
--- a/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts
+++ b/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts
@@ -2,8 +2,11 @@
 
 // @module: CommonJS
 // @declaration: true
-//// interface privateInterface {}
-//// export class Bar implements /*1*/privateInterface/*2*/{ }
+//// export function /*1*/foo/*2*/() {
+////     interface privateInterface {}
+////     class Bar implements privateInterface { }
+////     return Bar;
+//// }
 
 verify.errorExistsBetweenMarkers("1", "2");
 verify.numberOfErrorsInCurrentFile(1);
diff --git a/tests/cases/fourslash/shims-pp/getSemanticDiagnostics.ts b/tests/cases/fourslash/shims-pp/getSemanticDiagnostics.ts
index 804abbde33bb7..7317def0a9a92 100644
--- a/tests/cases/fourslash/shims-pp/getSemanticDiagnostics.ts
+++ b/tests/cases/fourslash/shims-pp/getSemanticDiagnostics.ts
@@ -2,8 +2,11 @@
 
 // @module: CommonJS
 // @declaration: true
-//// interface privateInterface {}
-//// export class Bar implements /*1*/privateInterface/*2*/{ }
+//// export function /*1*/foo/*2*/() {
+////     interface privateInterface {}
+////     class Bar implements privateInterface { }
+////     return Bar;
+//// }
 
 verify.errorExistsBetweenMarkers("1", "2");
 verify.numberOfErrorsInCurrentFile(1);
diff --git a/tests/cases/fourslash/shims/getSemanticDiagnostics.ts b/tests/cases/fourslash/shims/getSemanticDiagnostics.ts
index 804abbde33bb7..7317def0a9a92 100644
--- a/tests/cases/fourslash/shims/getSemanticDiagnostics.ts
+++ b/tests/cases/fourslash/shims/getSemanticDiagnostics.ts
@@ -2,8 +2,11 @@
 
 // @module: CommonJS
 // @declaration: true
-//// interface privateInterface {}
-//// export class Bar implements /*1*/privateInterface/*2*/{ }
+//// export function /*1*/foo/*2*/() {
+////     interface privateInterface {}
+////     class Bar implements privateInterface { }
+////     return Bar;
+//// }
 
 verify.errorExistsBetweenMarkers("1", "2");
 verify.numberOfErrorsInCurrentFile(1);