diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 72efb5fee..55ecffcc6 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -34,11 +34,6 @@ const {posixPath} = require('../helpers');
 //                        Build                           //
 ////////////////////////////////////////////////////////////
 
-/**
- * Directory in which core/ can be found after passing through tsc.
- */
-const CORE_DIR = path.join(TSC_OUTPUT_DIR, 'core');
-
 /**
  * Suffix to add to compiled output files.
  */
@@ -104,49 +99,47 @@ const NAMESPACE_PROPERTY = '__namespace__';
 const chunks = [
   {
     name: 'blockly',
-    entry: posixPath((argv.compileTs) ?
-      path.join(TSC_OUTPUT_DIR, CORE_DIR, 'main.js') :
-      path.join(CORE_DIR, 'main.js')),
+    entry: path.join(TSC_OUTPUT_DIR, 'core', 'main.js'),
     exports: 'module$build$src$core$blockly',
     reexport: 'Blockly',
   },
   {
     name: 'blocks',
-    entry: 'blocks/blocks.js',
+    entry: path.join(TSC_OUTPUT_DIR, 'blocks', 'blocks.js'),
     exports: 'module$exports$Blockly$libraryBlocks',
     reexport: 'Blockly.libraryBlocks',
   },
   {
     name: 'javascript',
-    entry: 'generators/javascript/all.js',
+    entry: path.join(TSC_OUTPUT_DIR, 'generators', 'javascript', 'all.js'),
     exports: 'module$exports$Blockly$JavaScript',
     reexport: 'Blockly.JavaScript',
     reexportOnly: 'javascriptGenerator',
   },
   {
     name: 'python',
-    entry: 'generators/python/all.js',
+    entry: path.join(TSC_OUTPUT_DIR, 'generators', 'python', 'all.js'),
     exports: 'module$exports$Blockly$Python',
     reexport: 'Blockly.Python',
     reexportOnly: 'pythonGenerator',
   },
   {
     name: 'php',
-    entry: 'generators/php/all.js',
+    entry: path.join(TSC_OUTPUT_DIR, 'generators', 'php', 'all.js'),
     exports: 'module$exports$Blockly$PHP',
     reexport: 'Blockly.PHP',
     reexportOnly: 'phpGenerator',
   },
   {
     name: 'lua',
-    entry: 'generators/lua/all.js',
+    entry: path.join(TSC_OUTPUT_DIR, 'generators', 'lua', 'all.js'),
     exports: 'module$exports$Blockly$Lua',
     reexport: 'Blockly.Lua',
     reexportOnly: 'luaGenerator',
   },
   {
     name: 'dart',
-    entry: 'generators/dart/all.js',
+    entry: path.join(TSC_OUTPUT_DIR, 'generators', 'dart', 'all.js'),
     exports: 'module$exports$Blockly$Dart',
     reexport: 'Blockly.Dart',
     reexportOnly: 'dartGenerator',
@@ -313,8 +306,6 @@ function buildDeps() {
   const roots = [
     path.join(TSC_OUTPUT_DIR, 'closure', 'goog', 'base.js'),
     TSC_OUTPUT_DIR,
-    'blocks',
-    'generators',
     'tests/mocha',
   ];
 
@@ -691,14 +682,13 @@ function buildAdvancedCompilationTest() {
   }
 
   const srcs = [
-    TSC_OUTPUT_DIR + '/closure/goog/base_minimal.js',
-    TSC_OUTPUT_DIR + '/closure/goog/goog.js',
-    TSC_OUTPUT_DIR + '/core/**/*.js',
-    'blocks/**/*.js',
-    'generators/**/*.js',
+    TSC_OUTPUT_DIR + '/**/*.js',
     'tests/compile/main.js',
     'tests/compile/test_blocks.js',
   ];
+  const ignore = [
+    TSC_OUTPUT_DIR + '/closure/goog/base.js',  // Use base_minimal.js only.
+  ];
 
   // Closure Compiler options.
   const options = {
@@ -707,7 +697,7 @@ function buildAdvancedCompilationTest() {
     entry_point: './tests/compile/main.js',
     js_output_file: 'main_compressed.js',
   };
-  return gulp.src(srcs, {base: './'})
+  return gulp.src(srcs, {base: './', ignore})
       .pipe(stripApacheLicense())
       .pipe(gulp.sourcemaps.init())
       .pipe(compile(options))
diff --git a/tsconfig.json b/tsconfig.json
index 2d65a6486..a686762a5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,9 @@
 {
   "include": [
     "core/**/*",  // N.B.: also pulls in closure/goog/goog.js if needed.
-    "closure/**/*",  // Just for ouptut directory structure.
+    "closure/goog/*",  // For base.js and base_minimal.js.
+    "blocks/**/*",
+    "generators/**/*",
   ],
   "compilerOptions": {
     // Tells TypeScript to read JS files, as
@@ -36,5 +38,5 @@
     // PR #6564: https://github.com/google/blockly/pull/6564), so
     // disable it except for the explicitly-specified types.
     "types": [],
-  }
+  },
 }