diff --git a/src/node_buffer.h b/src/node_buffer.h
index d680eb90eb1649..acf9b23c3b3256 100644
--- a/src/node_buffer.h
+++ b/src/node_buffer.h
@@ -22,7 +22,8 @@
 #ifndef SRC_NODE_BUFFER_H_
 #define SRC_NODE_BUFFER_H_
 
-#include "node_internals.h"
+#include "node.h"
+#include "v8.h"
 
 namespace node {
 
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
index ced9e4dd982f79..f477016ec03e9f 100644
--- a/src/node_serdes.cc
+++ b/src/node_serdes.cc
@@ -1,10 +1,7 @@
-#include "node.h"
+#include "node_internals.h"
 #include "node_buffer.h"
 #include "base-object.h"
 #include "base-object-inl.h"
-#include "env.h"
-#include "env-inl.h"
-#include "v8.h"
 
 namespace node {
 
diff --git a/src/spawn_sync.h b/src/spawn_sync.h
index a3eef5b15eb2bf..5b17e400911f9d 100644
--- a/src/spawn_sync.h
+++ b/src/spawn_sync.h
@@ -24,7 +24,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "node.h"
+#include "node_internals.h"
 #include "node_buffer.h"
 
 namespace node {
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
index 9df42f3bfada01..60e88c45888944 100644
--- a/src/string_bytes.cc
+++ b/src/string_bytes.cc
@@ -22,9 +22,8 @@
 #include "string_bytes.h"
 
 #include "base64.h"
-#include "node.h"
+#include "node_internals.h"
 #include "node_buffer.h"
-#include "v8.h"
 
 #include <limits.h>
 #include <string.h>  // memcpy