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

joyeecheung · MylesBorins · commit b00ced5b52b2 · 2017-11-28T13:10:31.000+09:00
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>
diff --git a/src/async-wrap-inl.h b/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"
 
diff --git a/src/async-wrap.cc b/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"
diff --git a/src/base-object-inl.h b/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"
 
diff --git a/src/cares_wrap.cc b/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"
 
diff --git a/src/connect_wrap.cc b/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"
diff --git a/src/connection_wrap.cc b/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 {
diff --git a/src/debug-agent.cc b/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>
diff --git a/src/debug-agent.h b/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"
diff --git a/src/env-inl.h b/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"
diff --git a/src/env.cc b/src/env.cc
@@ -1,4 +1,3 @@
-#include "env.h"
 #include "env-inl.h"
 #include "v8.h"
 
diff --git a/src/fs_event_wrap.cc b/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"
diff --git a/src/handle_wrap.cc b/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"
 
diff --git a/src/inspector_agent.cc b/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"
diff --git a/src/inspector_socket.cc b/src/inspector_socket.cc
@@ -1,5 +1,4 @@
 #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
@@ -2,7 +2,6 @@
 #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
@@ -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"
 
diff --git a/src/node.cc b/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"
diff --git a/src/node_buffer.cc b/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"
diff --git a/src/node_config.cc b/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"
 
 
diff --git a/src/node_constants.cc b/src/node_constants.cc
@@ -1,5 +1,4 @@
 #include "node_constants.h"
-#include "env.h"
 #include "env-inl.h"
 
 #include "uv.h"
diff --git a/src/node_contextify.cc b/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"
 
diff --git a/src/node_counters.cc b/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>
diff --git a/src/node_crypto.cc b/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
diff --git a/src/node_crypto.h b/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"
diff --git a/src/node_crypto_bio.cc b/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>
diff --git a/src/node_crypto_bio.h b/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"
 
diff --git a/src/node_crypto_clienthello-inl.h b/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 {
diff --git a/src/node_crypto_clienthello.cc b/src/node_crypto_clienthello.cc
@@ -1,4 +1,3 @@
-#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
@@ -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"
diff --git a/src/node_file.cc b/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"
diff --git a/src/node_http_parser.cc b/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"
diff --git a/src/node_i18n.cc b/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"
 
diff --git a/src/node_internals.h b/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"
diff --git a/src/node_lttng.cc b/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 {
diff --git a/src/node_os.cc b/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"
 
diff --git a/src/node_stat_watcher.cc b/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>
diff --git a/src/node_util.cc b/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 {
diff --git a/src/node_v8.cc b/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"
 
diff --git a/src/node_watchdog.cc b/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>
 
diff --git a/src/node_win32_etw_provider.cc b/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"
 
diff --git a/src/node_wrap.h b/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"
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc
diff --git a/src/process_wrap.cc b/src/process_wrap.cc
diff --git a/src/req-wrap-inl.h b/src/req-wrap-inl.h
diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc
diff --git a/src/stream_base-inl.h b/src/stream_base-inl.h
diff --git a/src/stream_base.cc b/src/stream_base.cc
diff --git a/src/stream_base.h b/src/stream_base.h
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
diff --git a/src/string_bytes.h b/src/string_bytes.h
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc
diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
diff --git a/src/udp_wrap.h b/src/udp_wrap.h
diff --git a/src/uv.cc b/src/uv.cc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "env.h"`
`2`	`1`	`#include "env-inl.h"`
`3`	`2`	`#include "v8.h"`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "inspector_socket.h"`
`2`		`-#include "util.h"`
`3`	`2`	`#include "util-inl.h"`
`4`	`3`
`5`	`4`	`#define NODE_WANT_INTERNALS 1`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "node_constants.h"`
`2`		`-#include "env.h"`
`3`	`2`	`#include "env-inl.h"`
`4`	`3`
`5`	`4`	`#include "uv.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "node_crypto_clienthello.h"`
`2`	`1`	`#include "node_crypto_clienthello-inl.h"`
`3`	`2`
`4`	`3`	`namespace node {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "node_dtrace.h"`
`2`		`-#include "node_win32_etw_provider.h"`
`3`	`2`	`#include "node_etw_provider.h"`
`4`	`3`	`#include "node_win32_etw_provider-inl.h"`
`5`	`4`