diff --git a/CPP_STYLE_GUIDE.md b/CPP_STYLE_GUIDE.md
index 3bea5bb107586f..3e7319c1f8e8f7 100644
--- a/CPP_STYLE_GUIDE.md
+++ b/CPP_STYLE_GUIDE.md
@@ -127,21 +127,6 @@ class FancyContainer {
 
 What it says in the title.
 
-## Do not include `*.h` if `*-inl.h` has already been included
-
-Do
-
-```cpp
-#include "util-inl.h"  // already includes util.h
-```
-
-instead of
-
-```cpp
-#include "util.h"
-#include "util-inl.h"
-```
-
 ## Avoid throwing JavaScript errors in nested C++ methods
 
 If you need to throw JavaScript errors from a C++ binding method, try to do it
diff --git a/src/aliased_buffer.h b/src/aliased_buffer.h
index 21aaeb61141c59..2e5598b4757902 100644
--- a/src/aliased_buffer.h
+++ b/src/aliased_buffer.h
@@ -3,6 +3,7 @@
 #define SRC_ALIASED_BUFFER_H_
 
 #include "v8.h"
+#include "util.h"
 #include "util-inl.h"
 
 namespace node {
diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h
index 617d51dc59f037..dd947dbd446cac 100644
--- a/src/async-wrap-inl.h
+++ b/src/async-wrap-inl.h
@@ -25,6 +25,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "async-wrap.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 #include "node_internals.h"
 
diff --git a/src/async-wrap.cc b/src/async-wrap.cc
index 8f2b8f377f4d1f..36480b323245d5 100644
--- a/src/async-wrap.cc
+++ b/src/async-wrap.cc
@@ -19,8 +19,11 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include "uv.h"
diff --git a/src/base-object-inl.h b/src/base-object-inl.h
index 480edd7463e7f0..94449819a83239 100644
--- a/src/base-object-inl.h
+++ b/src/base-object-inl.h
@@ -25,7 +25,9 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "base-object.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 1abbbe629a6e0e..e800e0f2fee260 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -21,10 +21,14 @@
 
 #define CARES_STATICLIB
 #include "ares.h"
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
 #include "node.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 
diff --git a/src/connect_wrap.cc b/src/connect_wrap.cc
index 3dd3b40194ac28..e373b5a36e33e6 100644
--- a/src/connect_wrap.cc
+++ b/src/connect_wrap.cc
@@ -1,7 +1,10 @@
 #include "connect_wrap.h"
 
+#include "env.h"
 #include "env-inl.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
+#include "util.h"
 #include "util-inl.h"
 
 namespace node {
diff --git a/src/connection_wrap.cc b/src/connection_wrap.cc
index b620c387ff1cfc..a7f08ecc19f2d8 100644
--- a/src/connection_wrap.cc
+++ b/src/connection_wrap.cc
@@ -2,9 +2,11 @@
 
 #include "connect_wrap.h"
 #include "env-inl.h"
+#include "env.h"
 #include "pipe_wrap.h"
 #include "stream_wrap.h"
 #include "tcp_wrap.h"
+#include "util.h"
 #include "util-inl.h"
 
 namespace node {
diff --git a/src/env-inl.h b/src/env-inl.h
index 83b87fadacc6fd..bd13881cb13e56 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -27,6 +27,7 @@
 #include "aliased_buffer.h"
 #include "env.h"
 #include "node.h"
+#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 #include "v8.h"
diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc
index da39602c1bba36..8ec8dd6dcfbd76 100644
--- a/src/fs_event_wrap.cc
+++ b/src/fs_event_wrap.cc
@@ -19,8 +19,11 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "node.h"
 #include "handle_wrap.h"
diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc
index 071f5ff873758a..7d0925e2fd6354 100644
--- a/src/handle_wrap.cc
+++ b/src/handle_wrap.cc
@@ -20,8 +20,11 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "handle_wrap.h"
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "node.h"
 
diff --git a/src/inspector_io.cc b/src/inspector_io.cc
index 73f0419ead6545..12a0d20720354a 100644
--- a/src/inspector_io.cc
+++ b/src/inspector_io.cc
@@ -1,6 +1,7 @@
 #include "inspector_io.h"
 
 #include "inspector_socket_server.h"
+#include "env.h"
 #include "env-inl.h"
 #include "node.h"
 #include "node_crypto.h"
diff --git a/src/inspector_js_api.cc b/src/inspector_js_api.cc
index f72517bac18c70..8bd682351a0531 100644
--- a/src/inspector_js_api.cc
+++ b/src/inspector_js_api.cc
@@ -1,3 +1,4 @@
+#include "base-object.h"
 #include "base-object-inl.h"
 #include "inspector_agent.h"
 #include "inspector_io.h"
diff --git a/src/inspector_socket.cc b/src/inspector_socket.cc
index 265b37616138dc..092138a7fa6f90 100644
--- a/src/inspector_socket.cc
+++ b/src/inspector_socket.cc
@@ -1,4 +1,5 @@
 #include "inspector_socket.h"
+#include "util.h"
 #include "util-inl.h"
 
 #define NODE_WANT_INTERNALS 1
diff --git a/src/inspector_socket.h b/src/inspector_socket.h
index f93150d6f9a1cf..ee4bd7835c75ff 100644
--- a/src/inspector_socket.h
+++ b/src/inspector_socket.h
@@ -2,6 +2,7 @@
 #define SRC_INSPECTOR_SOCKET_H_
 
 #include "http_parser.h"
+#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 
diff --git a/src/js_stream.cc b/src/js_stream.cc
index 9d28b90585048a..a279970c1bbfca 100644
--- a/src/js_stream.cc
+++ b/src/js_stream.cc
@@ -1,8 +1,10 @@
 #include "js_stream.h"
 
 #include "async-wrap.h"
+#include "env.h"
 #include "env-inl.h"
 #include "node_buffer.h"
+#include "stream_base.h"
 #include "stream_base-inl.h"
 #include "v8.h"
 
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index c28fe6580e0802..92dc9cf917934f 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -5,6 +5,7 @@
 
 #include "env.h"
 #include "node_url.h"
+#include "util.h"
 #include "util-inl.h"
 #include "node_internals.h"
 
diff --git a/src/module_wrap.h b/src/module_wrap.h
index e0f7ce5bd2dddc..ac2f90476d5b59 100644
--- a/src/module_wrap.h
+++ b/src/module_wrap.h
@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 #include "node_url.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 
 namespace node {
diff --git a/src/node.cc b/src/node.cc
index 9f6c8084cfd3c9..2039edfeb9cbd6 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -54,11 +54,14 @@
 #endif
 
 #include "ares.h"
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "http_parser.h"
 #include "nghttp2/nghttp2ver.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "string_bytes.h"
 #include "tracing/agent.h"
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index 4c60073c306f0e..dc67844553f64e 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -22,9 +22,11 @@
 #include "node.h"
 #include "node_buffer.h"
 
+#include "env.h"
 #include "env-inl.h"
 #include "string_bytes.h"
 #include "string_search.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8-profiler.h"
 #include "v8.h"
diff --git a/src/node_config.cc b/src/node_config.cc
index b39dc20f870bf4..8af3472b0f42d0 100644
--- a/src/node_config.cc
+++ b/src/node_config.cc
@@ -1,6 +1,8 @@
 #include "node.h"
 #include "node_i18n.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "node_debug_options.h"
 
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 91793457029cb0..12edf20810fe57 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -21,6 +21,7 @@
 
 #include "node_internals.h"
 #include "node_watchdog.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 #include "v8-debug.h"
 
diff --git a/src/node_counters.cc b/src/node_counters.cc
index 06d2b9f68f103e..c6e9ea50379cb0 100644
--- a/src/node_counters.cc
+++ b/src/node_counters.cc
@@ -21,6 +21,7 @@
 
 #include "node_counters.h"
 #include "uv.h"
+#include "env.h"
 #include "env-inl.h"
 
 #include <string.h>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index c692a83292fe83..57439a73cbcab2 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -28,9 +28,12 @@
 #include "node_mutex.h"
 #include "tls_wrap.h"  // TLSWrap
 
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
 #include "string_bytes.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 // CNNIC Hash WhiteList is taken from
diff --git a/src/node_crypto.h b/src/node_crypto.h
index a155411aa8195c..3abfe973a79ebd 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -25,13 +25,15 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node.h"
-// ClientHelloParser
+#include "node_crypto_clienthello.h"  // ClientHelloParser
 #include "node_crypto_clienthello-inl.h"
 
 #include "node_buffer.h"
 
 #include "env.h"
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 
 #include "v8.h"
diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
index eb1399f0bffb96..00fd0b420c38c5 100644
--- a/src/node_crypto_bio.cc
+++ b/src/node_crypto_bio.cc
@@ -21,6 +21,7 @@
 
 #include "node_crypto_bio.h"
 #include "openssl/bio.h"
+#include "util.h"
 #include "util-inl.h"
 #include <limits.h>
 #include <string.h>
diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h
index 6ec256d008153b..5deac922323808 100644
--- a/src/node_crypto_bio.h
+++ b/src/node_crypto_bio.h
@@ -25,7 +25,9 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "openssl/bio.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 
diff --git a/src/node_crypto_clienthello-inl.h b/src/node_crypto_clienthello-inl.h
index 019d7188de6cf3..84cce301547561 100644
--- a/src/node_crypto_clienthello-inl.h
+++ b/src/node_crypto_clienthello-inl.h
@@ -25,6 +25,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node_crypto_clienthello.h"
+#include "util.h"
 #include "util-inl.h"
 
 namespace node {
diff --git a/src/node_crypto_clienthello.cc b/src/node_crypto_clienthello.cc
index d4d222f838c5ac..65b5dff7f74447 100644
--- a/src/node_crypto_clienthello.cc
+++ b/src/node_crypto_clienthello.cc
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "node_crypto_clienthello.h"
 #include "node_crypto_clienthello-inl.h"
 
 namespace node {
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc
index ed063fddfafc49..39014e710577d4 100644
--- a/src/node_dtrace.cc
+++ b/src/node_dtrace.cc
@@ -24,6 +24,7 @@
 #ifdef HAVE_DTRACE
 #include "node_provider.h"
 #elif HAVE_ETW
+#include "node_win32_etw_provider.h"
 #include "node_win32_etw_provider-inl.h"
 #else
 #define NODE_HTTP_SERVER_REQUEST(arg0, arg1)
diff --git a/src/node_file.cc b/src/node_file.cc
index c657ece93f30ed..b9b3d34f346e56 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -23,6 +23,7 @@
 #include "node_internals.h"
 #include "node_stat_watcher.h"
 
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "string_bytes.h"
 
diff --git a/src/node_http2_core.h b/src/node_http2_core.h
index a029366a9d433e..91c58e78bb57ca 100644
--- a/src/node_http2_core.h
+++ b/src/node_http2_core.h
@@ -3,6 +3,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
+#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 #include "nghttp2/nghttp2.h"
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
index 9102f9f886c3ae..11d0aa42b23829 100644
--- a/src/node_http_parser.cc
+++ b/src/node_http_parser.cc
@@ -22,10 +22,14 @@
 #include "node.h"
 #include "node_buffer.h"
 
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
 #include "http_parser.h"
+#include "stream_base.h"
 #include "stream_base-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 
diff --git a/src/node_i18n.cc b/src/node_i18n.cc
index 30f421a8b8384b..2e1aeaa4cb07c5 100644
--- a/src/node_i18n.cc
+++ b/src/node_i18n.cc
@@ -46,8 +46,11 @@
 
 #include "node.h"
 #include "node_buffer.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 #include "v8.h"
 
diff --git a/src/node_internals.h b/src/node_internals.h
index 610347364d5eab..54f20c39d39e4c 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -25,7 +25,9 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node.h"
+#include "util.h"
 #include "util-inl.h"
+#include "env.h"
 #include "env-inl.h"
 #include "uv.h"
 #include "v8.h"
diff --git a/src/node_lttng.cc b/src/node_lttng.cc
index 1f6f4322a5fe79..490beb6e40007d 100644
--- a/src/node_lttng.cc
+++ b/src/node_lttng.cc
@@ -21,6 +21,7 @@
 #define NODE_GC_DONE(arg0, arg1, arg2)
 #endif
 
+#include "env.h"
 #include "env-inl.h"
 
 namespace node {
diff --git a/src/node_perf.h b/src/node_perf.h
index ba7a326471d695..6699272e883367 100644
--- a/src/node_perf.h
+++ b/src/node_perf.h
@@ -6,6 +6,7 @@
 #include "node.h"
 #include "node_perf_common.h"
 #include "env.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 
 #include "v8.h"
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
index 4e99513a5fd31c..f477016ec03e9f 100644
--- a/src/node_serdes.cc
+++ b/src/node_serdes.cc
@@ -1,5 +1,6 @@
 #include "node_internals.h"
 #include "node_buffer.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 
 namespace node {
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc
index b8a395ef8deeab..4b2e4db7bc418c 100644
--- a/src/node_stat_watcher.cc
+++ b/src/node_stat_watcher.cc
@@ -20,8 +20,11 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "node_stat_watcher.h"
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include <string.h>
diff --git a/src/node_url.cc b/src/node_url.cc
index 49c005a23bc2c7..e7a0b47194e84a 100644
--- a/src/node_url.cc
+++ b/src/node_url.cc
@@ -1,5 +1,6 @@
 #include "node_url.h"
 #include "node_internals.h"
+#include "base-object.h"
 #include "base-object-inl.h"
 #include "node_i18n.h"
 
diff --git a/src/node_url.h b/src/node_url.h
index 872f2fbc97f65c..503fb21e0d4f30 100644
--- a/src/node_url.h
+++ b/src/node_url.h
@@ -4,6 +4,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node.h"
+#include "env.h"
 #include "env-inl.h"
 
 #include <string>
diff --git a/src/node_v8.cc b/src/node_v8.cc
index 695a2bf3237314..352b4b334ad999 100644
--- a/src/node_v8.cc
+++ b/src/node_v8.cc
@@ -20,7 +20,9 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "node.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 
diff --git a/src/node_win32_etw_provider.cc b/src/node_win32_etw_provider.cc
index 11694d7d0e43ea..8a854767d6aed8 100644
--- a/src/node_win32_etw_provider.cc
+++ b/src/node_win32_etw_provider.cc
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "node_win32_etw_provider.h"
 #include "node_etw_provider.h"
 #include "node_win32_etw_provider-inl.h"
 
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index 067e8d96a0ba5c..93583181608132 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -22,8 +22,11 @@
 #include "node.h"
 #include "node_buffer.h"
 
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include "v8.h"
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc
index 5a6eeaa3ebdeb8..72dd99c1e5cc97 100644
--- a/src/pipe_wrap.cc
+++ b/src/pipe_wrap.cc
@@ -23,6 +23,7 @@
 
 #include "async-wrap.h"
 #include "connection_wrap.h"
+#include "env.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "node.h"
@@ -31,6 +32,7 @@
 #include "connect_wrap.h"
 #include "stream_wrap.h"
 #include "util-inl.h"
+#include "util.h"
 
 namespace node {
 
diff --git a/src/process_wrap.cc b/src/process_wrap.cc
index c1148f9bfb26ff..d5a408af692111 100644
--- a/src/process_wrap.cc
+++ b/src/process_wrap.cc
@@ -19,9 +19,11 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "env.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "node_wrap.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include <string.h>
diff --git a/src/req-wrap-inl.h b/src/req-wrap-inl.h
index 4cf8e425de3833..e21fb1bdad9363 100644
--- a/src/req-wrap-inl.h
+++ b/src/req-wrap-inl.h
@@ -4,8 +4,11 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "req-wrap.h"
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
+#include "util.h"
 #include "util-inl.h"
 
 namespace node {
diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc
index 70b831132bb735..048a3de4beaece 100644
--- a/src/signal_wrap.cc
+++ b/src/signal_wrap.cc
@@ -19,9 +19,12 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 
diff --git a/src/stream_base-inl.h b/src/stream_base-inl.h
index 667c0a9ffbd50d..562af2a53325dd 100644
--- a/src/stream_base-inl.h
+++ b/src/stream_base-inl.h
@@ -6,6 +6,7 @@
 #include "stream_base.h"
 
 #include "node.h"
+#include "env.h"
 #include "env-inl.h"
 #include "v8.h"
 
diff --git a/src/stream_base.cc b/src/stream_base.cc
index c6aca1694f9568..a923fc669fd13c 100644
--- a/src/stream_base.cc
+++ b/src/stream_base.cc
@@ -1,11 +1,14 @@
+#include "stream_base.h"
 #include "stream_base-inl.h"
 #include "stream_wrap.h"
 
 #include "node.h"
 #include "node_buffer.h"
+#include "env.h"
 #include "env-inl.h"
 #include "js_stream.h"
 #include "string_bytes.h"
+#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 
diff --git a/src/stream_base.h b/src/stream_base.h
index 9833a82636d28e..1b486e61db150e 100644
--- a/src/stream_base.h
+++ b/src/stream_base.h
@@ -5,6 +5,7 @@
 
 #include "env.h"
 #include "async-wrap.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "node.h"
 #include "util.h"
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
index 01022c91741d09..0107cbad2d9196 100644
--- a/src/stream_wrap.cc
+++ b/src/stream_wrap.cc
@@ -20,16 +20,20 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "stream_wrap.h"
+#include "stream_base.h"
 #include "stream_base-inl.h"
 
 #include "env-inl.h"
+#include "env.h"
 #include "handle_wrap.h"
 #include "node_buffer.h"
 #include "node_counters.h"
 #include "pipe_wrap.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "tcp_wrap.h"
 #include "udp_wrap.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include <stdlib.h>  // abort()
diff --git a/src/string_bytes.h b/src/string_bytes.h
index 0e38e017ab2f41..e46fa8227b7236 100644
--- a/src/string_bytes.h
+++ b/src/string_bytes.h
@@ -28,6 +28,7 @@
 
 #include "v8.h"
 #include "node.h"
+#include "env.h"
 #include "env-inl.h"
 #include "util.h"
 
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index ce86108cb0acbb..fdb8244bf6ac24 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -22,12 +22,14 @@
 #include "tcp_wrap.h"
 
 #include "connection_wrap.h"
+#include "env.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "node_buffer.h"
 #include "node_wrap.h"
 #include "connect_wrap.h"
 #include "stream_wrap.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include <stdlib.h>
diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc
index aabde9a6133ca2..e398a471e74242 100644
--- a/src/timer_wrap.cc
+++ b/src/timer_wrap.cc
@@ -19,9 +19,12 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
+#include "env.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include <stdint.h>
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index 3315267330afa2..63e3494047a21e 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -20,14 +20,16 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "tls_wrap.h"
+#include "async-wrap.h"
 #include "async-wrap-inl.h"
 #include "node_buffer.h"  // Buffer
 #include "node_crypto.h"  // SecureContext
 #include "node_crypto_bio.h"  // NodeBIO
-// ClientHelloParser
+#include "node_crypto_clienthello.h"  // ClientHelloParser
 #include "node_crypto_clienthello-inl.h"
 #include "node_counters.h"
 #include "node_internals.h"
+#include "stream_base.h"
 #include "stream_base-inl.h"
 
 namespace node {
diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc
index 872a126c6d4ee4..ca84008785829d 100644
--- a/src/tty_wrap.cc
+++ b/src/tty_wrap.cc
@@ -21,12 +21,15 @@
 
 #include "tty_wrap.h"
 
+#include "env.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "node_buffer.h"
 #include "node_wrap.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "stream_wrap.h"
+#include "util.h"
 #include "util-inl.h"
 
 namespace node {
diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
index b3702ea6e3feb2..b8c53534052f70 100644
--- a/src/udp_wrap.cc
+++ b/src/udp_wrap.cc
@@ -20,10 +20,13 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "udp_wrap.h"
+#include "env.h"
 #include "env-inl.h"
 #include "node_buffer.h"
 #include "handle_wrap.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
+#include "util.h"
 #include "util-inl.h"
 
 #include <stdlib.h>
diff --git a/src/udp_wrap.h b/src/udp_wrap.h
index fe9256bcc63a05..5be603d62e31e2 100644
--- a/src/udp_wrap.h
+++ b/src/udp_wrap.h
@@ -27,6 +27,7 @@
 #include "async-wrap.h"
 #include "env.h"
 #include "handle_wrap.h"
+#include "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "uv.h"
 #include "v8.h"
diff --git a/src/uv.cc b/src/uv.cc
index a13a0430c14b92..260aae92a7b760 100644
--- a/src/uv.cc
+++ b/src/uv.cc
@@ -21,6 +21,7 @@
 
 #include "uv.h"
 #include "node.h"
+#include "env.h"
 #include "env-inl.h"
 
 namespace node {