From dd9a03119edeb37edb677ae3c497c635fbfc4450 Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Fri, 27 Oct 2017 16:10:02 +0800 Subject: [PATCH] src: do not include x.h if x-inl.h is included PR-URL: https://github.com/nodejs/node/pull/16548 Fixes: https://github.com/nodejs/node/issues/16519 Reviewed-By: Ben Noordhuis Reviewed-By: Gireesh Punathil Reviewed-By: Daniel Bevenius Reviewed-By: Gibson Fahnestock Reviewed-By: Colin Ihrig --- src/aliased_buffer.h | 1 - src/async-wrap-inl.h | 1 - src/async-wrap.cc | 3 --- src/base-object-inl.h | 2 -- src/cares_wrap.cc | 4 ---- src/connect_wrap.cc | 3 --- src/connection_wrap.cc | 2 -- src/env-inl.h | 1 - src/fs_event_wrap.cc | 3 --- src/handle_wrap.cc | 3 --- src/inspector_io.cc | 1 - src/inspector_js_api.cc | 1 - src/inspector_socket.cc | 1 - src/inspector_socket.h | 1 - src/js_stream.cc | 2 -- src/module_wrap.cc | 1 - src/module_wrap.h | 1 - src/node.cc | 3 --- src/node_buffer.cc | 2 -- src/node_config.cc | 2 -- src/node_contextify.cc | 1 - src/node_counters.cc | 1 - src/node_crypto.cc | 3 --- 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 | 1 - src/node_file.cc | 1 - src/node_http2_core.h | 1 - src/node_http_parser.cc | 4 ---- src/node_i18n.cc | 3 --- src/node_internals.h | 2 -- src/node_lttng.cc | 1 - src/node_perf.h | 1 - src/node_serdes.cc | 1 - src/node_stat_watcher.cc | 3 --- src/node_url.cc | 1 - src/node_url.h | 1 - src/node_v8.cc | 2 -- src/node_win32_etw_provider.cc | 1 - src/node_zlib.cc | 3 --- src/pipe_wrap.cc | 2 -- src/process_wrap.cc | 2 -- src/req-wrap-inl.h | 3 --- src/signal_wrap.cc | 3 --- src/stream_base-inl.h | 1 - src/stream_base.cc | 3 --- src/stream_base.h | 1 - src/stream_wrap.cc | 4 ---- src/string_bytes.h | 1 - src/tcp_wrap.cc | 2 -- src/timer_wrap.cc | 3 --- src/tls_wrap.cc | 4 +--- src/tty_wrap.cc | 3 --- src/udp_wrap.cc | 3 --- src/udp_wrap.h | 1 - src/uv.cc | 1 - 59 files changed, 2 insertions(+), 113 deletions(-) diff --git a/src/aliased_buffer.h b/src/aliased_buffer.h index 2e5598b475..21aaeb6114 100644 --- a/src/aliased_buffer.h +++ b/src/aliased_buffer.h @@ -3,7 +3,6 @@ #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 2d10a6d5f7..44302343cf 100644 --- a/src/async-wrap-inl.h +++ b/src/async-wrap-inl.h @@ -25,7 +25,6 @@ #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 66c8e1ad07..e2280be225 100644 --- a/src/async-wrap.cc +++ b/src/async-wrap.cc @@ -19,11 +19,8 @@ // 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 3b3c6b4f1d..252cc2c5a8 100644 --- a/src/base-object-inl.h +++ b/src/base-object-inl.h @@ -25,9 +25,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 a4ed032fbd..619d59fd56 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -21,14 +21,10 @@ #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 e373b5a36e..3dd3b40194 100644 --- a/src/connect_wrap.cc +++ b/src/connect_wrap.cc @@ -1,10 +1,7 @@ #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 a7f08ecc19..b620c387ff 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/env-inl.h b/src/env-inl.h index 9ead71ab49..de18b6353c 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -27,7 +27,6 @@ #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 0ebd962549..442cd8b730 100644 --- a/src/fs_event_wrap.cc +++ b/src/fs_event_wrap.cc @@ -19,11 +19,8 @@ // 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 e23bbe41e3..25e5c55a2c 100644 --- a/src/handle_wrap.cc +++ b/src/handle_wrap.cc @@ -20,11 +20,8 @@ // 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 12a0d20720..73f0419ead 100644 --- a/src/inspector_io.cc +++ b/src/inspector_io.cc @@ -1,7 +1,6 @@ #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 8bd682351a..f72517bac1 100644 --- a/src/inspector_js_api.cc +++ b/src/inspector_js_api.cc @@ -1,4 +1,3 @@ -#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 092138a7fa..265b376161 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 ee4bd7835c..f93150d6f9 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 a279970c1b..9d28b90585 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/module_wrap.cc b/src/module_wrap.cc index 92dc9cf917..c28fe6580e 100644 --- a/src/module_wrap.cc +++ b/src/module_wrap.cc @@ -5,7 +5,6 @@ #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 ac2f90476d..e0f7ce5bd2 100644 --- a/src/module_wrap.h +++ b/src/module_wrap.h @@ -7,7 +7,6 @@ #include #include #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 3d1bf70e36..d667a6574e 100644 --- a/src/node.cc +++ b/src/node.cc @@ -54,14 +54,11 @@ #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 dc67844553..4c60073c30 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -22,11 +22,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 8af3472b0f..b39dc20f87 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" #include "node_debug_options.h" diff --git a/src/node_contextify.cc b/src/node_contextify.cc index efbb5fb7fe..3168aef8c3 100644 --- a/src/node_contextify.cc +++ b/src/node_contextify.cc @@ -21,7 +21,6 @@ #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 c6e9ea5037..06d2b9f68f 100644 --- a/src/node_counters.cc +++ b/src/node_counters.cc @@ -21,7 +21,6 @@ #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 93350ed12a..5b4ce7c059 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -28,12 +28,9 @@ #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 3abfe973a7..a155411aa8 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -25,15 +25,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 00fd0b420c..eb1399f0bf 100644 --- a/src/node_crypto_bio.cc +++ b/src/node_crypto_bio.cc @@ -21,7 +21,6 @@ #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 5deac92232..6ec256d008 100644 --- a/src/node_crypto_bio.h +++ b/src/node_crypto_bio.h @@ -25,9 +25,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 84cce30154..019d7188de 100644 --- a/src/node_crypto_clienthello-inl.h +++ b/src/node_crypto_clienthello-inl.h @@ -25,7 +25,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 65b5dff7f7..d4d222f838 100644 --- a/src/node_crypto_clienthello.cc +++ b/src/node_crypto_clienthello.cc @@ -19,7 +19,6 @@ // 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 39014e7105..ed063fddfa 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -24,7 +24,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) diff --git a/src/node_file.cc b/src/node_file.cc index aed16bf288..acce4d14e6 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -23,7 +23,6 @@ #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 75eefc74e6..ae4da047e0 100644 --- a/src/node_http2_core.h +++ b/src/node_http2_core.h @@ -3,7 +3,6 @@ #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 11d0aa42b2..9102f9f886 100644 --- a/src/node_http_parser.cc +++ b/src/node_http_parser.cc @@ -22,14 +22,10 @@ #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 2e1aeaa4cb..30f421a8b8 100644 --- a/src/node_i18n.cc +++ b/src/node_i18n.cc @@ -46,11 +46,8 @@ #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 1a1eafd8e7..258de16ca7 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -25,9 +25,7 @@ #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 490beb6e40..1f6f4322a5 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_perf.h b/src/node_perf.h index 6699272e88..ba7a326471 100644 --- a/src/node_perf.h +++ b/src/node_perf.h @@ -6,7 +6,6 @@ #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 f477016ec0..4e99513a5f 100644 --- a/src/node_serdes.cc +++ b/src/node_serdes.cc @@ -1,6 +1,5 @@ #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 2e5f793def..c5b436d8f3 100644 --- a/src/node_stat_watcher.cc +++ b/src/node_stat_watcher.cc @@ -20,11 +20,8 @@ // 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 diff --git a/src/node_url.cc b/src/node_url.cc index e7a0b47194..49c005a23b 100644 --- a/src/node_url.cc +++ b/src/node_url.cc @@ -1,6 +1,5 @@ #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 503fb21e0d..872f2fbc97 100644 --- a/src/node_url.h +++ b/src/node_url.h @@ -4,7 +4,6 @@ #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS #include "node.h" -#include "env.h" #include "env-inl.h" #include diff --git a/src/node_v8.cc b/src/node_v8.cc index 352b4b334a..695a2bf323 100644 --- a/src/node_v8.cc +++ b/src/node_v8.cc @@ -20,9 +20,7 @@ // 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 8a854767d6..11694d7d0e 100644 --- a/src/node_win32_etw_provider.cc +++ b/src/node_win32_etw_provider.cc @@ -19,7 +19,6 @@ // 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 3158c3a709..9e63a37302 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -22,11 +22,8 @@ #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 b01af7c09d..7e93366f1b 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -23,7 +23,6 @@ #include "async-wrap.h" #include "connection_wrap.h" -#include "env.h" #include "env-inl.h" #include "handle_wrap.h" #include "node.h" @@ -32,7 +31,6 @@ #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 d3d0451005..ed3a699675 100644 --- a/src/process_wrap.cc +++ b/src/process_wrap.cc @@ -19,11 +19,9 @@ // 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 diff --git a/src/req-wrap-inl.h b/src/req-wrap-inl.h index f5d93b6ee8..584db492fc 100644 --- a/src/req-wrap-inl.h +++ b/src/req-wrap-inl.h @@ -4,11 +4,8 @@ #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" #include "uv.h" diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc index 048a3de4be..70b831132b 100644 --- a/src/signal_wrap.cc +++ b/src/signal_wrap.cc @@ -19,12 +19,9 @@ // 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 e0e8c32f8e..3d265d68ff 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 a923fc669f..c6aca1694f 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 7557d61055..dedae53462 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 0107cbad2d..01022c9174 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -20,20 +20,16 @@ // 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 // abort() diff --git a/src/string_bytes.h b/src/string_bytes.h index e46fa8227b..0e38e017ab 100644 --- a/src/string_bytes.h +++ b/src/string_bytes.h @@ -28,7 +28,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 b402fd494e..a04730107c 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -22,14 +22,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 e398a471e7..aabde9a613 100644 --- a/src/timer_wrap.cc +++ b/src/timer_wrap.cc @@ -19,12 +19,9 @@ // 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 diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 63e3494047..3315267330 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -20,16 +20,14 @@ // 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 -#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" namespace node { diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index 10976ae156..7851b57b32 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -21,15 +21,12 @@ #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 0461ef6a3b..27d232f2aa 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -20,13 +20,10 @@ // 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 diff --git a/src/udp_wrap.h b/src/udp_wrap.h index 5be603d62e..fe9256bcc6 100644 --- a/src/udp_wrap.h +++ b/src/udp_wrap.h @@ -27,7 +27,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 260aae92a7..a13a0430c1 100644 --- a/src/uv.cc +++ b/src/uv.cc @@ -21,7 +21,6 @@ #include "uv.h" #include "node.h" -#include "env.h" #include "env-inl.h" namespace node {