src: do not include x.h if x-inl.h is included

Backport-PR-URL: #16610
Fixes: #16519
PR-URL: #16548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

src/async-wrap-inl.h

@@ -4,12 +4,10 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "async-wrap.h"
-#include "base-object.h"
 #include "base-object-inl.h"
 #include "env.h"
 #include "env-inl.h"
 #include "node_internals.h"
-#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 

src/async-wrap.cc

@@ -1,8 +1,6 @@
-#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"

src/base-object-inl.h

@@ -4,9 +4,7 @@
 #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"
 

src/cares_wrap.cc

@@ -1,14 +1,11 @@
 #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 "tree.h"
-#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 

src/connect_wrap.cc

@@ -1,8 +1,6 @@
 #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"

src/connection_wrap.cc

@@ -2,11 +2,9 @@
 
 #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 {

src/debug-agent.cc

@@ -23,11 +23,9 @@
 
 #include "node.h"
 #include "node_internals.h"  // arraysize
-#include "env.h"
 #include "env-inl.h"
 #include "v8.h"
 #include "v8-debug.h"
-#include "util.h"
 #include "util-inl.h"
 
 #include <string.h>

src/debug-agent.h

@@ -25,7 +25,6 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node_mutex.h"
-#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 #include "v8.h"

src/env-inl.h

@@ -5,7 +5,6 @@
 
 #include "env.h"
 #include "node.h"
-#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 #include "v8.h"

src/env.cc

@@ -1,4 +1,3 @@
-#include "env.h"
 #include "env-inl.h"
 #include "v8.h"
 

src/fs_event_wrap.cc

@@ -1,8 +1,6 @@
-#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"

src/handle_wrap.cc

@@ -1,9 +1,7 @@
 #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"
 

src/inspector_agent.cc

@@ -1,7 +1,6 @@
 #include "inspector_agent.h"
 
 #include "inspector_socket.h"
-#include "env.h"
 #include "env-inl.h"
 #include "node.h"
 #include "node_crypto.h"

src/inspector_socket.cc

@@ -1,5 +1,4 @@
 #include "inspector_socket.h"
-#include "util.h"
 #include "util-inl.h"
 
 #define NODE_WANT_INTERNALS 1

src/inspector_socket.h

@@ -2,7 +2,6 @@
 #define SRC_INSPECTOR_SOCKET_H_
 
 #include "http_parser.h"
-#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 

src/js_stream.cc

@@ -1,10 +1,8 @@
 #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"
 

src/node.cc

@@ -29,12 +29,10 @@
 #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 "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "string_bytes.h"
 #include "util.h"

src/node_buffer.cc

@@ -1,11 +1,9 @@
 #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"

src/node_config.cc

@@ -1,8 +1,6 @@
 #include "node.h"
 #include "node_i18n.h"
-#include "env.h"
 #include "env-inl.h"
-#include "util.h"
 #include "util-inl.h"
 
 

src/node_constants.cc

@@ -1,5 +1,4 @@
 #include "node_constants.h"
-#include "env.h"
 #include "env-inl.h"
 
 #include "uv.h"

src/node_contextify.cc

@@ -1,11 +1,9 @@
 #include "node.h"
 #include "node_internals.h"
 #include "node_watchdog.h"
-#include "base-object.h"
 #include "base-object-inl.h"
 #include "env.h"
 #include "env-inl.h"
-#include "util.h"
 #include "util-inl.h"
 #include "v8-debug.h"
 

src/node_counters.cc

@@ -1,6 +1,5 @@
 #include "node_counters.h"
 #include "uv.h"
-#include "env.h"
 #include "env-inl.h"
 
 #include <string.h>

src/node_crypto.cc

@@ -6,12 +6,10 @@
 #include "node_crypto_groups.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

src/node_crypto.h

@@ -4,15 +4,13 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node.h"
-#include "node_crypto_clienthello.h"  // ClientHelloParser
+// 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"

