From d9f57a15371c77ef5900bf6266e864ac96c9a6a8 Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Fri, 27 Oct 2017 16:10:02 +0800
Subject: [PATCH 1/2] src: do not include x.h if x-inl.h is included

---
 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 2e5598b47579..21aaeb61141c 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 dd947dbd446c..617d51dc59f0 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 36480b323245..8f2b8f377f4d 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 94449819a832..480edd7463e7 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 e800e0f2fee2..1abbbe629a6e 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 e373b5a36e33..3dd3b40194ac 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 a7f08ecc19f2..b620c387ff1c 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 e6e189be3dcb..2cd0046b8547 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 8ec8dd6dcfbd..da39602c1bba 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 7d0925e2fd63..071f5ff87375 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 12a0d2072035..73f0419ead65 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 110f1363aa52..69eb08b7f497 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 2d5054bb802d..6988aac703bc 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 ee4bd7835c75..f93150d6f9a1 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 a279970c1bbf..9d28b9058504 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 bda760369e9b..4e4f860cccd6 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 82fd1d89ffd5..7e651beda624 100644
--- a/src/module_wrap.h
+++ b/src/module_wrap.h
@@ -7,7 +7,6 @@
 #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 b780d526531d..5240b870ca5d 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 dc67844553f6..4c60073c306f 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 38ce2a47bb0f..1119758211e4 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 fbc04ba0c07a..b36e7bbf0dd4 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 c6e9ea50379c..06d2b9f68f10 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 <string.h>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 3d114d73d2c3..50430a53e84a 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 3abfe973a79e..a155411aa819 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 00fd0b420c38..eb1399f0bffb 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 <limits.h>
 #include <string.h>
diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h
index 5deac9223238..6ec256d00815 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 84cce3015475..019d7188de6c 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 65b5dff7f744..d4d222f838c5 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 39014e710577..ed063fddfafc 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 b9b3d34f346e..c657ece93f30 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 bb536f1159d9..e5632bad0666 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 11d0aa42b238..9102f9f886c3 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 2e1aeaa4cb07..30f421a8b838 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 54f20c39d39e..610347364d5e 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 490beb6e4000..1f6f4322a5fe 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 6699272e8833..ba7a326471d6 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 f477016ec03e..4e99513a5fd3 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 4b2e4db7bc41..b8a395ef8dee 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 <string.h>
diff --git a/src/node_url.cc b/src/node_url.cc
index e7a0b47194e8..49c005a23bc2 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 503fb21e0d4f..872f2fbc97f6 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 <string>
diff --git a/src/node_v8.cc b/src/node_v8.cc
index f46bed248ea2..8b4d31a880dc 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 8a854767d6ae..11694d7d0e43 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 fdfd31422266..1282b7c11947 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 72dd99c1e5cc..5a6eeaa3ebde 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 d5a408af6921..c1148f9bfb26 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 <string.h>
diff --git a/src/req-wrap-inl.h b/src/req-wrap-inl.h
index e21fb1bdad93..4cf8e425de38 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"
 
 namespace node {
diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc
index 048a3de4beae..70b831132bb7 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 25293d2d0655..34215079afa5 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 a923fc669fd1..c6aca1694f95 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 1b486e61db15..9833a82636d2 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 0107cbad2d91..01022c91741d 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 <stdlib.h>  // abort()
diff --git a/src/string_bytes.h b/src/string_bytes.h
index e46fa8227b72..0e38e017ab2f 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 fdb8244bf6ac..ce86108cb0ac 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 <stdlib.h>
diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc
index e398a471e742..aabde9a6133c 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 <stdint.h>
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index 63e3494047a2..3315267330af 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 ca8400878582..872a126c6d4e 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 98399155a84f..532bd1cb48d1 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 <stdlib.h>
diff --git a/src/udp_wrap.h b/src/udp_wrap.h
index 5be603d62e31..fe9256bcc63a 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 260aae92a7b7..a13a0430c14b 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 {

From 5e5df379cbd0c61eddb0f33dc4c01b591ffb1fde Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Fri, 27 Oct 2017 16:30:31 +0800
Subject: [PATCH 2/2] doc: add *-inl.h include rule to C++ style guide

---
 CPP_STYLE_GUIDE.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CPP_STYLE_GUIDE.md b/CPP_STYLE_GUIDE.md
index 3e7319c1f8e8..3bea5bb10758 100644
--- a/CPP_STYLE_GUIDE.md
+++ b/CPP_STYLE_GUIDE.md
@@ -127,6 +127,21 @@ 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