From ea7c23eb63fcf380fafc8723edbb7d1771226eaa Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 11 Jul 2014 14:44:31 -0700
Subject: [PATCH] Emit global context declarations into the declaration file

---
 src/compiler/emitter.ts                       |   55 +-
 tests/baselines/reference/commentsClass.js    |   37 +
 .../reference/commentsClassMembers.js         |   65 ++
 .../reference/commentsCommentParsing.js       |   25 +
 tests/baselines/reference/commentsEnums.js    |    5 +
 .../reference/commentsExternalModules.js      |    2 -
 tests/baselines/reference/commentsFunction.js |    5 +
 .../reference/commentsInheritance.js          |   83 ++
 .../baselines/reference/commentsInterface.js  |   43 +
 tests/baselines/reference/commentsModules.js  |   46 +
 .../commentsMultiModuleSingleFile.js          |   12 +
 .../baselines/reference/commentsOverloads.js  |  103 ++
 tests/baselines/reference/commentsVarDecl.js  |   12 +
 .../reference/commentsVariableStatement1.js   |    1 +
 .../reference/commentsdoNotEmitComments.js    |   30 +
 .../reference/commentsemitComments.js         |   30 +
 .../constructorTypeWithTypeParameters.js      |    3 +
 .../baselines/reference/declFileAccessors.js  |   10 +
 ...tExternalModuleWithSingleExportedModule.js |    6 +
 .../reference/declFileCallSignatures.js       |   19 +
 .../declFileClassWithIndexSignature.js        |    3 +
 .../reference/declFileConstructSignatures.js  |   19 +
 .../reference/declFileConstructors.js         |   30 +
 .../reference/declFileEnumUsedAsValue.js      |    6 +
 tests/baselines/reference/declFileEnums.js    |   28 +
 ...declFileForClassWithMultipleBaseClasses.js |   20 +
 ...leForClassWithPrivateOverloadedFunction.js |    5 +
 .../declFileForFunctionTypeAsTypeParameter.js |    6 +
 ...eclFileForInterfaceWithOptionalFunction.js |    4 +
 .../declFileForInterfaceWithRestParams.js     |    5 +
 .../reference/declFileForTypeParameters.js    |    4 +
 .../baselines/reference/declFileForVarList.js |    2 +
 .../baselines/reference/declFileFunctions.js  |    6 +
 ...ileGenericClassWithGenericExtendedClass.js |   13 +
 .../reference/declFileGenericType2.js         |   23 +
 ...eclFileImportedTypeUseInTypeArgPosition.js |    7 +
 .../reference/declFileIndexSignatures.js      |   13 +
 .../reference/declFileInternalAliases.js      |   11 +
 tests/baselines/reference/declFileMethods.js  |   33 +
 ...ModuleAssignmentInObjectLiteralProperty.js |    5 +
 .../reference/declFileModuleContinuation.js   |    8 +
 .../declFileModuleWithPropertyOfTypeModule.js |    5 +
 .../declFileOptionalInterfaceMethod.js        |    3 +
 .../reference/declFileRegressionTests.js      |    1 +
 ...RestParametersOfFunctionAndFunctionType.js |    6 +
 .../reference/declFileTypeofClass.js          |   12 +
 .../baselines/reference/declFileTypeofEnum.js |   12 +
 .../reference/declFileTypeofFunction.js       |   14 +
 .../declFileTypeofInAnonymousType.js          |   13 +
 .../reference/declFileTypeofModule.js         |   10 +
 ...lictingWithClassReferredByExtendsClause.js |   15 +
 ...dsClauseThatHasItsContainerNameConflict.js |   12 +
 ...rnalModuleNameConflictsInExtendsClause1.js |    8 +
 ...rnalModuleNameConflictsInExtendsClause2.js |   10 +
 ...rnalModuleNameConflictsInExtendsClause3.js |   12 +
 tests/baselines/reference/declInput-2.js      |   21 +
 tests/baselines/reference/declInput3.js       |    7 +
 tests/baselines/reference/declInput4.js       |   15 +
 ...it_array-types-from-generic-array-usage.js |    2 +
 .../declarationEmit_nameConflicts2.js         |   16 +
 .../declarationEmit_nameConflicts3.js         |   27 +
 .../reference/declareDottedModuleName.js      |    8 +
 tests/baselines/reference/enumDecl1.js        |    2 +
 tests/baselines/reference/es3-amd.js          |    4 +
 .../reference/es3-declaration-amd.js          |    4 +
 tests/baselines/reference/es5-amd.js          |    4 +
 .../reference/es5-declaration-amd.js          |    4 +
 tests/baselines/reference/funcdecl.js         |   30 +
 ...tionWithArgumentOfTypeFunctionTypeArray.js |    1 +
 .../functionExpressionReturningItself.js      |    1 +
 .../reference/functionReturningItself.js      |    1 +
 tests/baselines/reference/genericArray0.js    |    3 +
 tests/baselines/reference/genericArray1.js    |    1 +
 ...entingGenericInterfaceFromAnotherModule.js |    8 +
 tests/baselines/reference/genericClasses0.js  |    5 +
 tests/baselines/reference/genericClasses1.js  |    5 +
 tests/baselines/reference/genericClasses2.js  |   12 +
 tests/baselines/reference/genericClasses3.js  |   11 +
 .../reference/genericClassesInModule.js       |    7 +
 .../reference/genericConstraintDeclaration.js |    3 +
 .../baselines/reference/genericFunctions0.js  |    2 +
 .../baselines/reference/genericFunctions1.js  |    2 +
 .../baselines/reference/genericFunctions2.js  |    3 +
 tests/baselines/reference/generics0.js        |    5 +
 tests/baselines/reference/generics1NoError.js |   16 +
 tests/baselines/reference/generics2NoError.js |   16 +
 tests/baselines/reference/generics3.js        |   11 +
 tests/baselines/reference/generics4NoError.js |   11 +
 .../implicitAnyAnyReturningFunction.js        |    6 +
 ...citAnyDeclareFunctionWithoutFormalType2.js |    3 +
 tests/baselines/reference/interfaceOnly.js    |    4 +
 .../interfaceWithOptionalProperty.js          |    3 +
 tests/baselines/reference/interfacedecl.js    |   34 +
 .../baselines/reference/internalAliasClass.js |    7 +
 ...alAliasClassInsideLocalModuleWithExport.js |    1 -
 ...liasClassInsideLocalModuleWithoutExport.js |    1 -
 .../baselines/reference/internalAliasEnum.js  |   10 +
 .../reference/internalAliasFunction.js        |    7 +
 ...sFunctionInsideLocalModuleWithoutExport.js |    1 -
 .../internalAliasInitializedModule.js         |    9 +
 .../reference/internalAliasInterface.js       |    7 +
 .../internalAliasUninitializedModule.js       |   10 +
 tests/baselines/reference/internalAliasVar.js |    6 +
 .../methodSignatureDeclarationEmit1.js        |    5 +
 .../missingImportAfterModuleImport.js         |    3 +
 .../reference/moduleOuterQualification.js     |    2 +
 .../reference/noConstraintInReturnType1.js    |    3 +
 .../objectLiteralDeclarationGeneration1.js    |    2 +
 tests/baselines/reference/out-flag.js         |    4 +
 ...rivacyCheckTypeOfInvisibleModuleNoError.js |    3 +
 .../amd/useModule.d.ts                        |    8 +
 .../node/useModule.d.ts                       |    8 +
 .../amd/useModule.d.ts                        |    3 -
 .../node/useModule.d.ts                       |    3 -
 .../amd/useModule.d.ts                        |    3 -
 .../node/useModule.d.ts                       |    3 -
 .../amd/useModule.d.ts                        |    3 -
 .../node/useModule.d.ts                       |    3 -
 .../amd/useModule.d.ts                        |    3 -
 .../node/useModule.d.ts                       |    3 -
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../amd/m1.d.ts                               |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/m1.d.ts                              |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/test.d.ts                             |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../amd/m1.d.ts                               |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/m1.d.ts                              |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/test.d.ts                             |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../maprootUrlSimpleNoOutdir/amd/m1.d.ts      |    6 +
 .../maprootUrlSimpleNoOutdir/amd/test.d.ts    |    6 +
 .../maprootUrlSimpleNoOutdir/node/m1.d.ts     |    6 +
 .../maprootUrlSimpleNoOutdir/node/test.d.ts   |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/test.d.ts                             |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../maprootUrlSubfolderNoOutdir/amd/test.d.ts |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../amd/m1.d.ts                               |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/m1.d.ts                              |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/test.d.ts                             |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../outMixedSubfolderNoOutdir/amd/ref/m1.d.ts |    6 +
 .../outMixedSubfolderNoOutdir/amd/test.d.ts   |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../outMixedSubfolderNoOutdir/node/test.d.ts  |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../outMultifolderNoOutdir/amd/diskFile1.d.ts |    6 +
 .../outMultifolderNoOutdir/amd/ref/m1.d.ts    |    6 +
 .../outMultifolderNoOutdir/amd/test.d.ts      |    6 +
 .../node/diskFile1.d.ts                       |    6 +
 .../outMultifolderNoOutdir/node/ref/m1.d.ts   |    6 +
 .../outMultifolderNoOutdir/node/test.d.ts     |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../project/outSimpleNoOutdir/amd/m1.d.ts     |    6 +
 .../project/outSimpleNoOutdir/amd/test.d.ts   |    6 +
 .../project/outSimpleNoOutdir/node/m1.d.ts    |    6 +
 .../project/outSimpleNoOutdir/node/test.d.ts  |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../outSingleFileNoOutdir/amd/test.d.ts       |    6 +
 .../outSingleFileNoOutdir/node/test.d.ts      |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../outSubfolderNoOutdir/amd/ref/m1.d.ts      |    6 +
 .../outSubfolderNoOutdir/amd/test.d.ts        |    6 +
 .../outSubfolderNoOutdir/node/ref/m1.d.ts     |    6 +
 .../outSubfolderNoOutdir/node/test.d.ts       |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/li'b/class'A.d.ts                     |    5 +
 .../amd/m'ain.d.ts                            |    2 +
 .../node/li'b/class'A.d.ts                    |    5 +
 .../node/m'ain.d.ts                           |    2 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../amd/m1.d.ts                               |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/m1.d.ts                              |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/test.d.ts                             |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../amd/m1.d.ts                               |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/m1.d.ts                              |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/test.d.ts                             |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../sourcemapSimpleNoOutdir/amd/m1.d.ts       |    6 +
 .../sourcemapSimpleNoOutdir/amd/test.d.ts     |    6 +
 .../sourcemapSimpleNoOutdir/node/m1.d.ts      |    6 +
 .../sourcemapSimpleNoOutdir/node/test.d.ts    |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../sourcemapSingleFileNoOutdir/amd/test.d.ts |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../sourcemapSubfolderNoOutdir/amd/test.d.ts  |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../sourcemapSubfolderNoOutdir/node/test.d.ts |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/bin/outAndOutDirFile.d.ts             |   12 +
 .../node/bin/outAndOutDirFile.d.ts            |   12 +
 .../amd/diskFile2.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/diskFile2.d.ts                       |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../simple/outputdir_multifolder/ref/m1.d.ts  |    6 +
 .../simple/outputdir_multifolder/test.d.ts    |    6 +
 .../simple/outputdir_multifolder_ref/m2.d.ts  |    6 +
 .../amd/bin/test.d.ts                         |   18 +
 .../node/bin/test.d.ts                        |   18 +
 .../sourcerootUrlSimpleNoOutdir/amd/m1.d.ts   |    6 +
 .../sourcerootUrlSimpleNoOutdir/amd/test.d.ts |    6 +
 .../sourcerootUrlSimpleNoOutdir/node/m1.d.ts  |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/m1.d.ts                 |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/m1.d.ts                |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 .../amd/test.d.ts                             |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |    6 +
 .../node/bin/test.d.ts                        |    6 +
 .../amd/ref/m1.d.ts                           |    6 +
 .../amd/test.d.ts                             |    6 +
 .../node/ref/m1.d.ts                          |    6 +
 .../node/test.d.ts                            |    6 +
 .../amd/outdir/simple/ref/m1.d.ts             |    6 +
 .../amd/outdir/simple/test.d.ts               |    6 +
 .../node/outdir/simple/ref/m1.d.ts            |    6 +
 .../node/outdir/simple/test.d.ts              |    6 +
 .../amd/bin/test.d.ts                         |   12 +
 .../node/bin/test.d.ts                        |   12 +
 tests/baselines/reference/properties.js       |    3 +
 ...lassDeclarationWhenInBaseTypeResolution.js | 1018 +++++++++++++++++
 .../stringLiteralObjectLiteralDeclaration1.js |    3 +
 .../structuralTypeInDeclareFileForModule.js   |    4 +
 tests/baselines/reference/typeofUndefined.js  |    2 +
 tests/baselines/reference/vardecl.js          |   41 +
 598 files changed, 5903 insertions(+), 53 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 18282548b7f..661adef45f5 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -33,7 +33,7 @@ module ts {
         return !!(sourceFile.flags & (NodeFlags.ExternalModule | NodeFlags.DeclarationFile));
     }
 