src/node_crypto_bio.cc

@@ -1,6 +1,5 @@
 #include "node_crypto_bio.h"
 #include "openssl/bio.h"
-#include "util.h"
 #include "util-inl.h"
 #include <limits.h>
 #include <string.h>

src/node_crypto_bio.h

@@ -4,9 +4,7 @@
 #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"
 

src/node_crypto_clienthello-inl.h

@@ -4,7 +4,6 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node_crypto_clienthello.h"
-#include "util.h"
 #include "util-inl.h"
 
 namespace node {

src/node_crypto_clienthello.cc

@@ -1,4 +1,3 @@
-#include "node_crypto_clienthello.h"
 #include "node_crypto_clienthello-inl.h"
 
 namespace node {

src/node_dtrace.cc

@@ -3,7 +3,6 @@
 #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)
@@ -22,7 +21,6 @@
 #define NODE_GC_DONE(arg0, arg1, arg2)
 #endif
 
-#include "env.h"
 #include "env-inl.h"
 
 #include "util.h"

src/node_file.cc

@@ -4,9 +4,7 @@
 #include "node_internals.h"
 #include "node_stat_watcher.h"
 
-#include "env.h"
 #include "env-inl.h"
-#include "req-wrap.h"
 #include "req-wrap-inl.h"
 #include "string_bytes.h"
 #include "util.h"

src/node_http_parser.cc

@@ -2,11 +2,9 @@
 #include "node_buffer.h"
 #include "node_http_parser.h"
 
-#include "async-wrap.h"
 #include "async-wrap-inl.h"
 #include "env.h"
 #include "env-inl.h"
-#include "stream_base.h"
 #include "stream_base-inl.h"
 #include "util.h"
 #include "util-inl.h"

src/node_i18n.cc

@@ -24,9 +24,7 @@
 #if defined(NODE_HAVE_I18N_SUPPORT)
 
 #include "node.h"
-#include "env.h"
 #include "env-inl.h"
-#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 

src/node_internals.h

@@ -4,7 +4,6 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node.h"
-#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 #include "v8.h"

src/node_lttng.cc

@@ -21,7 +21,6 @@
 #define NODE_GC_DONE(arg0, arg1, arg2)
 #endif
 
-#include "env.h"
 #include "env-inl.h"
 
 namespace node {

src/node_os.cc

@@ -1,6 +1,5 @@
 #include "node.h"
 #include "v8.h"
-#include "env.h"
 #include "env-inl.h"
 #include "string_bytes.h"
 

src/node_stat_watcher.cc

@@ -1,9 +1,7 @@
 #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>

src/node_util.cc

@@ -1,7 +1,6 @@
 #include "node.h"
 #include "node_watchdog.h"
 #include "v8.h"
-#include "env.h"
 #include "env-inl.h"
 
 namespace node {

src/node_v8.cc

@@ -1,7 +1,5 @@
 #include "node.h"
-#include "env.h"
 #include "env-inl.h"
-#include "util.h"
 #include "util-inl.h"
 #include "v8.h"
 

src/node_watchdog.cc

@@ -1,6 +1,5 @@
 #include "node_watchdog.h"
 #include "node_internals.h"
-#include "util.h"
 #include "util-inl.h"
 #include <algorithm>
 

src/node_win32_etw_provider.cc

@@ -1,5 +1,4 @@
 #include "node_dtrace.h"
-#include "node_win32_etw_provider.h"
 #include "node_etw_provider.h"
 #include "node_win32_etw_provider-inl.h"
 

src/node_wrap.h

@@ -3,14 +3,12 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "env.h"
 #include "env-inl.h"
 #include "js_stream.h"
 #include "pipe_wrap.h"
 #include "tcp_wrap.h"
 #include "tty_wrap.h"
 #include "udp_wrap.h"
-#include "util.h"
 #include "util-inl.h"
 #include "uv.h"
 #include "v8.h"