diff --git a/BUILD.gn b/BUILD.gn
index 3593751524..b1c455a5e2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -184,6 +184,12 @@ run_node("deno_runtime_declaration") {
   deps = [
     ":msg_ts",
   ]
+  inputs = ts_sources + [
+             "tools/ts_library_builder/tsconfig.json",
+             "tools/ts_library_builder/main.ts",
+             "tools/ts_library_builder/build_library.ts",
+             "tools/ts_library_builder/ast_util.ts",
+           ]
   args = [
     rebase_path("node_modules/ts-node/dist/bin.js", root_build_dir),
     "--project",
@@ -197,7 +203,7 @@ run_node("deno_runtime_declaration") {
     "--buildPath",
     rebase_path(root_build_dir, root_build_dir),
     "--outFile",
-    rebase_path("$out_dir/lib/lib.deno_runtime.d.ts", root_build_dir),
+    rebase_path(outputs[0], root_build_dir),
     "--silent",
   ]
   if (is_debug) {
diff --git a/libdeno/deno.gni b/libdeno/deno.gni
index 56843f4dc3..90d61240b9 100644
--- a/libdeno/deno.gni
+++ b/libdeno/deno.gni
@@ -10,15 +10,19 @@ template("bundle") {
       out_dir + out_name + ".js",
       out_dir + out_name + ".js.map",
     ]
+    inputs = [
+      "js/" + out_name + ".ts",
+      "rollup.config.js",
+    ]
     depfile = out_dir + out_name + ".d"
     args = [
       rebase_path("third_party/node_modules/rollup/bin/rollup", root_build_dir),
       "-c",
       rebase_path("rollup.config.js", root_build_dir),
       "-i",
-      rebase_path("js/" + out_name + ".ts", root_build_dir),
+      rebase_path(inputs[0], root_build_dir),
       "-o",
-      rebase_path(out_dir + out_name + ".js", root_build_dir),
+      rebase_path(outputs[0], root_build_dir),
       "--sourcemapFile",
       rebase_path("."),
       "--silent",
diff --git a/src/deno_dir.rs b/src/deno_dir.rs
index 1d101dd8a2..829af5aa28 100644
--- a/src/deno_dir.rs
+++ b/src/deno_dir.rs
@@ -1183,7 +1183,8 @@ mod tests {
 
     let specifier = "http_test.ts";
     let referrer = add_root!("/Users/rld/src/deno_net/");
-    let expected_module_name = file_url!("/Users/rld/src/deno_net/http_test.ts");
+    let expected_module_name =
+      file_url!("/Users/rld/src/deno_net/http_test.ts");
     let expected_filename = add_root!("/Users/rld/src/deno_net/http_test.ts");
 
     let (module_name, filename) =