-    function findConstructor(node: ClassDeclaration): ConstructorDeclaration {
+    function getFirstConstructorWithBody(node: ClassDeclaration): ConstructorDeclaration {
         return forEach(node.members, member => {
             if (member.kind === SyntaxKind.Constructor && (<ConstructorDeclaration>member).body) {
                 return <ConstructorDeclaration>member;
@@ -1352,7 +1352,7 @@ module ts {
         }
 
         function emitClassDeclaration(node: ClassDeclaration) {
-            var ctor = findConstructor(node);
+            var ctor = getFirstConstructorWithBody(node);
             write("var ");
             emit(node.name);
             write(" = (function (");
@@ -1866,7 +1866,7 @@ module ts {
             }
         }
 
-        function emitCommaTypeList(nodes: Node[]) {
+        function emitCommaSeparatedSymbolToString(nodes: Node[]) {
             if (nodes) {
                 for (var i = 0, n = nodes.length; i < n; i++) {
                     if (i) {
@@ -1901,7 +1901,8 @@ module ts {
                 //TODO: only emit when export flag once the above condition is modified
                 write("export ");
                 write("import ");
-                write(getSourceTextOfLocalNode(node.name) + " = ");
+                emitSourceTextOfNode(node.name);
+                write(" = ");
                 if (node.entityName) {
                     emitSourceTextOfNode(node.entityName);
                     write(";");
@@ -1915,17 +1916,22 @@ module ts {
             }
         }
 
-        function canEmitDeclaration(node: Declaration) {
-            if (node.parent.kind === SyntaxKind.ModuleDeclaration || node.parent.kind === SyntaxKind.SourceFile) {
-                if (!(node.flags & NodeFlags.Export)) {
-                    // Non exported member
-                    // TODO(shkamat): check if the symbol at this location is externally visible 
-                    // eg. because of export assignment or is in global context because source file is non external module
-                    return false;
+        function canEmitModuleElementDeclaration(node: Declaration) {
+            if (node.flags & NodeFlags.Export) {
+                // Exported member - emit this declaration
+                return true;
+            }
+
+            if (node.parent.kind === SyntaxKind.SourceFile) {
+                // Global context nodes - emit this declaration
+                if (!(node.parent.flags & NodeFlags.ExternalModule)) {
+                    return true;
                 }
             }
 
-            return true;
+            // TODO(shkamat): check if this node is part of export assignment in the external module
+
+            return false;
         }
 
         function emitDeclarationFlags(node: Declaration) {
@@ -1954,7 +1960,7 @@ module ts {
         }
         
         function emitModuleDeclaration(node: ModuleDeclaration) {
-            if (canEmitDeclaration(node)) {
+            if (canEmitModuleElementDeclaration(node)) {
                 emitDeclarationFlags(node);
                 write("module ");
                 emitSourceTextOfNode(node.name);
@@ -1974,7 +1980,7 @@ module ts {
         }
 
         function emitEnumDeclaration(node: EnumDeclaration) {
-            if (canEmitDeclaration(node)) {
+            if (canEmitModuleElementDeclaration(node)) {
                 emitDeclarationFlags(node);
                 write("enum ");
                 emitSourceTextOfNode(node.name);
@@ -2002,7 +2008,7 @@ module ts {
         function emitTypeParameters(typeParameters: TypeParameterDeclaration[]) {
             if (typeParameters) {
                 write("<");
-                emitCommaTypeList(typeParameters);
+                emitCommaSeparatedSymbolToString(typeParameters);
                 write(">");
             }
         }
@@ -2010,14 +2016,14 @@ module ts {
         function emitHeritageClause(typeReferences: TypeReferenceNode[], isImplementsList: boolean) {
             if (typeReferences) {
                 write(isImplementsList ? " implments " : " extends ");
-                emitCommaTypeList(typeReferences);
+                emitCommaSeparatedSymbolToString(typeReferences);
             }
         }
 
         function emitClassDeclaration(node: ClassDeclaration) {
-            function emitParameterProperties(node: ConstructorDeclaration) {
-                if (node) {
-                    forEach(node.parameters, param => {
+            function emitParameterProperties(constructorDeclaration: ConstructorDeclaration) {
+                if (constructorDeclaration) {
+                    forEach(constructorDeclaration.parameters, param => {
                         if (param.flags & (NodeFlags.Public | NodeFlags.Private)) {
                             emitPropertyDeclaration(param);
                         }
@@ -2025,7 +2031,7 @@ module ts {
                 }
             }
 
-            if (canEmitDeclaration(node)) {
+            if (canEmitModuleElementDeclaration(node)) {
                 emitDeclarationFlags(node);
                 write("class ");
                 emitSourceTextOfNode(node.name);
@@ -2037,7 +2043,7 @@ module ts {
                 write(" {");
                 writeLine();
                 increaseIndent();
-                emitParameterProperties(findConstructor(node));
+                emitParameterProperties(getFirstConstructorWithBody(node));
                 emitLines(node.members);
                 decreaseIndent();
                 write("}");
@@ -2046,7 +2052,7 @@ module ts {
         }
 
         function emitInterfaceDeclaration(node: InterfaceDeclaration) {
-            if (canEmitDeclaration(node)) {
+            if (canEmitModuleElementDeclaration(node)) {
                 emitDeclarationFlags(node);
                 write("interface ");
                 emitSourceTextOfNode(node.name);
@@ -2081,7 +2087,7 @@ module ts {
         }
 
         function emitVariableStatement(node: VariableStatement) {
-            if (canEmitDeclaration(node)) {
+            if (canEmitModuleElementDeclaration(node)) {
                 emitDeclarationFlags(node);
                 write("var ");
                 emitCommaList(node.declarations);
@@ -2106,7 +2112,8 @@ module ts {
 
         function emitFunctionDeclaration(node: FunctionDeclaration) {
             // TODO(shkamat): if this is overloaded declaration do not emit if body is present
-            if (canEmitDeclaration(node)) {
+            // If we are emitting Method/Constructor it isnt moduleElement and doesnt need canEmitModuleElement check
+            if (node.kind !== SyntaxKind.FunctionDeclaration || canEmitModuleElementDeclaration(node)) {
                 emitDeclarationFlags(node);
                 if (node.kind === SyntaxKind.FunctionDeclaration) {
                     write("function ");
diff --git a/tests/baselines/reference/commentsClass.js b/tests/baselines/reference/commentsClass.js
index 8d9ca135b4a..2f50e238de2 100644
--- a/tests/baselines/reference/commentsClass.js
+++ b/tests/baselines/reference/commentsClass.js
@@ -118,3 +118,40 @@ var i8_c = c8;
 
 
 //// [commentsClass.d.ts]
+declare class c2 {
+}
+declare var i2;
+declare var i2_c;
+declare class c3 {
+    constructor ();
+}
+declare var i3;
+declare var i3_c;
+declare class c4 {
+    constructor ();
+}
+declare var i4;
+declare var i4_c;
+declare class c5 {
+    static s1;
+}
+declare var i5;
+declare var i5_c;
+declare class c6 {
+    static s1;
+    constructor ();
+}
+declare var i6;
+declare var i6_c;
+declare class c7 {
+    static s1;
+    constructor ();
+}
+declare var i7;
+declare var i7_c;
+declare class c8 {
+    static s1;
+    constructor ();
+}
+declare var i8;
+declare var i8_c;
diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js
index 002e2d41081..688145a9f6a 100644
--- a/tests/baselines/reference/commentsClassMembers.js
+++ b/tests/baselines/reference/commentsClassMembers.js
@@ -438,3 +438,68 @@ cProperties_i.nc_p2 = cProperties_i.nc_p1;
 
 
 //// [commentsClassMembers.d.ts]
+declare class c1 {
+    p1;
+    p2(b);
+    p3;
+    private pp1;
+    private pp2(b);
+    private pp3;
+    constructor ();
+    static s1;
+    static s2(b);
+    static s3;
+    nc_p1;
+    nc_p2(b);
+    nc_p3;
+    private nc_pp1;
+    private nc_pp2(b);
+    private nc_pp3;
+    static nc_s1;
+    static nc_s2(b);
+    static nc_s3;
+    a_p1;
+    a_p2(b);
+    a_p3;
+    private a_pp1;
+    private a_pp2(b);
+    private a_pp3;
+    static a_s1;
+    static a_s2(b);
+    static a_s3;
+    b_p1;
+    b_p2(b);
+    b_p3;
+    private b_pp1;
+    private b_pp2(b);
+    private b_pp3;
+    static b_s1;
+    static b_s2(b);
+    static b_s3;
+}
+declare var i1;
+declare var i1_p;
+declare var i1_f;
+declare var i1_r;
+declare var i1_prop;
+declare var i1_nc_p;
+declare var i1_ncf;
+declare var i1_ncr;
+declare var i1_ncprop;
+declare var i1_s_p;
+declare var i1_s_f;
+declare var i1_s_r;
+declare var i1_s_prop;
+declare var i1_s_nc_p;
+declare var i1_s_ncf;
+declare var i1_s_ncr;
+declare var i1_s_ncprop;
+declare var i1_c;
+declare class cProperties {
+    private val;
+    p1;
+    nc_p1;
+    p2;
+    nc_p2;
+}
+declare var cProperties_i;
diff --git a/tests/baselines/reference/commentsCommentParsing.js b/tests/baselines/reference/commentsCommentParsing.js
index 2ec854fe789..e2f95d842ee 100644
--- a/tests/baselines/reference/commentsCommentParsing.js
+++ b/tests/baselines/reference/commentsCommentParsing.js
@@ -224,3 +224,28 @@ var NoQuickInfoClass = (function () {
 
 
 //// [commentsCommentParsing.d.ts]
+declare function simple();
+declare function multiLine();
+declare function jsDocSingleLine();
+declare function jsDocMultiLine();
+declare function jsDocMultiLineMerge();
+declare function jsDocMixedComments1();
+declare function jsDocMixedComments2();
+declare function jsDocMixedComments3();
+declare function jsDocMixedComments4();
+declare function jsDocMixedComments5();
+declare function jsDocMixedComments6();
+declare function noHelpComment1();
+declare function noHelpComment2();
+declare function noHelpComment3();
+declare function sum(a, b);
+declare function multiply(a, b, c?, d?, e?);
+declare function f1(a);
+declare function f1(b);
+declare function f1(aOrb, opt?);
+declare function subtract(a, b, c?, d?, e?, f?);
+declare function square(a);
+declare function divide(a, b);
+declare function jsDocParamTest(a, b, c, d);
+declare class NoQuickInfoClass {
+}
diff --git a/tests/baselines/reference/commentsEnums.js b/tests/baselines/reference/commentsEnums.js
index c6f12e13d05..53d8beed407 100644
--- a/tests/baselines/reference/commentsEnums.js
+++ b/tests/baselines/reference/commentsEnums.js
@@ -23,3 +23,8 @@ x = 1 /* FancyPink */;
 
 
 //// [commentsEnums.d.ts]
+declare enum Colors {
+    Cornflower = 0,
+    FancyPink = 1,
+}
+declare var x;
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 4988eac8a83..fd9c97662f0 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -124,7 +124,6 @@ define(["require", "exports", "commentsExternalModules_0"], function (require, e
 //// [commentsExternalModules_0.d.ts]
 export declare module m1 {
     var b;
-    function foo();
     module m2 {
         class c {
         }
@@ -134,7 +133,6 @@ export declare module m1 {
 }
 export declare module m4 {
     var b;
-    function foo();
     module m2 {
         class c {
         }
diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js
index 9a1c0702ce7..be4a57913fc 100644
--- a/tests/baselines/reference/commentsFunction.js
+++ b/tests/baselines/reference/commentsFunction.js
@@ -42,3 +42,8 @@ lambddaNoVarComment(10, 20);
 
 
 //// [commentsFunction.d.ts]
+declare function foo();
+declare function fooWithParameters(a, b);
+declare var fooFunc;
+declare var lambdaFoo;
+declare var lambddaNoVarComment;
diff --git a/tests/baselines/reference/commentsInheritance.js b/tests/baselines/reference/commentsInheritance.js
index 1e1ee51e385..d7268c386a2 100644
--- a/tests/baselines/reference/commentsInheritance.js
+++ b/tests/baselines/reference/commentsInheritance.js
@@ -258,3 +258,86 @@ i2_i = i3_i;
 
 
 //// [commentsInheritance.d.ts]
+interface i1 {
+    i1_p1;
+    i1_f1();
+    i1_l1;
+    i1_nc_p1;
+    i1_nc_f1();
+    i1_nc_l1;
+    p1;
+    f1();
+    l1;
+    nc_p1;
+    nc_f1();
+    nc_l1;
+}
+declare class c1 implments i1 {
+    i1_p1;
+    i1_f1();
+    i1_l1;
+    i1_nc_p1;
+    i1_nc_f1();
+    i1_nc_l1;
+    p1;
+    f1();
+    l1;
+    nc_p1;
+    nc_f1();
+    nc_l1;
+}
+declare var i1_i;
+declare var c1_i;
+declare class c2 {
+    c2_p1;
+    c2_f1();
+    c2_prop;
+    c2_nc_p1;
+    c2_nc_f1();
+    c2_nc_prop;
+    p1;
+    f1();
+    prop;
+    nc_p1;
+    nc_f1();
+    nc_prop;
+    constructor (a);
+}
+declare class c3 extends c2 {
+    constructor ();
+    p1;
+    f1();
+    prop;
+    nc_p1;
+    nc_f1();
+    nc_prop;
+}
+declare var c2_i;
+declare var c3_i;
+declare class c4 extends c2 {
+}
+declare var c4_i;
+interface i2 {
+    i2_p1;
+    i2_f1();
+    i2_l1;
+    i2_nc_p1;
+    i2_nc_f1();
+    i2_nc_l1;
+    p1;
+    f1();
+    l1;
+    nc_p1;
+    nc_f1();
+    nc_l1;
+}
+interface i3 extends i2 {
+    p1;
+    f1();
+    l1;
+    nc_p1;
+    nc_f1();
+    nc_l1;
+}
+declare var i2_i;
+declare var i3_i;
diff --git a/tests/baselines/reference/commentsInterface.js b/tests/baselines/reference/commentsInterface.js
index 0bca2ac73e1..e260bb0cbd7 100644
--- a/tests/baselines/reference/commentsInterface.js
+++ b/tests/baselines/reference/commentsInterface.js
@@ -103,3 +103,46 @@ i3_i.nc_l(10);
 
 
 //// [commentsInterface.d.ts]
+interface i1 {
+}
+declare var i1_i;
+interface nc_i1 {
+}
+declare var nc_i1_i;
+interface i2 {
+    x;
+    foo;
+    [i];
+    new (i);
+    nc_x;
+    nc_foo;
+    [i];
+    (a, b);
+    fnfoo(b);
+    nc_fnfoo(b);
+    nc_y;
+}
+declare var i2_i;
+declare var i2_i_x;
+declare var i2_i_foo;
+declare var i2_i_foo_r;
+declare var i2_i_i2_si;
+declare var i2_i_i2_ii;
+declare var i2_i_n;
+declare var i2_i_nc_x;
+declare var i2_i_nc_foo;
+declare var i2_i_nc_foo_r;
+declare var i2_i_r;
+declare var i2_i_fnfoo;
+declare var i2_i_fnfoo_r;
+declare var i2_i_nc_fnfoo;
+declare var i2_i_nc_fnfoo_r;
+interface i3 {
+    x;
+    f(a);
+    l;
+    nc_x;
+    nc_f(a);
+    nc_l;
+}
+declare var i3_i;
diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js
index c5cc74d40ef..4e96f4e999e 100644
--- a/tests/baselines/reference/commentsModules.js
+++ b/tests/baselines/reference/commentsModules.js
@@ -243,3 +243,49 @@ new m7.m8.m9.c();
 
 
 //// [commentsModules.d.ts]
+declare module m1 {
+    var b;
+    module m2 {
+        class c {
+        }
+        var i;
+    }
+    function fooExport();
+    function foo2Export(a);
+    function foo3Export();
+}
+declare var myvar;
+declare module m2.m3 {
+    class c {
+    }
+}
+declare module m3.m4.m5 {
+    class c {
+    }
+}
+declare module m4.m5.m6 {
+    module m7 {
+        class c {
+        }
+    }
+}
+declare module m5.m6.m7 {
+    module m8 {
+        class c {
+        }
+    }
+}
+declare module m6.m7 {
+    module m8 {
+        class c {
+        }
+    }
+}
+declare module m7.m8 {
+    module m9 {
+        class c {
+        }
+        class e {
+        }
+    }
+}
diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.js b/tests/baselines/reference/commentsMultiModuleSingleFile.js
index 093e9b78bd2..3f5cf7cfd4e 100644
--- a/tests/baselines/reference/commentsMultiModuleSingleFile.js
+++ b/tests/baselines/reference/commentsMultiModuleSingleFile.js
@@ -60,3 +60,15 @@ new multiM.c();
 
 
 //// [commentsMultiModuleSingleFile.d.ts]
+declare module multiM {
+    class b {
+    }
+    class d {
+    }
+}
+declare module multiM {
+    class c {
+    }
+    class e {
+    }
+}
diff --git a/tests/baselines/reference/commentsOverloads.js b/tests/baselines/reference/commentsOverloads.js
index c359c949f3b..f09eced2718 100644
--- a/tests/baselines/reference/commentsOverloads.js
+++ b/tests/baselines/reference/commentsOverloads.js
@@ -257,3 +257,106 @@ var c5_i_2 = new c5("hello");
 
 
 //// [commentsOverloads.d.ts]
+declare function f1(a);
+declare function f1(b);
+declare function f1(aOrb);
+declare function f2(a);
+declare function f2(b);
+declare function f2(aOrb);
+declare function f3(a);
+declare function f3(b);
+declare function f3(aOrb);
+declare function f4(a);
+declare function f4(b);
+declare function f4(aOrb);
+interface i1 {
+    (a);
+    (b);
+    foo(a);
+    foo(b);
+    foo(arr);
+    foo(arr);
+    foo2(a);
+    foo2(b);
+    foo3(a);
+    foo3(b);
+    foo4(a);
+    foo4(b);
+    foo4(c);
+    new (a);
+    new (b);
+}
+declare var i1_i;
+interface i2 {
+    new (a);
+    new (b);
+    (a);
+    (b);
+}
+declare var i2_i;
+interface i3 {
+    new (a);
+    new (b);
+    (a);
+    (b);
+}
+declare var i3_i;
+interface i4 {
+    new (a);
+    new (b);
+    (a);
+    (b);
+}
+declare class c {
+    prop1(a);
+    prop1(b);
+    prop1(aorb);
+    prop2(a);
+    prop2(b);
+    prop2(aorb);
+    prop3(a);
+    prop3(b);
+    prop3(aorb);
+    prop4(a);
+    prop4(b);
+    prop4(aorb);
+    prop5(a);
+    prop5(b);
+    prop5(aorb);
+}
+declare class c1 {
+    constructor (a);
+    constructor (b);
+    constructor (aorb);
+}
+declare class c2 {
+    constructor (a);
+    constructor (b);
+    constructor (aorb);
+}
+declare class c3 {
+    constructor (a);
+    constructor (b);
+    constructor (aorb);
+}
+declare class c4 {
+    constructor (a);
+    constructor (b);
+    constructor (aorb);
+}
+declare class c5 {
+    constructor (a);
+    constructor (b);
+    constructor (aorb);
+}
+declare var c_i;
+declare var c1_i_1;
+declare var c1_i_2;
+declare var c2_i_1;
+declare var c2_i_2;
+declare var c3_i_1;
+declare var c3_i_2;
+declare var c4_i_1;
+declare var c4_i_2;
+declare var c5_i_1;
+declare var c5_i_2;
diff --git a/tests/baselines/reference/commentsVarDecl.js b/tests/baselines/reference/commentsVarDecl.js
index 2d115b44fa6..3b8efffe2e2 100644
--- a/tests/baselines/reference/commentsVarDecl.js
+++ b/tests/baselines/reference/commentsVarDecl.js
@@ -61,3 +61,15 @@ n4 = z2;
 
 
 //// [commentsVarDecl.d.ts]
+declare var myVariable;
+declare var anotherVariable;
+declare var aVar;
+declare var anotherAnotherVariable;
+declare var x;
+declare var n;
+declare var y;
+declare var yy;
+declare var z;
+declare var z2;
+declare var x2;
+declare var n4;
diff --git a/tests/baselines/reference/commentsVariableStatement1.js b/tests/baselines/reference/commentsVariableStatement1.js
index dcdf0420abe..6df1eb73851 100644
--- a/tests/baselines/reference/commentsVariableStatement1.js
+++ b/tests/baselines/reference/commentsVariableStatement1.js
@@ -8,3 +8,4 @@ var v = 1;
 
 
 //// [commentsVariableStatement1.d.ts]
+declare var v;
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.js b/tests/baselines/reference/commentsdoNotEmitComments.js
index 252e37fdebc..1b6949a33f6 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.js
+++ b/tests/baselines/reference/commentsdoNotEmitComments.js
@@ -132,3 +132,33 @@ var m1;
 
 
 //// [commentsdoNotEmitComments.d.ts]
+declare var myVariable;
+declare function foo(p);
+declare var fooVar;
+declare class c {
+    constructor ();
+    b;
+    myFoo();
+    prop1;
+    foo1(a);
+    foo1(b);
+    foo1(aOrb);
+}
+declare var i;
+interface i1 {
+    (a);
+    new (b);
+    [a];
+    myFoo(a);
+    prop;
+}
+declare var i1_i;
+declare module m1 {
+    class b {
+        x;
+        constructor (x);
+    }
+    module m2 {
+    }
+}
+declare var x;
diff --git a/tests/baselines/reference/commentsemitComments.js b/tests/baselines/reference/commentsemitComments.js
index e9c55e4d601..d44a3cacdad 100644
--- a/tests/baselines/reference/commentsemitComments.js
+++ b/tests/baselines/reference/commentsemitComments.js
@@ -132,3 +132,33 @@ var m1;
 
 
 //// [commentsemitComments.d.ts]
+declare var myVariable;
+declare function foo(p);
+declare var fooVar;
+declare class c {
+    constructor ();
+    b;
+    myFoo();
+    prop1;
+    foo1(a);
+    foo1(b);
+    foo1(aOrb);
+}
+declare var i;
+interface i1 {
+    (a);
+    new (b);
+    [a];
+    myFoo(a);
+    prop;
+}
+declare var i1_i;
+declare module m1 {
+    class b {
+        x;
+        constructor (x);
+    }
+    module m2 {
+    }
+}
+declare var x;
diff --git a/tests/baselines/reference/constructorTypeWithTypeParameters.js b/tests/baselines/reference/constructorTypeWithTypeParameters.js
index 3c20b6ffa68..97af5116fbd 100644
--- a/tests/baselines/reference/constructorTypeWithTypeParameters.js
+++ b/tests/baselines/reference/constructorTypeWithTypeParameters.js
@@ -12,3 +12,6 @@ var anotherVar;
 
 
 //// [constructorTypeWithTypeParameters.d.ts]
+declare var X;
+declare var Y;
+declare var anotherVar;
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index 04471c4ee73..b355534e89e 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -262,3 +262,13 @@ export declare class c1 {
     onlySetter;
 }
 //// [declFileAccessors_1.d.ts]
+declare class c2 {
+    p3;
+    private pp3;
+    static s3;
+    nc_p3;
+    private nc_pp3;
+    static nc_s3;
+    onlyGetter;
+    onlySetter;
+}
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
index 5e124586d10..6399c1be7ba 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
@@ -24,6 +24,12 @@ exports.x;
 
 
 //// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts]
+declare module "SubModule" {
+    module m {
+        module m3 {
+        }
+    }
+}
 //// [declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts]
 /// <reference path='declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts' />
 export declare var x;
diff --git a/tests/baselines/reference/declFileCallSignatures.js b/tests/baselines/reference/declFileCallSignatures.js
index f824425d313..1b4faf5759e 100644
--- a/tests/baselines/reference/declFileCallSignatures.js
+++ b/tests/baselines/reference/declFileCallSignatures.js
@@ -90,3 +90,22 @@ export interface ICallSignatureWithOwnTypeParametes {
     <T extends ICallSignature>(a);
 }
 //// [declFileCallSignatures_1.d.ts]
+interface IGlobalCallSignature {
+    ();
+}
+interface IGlobalCallSignatureWithParameters {
+    (a, b);
+}
+interface IGlobalCallSignatureWithRestParameters {
+    (a, ...rests);
+}
+interface IGlobalCallSignatureWithOverloads {
+    (a);
+    (a);
+}
+interface IGlobalCallSignatureWithTypeParameters<T> {
+    (a);
+}
+interface IGlobalCallSignatureWithOwnTypeParametes {
+    <T extends IGlobalCallSignature>(a);
+}
diff --git a/tests/baselines/reference/declFileClassWithIndexSignature.js b/tests/baselines/reference/declFileClassWithIndexSignature.js
index 139a6845203..6720bb2e6c3 100644
--- a/tests/baselines/reference/declFileClassWithIndexSignature.js
+++ b/tests/baselines/reference/declFileClassWithIndexSignature.js
@@ -13,3 +13,6 @@ var BlockIntrinsics = (function () {
 
 
 //// [declFileClassWithIndexSignature.d.ts]
+declare class BlockIntrinsics {
+    [s];
+}
diff --git a/tests/baselines/reference/declFileConstructSignatures.js b/tests/baselines/reference/declFileConstructSignatures.js
index edd9ad1d4d1..b0122bc39aa 100644
--- a/tests/baselines/reference/declFileConstructSignatures.js
+++ b/tests/baselines/reference/declFileConstructSignatures.js
@@ -90,3 +90,22 @@ export interface IConstructSignatureWithOwnTypeParametes {
     new <T extends IConstructSignature>(a);
 }
 //// [declFileConstructSignatures_1.d.ts]
+interface IGlobalConstructSignature {
+    new ();
+}
+interface IGlobalConstructSignatureWithParameters {
+    new (a, b);
+}
+interface IGlobalConstructSignatureWithRestParameters {
+    new (a, ...rests);
+}
+interface IGlobalConstructSignatureWithOverloads {
+    new (a);
+    new (a);
+}
+interface IGlobalConstructSignatureWithTypeParameters<T> {
+    new (a);
+}
+interface IGlobalConstructSignatureWithOwnTypeParametes {
+    new <T extends IGlobalConstructSignature>(a);
+}
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index faa83b25aa5..8f7299e0f36 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -243,3 +243,33 @@ export declare class ConstructorWithParameterInitializer {
     constructor (x?);
 }
 //// [declFileConstructors_1.d.ts]
+declare class GlobalSimpleConstructor {
+    constructor ();
+}
+declare class GlobalConstructorWithParameters {
+    constructor (a, b);
+}
+declare class GlobalConstructorWithRestParamters {
+    constructor (a, ...rests);
+}
+declare class GlobalConstructorWithOverloads {
+    constructor (a);
+    constructor (a);
+    constructor (a);
+}
+declare class GlobalConstructorWithPublicParameterProperty {
+    x;
+    constructor (x);
+}
+declare class GlobalConstructorWithPrivateParameterProperty {
+    private x;
+    constructor (x);
+}
+declare class GlobalConstructorWithOptionalParameterProperty {
+    x;
+    constructor (x?);
+}
+declare class GlobalConstructorWithParameterInitializer {
+    x;
+    constructor (x?);
+}
diff --git a/tests/baselines/reference/declFileEnumUsedAsValue.js b/tests/baselines/reference/declFileEnumUsedAsValue.js
index 941d169e874..1787daf774a 100644
--- a/tests/baselines/reference/declFileEnumUsedAsValue.js
+++ b/tests/baselines/reference/declFileEnumUsedAsValue.js
@@ -18,3 +18,9 @@ var x = e;
 
 
 //// [declFileEnumUsedAsValue.d.ts]
+declare enum e {
+    a = 0,
+    b = 1,
+    c = 2,
+}
+declare var x;
diff --git a/tests/baselines/reference/declFileEnums.js b/tests/baselines/reference/declFileEnums.js
index 33eb1f7a8a6..97559f05574 100644
--- a/tests/baselines/reference/declFileEnums.js
+++ b/tests/baselines/reference/declFileEnums.js
@@ -73,3 +73,31 @@ var e5;
 
 
 //// [declFileEnums.d.ts]
+declare enum e1 {
+    a = 0,
+    b = 1,
+    c = 2,
+}
+declare enum e2 {
+    a = 10,
+    b,
+    c = 10,
+}
+declare enum e3 {
+    a = 10,
+    b,
+    c,
+}
+declare enum e4 {
+    a = 0,
+    b = 1,
+    c = 2,
+    d = 10,
+    e = 11,
+}
+declare enum e5 {
+    "Friday" = 0,
+    "Saturday" = 1,
+    "Sunday" = 2,
+    "Weekend days" = 3,
+}
diff --git a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js
index 96f578f8b9b..3a71755b72e 100644
--- a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js
+++ b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js
@@ -58,3 +58,23 @@ var D = (function () {
 
 
 //// [declFileForClassWithMultipleBaseClasses.d.ts]
+declare class A {
+    foo();
+}
+declare class B {
+    bar();
+}
+interface I {
+    baz();
+}
+interface J {
+    bat();
+}
+declare class D implments I, J {
+    baz();
+    bat();
+    foo();
+    bar();
+}
+interface I extends A, B {
+}
diff --git a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js
index 47e64832145..668adee2692 100644
--- a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js
+++ b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js
@@ -17,3 +17,8 @@ var C = (function () {
 
 
 //// [declFileForClassWithPrivateOverloadedFunction.d.ts]
+declare class C {
+    private foo(x);
+    private foo(x);
+    private foo(x);
+}
diff --git a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
index 3b89866aca3..c19ab9a3fb1 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
@@ -31,3 +31,9 @@ var C = (function (_super) {
 
 
 //// [declFileForFunctionTypeAsTypeParameter.d.ts]
+declare class X<T> {
+}
+declare class C extends X<() => number> {
+}
+interface I extends X<() => number> {
+}
diff --git a/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.js b/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.js
index 0275a801a1c..d030d0f74f3 100644
--- a/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.js
+++ b/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.js
@@ -9,3 +9,7 @@ interface I {
 
 
 //// [declFileForInterfaceWithOptionalFunction.d.ts]
+interface I {
+    foo?(x?);
+    foo2?(x?);
+}
diff --git a/tests/baselines/reference/declFileForInterfaceWithRestParams.js b/tests/baselines/reference/declFileForInterfaceWithRestParams.js
index c56bce67d33..5fe0f4a3dd5 100644
--- a/tests/baselines/reference/declFileForInterfaceWithRestParams.js
+++ b/tests/baselines/reference/declFileForInterfaceWithRestParams.js
@@ -10,3 +10,8 @@ interface I {
 
 
 //// [declFileForInterfaceWithRestParams.d.ts]
+interface I {
+    foo(...x);
+    foo2(a, ...x);
+    foo3(b, ...x);
+}
diff --git a/tests/baselines/reference/declFileForTypeParameters.js b/tests/baselines/reference/declFileForTypeParameters.js
index 2b780582b8a..90c652c2e37 100644
--- a/tests/baselines/reference/declFileForTypeParameters.js
+++ b/tests/baselines/reference/declFileForTypeParameters.js
@@ -19,3 +19,7 @@ var C = (function () {
 
 
 //// [declFileForTypeParameters.d.ts]
+declare class C<T> {
+    x;
+    foo(a);
+}
diff --git a/tests/baselines/reference/declFileForVarList.js b/tests/baselines/reference/declFileForVarList.js
index efbc7e3c6a1..3345d9f4652 100644
--- a/tests/baselines/reference/declFileForVarList.js
+++ b/tests/baselines/reference/declFileForVarList.js
@@ -9,3 +9,5 @@ var x1 = 1, y2 = 2, z2 = 3;
 
 
 //// [declFileForVarList.d.ts]
+declare var x, y, z;
+declare var x1, y2, z2;
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
index 9142051cc48..9e80447786b 100644
--- a/tests/baselines/reference/declFileFunctions.js
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -120,3 +120,9 @@ export declare function fooWithOverloads(a);
 export declare function fooWithOverloads(a);
 export declare function fooWithOverloads(a);
 //// [declFileFunctions_1.d.ts]
+declare function globalfoo();
+declare function globalfooWithParameters(a, b);
+declare function globalfooWithRestParameters(a, ...rests);
+declare function globalfooWithOverloads(a);
+declare function globalfooWithOverloads(a);
+declare function globalfooWithOverloads(a);
diff --git a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
index 833fedd7645..d45be2bc42c 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
@@ -39,3 +39,16 @@ var Baz = (function () {
 
 
 //// [declFileGenericClassWithGenericExtendedClass.d.ts]
+interface IFoo {
+    baz;
+}
+declare class Base<T> {
+}
+declare class Derived<T> extends Base<T> {
+}
+interface IBar<T> {
+    derived;
+}
+declare class Baz implments IBar<Baz> {
+    derived;
+}
diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js
index c621eb7c744..9c66c315e4f 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -90,3 +90,26 @@ var templa;
 
 
 //// [declFileGenericType2.d.ts]
+declare module templa.mvc {
+}
+declare module templa.mvc {
+}
+declare module templa.mvc {
+}
+declare module templa.mvc.composite {
+}
+declare module templa.dom.mvc {
+    interface IElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.IController<ModelType> {
+    }
+}
+declare module templa.dom.mvc {
+    class AbstractElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.AbstractController<ModelType> implments IElementController<ModelType> {
+        constructor ();
+    }
+}
+declare module templa.dom.mvc.composite {
+    class AbstractCompositeElementController<ModelType extends templa.mvc.composite.ICompositeControllerModel> extends templa.dom.mvc.AbstractElementController<ModelType> {
+        _controllers;
+        constructor ();
+    }
+}
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
index 4812862a4c2..215c359a177 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
@@ -22,3 +22,10 @@ var List = (function () {
 
 
 //// [declFileImportedTypeUseInTypeArgPosition.d.ts]
+declare class List<T> {
+}
+declare module 'mod1' {
+}
+declare module 'moo' {
+    var p;
+}
diff --git a/tests/baselines/reference/declFileIndexSignatures.js b/tests/baselines/reference/declFileIndexSignatures.js
index 80c818ebb00..73ccc1f8c7a 100644
--- a/tests/baselines/reference/declFileIndexSignatures.js
+++ b/tests/baselines/reference/declFileIndexSignatures.js
@@ -54,3 +54,16 @@ export interface IIndexSignatureWithTypeParameter<T> {
     [a];
 }
 //// [declFileIndexSignatures_1.d.ts]
+interface IGlobalStringIndexSignature {
+    [s];
+}
+interface IGlobalNumberIndexSignature {
+    [n];
+}
+interface IGlobalBothIndexSignature {
+    [s];
+    [n];
+}
+interface IGlobalIndexSignatureWithTypeParameter<T> {
+    [a];
+}
diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js
index 1c157705429..daa42656ee9 100644
--- a/tests/baselines/reference/declFileInternalAliases.js
+++ b/tests/baselines/reference/declFileInternalAliases.js
@@ -35,3 +35,14 @@ var m2;
 
 
 //// [declFileInternalAliases.d.ts]
+declare module m {
+    class c {
+    }
+}
+declare module m1 {
+    var d;
+}
+declare module m2 {
+    export import x = m.c;
+    var d;
+}
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index 71d5d9359ba..13179cb29b9 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -360,3 +360,36 @@ export interface I1 {
     fooWithOverloads(a);
 }
 //// [declFileMethods_1.d.ts]
+declare class c2 {
+    foo();
+    fooWithParameters(a, b);
+    fooWithRestParameters(a, ...rests);
+    fooWithOverloads(a);
+    fooWithOverloads(a);
+    fooWithOverloads(a);
+    private privateFoo();
+    private privateFooWithParameters(a, b);
+    private privateFooWithRestParameters(a, ...rests);
+    private privateFooWithOverloads(a);
+    private privateFooWithOverloads(a);
+    private privateFooWithOverloads(a);
+    static staticFoo();
+    static staticFooWithParameters(a, b);
+    static staticFooWithRestParameters(a, ...rests);
+    static staticFooWithOverloads(a);
+    static staticFooWithOverloads(a);
+    static staticFooWithOverloads(a);
+    private static privateStaticFoo();
+    private static privateStaticFooWithParameters(a, b);
+    private static privateStaticFooWithRestParameters(a, ...rests);
+    private static privateStaticFooWithOverloads(a);
+    private static privateStaticFooWithOverloads(a);
+    private static privateStaticFooWithOverloads(a);
+}
+interface I2 {
+    foo();
+    fooWithParameters(a, b);
+    fooWithRestParameters(a, ...rests);
+    fooWithOverloads(a);
+    fooWithOverloads(a);
+}
diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
index 4b2d10d03c8..b9a3f14242a 100644
--- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
+++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
@@ -26,3 +26,8 @@ var d = {
 
 
 //// [declFileModuleAssignmentInObjectLiteralProperty.d.ts]
+declare module m1 {
+    class c {
+    }
+}
+declare var d;
diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js
index 45be49ce98e..490d599a2d9 100644
--- a/tests/baselines/reference/declFileModuleContinuation.js
+++ b/tests/baselines/reference/declFileModuleContinuation.js
@@ -28,3 +28,11 @@ var A;
 
 
 //// [declFileModuleContinuation.d.ts]
+declare module A.C {
+    interface Z {
+    }
+}
+declare module A.B.C {
+    class W implments A.C.Z {
+    }
+}
diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js
index 53d422d83cf..ed9a866bc6e 100644
--- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js
+++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js
@@ -21,3 +21,8 @@ var m;
 
 
 //// [declFileModuleWithPropertyOfTypeModule.d.ts]
+declare module m {
+    class c {
+    }
+    var a;
+}
diff --git a/tests/baselines/reference/declFileOptionalInterfaceMethod.js b/tests/baselines/reference/declFileOptionalInterfaceMethod.js
index ae3ee140f07..f1910643b8f 100644
--- a/tests/baselines/reference/declFileOptionalInterfaceMethod.js
+++ b/tests/baselines/reference/declFileOptionalInterfaceMethod.js
@@ -8,3 +8,6 @@ interface X {
 
 
 //// [declFileOptionalInterfaceMethod.d.ts]
+interface X {
+    f?<T>();
+}
diff --git a/tests/baselines/reference/declFileRegressionTests.js b/tests/baselines/reference/declFileRegressionTests.js
index 9b80ded4e0b..5ba35f0a928 100644
--- a/tests/baselines/reference/declFileRegressionTests.js
+++ b/tests/baselines/reference/declFileRegressionTests.js
@@ -11,3 +11,4 @@ var n = { w: null, x: '', y: function () {
 
 
 //// [declFileRegressionTests.d.ts]
+declare var n;
diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
index 96d15b05dc7..04fd5fc02f9 100644
--- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
+++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
@@ -31,3 +31,9 @@ var f6 = function () {
 
 
 //// [declFileRestParametersOfFunctionAndFunctionType.d.ts]
+declare function f1(...args);
+declare function f2(x);
+declare function f3(x);
+declare function f4<T extends (...args) => void>();
+declare function f5<T extends { (...args): void }>();
+declare var f6;
diff --git a/tests/baselines/reference/declFileTypeofClass.js b/tests/baselines/reference/declFileTypeofClass.js
index fb75d5c8770..0338cc404a8 100644
--- a/tests/baselines/reference/declFileTypeofClass.js
+++ b/tests/baselines/reference/declFileTypeofClass.js
@@ -34,3 +34,15 @@ var genericX = genericC;
 
 
 //// [declFileTypeofClass.d.ts]
+declare class c {
+    static x;
+    private static y;
+    private x3;
+    y3;
+}
+declare var x;
+declare var y;
+declare var z;
+declare class genericC<T> {
+}
+declare var genericX;
diff --git a/tests/baselines/reference/declFileTypeofEnum.js b/tests/baselines/reference/declFileTypeofEnum.js
index 8b09b99230b..e228c5e0a1e 100644
--- a/tests/baselines/reference/declFileTypeofEnum.js
+++ b/tests/baselines/reference/declFileTypeofEnum.js
@@ -31,3 +31,15 @@ var daysOfYear;
 
 
 //// [declFileTypeofEnum.d.ts]
+declare enum days {
+    monday = 0,
+    tuesday = 1,
+    wednesday = 2,
+    thursday = 3,
+    friday = 4,
+    saturday = 5,
+    sunday = 6,
+}
+declare var weekendDay;
+declare var daysOfMonth;
+declare var daysOfYear;
diff --git a/tests/baselines/reference/declFileTypeofFunction.js b/tests/baselines/reference/declFileTypeofFunction.js
index 28467b225c7..ceceb369b01 100644
--- a/tests/baselines/reference/declFileTypeofFunction.js
+++ b/tests/baselines/reference/declFileTypeofFunction.js
@@ -64,3 +64,17 @@ function foo5(x) {
 
 
 //// [declFileTypeofFunction.d.ts]
+declare function f(n);
+declare function f(n);
+declare function f();
+declare function g(n);
+declare function g(n);
+declare function g();
+declare var b;
+declare function b1();
+declare function foo();
+declare var foo1;
+declare var foo2;
+declare var foo3;
+declare var x;
+declare function foo5(x);
diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js
index 042a89d60e3..c5304edc04d 100644
--- a/tests/baselines/reference/declFileTypeofInAnonymousType.js
+++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js
@@ -53,3 +53,16 @@ var d = {
 
 
 //// [declFileTypeofInAnonymousType.d.ts]
+declare module m1 {
+    class c {
+    }
+    enum e {
+        weekday = 0,
+        weekend = 1,
+        holiday = 2,
+    }
+}
+declare var a;
+declare var b;
+declare var c;
+declare var d;
diff --git a/tests/baselines/reference/declFileTypeofModule.js b/tests/baselines/reference/declFileTypeofModule.js
index 86b4ebc6f5b..3f23ba6ac5c 100644
--- a/tests/baselines/reference/declFileTypeofModule.js
+++ b/tests/baselines/reference/declFileTypeofModule.js
@@ -29,3 +29,13 @@ var m2_2;
 
 
 //// [declFileTypeofModule.d.ts]
+declare module m1 {
+    var c;
+}
+declare var m1_1;
+declare var m1_2;
+declare module m2 {
+    var d;
+}
+declare var m2_1;
+declare var m2_2;
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
index ab87c068566..9ede014b3ca 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -67,3 +67,18 @@ var X;
 
 
 //// [declFileWithClassNameConflictingWithClassReferredByExtendsClause.d.ts]
+declare module A.B.Base {
+    class W {
+        id;
+    }
+}
+declare module X.Y.base {
+    class W extends A.B.Base.W {
+        name;
+    }
+}
+declare module X.Y.base.Z {
+    class W<TValue> extends X.Y.base.W {
+        value;
+    }
+}
diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
index 43e333456a5..da35be030b9 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -57,3 +57,15 @@ var A;
 
 
 //// [declFileWithExtendsClauseThatHasItsContainerNameConflict.d.ts]
+declare module A.B.C {
+}
+declare module A.B {
+    class EventManager {
+        id;
+    }
+}
+declare module A.B.C {
+    class ContextMenu extends EventManager {
+        name;
+    }
+}
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
index e4aa93dbabc..98f3c1df276 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
@@ -33,3 +33,11 @@ var X;
 
 
 //// [declFileWithInternalModuleNameConflictsInExtendsClause1.d.ts]
+declare module X.A.C {
+    interface Z {
+    }
+}
+declare module X.A.B.C {
+    class W implments X.A.C.Z {
+    }
+}
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
index 450785c7ac5..6646ef907d1 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
@@ -36,3 +36,13 @@ var X;
 
 
 //// [declFileWithInternalModuleNameConflictsInExtendsClause2.d.ts]
+declare module X.A.C {
+    interface Z {
+    }
+}
+declare module X.A.B.C {
+    class W implments A.C.Z {
+    }
+}
+declare module X.A.B.C {
+}
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
index f0d4cf123c9..ca74a916fa8 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
@@ -36,3 +36,15 @@ var X;
 
 
 //// [declFileWithInternalModuleNameConflictsInExtendsClause3.d.ts]
+declare module X.A.C {
+    interface Z {
+    }
+}
+declare module X.A.B.C {
+    class W implments X.A.C.Z {
+    }
+}
+declare module X.A.B.C {
+    module A {
+    }
+}
diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js
index 057d26fc150..82e4e8bcf86 100644
--- a/tests/baselines/reference/declInput-2.js
+++ b/tests/baselines/reference/declInput-2.js
@@ -61,3 +61,24 @@ var M;
 
 
 //// [declInput-2.d.ts]
+declare module M {
+    class E {
+    }
+    interface I1 {
+    }
+    class D {
+        private c;
+        m1;
+        m2;
+        m22;
+        m23;
+        m24;
+        m25;
+        m232();
+        m242();
+        m252();
+        m26(i);
+        m262(i);
+        m3();
+    }
+}
diff --git a/tests/baselines/reference/declInput3.js b/tests/baselines/reference/declInput3.js
index 798d4a70655..e22cda208fe 100644
--- a/tests/baselines/reference/declInput3.js
+++ b/tests/baselines/reference/declInput3.js
@@ -31,3 +31,10 @@ var bar = (function () {
 
 
 //// [declInput3.d.ts]
+interface bar2 {
+}
+declare class bar {
+    f();
+    g();
+    h(x?, y?, z?);
+}
diff --git a/tests/baselines/reference/declInput4.js b/tests/baselines/reference/declInput4.js
index bc013b5fcdd..21b239aac15 100644
--- a/tests/baselines/reference/declInput4.js
+++ b/tests/baselines/reference/declInput4.js
@@ -47,3 +47,18 @@ var M;
 
 
 //// [declInput4.d.ts]
+declare module M {
+    class E {
+    }
+    interface I1 {
+    }
+    class D {
+        m1;
+        m2;
+        m23;
+        m24;
+        m232();
+        m242();
+        m26(i);
+    }
+}
diff --git a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js
index 6cf56814900..59974d0fb85 100644
--- a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js
+++ b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js
@@ -6,3 +6,5 @@ interface A extends Array<string> { }
 
 
 //// [declarationEmit_array-types-from-generic-array-usage.d.ts]
+interface A extends Array<string> {
+}
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js
index 64cb4509bae..72e220bdcde 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js
@@ -61,3 +61,19 @@ var X;
 
 
 //// [declarationEmit_nameConflicts2.d.ts]
+declare module X.Y.base {
+    function f();
+    class C {
+    }
+    module M {
+        var v;
+    }
+    enum E {
+    }
+}
+declare module X.Y.base.Z {
+    var f;
+    var C;
+    var M;
+    var E;
+}
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js
index 879491b6c7a..41d73e3ddfd 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js
@@ -88,3 +88,30 @@ var M;
 
 
 //// [declarationEmit_nameConflicts3.d.ts]
+declare module M {
+    interface D {
+    }
+    module D {
+        function f();
+    }
+    module C {
+        function f();
+    }
+    module E {
+        function f();
+    }
+}
+declare module M.P {
+    class C {
+        static f();
+    }
+    class E extends C {
+    }
+    enum D {
+        f = 0,
+    }
+    var v;
+    var w;
+    var x;
+    var x;
+}
diff --git a/tests/baselines/reference/declareDottedModuleName.js b/tests/baselines/reference/declareDottedModuleName.js
index 93e39ed0103..19427e941aa 100644
--- a/tests/baselines/reference/declareDottedModuleName.js
+++ b/tests/baselines/reference/declareDottedModuleName.js
@@ -14,3 +14,11 @@ module T.U { // This needs to be emitted
 
 
 //// [declareDottedModuleName.d.ts]
+declare module M {
+}
+declare module M {
+    module R.S {
+    }
+}
+declare module T.U {
+}
diff --git a/tests/baselines/reference/enumDecl1.js b/tests/baselines/reference/enumDecl1.js
index 091d58c6909..f912586f28e 100644
--- a/tests/baselines/reference/enumDecl1.js
+++ b/tests/baselines/reference/enumDecl1.js
@@ -13,3 +13,5 @@ declare module mAmbient {
 
 
 //// [enumDecl1.d.ts]
+declare module mAmbient {
+}
diff --git a/tests/baselines/reference/es3-amd.js b/tests/baselines/reference/es3-amd.js
index c36c979aac2..29c95e2342c 100644
--- a/tests/baselines/reference/es3-amd.js
+++ b/tests/baselines/reference/es3-amd.js
@@ -25,3 +25,7 @@ var A = (function () {
 //# sourceMappingURL=es3-amd.js.map
 
 //// [es3-amd.d.ts]
+declare class A {
+    constructor ();
+    B();
+}
diff --git a/tests/baselines/reference/es3-declaration-amd.js b/tests/baselines/reference/es3-declaration-amd.js
index d05ea891ba8..47ab55ed675 100644
--- a/tests/baselines/reference/es3-declaration-amd.js
+++ b/tests/baselines/reference/es3-declaration-amd.js
@@ -25,3 +25,7 @@ var A = (function () {
 //# sourceMappingURL=es3-declaration-amd.js.map
 
 //// [es3-declaration-amd.d.ts]
+declare class A {
+    constructor ();
+    B();
+}
diff --git a/tests/baselines/reference/es5-amd.js b/tests/baselines/reference/es5-amd.js
index d6414f28eeb..f75b2951073 100644
--- a/tests/baselines/reference/es5-amd.js
+++ b/tests/baselines/reference/es5-amd.js
@@ -25,3 +25,7 @@ var A = (function () {
 //# sourceMappingURL=es5-amd.js.map
 
 //// [es5-amd.d.ts]
+declare class A {
+    constructor ();
+    B();
+}
diff --git a/tests/baselines/reference/es5-declaration-amd.js b/tests/baselines/reference/es5-declaration-amd.js
index c5e6cba8732..dbf38037761 100644
--- a/tests/baselines/reference/es5-declaration-amd.js
+++ b/tests/baselines/reference/es5-declaration-amd.js
@@ -25,3 +25,7 @@ var A = (function () {
 //# sourceMappingURL=es5-declaration-amd.js.map
 
 //// [es5-declaration-amd.d.ts]
+declare class A {
+    constructor ();
+    B();
+}
diff --git a/tests/baselines/reference/funcdecl.js b/tests/baselines/reference/funcdecl.js
index 2f38ce13173..bd35dded7f5 100644
--- a/tests/baselines/reference/funcdecl.js
+++ b/tests/baselines/reference/funcdecl.js
@@ -133,3 +133,33 @@ var f2 = function () {
 
 
 //// [funcdecl.d.ts]
+declare function simpleFunc();
+declare var simpleFuncVar;
+declare function anotherFuncNoReturn();
+declare var anotherFuncNoReturnVar;
+declare function withReturn();
+declare var withReturnVar;
+declare function withParams(a);
+declare var withparamsVar;
+declare function withMultiParams(a, b, c);
+declare var withMultiParamsVar;
+declare function withOptionalParams(a?);
+declare var withOptionalParamsVar;
+declare function withInitializedParams(a, b0, b?, c?);
+declare var withInitializedParamsVar;
+declare function withOptionalInitializedParams(a, c?);
+declare var withOptionalInitializedParamsVar;
+declare function withRestParams(a, ...myRestParameter);
+declare var withRestParamsVar;
+declare function overload1(n);
+declare function overload1(s);
+declare function overload1(ns);
+declare var withOverloadSignature;
+declare function f(n);
+declare module m2 {
+    function foo(n);
+}
+declare function fooAmbient(n);
+declare function overloadAmbient(n);
+declare function overloadAmbient(s);
+declare var f2;
diff --git a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.js b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.js
index 9a377177bc4..97e70d7b95e 100644
--- a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.js
+++ b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.js
@@ -11,3 +11,4 @@ function foo(args) {
 
 
 //// [functionDeclarationWithArgumentOfTypeFunctionTypeArray.d.ts]
+declare function foo(args);
diff --git a/tests/baselines/reference/functionExpressionReturningItself.js b/tests/baselines/reference/functionExpressionReturningItself.js
index a7a0fb0832b..bce3c6b472f 100644
--- a/tests/baselines/reference/functionExpressionReturningItself.js
+++ b/tests/baselines/reference/functionExpressionReturningItself.js
@@ -8,3 +8,4 @@ var x = function somefn() {
 
 
 //// [functionExpressionReturningItself.d.ts]
+declare var x;
diff --git a/tests/baselines/reference/functionReturningItself.js b/tests/baselines/reference/functionReturningItself.js
index e90398d633e..9d941923690 100644
--- a/tests/baselines/reference/functionReturningItself.js
+++ b/tests/baselines/reference/functionReturningItself.js
@@ -10,3 +10,4 @@ function somefn() {
 
 
 //// [functionReturningItself.d.ts]
+declare function somefn();
diff --git a/tests/baselines/reference/genericArray0.js b/tests/baselines/reference/genericArray0.js
index 8e073a5e010..84b536212c1 100644
--- a/tests/baselines/reference/genericArray0.js
+++ b/tests/baselines/reference/genericArray0.js
@@ -20,3 +20,6 @@ function map() {
 
 
 //// [genericArray0.d.ts]
+declare var x;
+declare var y;
+declare function map<U>();
diff --git a/tests/baselines/reference/genericArray1.js b/tests/baselines/reference/genericArray1.js
index ca3f60285be..1640e7d6466 100644
--- a/tests/baselines/reference/genericArray1.js
+++ b/tests/baselines/reference/genericArray1.js
@@ -19,3 +19,4 @@ var lengths = ["a", "b", "c"].map(function (x) { return x.length; });
 
 
 //// [genericArray1.d.ts]
+declare var lengths;
diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
index fa8097fdecc..bbfc13f872b 100644
--- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
+++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
@@ -20,3 +20,11 @@ var bar;
 
 
 //// [genericClassImplementingGenericInterfaceFromAnotherModule.d.ts]
+declare module foo {
+    interface IFoo<T> {
+    }
+}
+declare module bar {
+    class Foo<T> implments foo.IFoo<T> {
+    }
+}
diff --git a/tests/baselines/reference/genericClasses0.js b/tests/baselines/reference/genericClasses0.js
index 9765a3a1c2d..6b2d5a37a98 100644
--- a/tests/baselines/reference/genericClasses0.js
+++ b/tests/baselines/reference/genericClasses0.js
@@ -18,3 +18,8 @@ var y = v1.x;
 
 
 //// [genericClasses0.d.ts]
+declare class C<T> {
+    x;
+}
+declare var v1;
+declare var y;
diff --git a/tests/baselines/reference/genericClasses1.js b/tests/baselines/reference/genericClasses1.js
index 9a08642ecda..184678aa302 100644
--- a/tests/baselines/reference/genericClasses1.js
+++ b/tests/baselines/reference/genericClasses1.js
@@ -18,3 +18,8 @@ var y = v1.x;
 
 
 //// [genericClasses1.d.ts]
+declare class C<T> {
+    x;
+}
+declare var v1;
+declare var y;
diff --git a/tests/baselines/reference/genericClasses2.js b/tests/baselines/reference/genericClasses2.js
index e81864dae6d..625aeaa32c4 100644
--- a/tests/baselines/reference/genericClasses2.js
+++ b/tests/baselines/reference/genericClasses2.js
@@ -28,3 +28,15 @@ var z = v1.z.a;
 
 
 //// [genericClasses2.d.ts]
+interface Foo<T> {
+    a;
+}
+declare class C<T> {
+    x;
+    y;
+    z;
+}
+declare var v1;
+declare var y;
+declare var w;
+declare var z;
diff --git a/tests/baselines/reference/genericClasses3.js b/tests/baselines/reference/genericClasses3.js
index 61c047d664b..3d8eb05a347 100644
--- a/tests/baselines/reference/genericClasses3.js
+++ b/tests/baselines/reference/genericClasses3.js
@@ -43,3 +43,14 @@ var z = v2.b;
 
 
 //// [genericClasses3.d.ts]
+declare class B<T> {
+    a;
+    b;
+}
+declare class C<T> extends B<T> {
+    x;
+}
+declare var v2;
+declare var y;
+declare var u;
+declare var z;
diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js
index 462abc9ebb7..1645cb8ee0b 100644
--- a/tests/baselines/reference/genericClassesInModule.js
+++ b/tests/baselines/reference/genericClassesInModule.js
@@ -29,3 +29,10 @@ var a = new Foo.B();
 
 
 //// [genericClassesInModule.d.ts]
+declare module Foo {
+    class B<T> {
+    }
+    class A {
+    }
+}
+declare var a;
diff --git a/tests/baselines/reference/genericConstraintDeclaration.js b/tests/baselines/reference/genericConstraintDeclaration.js
index 87a37adb6fe..ad280c4b28d 100644
--- a/tests/baselines/reference/genericConstraintDeclaration.js
+++ b/tests/baselines/reference/genericConstraintDeclaration.js
@@ -20,3 +20,6 @@ var List = (function () {
 
 
 //// [genericConstraintDeclaration.d.ts]
+declare class List<T extends {}> {
+    static empty<T extends {}>();
+}
diff --git a/tests/baselines/reference/genericFunctions0.js b/tests/baselines/reference/genericFunctions0.js
index 8baa7b64f5e..baa5fa59581 100644
--- a/tests/baselines/reference/genericFunctions0.js
+++ b/tests/baselines/reference/genericFunctions0.js
@@ -11,3 +11,5 @@ var x = foo(5);
 
 
 //// [genericFunctions0.d.ts]
+declare function foo<T>(x);
+declare var x;
diff --git a/tests/baselines/reference/genericFunctions1.js b/tests/baselines/reference/genericFunctions1.js
index ba9ac262cbf..b714b3e48f7 100644
--- a/tests/baselines/reference/genericFunctions1.js
+++ b/tests/baselines/reference/genericFunctions1.js
@@ -11,3 +11,5 @@ var x = foo(5);
 
 
 //// [genericFunctions1.d.ts]
+declare function foo<T>(x);
+declare var x;
diff --git a/tests/baselines/reference/genericFunctions2.js b/tests/baselines/reference/genericFunctions2.js
index b9c92e022ee..2cd758676d9 100644
--- a/tests/baselines/reference/genericFunctions2.js
+++ b/tests/baselines/reference/genericFunctions2.js
@@ -12,3 +12,6 @@ var lengths = map(myItems, function (x) { return x.length; });
 
 
 //// [genericFunctions2.d.ts]
+declare function map<T, U>(items, f);
+declare var myItems;
+declare var lengths;
diff --git a/tests/baselines/reference/generics0.js b/tests/baselines/reference/generics0.js
index 03612d8d24f..6796ff4dcf3 100644
--- a/tests/baselines/reference/generics0.js
+++ b/tests/baselines/reference/generics0.js
@@ -13,3 +13,8 @@ var z = v2.x;
 
 
 //// [generics0.d.ts]
+interface G<T> {
+    x;
+}
+declare var v2;
+declare var z;
diff --git a/tests/baselines/reference/generics1NoError.js b/tests/baselines/reference/generics1NoError.js
index 547f9d252ae..7bc6ab39efb 100644
--- a/tests/baselines/reference/generics1NoError.js
+++ b/tests/baselines/reference/generics1NoError.js
@@ -17,3 +17,19 @@ var v4;
 
 
 //// [generics1NoError.d.ts]
+interface A {
+    a;
+}
+interface B extends A {
+    b;
+}
+interface C extends B {
+    c;
+}
+interface G<T, U extends B> {
+    x;
+    y;
+}
+declare var v1;
+declare var v2;
+declare var v4;
diff --git a/tests/baselines/reference/generics2NoError.js b/tests/baselines/reference/generics2NoError.js
index 2c5cd02c0b9..bbf691438f8 100644
--- a/tests/baselines/reference/generics2NoError.js
+++ b/tests/baselines/reference/generics2NoError.js
@@ -24,3 +24,19 @@ var v4;
 
 
 //// [generics2NoError.d.ts]
+interface A {
+    a;
+}
+interface B extends A {
+    b;
+}
+interface C extends B {
+    c;
+}
+interface G<T, U extends B> {
+    x;
+    y;
+}
+declare var v1;
+declare var v2;
+declare var v4;
diff --git a/tests/baselines/reference/generics3.js b/tests/baselines/reference/generics3.js
index 104b2284e5a..e7d8258b989 100644
--- a/tests/baselines/reference/generics3.js
+++ b/tests/baselines/reference/generics3.js
@@ -19,3 +19,14 @@ a = b;
 
 
 //// [generics3.d.ts]
+declare class C<T> {
+    private x;
+}
+interface X {
+    f();
+}
+interface Y {
+    f();
+}
+declare var a;
+declare var b;
diff --git a/tests/baselines/reference/generics4NoError.js b/tests/baselines/reference/generics4NoError.js
index fa269796b8e..3f2387014dc 100644
--- a/tests/baselines/reference/generics4NoError.js
+++ b/tests/baselines/reference/generics4NoError.js
@@ -17,3 +17,14 @@ var b;
 
 
 //// [generics4NoError.d.ts]
+declare class C<T> {
+    private x;
+}
+interface X {
+    f();
+}
+interface Y {
+    f();
+}
+declare var a;
+declare var b;
diff --git a/tests/baselines/reference/implicitAnyAnyReturningFunction.js b/tests/baselines/reference/implicitAnyAnyReturningFunction.js
index d57859c9171..9a43d7cc801 100644
--- a/tests/baselines/reference/implicitAnyAnyReturningFunction.js
+++ b/tests/baselines/reference/implicitAnyAnyReturningFunction.js
@@ -43,3 +43,9 @@ var C = (function () {
 
 
 //// [implicitAnyAnyReturningFunction.d.ts]
+declare function A();
+declare function B();
+declare class C {
+    A();
+    B();
+}
diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.js b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.js
index ded9d79f16b..114c07aa242 100644
--- a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.js
+++ b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.js
@@ -32,3 +32,6 @@ function fn3() {
 
 
 //// [implicitAnyDeclareFunctionWithoutFormalType2.d.ts]
+declare function fn1();
+declare function fn2();
+declare function fn3();
diff --git a/tests/baselines/reference/interfaceOnly.js b/tests/baselines/reference/interfaceOnly.js
index 18b7fd4a7da..707dc0ea660 100644
--- a/tests/baselines/reference/interfaceOnly.js
+++ b/tests/baselines/reference/interfaceOnly.js
@@ -8,3 +8,7 @@ interface foo {
 
 
 //// [interfaceOnly.d.ts]
+interface foo {
+    foo();
+    f2(f);
+}
diff --git a/tests/baselines/reference/interfaceWithOptionalProperty.js b/tests/baselines/reference/interfaceWithOptionalProperty.js
index 3bb49bde85c..7d365b64d6b 100644
--- a/tests/baselines/reference/interfaceWithOptionalProperty.js
+++ b/tests/baselines/reference/interfaceWithOptionalProperty.js
@@ -8,3 +8,6 @@ interface I {
 
 
 //// [interfaceWithOptionalProperty.d.ts]
+interface I {
+    x?;
+}
diff --git a/tests/baselines/reference/interfacedecl.js b/tests/baselines/reference/interfacedecl.js
index f4180ce7eb4..f40eb7f30dc 100644
--- a/tests/baselines/reference/interfacedecl.js
+++ b/tests/baselines/reference/interfacedecl.js
@@ -56,3 +56,37 @@ var instance2 = new c1();
 
 
 //// [interfacedecl.d.ts]
+interface a0 {
+    ();
+    (a, b, c?);
+    new ();
+    new (s);
+    [n];
+    [s];
+    p1;
+    p2;
+    p3?;
+    p4?;
+    p5;
+    f1();
+    f2?();
+    f3(a);
+    f4?(s);
+}
+interface a1 {
+    [n];
+}
+interface a2 {
+    [s];
+}
+interface a {
+}
+interface b extends a {
+}
+interface c extends a, b {
+}
+interface d extends a {
+}
+declare class c1 implments a {
+}
+declare var instance2;
diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js
index 9730047d73e..ed075ae70f7 100644
--- a/tests/baselines/reference/internalAliasClass.js
+++ b/tests/baselines/reference/internalAliasClass.js
@@ -27,3 +27,10 @@ var c;
 
 
 //// [internalAliasClass.d.ts]
+declare module a {
+    class c {
+    }
+}
+declare module c {
+    var x;
+}
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index 4c1d6f33fe4..84a6a04f723 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -52,7 +52,6 @@ export declare module m2 {
     module m3 {
         export import c = x.c;
         var cProp;
-        var cReturnVal;
     }
 }
 export declare var d;
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index e28c236fe8c..264fa5d8618 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -48,6 +48,5 @@ export declare module x {
 export declare module m2 {
     module m3 {
         var cProp;
-        var cReturnVal;
     }
 }
diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js
index dd1c9386587..12159d0e9b7 100644
--- a/tests/baselines/reference/internalAliasEnum.js
+++ b/tests/baselines/reference/internalAliasEnum.js
@@ -31,3 +31,13 @@ var c;
 
 
 //// [internalAliasEnum.d.ts]
+declare module a {
+    enum weekend {
+        Friday = 0,
+        Saturday = 1,
+        Sunday = 2,
+    }
+}
+declare module c {
+    var bVal;
+}
diff --git a/tests/baselines/reference/internalAliasFunction.js b/tests/baselines/reference/internalAliasFunction.js
index 26cd6f21d55..f8cb37bbaed 100644
--- a/tests/baselines/reference/internalAliasFunction.js
+++ b/tests/baselines/reference/internalAliasFunction.js
@@ -29,3 +29,10 @@ var c;
 
 
 //// [internalAliasFunction.d.ts]
+declare module a {
+    function foo(x);
+}
+declare module c {
+    var bVal;
+    var bVal2;
+}
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
index abd17e53b24..ca690cb1f37 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
@@ -33,6 +33,5 @@ export declare module a {
     function foo(x);
 }
 export declare module c {
-    var bVal;
     var bVal2;
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js
index 5b6fcf50561..89ee77acb06 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.js
+++ b/tests/baselines/reference/internalAliasInitializedModule.js
@@ -32,3 +32,12 @@ var c;
 
 
 //// [internalAliasInitializedModule.d.ts]
+declare module a {
+    module b {
+        class c {
+        }
+    }
+}
+declare module c {
+    var x;
+}
diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js
index 3e60693c4ab..46086ece3df 100644
--- a/tests/baselines/reference/internalAliasInterface.js
+++ b/tests/baselines/reference/internalAliasInterface.js
@@ -18,3 +18,10 @@ var c;
 
 
 //// [internalAliasInterface.d.ts]
+declare module a {
+    interface I {
+    }
+}
+declare module c {
+    var x;
+}
diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js
index a54bd4ec917..908da8d6562 100644
--- a/tests/baselines/reference/internalAliasUninitializedModule.js
+++ b/tests/baselines/reference/internalAliasUninitializedModule.js
@@ -22,3 +22,13 @@ var c;
 
 
 //// [internalAliasUninitializedModule.d.ts]
+declare module a {
+    module b {
+        interface I {
+            foo();
+        }
+    }
+}
+declare module c {
+    var x;
+}
diff --git a/tests/baselines/reference/internalAliasVar.js b/tests/baselines/reference/internalAliasVar.js
index 3d653c4c1e3..b46a677d34a 100644
--- a/tests/baselines/reference/internalAliasVar.js
+++ b/tests/baselines/reference/internalAliasVar.js
@@ -22,3 +22,9 @@ var c;
 
 
 //// [internalAliasVar.d.ts]
+declare module a {
+    var x;
+}
+declare module c {
+    var bVal;
+}
diff --git a/tests/baselines/reference/methodSignatureDeclarationEmit1.js b/tests/baselines/reference/methodSignatureDeclarationEmit1.js
index 63d5a8c9209..38f37d84e17 100644
--- a/tests/baselines/reference/methodSignatureDeclarationEmit1.js
+++ b/tests/baselines/reference/methodSignatureDeclarationEmit1.js
@@ -17,3 +17,8 @@ var C = (function () {
 
 
 //// [methodSignatureDeclarationEmit1.d.ts]
+declare class C {
+    foo(n);
+    foo(s);
+    foo(a);
+}
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.js b/tests/baselines/reference/missingImportAfterModuleImport.js
index 439bc9805ce..088fb293f9c 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.js
+++ b/tests/baselines/reference/missingImportAfterModuleImport.js
@@ -34,6 +34,9 @@ module.exports = MainModule;
 
 
 //// [missingImportAfterModuleImport_0.d.ts]
+declare module "SubModule" {
+    export = SubModule;
+}
 //// [missingImportAfterModuleImport_1.d.ts]
 /// <reference path='missingImportAfterModuleImport_0.d.ts' />
 export = MainModule;
diff --git a/tests/baselines/reference/moduleOuterQualification.js b/tests/baselines/reference/moduleOuterQualification.js
index b80f8388ae0..e5c22402625 100644
--- a/tests/baselines/reference/moduleOuterQualification.js
+++ b/tests/baselines/reference/moduleOuterQualification.js
@@ -13,3 +13,5 @@ declare module outer {
 
 
 //// [moduleOuterQualification.d.ts]
+declare module outer {
+}
diff --git a/tests/baselines/reference/noConstraintInReturnType1.js b/tests/baselines/reference/noConstraintInReturnType1.js
index 0c9fe01bae8..7a123470f6b 100644
--- a/tests/baselines/reference/noConstraintInReturnType1.js
+++ b/tests/baselines/reference/noConstraintInReturnType1.js
@@ -16,3 +16,6 @@ var List = (function () {
 
 
 //// [noConstraintInReturnType1.d.ts]
+declare class List<T extends {}> {
+    static empty<T extends {}>();
+}
diff --git a/tests/baselines/reference/objectLiteralDeclarationGeneration1.js b/tests/baselines/reference/objectLiteralDeclarationGeneration1.js
index 107a17d49eb..39ea91daf81 100644
--- a/tests/baselines/reference/objectLiteralDeclarationGeneration1.js
+++ b/tests/baselines/reference/objectLiteralDeclarationGeneration1.js
@@ -10,3 +10,5 @@ var y = (function () {
 
 
 //// [objectLiteralDeclarationGeneration1.d.ts]
+declare class y<T extends {}> {
+}
diff --git a/tests/baselines/reference/out-flag.js b/tests/baselines/reference/out-flag.js
index f634bad26db..86eeed05583 100644
--- a/tests/baselines/reference/out-flag.js
+++ b/tests/baselines/reference/out-flag.js
@@ -30,3 +30,7 @@ var MyClass = (function () {
 //# sourceMappingURL=out-flag.js.map
 
 //// [out-flag.d.ts]
+declare class MyClass {
+    Count();
+    SetCount(value);
+}
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
index c5243f65d09..5338a15586c 100644
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
+++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
@@ -20,3 +20,6 @@ var Outer;
 
 
 //// [privacyCheckTypeOfInvisibleModuleNoError.d.ts]
+declare module Outer {
+    var f;
+}
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
index e69de29bb2d..cd75b7891a0 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
@@ -0,0 +1,8 @@
+declare module "quotedm1" {
+    class v {
+        c;
+    }
+}
+declare module "quotedm2" {
+    var c;
+}
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
index e69de29bb2d..cd75b7891a0 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
@@ -0,0 +1,8 @@
+declare module "quotedm1" {
+    class v {
+        c;
+    }
+}
+declare module "quotedm2" {
+    var c;
+}
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts
index d354e4bfdda..bb36452b3b3 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts
@@ -1,6 +1,3 @@
 export declare module usePrivate_m4_m1 {
-    var x3;
-    var d3;
-    var f3;
     var numberVar;
 }
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts
index d354e4bfdda..bb36452b3b3 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts
@@ -1,6 +1,3 @@
 export declare module usePrivate_m4_m1 {
-    var x3;
-    var d3;
-    var f3;
     var numberVar;
 }
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
index 51056e329ac..f4b3d75a4f2 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
@@ -5,9 +5,6 @@ export declare module m1 {
     var x2;
     var d2;
     var f2;
-    var x3;
-    var d3;
-    var f3;
 }
 export declare var useMultiImport_m4_x4;
 export declare var useMultiImport_m4_d4;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
index 51056e329ac..f4b3d75a4f2 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
@@ -5,9 +5,6 @@ export declare module m1 {
     var x2;
     var d2;
     var f2;
-    var x3;
-    var d3;
-    var f3;
 }
 export declare var useMultiImport_m4_x4;
 export declare var useMultiImport_m4_d4;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
index 350e7dc2031..6ac0e037bf1 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
@@ -5,8 +5,5 @@ export declare module m1 {
     var x2;
     var d2;
     var f2;
-    var x3;
-    var d3;
-    var f3;
 }
 export declare var d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
index 350e7dc2031..6ac0e037bf1 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
@@ -5,8 +5,5 @@ export declare module m1 {
     var x2;
     var d2;
     var f2;
-    var x3;
-    var d3;
-    var f3;
 }
 export declare var d;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
index ba629139285..40d2244c97e 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
@@ -5,7 +5,4 @@ export declare module m1 {
     var x2;
     var d2;
     var f2;
-    var x3;
-    var d3;
-    var f3;
 }
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
index ba629139285..40d2244c97e 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
@@ -5,7 +5,4 @@ export declare module m1 {
     var x2;
     var d2;
     var f2;
-    var x3;
-    var d3;
-    var f3;
 }
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile1.d.ts b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile1.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile1.d.ts
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile1.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile1.d.ts b/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile1.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile1.d.ts
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile1.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts
index e69de29bb2d..cf77b174757 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts
@@ -0,0 +1,5 @@
+declare module test {
+    class ClassA {
+        method();
+    }
+}
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts
index 1d9ec2138ba..cdde109b62b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts
@@ -1 +1,3 @@
 /// <reference path='li'b/class'A.d.ts' />
+declare class ClassC extends test.ClassA {
+}
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts
index e69de29bb2d..cf77b174757 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts
@@ -0,0 +1,5 @@
+declare module test {
+    class ClassA {
+        method();
+    }
+}
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts
index 1d9ec2138ba..cdde109b62b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts
@@ -1 +1,3 @@
 /// <reference path='li'b/class'A.d.ts' />
+declare class ClassC extends test.ClassA {
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index df5e4d4429b..ff730d8da84 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index 7bbc692f243..592f4636287 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1 +1,13 @@
 /// <reference path='../ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 057e5839eb0..110a7cc5723 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1 +1,13 @@
 /// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
index 4002f03fdad..1776f66eeba 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.d.ts
@@ -1,2 +1,8 @@
 /// <reference path='ref/m1.d.ts' />
 /// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
index e69de29bb2d..daf875d0b7b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.d.ts
@@ -0,0 +1,6 @@
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..24ab04b39fe 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var m2_a1;
+declare class m2_c1 {
+    m2_c1_p1;
+}
+declare var m2_instance1;
+declare function m2_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9480f510a38..8ef38975609 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..a21f7c460e9 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,6 @@
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
index e69de29bb2d..2cb96155f83 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 9c08e5a85e3..dbc22bfb284 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -1 +1,7 @@
 /// <reference path='ref/m1.d.ts' />
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..c893db210a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,12 @@
+declare var m1_a1;
+declare class m1_c1 {
+    m1_c1_p1;
+}
+declare var m1_instance1;
+declare function m1_f1();
+declare var a1;
+declare class c1 {
+    p1;
+}
+declare var instance1;
+declare function f1();
diff --git a/tests/baselines/reference/properties.js b/tests/baselines/reference/properties.js
index c3d36ec798f..bc607e34ccb 100644
--- a/tests/baselines/reference/properties.js
+++ b/tests/baselines/reference/properties.js
@@ -31,3 +31,6 @@ var MyClass = (function () {
 //# sourceMappingURL=properties.js.map
 
 //// [properties.d.ts]
+declare class MyClass {
+    Count;
+}
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
index 9dbf0160d97..0d7fd62da5f 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -7406,3 +7406,1021 @@ var caurinus;
 
 
 //// [resolvingClassDeclarationWhenInBaseTypeResolution.d.ts]
+declare module rionegrensis {
+    class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
+        salomonseni();
+        uchidai();
+        raffrayana();
+        Uranium();
+        nayaur();
+    }
+    class veraecrucis<T0, T1> extends trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> {
+        naso();
+        vancouverensis();
+        africana();
+        palliolata();
+        nivicola();
+    }
+}
+declare module julianae {
+    class steerii {
+    }
+    class nudicaudus {
+        brandtii();
+        maxwellii();
+        endoi();
+        venezuelae();
+        zamicrus();
+    }
+    class galapagoensis {
+        isabellae();
+        rueppellii();
+        peregusna();
+        gliroides();
+        banakrisi();
+        rozendaali();
+        stuhlmanni();
+    }
+    class albidens<T0, T1> {
+        mattheyi();
+        Astatine();
+        vincenti();
+        hirta();
+        virginianus();
+        macrophyllum();
+        porcellus();
+    }
+    class oralis<T0, T1> extends caurinus.psilurus {
+        cepapi();
+        porteri();
+        bindi();
+        puda();
+        mindorensis();
+        ignitus();
+        rufus();
+        monax();
+        unalascensis();
+        wuchihensis();
+        leucippe();
+        ordii();
+        eisentrauti();
+    }
+    class sumatrana extends Lanthanum.jugularis {
+        wolffsohni();
+        geata();
+        awashensis();
+        sturdeei();
+        pachyurus();
+        lyelli();
+        neohibernicus();
+    }
+    class gerbillus<T0, T1> {
+        pundti();
+        tristrami();
+        swarthi();
+        horsfieldii();
+        diazi();
+        rennelli();
+        maulinus();
+        muscina();
+        pelengensis();
+        abramus();
+        reevesi();
+    }
+    class acariensis {
+        levicula();
+        minous();
+        cinereiventer();
+        longicaudatus();
+        baeodon();
+        soricoides();
+        datae();
+        spixii();
+        anakuma();
+        kihaulei();
+        gymnura();
+        olchonensis();
+    }
+    class durangae extends dogramacii.aurata {
+        Californium();
+        Flerovium();
+        phrudus();
+    }
+}
+declare module ruatanica {
+    class hector<T0, T1> {
+        humulis();
+        eurycerus();
+    }
+}
+declare module Lanthanum {
+    class suillus<T0, T1> {
+        spilosoma();
+        tumbalensis();
+        anatolicus();
+    }
+    class nitidus<T0, T1> extends argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> {
+        granatensis();
+        negligens();
+        lewisi();
+        arge();
+        dominicensis();
+        taurus();
+        tonganus();
+        silvatica();
+        midas();
+        bicornis();
+    }
+    class megalonyx extends caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> {
+        phillipsii();
+        melanogaster();
+        elaphus();
+        elater();
+        ourebi();
+        caraccioli();
+        parva();
+        albipes();
+    }
+    class jugularis {
+        torrei();
+        revoili();
+        macrobullatus();
+        compactus();
+        talpinus();
+        stramineus();
+        dartmouthi();
+        ogilbyi();
+        incomtus();
+        surdaster();
+        melanorhinus();
+        picticaudata();
+        pomona();
+        ileile();
+    }
+}
+declare module rendalli {
+    class zuluensis extends julianae.steerii {
+        telfairi();
+        keyensis();
+        occasius();
+        damarensis();
+        Neptunium();
+        griseoflavus();
+        thar();
+        alborufus();
+        fusicaudus();
+        gordonorum();
+        ruber();
+        desmarestianus();
+        lutillus();
+        salocco();
+    }
+    class moojeni<T0, T1> {
+        floweri();
+        montosa();
+        miletus();
+        heaneyi();
+        marchei();
+        budini();
+        maggietaylorae();
+        poliocephalus();
+        zibethicus();
+        biacensis();
+    }
+    class crenulata<T0, T1> extends trivirgatus.falconeri {
+        salvanius();
+        maritimus();
+        edax();
+    }
+}
+declare module trivirgatus {
+    class tumidifrons<T0, T1> {
+        nivalis();
+        vestitus();
+        aequatorius();
+        scherman();
+        improvisum();
+        cervinipes();
+        audax();
+        vallinus();
+    }
+    class mixtus<T0, T1> extends argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>> {
+        ochrogaster();
+        bryophilus();
+        liechtensteini();
+        crawfordi();
+        hypsibia();
+        matacus();
+        demidoff();
+    }
+    class lotor<T0, T1> {
+        balensis();
+        pullata();
+    }
+    class falconeri {
+        cabrali();
+        gouldi();
+        fuscicollis();
+        martiensseni();
+        gaoligongensis();
+        shawi();
+        gmelini();
+    }
+    class oconnelli {
+        youngsoni();
+        terrestris();
+        chrysopus();
+        fuscomurina();
+        hellwaldii();
+        aenea();
+        perrini();
+        entellus();
+        krebsii();
+        cephalotes();
+        molossinus();
+        luisi();
+        ceylonicus();
+        ralli();
+    }
+}
+declare module quasiater {
+    class bobrinskoi {
+        crassicaudatus();
+        mulatta();
+        ansorgei();
+        Copper();
+    }
+}
+declare module ruatanica {
+    class americanus extends imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> {
+        nasoloi();
+        mystacalis();
+        fardoulisi();
+        tumidus();
+    }
+}
+declare module lavali {
+    class wilsoni extends Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> {
+        setiger();
+        lorentzii();
+        antisensis();
+        blossevillii();
+        bontanus();
+        caligata();
+        franqueti();
+        roberti();
+        degelidus();
+        amoenus();
+        kob();
+        csorbai();
+        dorsata();
+    }
+    class beisa {
+    }
+    class otion extends howi.coludo<argurus.oreas, howi.marcanoi> {
+        bonaerensis();
+        dussumieri();
+        osvaldoreigi();
+        grevyi();
+        hirtula();
+        cristatus();
+        darlingtoni();
+        fontanierii();
+        umbrosus();
+        chiriquinus();
+        orarius();
+        ilaeus();
+        musschenbroekii();
+    }
+    class xanthognathus {
+        nanulus();
+        albigena();
+        onca();
+        gunnii();
+        apeco();
+        variegates();
+        goudotii();
+        pohlei();
+        ineptus();
+        euryotis();
+        maurisca();
+        coyhaiquensis();
+    }
+    class thaeleri extends argurus.oreas {
+        coromandra();
+        parvipes();
+        sponsorius();
+        vates();
+        roosmalenorum();
+        rubicola();
+        ikonnikovi();
+        paramicrus();
+    }
+    class lepturus extends Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> {
+        ferrumequinum();
+        aequalis();
+    }
+}
+declare module dogramacii {
+    class robustulus extends lavali.wilsoni {
+        fossor();
+        humboldti();
+        mexicana();
+        martini();
+        beatus();
+        leporina();
+        pearsonii();
+        keaysi();
+        hindei();
+    }
+    class koepckeae {
+        culturatus();
+    }
+    class kaiseri {
+        bedfordiae();
+        paramorum();
+        rubidus();
+        juninensis();
+        marginata();
+        Meitnerium();
+        pinetorum();
+        hoolock();
+        poeyi();
+        Thulium();
+        patrius();
+        quadraticauda();
+        ater();
+    }
+    class aurata {
+        grunniens();
+        howensis();
+        karlkoopmani();
+        mirapitanga();
+        ophiodon();
+        landeri();
+        sonomae();
+        erythromos();
+    }
+}
+declare module lutreolus {
+    class schlegeli extends lavali.beisa {
+        mittendorfi();
+        blicki();
+        culionensis();
+        scrofa();
+        fernandoni();
+        Tin();
+        marmorata();
+        tavaratra();
+        peregrina();
+        frontalis();
+        cuniculus();
+        magdalenae();
+        andamanensis();
+        dispar();
+    }
+}
+declare module argurus {
+    class dauricus<T0, T1> {
+        chinensis();
+        duodecimcostatus();
+        foxi();
+        macleayii();
+        darienensis();
+        hardwickii();
+        albifrons();
+        jacobitus();
+        guentheri();
+        mahomet();
+        misionensis();
+    }
+}
+declare module nigra {
+    class dolichurus<T0, T1> {
+        solomonis();
+        alfredi();
+        morrisi();
+        lekaguli();
+        dimissus();
+        phaeotis();
+        ustus();
+        sagei();
+    }
+}
+declare module panglima {
+    class amphibius<T0, T1> extends caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis> {
+        bottegi();
+        jerdoni();
+        camtschatica();
+        spadix();
+        luismanueli();
+        aceramarcae();
+    }
+    class fundatus<T0, T1> extends lutreolus.schlegeli {
+        crassulus();
+        flamarioni();
+        mirabilis();
+    }
+    class abidi<T0, T1> extends argurus.dauricus<argurus.germaini, julianae.durangae> {
+        greyii();
+        macedonicus();
+        galili();
+        thierryi();
+        ega();
+    }
+}
+declare module quasiater {
+    class carolinensis {
+        concinna();
+        aeneus();
+        aloysiisabaudiae();
+        tenellus();
+        andium();
+        persephone();
+        patrizii();
+    }
+}
+declare module minutus {
+    class himalayana<T0, T1> extends lutreolus.punicus {
+        simoni();
+        lobata();
+        rusticus();
+        latona();
+        famulus();
+        flaviceps();
+        paradoxolophus();
+        Osmium();
+        vulgaris();
+        betsileoensis();
+        vespuccii();
+        olympus();
+    }
+}
+declare module caurinus {
+    class mahaganus<T0, T1> extends panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> {
+        martiniquensis();
+        devius();
+        masalai();
+        kathleenae();
+        simulus();
+        nigrovittatus();
+        senegalensis();
+        acticola();
+    }
+}
+declare module macrorhinos {
+    class marmosurus<T0, T1> {
+        tansaniana();
+    }
+}
+declare module howi {
+    class angulatus<T0, T1> extends sagitta.stolzmanni {
+        pennatus();
+    }
+}
+declare module daubentonii {
+    class nesiotes<T0, T1> {
+    }
+}
+declare module nigra {
+    class thalia<T0, T1> {
+        dichotomus();
+        arnuxii();
+        verheyeni();
+        dauuricus();
+        tristriatus();
+        lasiura();
+        gangetica();
+        brucei();
+    }
+}
+declare module sagitta {
+    class walkeri extends minutus.portoricensis {
+        maracajuensis();
+    }
+}
+declare module minutus {
+    class inez<T0, T1> extends samarensis.pelurus<argurus.germaini, julianae.durangae> {
+        vexillaris();
+    }
+}
+declare module macrorhinos {
+    class konganensis extends imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> {
+    }
+}
+declare module panamensis {
+    class linulus<T0, T1> extends ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>> {
+        goslingi();
+        taki();
+        fumosus();
+        rufinus();
+        lami();
+        regina();
+        nanilla();
+        enganus();
+        gomantongensis();
+    }
+}
+declare module nigra {
+    class gracilis<T0, T1> {
+        weddellii();
+        echinothrix();
+        garridoi();
+        rouxii();
+        aurita();
+        geoffrensis();
+        theresa();
+        melanocarpus();
+        dubiaquercus();
+        pectoralis();
+        apoensis();
+        grisescens();
+        ramirohitra();
+    }
+}
+declare module samarensis {
+    class pelurus<T0, T1> extends sagitta.stolzmanni {
+        Palladium();
+        castanea();
+        chamek();
+        nigriceps();
+        lunatus();
+        madurae();
+        chinchilla();
+        eliasi();
+        proditor();
+        gambianus();
+        petteri();
+        nusatenggara();
+        olitor();
+    }
+    class fuscus<T0, T1> extends macrorhinos.daphaenodon {
+        planifrons();
+        badia();
+        prymnolopha();
+        natalensis();
+        hunteri();
+        sapiens();
+        macrocercus();
+        nimbae();
+        suricatta();
+        jagorii();
+        beecrofti();
+        imaizumii();
+        colocolo();
+        wolfi();
+    }
+    class pallidus {
+        oblativa();
+        watersi();
+        glacialis();
+        viaria();
+    }
+    class cahirinus<T0, T1> {
+        alashanicus();
+        flaviventer();
+        bottai();
+        pinetis();
+        saussurei();
+    }
+}
+declare module sagitta {
+    class leptoceros<T0, T1> extends caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>> {
+        victus();
+        hoplomyoides();
+        gratiosus();
+        rex();
+        bolami();
+    }
+}
+declare module daubentonii {
+    class nigricans<T0, T1> extends sagitta.stolzmanni {
+        woosnami();
+    }
+}
+declare module dammermani {
+    class siberu<T0, T1> {
+    }
+}
+declare module argurus {
+    class pygmaea<T0, T1> extends rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> {
+        pajeros();
+        capucinus();
+        cuvieri();
+    }
+}
+declare module chrysaeolus {
+    class sarasinorum<T0, T1> extends caurinus.psilurus {
+        belzebul();
+        hinpoon();
+        kandti();
+        cynosuros();
+        Germanium();
+        Ununoctium();
+        princeps();
+    }
+}
+declare module argurus {
+    class wetmorei<T0, T1> {
+        leucoptera();
+        ochraventer();
+        tephromelas();
+        cracens();
+        jamaicensis();
+        gymnocaudus();
+        mayori();
+    }
+}
+declare module argurus {
+    class oreas extends lavali.wilsoni {
+        salamonis();
+        paniscus();
+        fagani();
+        papuanus();
+        timidus();
+        nghetinhensis();
+        barbei();
+        univittatus();
+    }
+}
+declare module daubentonii {
+    class arboreus<T0, T1> {
+        capreolus();
+        moreni();
+        hypoleucos();
+        paedulcus();
+        pucheranii();
+        stella();
+        brasiliensis();
+        brevicaudata();
+        vitticollis();
+        huangensis();
+        cameroni();
+        tianshanica();
+    }
+}
+declare module patas {
+    class uralensis {
+        cartilagonodus();
+        pyrrhinus();
+        insulans();
+        nigricauda();
+        muricauda();
+        albicaudus();
+        fallax();
+        attenuata();
+        megalura();
+        neblina();
+        citellus();
+        tanezumi();
+        albiventer();
+    }
+}
+declare module provocax {
+    class melanoleuca extends lavali.wilsoni {
+        Neodymium();
+        baeri();
+    }
+}
+declare module sagitta {
+    class sicarius<T0, T1> {
+        Chlorine();
+        simulator();
+    }
+}
+declare module howi {
+    class marcanoi extends Lanthanum.megalonyx {
+        formosae();
+        dudui();
+        leander();
+        martinsi();
+        beatrix();
+        griseoventer();
+        zerda();
+        yucatanicus();
+        nigrita();
+        jouvenetae();
+        indefessus();
+        vuquangensis();
+        Zirconium();
+        hyaena();
+    }
+}
+declare module argurus {
+    class gilbertii<T0, T1> {
+        nasutus();
+        poecilops();
+        sondaicus();
+        auriventer();
+        cherriei();
+        lindberghi();
+        pipistrellus();
+        paranus();
+        dubosti();
+        opossum();
+        oreopolus();
+        amurensis();
+    }
+}
+declare module petrophilus {
+    class minutilla {
+    }
+}
+declare module lutreolus {
+    class punicus {
+        strandi();
+        lar();
+        erica();
+        trichura();
+        lemniscatus();
+        aspalax();
+        marshalli();
+        Zinc();
+        monochromos();
+        purinus();
+        ischyrus();
+        tenuis();
+        Helium();
+    }
+}
+declare module macrorhinos {
+    class daphaenodon {
+        bredanensis();
+        othus();
+        hammondi();
+        aureocollaris();
+        flavipes();
+        callosus();
+    }
+}
+declare module sagitta {
+    class cinereus<T0, T1> {
+        zunigae();
+        microps();
+        guaporensis();
+        tonkeana();
+        montensis();
+        sphinx();
+        glis();
+        dorsalis();
+        fimbriatus();
+        sara();
+        epimelas();
+        pittieri();
+    }
+}
+declare module nigra {
+    class caucasica<T0, T1> {
+    }
+}
+declare module gabriellae {
+    class klossii<T0, T1> extends imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> {
+    }
+    class amicus {
+        pirrensis();
+        phaeura();
+        voratus();
+        satarae();
+        hooperi();
+        perrensi();
+        ridei();
+        audeberti();
+        Lutetium();
+        atrox();
+    }
+    class echinatus {
+        tenuipes();
+    }
+}
+declare module imperfecta {
+    class lasiurus<T0, T1> {
+        marisae();
+        fulvus();
+        paranaensis();
+        didactylus();
+        schreibersii();
+        orii();
+    }
+    class subspinosus {
+        monticularis();
+        Gadolinium();
+        oasicus();
+        paterculus();
+        punctata();
+        invictus();
+        stangeri();
+        siskiyou();
+        welwitschii();
+        Polonium();
+        harpia();
+    }
+    class ciliolabrum<T0, T1> extends dogramacii.robustulus {
+        leschenaultii();
+        ludia();
+        sinicus();
+    }
+}
+declare module quasiater {
+    class wattsi<T0, T1> {
+        lagotis();
+        hussoni();
+        bilarni();
+        cabrerae();
+    }
+}
+declare module butleri {
+}
+declare module petrophilus {
+    class sodyi<T0, T1> extends quasiater.bobrinskoi {
+        saundersiae();
+        imberbis();
+        cansdalei();
+        Lawrencium();
+        catta();
+        breviceps();
+        transitionalis();
+        heptneri();
+        bairdii();
+    }
+}
+declare module caurinus {
+    class megaphyllus extends imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> {
+        montana();
+        amatus();
+        bucculentus();
+        lepida();
+        graecus();
+        forsteri();
+        perotensis();
+        cirrhosus();
+    }
+}
+declare module minutus {
+    class portoricensis {
+        relictus();
+        aequatorianus();
+        rhinogradoides();
+    }
+}
+declare module lutreolus {
+    class foina {
+        tarfayensis();
+        Promethium();
+        salinae();
+        kerri();
+        scotti();
+        camerunensis();
+        affinis();
+        siebersi();
+        maquassiensis();
+        layardi();
+        bishopi();
+        apodemoides();
+        argentiventer();
+    }
+}
+declare module lutreolus {
+    class cor<T0, T1> extends panglima.fundatus<panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops> {
+        antinorii();
+        voi();
+        mussoi();
+        truncatus();
+        achates();
+        praedatrix();
+        mzabi();
+        xanthinus();
+        tapoatafa();
+        castroviejoi();
+    }
+}
+declare module howi {
+    class coludo<T0, T1> {
+        bernhardi();
+        isseli();
+    }
+}
+declare module argurus {
+    class germaini extends gabriellae.amicus {
+        sharpei();
+        palmarum();
+    }
+}
+declare module sagitta {
+    class stolzmanni {
+        riparius();
+        dhofarensis();
+        tricolor();
+        gardneri();
+        walleri();
+        talpoides();
+        pallipes();
+        lagurus();
+        hipposideros();
+        griselda();
+        florium();
+    }
+}
+declare module dammermani {
+    class melanops extends minutus.inez<sagitta.stolzmanni, dammermani.melanops> {
+        blarina();
+        harwoodi();
+        ashaninka();
+        wiedii();
+        godmani();
+        condorensis();
+        xerophila();
+        laminatus();
+        archeri();
+        hidalgo();
+        unicolor();
+        philippii();
+        bocagei();
+    }
+}
+declare module argurus {
+    class peninsulae extends patas.uralensis {
+        aitkeni();
+        novaeangliae();
+        olallae();
+        anselli();
+        timminsi();
+        sordidus();
+        telfordi();
+        cavernarum();
+    }
+}
+declare module argurus {
+    class netscheri<T0, T1> {
+        gravis();
+        ruschii();
+        tricuspidatus();
+        fernandezi();
+        colletti();
+        microbullatus();
+        eburneae();
+        tatei();
+        millardi();
+        pruinosus();
+        delator();
+        nyikae();
+        ruemmleri();
+    }
+}
+declare module ruatanica {
+    class Praseodymium<T0, T1> extends ruatanica.hector<lutreolus.punicus, gabriellae.amicus> {
+        clara();
+        spectabilis();
+        kamensis();
+        ruddi();
+        bartelsii();
+        yerbabuenae();
+        davidi();
+        pilirostris();
+        catherinae();
+        frontata();
+        Terbium();
+        thomensis();
+        soricinus();
+    }
+}
+declare module caurinus {
+    class johorensis<T0, T1> extends lutreolus.punicus {
+        maini();
+    }
+}
+declare module argurus {
+    class luctuosa {
+        loriae();
+    }
+}
+declare module panamensis {
+    class setulosus<T0, T1> {
+        duthieae();
+        guereza();
+        buselaphus();
+        nuttalli();
+        pelii();
+        tunneyi();
+        lamula();
+        vampyrus();
+    }
+}
+declare module petrophilus {
+    class rosalia<T0, T1> {
+        palmeri();
+        baeops();
+        ozensis();
+        creaghi();
+        montivaga();
+    }
+}
+declare module caurinus {
+    class psilurus extends lutreolus.punicus {
+        socialis();
+        lundi();
+        araeum();
+        calamianensis();
+        petersoni();
+        nitela();
+    }
+}
diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js
index 1ae4c9db619..133421417d9 100644
--- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js
+++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js
@@ -12,3 +12,6 @@ var m1;
 
 
 //// [stringLiteralObjectLiteralDeclaration1.d.ts]
+declare module m1 {
+    var n;
+}
diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js
index 334f32477f1..e43311b7296 100644
--- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js
+++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js
@@ -12,3 +12,7 @@ var m = M;
 
 
 //// [structuralTypeInDeclareFileForModule.d.ts]
+declare module M {
+    var x;
+}
+declare var m;
diff --git a/tests/baselines/reference/typeofUndefined.js b/tests/baselines/reference/typeofUndefined.js
index 5278360fb93..e6a6b0b03dc 100644
--- a/tests/baselines/reference/typeofUndefined.js
+++ b/tests/baselines/reference/typeofUndefined.js
@@ -9,3 +9,5 @@ var x;
 
 
 //// [typeofUndefined.d.ts]
+declare var x;
+declare var x;
diff --git a/tests/baselines/reference/vardecl.js b/tests/baselines/reference/vardecl.js
index 965c50bd704..1c59cade0b8 100644
--- a/tests/baselines/reference/vardecl.js
+++ b/tests/baselines/reference/vardecl.js
@@ -171,3 +171,44 @@ var b = 10;
 
 
 //// [vardecl.d.ts]
+declare var simpleVar;
+declare var anotherVar;
+declare var varWithSimpleType;
+declare var varWithArrayType;
+declare var varWithInitialValue;
+declare var withComplicatedValue;
+declare var declaredVar;
+declare var declareVar2;
+declare var declaredVar3;
+declare var deckareVarWithType;
+declare var arrayVar;
+declare var complicatedArrayVar;
+declare var n1;
+declare var c;
+declare var d;
+declare var d3;
+declare var d2;
+declare var n2;
+declare var n4;
+declare var d4;
+declare module m2 {
+    var a, b2, b;
+    class C2 {
+        b;
+        constructor (b);
+    }
+    var mE;
+    var d1E, d2E;
+    var b2E;
+    var v1E;
+}
+declare var a22, b22, c22;
+declare var nn;
+declare var da1, da2;
+declare var normalVar;
+declare var dv1;
+declare var xl;
+declare var x;
+declare var z;
+declare function foo(a2);
+declare var b;