From b00ced5b52b2061c9f12ef1ec10252ee691d3ffd Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Mon, 30 Oct 2017 18:41:06 +0800 Subject: [PATCH] src: do not include x.h if x-inl.h is included Backport-PR-URL: https://github.com/nodejs/node/pull/16610 Fixes: https://github.com/nodejs/node/issues/16519 PR-URL: https://github.com/nodejs/node/pull/16548 Reviewed-By: Ben Noordhuis Reviewed-By: Gireesh Punathil Reviewed-By: Daniel Bevenius Reviewed-By: Gibson Fahnestock Reviewed-By: Colin Ihrig --- src/async-wrap-inl.h | 2 -- src/async-wrap.cc | 2 -- src/base-object-inl.h | 2 -- src/cares_wrap.cc | 3 --- src/connect_wrap.cc | 2 -- src/connection_wrap.cc | 2 -- src/debug-agent.cc | 2 -- src/debug-agent.h | 1 - src/env-inl.h | 1 - src/env.cc | 1 - src/fs_event_wrap.cc | 2 -- src/handle_wrap.cc | 2 -- src/inspector_agent.cc | 1 - src/inspector_socket.cc | 1 - src/inspector_socket.h | 1 - src/js_stream.cc | 2 -- src/node.cc | 2 -- src/node_buffer.cc | 2 -- src/node_config.cc | 2 -- src/node_constants.cc | 1 - src/node_contextify.cc | 2 -- src/node_counters.cc | 1 - src/node_crypto.cc | 2 -- src/node_crypto.h | 4 +--- src/node_crypto_bio.cc | 1 - src/node_crypto_bio.h | 2 -- src/node_crypto_clienthello-inl.h | 1 - src/node_crypto_clienthello.cc | 1 - src/node_dtrace.cc | 2 -- src/node_file.cc | 2 -- src/node_http_parser.cc | 2 -- src/node_i18n.cc | 2 -- src/node_internals.h | 1 - src/node_lttng.cc | 1 - src/node_os.cc | 1 - src/node_stat_watcher.cc | 2 -- src/node_util.cc | 1 - src/node_v8.cc | 2 -- src/node_watchdog.cc | 1 - src/node_win32_etw_provider.cc | 1 - src/node_wrap.h | 2 -- src/node_zlib.cc | 2 -- src/pipe_wrap.cc | 3 --- src/process_wrap.cc | 2 -- src/req-wrap-inl.h | 2 -- src/signal_wrap.cc | 2 -- src/stream_base-inl.h | 1 - src/stream_base.cc | 3 --- src/stream_base.h | 1 - src/stream_wrap.cc | 3 --- src/string_bytes.h | 1 - src/tcp_wrap.cc | 2 -- src/timer_wrap.cc | 2 -- src/tls_wrap.cc | 4 +--- src/tty_wrap.cc | 3 --- src/udp_wrap.cc | 2 -- src/udp_wrap.h | 1 - src/uv.cc | 1 - 58 files changed, 2 insertions(+), 101 deletions(-) diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h index 64b5f091612368..d6e813525d8232 100644 --- 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 index a0780566db72d8..7866dbf76faf56 100644 --- 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 index 4ddc5e1349bc13..de3ff5d64aa7bc 100644 --- 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 index 638daef76226ca..5290af2c24c959 100644 --- 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 index df3f093e732972..f8d936073b2206 100644 --- 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 index 020fe8b4c9508c..17e95dc07f1600 100644 --- 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 index 7f236fc44eec01..161d64ea95ed8d 100644 --- 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 diff --git a/src/debug-agent.h b/src/debug-agent.h index 504212653bc635..e1c5e2e498c77b 100644 --- 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 index e2876de44a9390..30d7950e93950d 100644 --- 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 index 90a1b8723d967b..5090475499dcaf 100644 --- 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 index 025f511d93b1a5..6f45213a8c319b 100644 --- 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 index 317fb48b1d28e3..1788f89938bfd8 100644 --- 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 index 60c11ea636cf0f..f7141f6f8021c7 100644 --- 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 index 6edc08248b6a85..9e388f5a00ed55 100644 --- 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 index 558d87bcb76bf1..46c739c4def207 100644 --- 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 index e51c4ae9b35084..b7c91218ddb718 100644 --- 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 index c19f314c0b44a5..20deda5034f5d1 100644 --- 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 index 5e6de043ee6006..da838e8bb053a6 100644 --- 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 index 0e6184709642ea..64177f2f3578f5 100644 --- 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 index be6e034a923a92..205380692c90c2 100644 --- 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 index 9d774d2c37aede..9e1b0945372e57 100644 --- 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 index 092d990d16b3e5..74efe7f35a3114 100644 --- 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 diff --git a/src/node_crypto.cc b/src/node_crypto.cc index b4c338aa59c34e..ba693377a77bc9 100644 --- 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 index 373d859530bcf5..656bb7189a706e 100644 --- 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 index ba19eb6ef2385a..bfb29366e8c58d 100644 --- 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 #include diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h index fd70fcc546178f..e25e632f708e83 100644 --- 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 index aeab2386e4e78c..ed89ffa99666b2 100644 --- 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 index 93f0c1de05aebb..2e32ee555f0167 100644 --- 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 index 401e9d5a2ed95b..334e46756b1981 100644 --- 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 index af3ebdb1214816..40a9d65627dc42 100644 --- 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 index 45d54ab548f862..d634cba4d3af03 100644 --- 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 index 27b40ebc28b49c..8e32f1fe08177b 100644 --- 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 index 9ead8b10377075..de1b8adc87f4d3 100644 --- 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 index 490beb6e40007d..1f6f4322a5fe79 100644 --- 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 index 19eaaeeb301d88..3b82903fe5b5e0 100644 --- 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 index cff92e34045a1e..598f3516d3fc84 100644 --- 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 diff --git a/src/node_util.cc b/src/node_util.cc index 0db7ab40fbf609..f96e91483857c7 100644 --- 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 index 2d44da42a44b0e..57b14b592e46fd 100644 --- 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 index 049cd177ef0a0b..ef28aae7a10bff 100644 --- 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 diff --git a/src/node_win32_etw_provider.cc b/src/node_win32_etw_provider.cc index 7b766bd2bb99b8..6a69eba8fc97ea 100644 --- 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 index 15cea7beda7de8..2df9b10f6f87af 100644 --- 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 index 31241e10c391db..1dabd3e63d9340 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -1,11 +1,9 @@ #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 5f47dadddb4d96..3fea56881848d8 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -2,7 +2,6 @@ #include "async-wrap.h" #include "connection_wrap.h" -#include "env.h" #include "env-inl.h" #include "handle_wrap.h" #include "node.h" @@ -11,8 +10,6 @@ #include "connect_wrap.h" #include "stream_wrap.h" #include "util-inl.h" -#include "util.h" - namespace node { using v8::Context; diff --git a/src/process_wrap.cc b/src/process_wrap.cc index 3dcde0962af080..0c41723ee77610 100644 --- a/src/process_wrap.cc +++ b/src/process_wrap.cc @@ -1,8 +1,6 @@ -#include "env.h" #include "env-inl.h" #include "handle_wrap.h" #include "node_wrap.h" -#include "util.h" #include "util-inl.h" #include diff --git a/src/req-wrap-inl.h b/src/req-wrap-inl.h index 84af22023dc3b9..a33f02138b8885 100644 --- a/src/req-wrap-inl.h +++ b/src/req-wrap-inl.h @@ -4,11 +4,9 @@ #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 582d1a9ecfdc02..1be400f487b1d8 100644 --- a/src/signal_wrap.cc +++ b/src/signal_wrap.cc @@ -1,9 +1,7 @@ -#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 da636909b695f3..8857843a3b421b 100644 --- a/src/stream_base-inl.h +++ b/src/stream_base-inl.h @@ -6,7 +6,6 @@ #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 19130b5bb8bd7e..1eca246bfe0e56 100644 --- a/src/stream_base.cc +++ b/src/stream_base.cc @@ -1,14 +1,11 @@ -#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 56cd4129d8a373..0d9e011d75dfdf 100644 --- a/src/stream_base.h +++ b/src/stream_base.h @@ -5,7 +5,6 @@ #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 ba03221696a539..09c954b9c783e6 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -1,5 +1,4 @@ #include "stream_wrap.h" -#include "stream_base.h" #include "stream_base-inl.h" #include "env-inl.h" @@ -8,11 +7,9 @@ #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 // abort() diff --git a/src/string_bytes.h b/src/string_bytes.h index 75d70defe38104..d0d06c482f08da 100644 --- a/src/string_bytes.h +++ b/src/string_bytes.h @@ -7,7 +7,6 @@ #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 5150972591d62f..8695643cf0cc5c 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -1,14 +1,12 @@ #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 diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc index 843fde4673b071..7d58a6d8f0272d 100644 --- a/src/timer_wrap.cc +++ b/src/timer_wrap.cc @@ -1,9 +1,7 @@ -#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 diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 813f7ef869ecce..a0a2232884a805 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -1,14 +1,12 @@ #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 -#include "node_crypto_clienthello.h" // ClientHelloParser +// ClientHelloParser #include "node_crypto_clienthello-inl.h" #include "node_counters.h" #include "node_internals.h" -#include "stream_base.h" #include "stream_base-inl.h" #include "util.h" #include "util-inl.h" diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index 26f061b99b34e8..e4ed943b137a5f 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -1,14 +1,11 @@ #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 d14eefd64d600a..5d6614f8b30d9f 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -1,9 +1,7 @@ #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" diff --git a/src/udp_wrap.h b/src/udp_wrap.h index ad5f92c0f52bcb..8baa0235be12da 100644 --- a/src/udp_wrap.h +++ b/src/udp_wrap.h @@ -6,7 +6,6 @@ #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 c0e742bf159d98..df8b09bc9bbee7 100644 --- a/src/uv.cc +++ b/src/uv.cc @@ -1,6 +1,5 @@ #include "uv.h" #include "node.h" -#include "env.h" #include "env-inl.h" namespace node {