diff --git a/deno2/deno_internal.h b/deno2/deno_internal.h
index d125f39b15..35a20bdc0b 100644
--- a/deno2/deno_internal.h
+++ b/deno2/deno_internal.h
@@ -16,6 +16,10 @@ static intptr_t external_references[] = {reinterpret_cast<intptr_t>(Print),
                                          reinterpret_cast<intptr_t>(Recv),
                                          reinterpret_cast<intptr_t>(Send), 0};
 
+v8::StartupData make_snapshot(v8::StartupData* prev_natives_blob,
+                              v8::StartupData* prev_snapshot_blob,
+                              const char* js_filename, const char* js_source);
+
 // deno_s = Wrapped Isolate.
 struct deno_s {
   v8::Isolate* isolate;
diff --git a/deno2/include/deno.h b/deno2/include/deno.h
index e5a25f2405..d2bdca9002 100644
--- a/deno2/include/deno.h
+++ b/deno2/include/deno.h
@@ -3,9 +3,6 @@
 #ifndef INCLUDE_DENO_H_
 #define INCLUDE_DENO_H_
 
-#include <string>
-#include "v8/include/v8.h"
-
 namespace deno {
 
 // Data that gets transmitted.
@@ -28,10 +25,6 @@ void v8_set_flags(int* argc, char** argv);
 // Constructors:
 Deno* from_snapshot(void* data, RecvCallback cb);
 
-v8::StartupData make_snapshot(v8::StartupData* prev_natives_blob,
-                              v8::StartupData* prev_snapshot_blob,
-                              const char* js_filename, const char* js_source);
-
 void* deno_get_data();
 
 // Returns nonzero on error.
diff --git a/deno2/snapshot_creator.cc b/deno2/snapshot_creator.cc
index f1bbfb0ed4..f904e6679e 100644
--- a/deno2/snapshot_creator.cc
+++ b/deno2/snapshot_creator.cc
@@ -10,6 +10,7 @@
 #include "v8/include/v8.h"
 
 #include "include/deno.h"
+#include "./deno_internal.h"
 
 class StartupDataCppWriter {
  public:
diff --git a/deno2/tools/format.sh b/deno2/tools/format.sh
index e4fe09f82c..25c9f4a892 100755
--- a/deno2/tools/format.sh
+++ b/deno2/tools/format.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd `dirname "$0"`/..
-clang-format -i -style Google *.cc *.h
+clang-format -i -style Google *.cc *.h include/*.h
 gn format BUILD.gn
 gn format .gn
 yapf -i tools/*.py