Skip to content

Commit 290315a

Browse files
addaleaxaddaleax
committed
src: refactor #include handling
`node_internals.h` already includes the most common headers, so double includes can be avoided in a lot of cases. Also don’t include `node_internals.h` from `node.h` implicitly anymore, as that is mostly unnecessary. PR-URL: #14697 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 4ae0afb commit 290315a

30 files changed

+25
-73
lines changed

‎src/async-wrap-inl.h

-5
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@
2727
#include "async-wrap.h"
2828
#include "base-object.h"
2929
#include "base-object-inl.h"
30-
#include "env.h"
31-
#include "env-inl.h"
3230
#include "node_internals.h"
33-
#include "util.h"
34-
#include "util-inl.h"
35-
#include "v8.h"
3631

3732
namespace node {
3833

‎src/backtrace_posix.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "node.h"
1+
#include "node_internals.h"
22

33
#if defined(__linux__)
44
#include <features.h>

‎src/env-inl.h

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "util-inl.h"
3232
#include "uv.h"
3333
#include "v8.h"
34+
#include "node_perf_common.h"
3435

3536
#include <stddef.h>
3637
#include <stdint.h>

‎src/env.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
#include "env.h"
2-
#include "env-inl.h"
1+
#include "node_internals.h"
32
#include "async-wrap.h"
4-
#include "v8.h"
53
#include "v8-profiler.h"
64

75
#if defined(_MSC_VER)

‎src/env.h

+4
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ struct nghttp2_rcbuf;
4848

4949
namespace node {
5050

51+
namespace performance {
52+
struct performance_state;
53+
}
54+
5155
// Pick an index that's hopefully out of the way when we're embedded inside
5256
// another application. Performance-wise or memory-wise it doesn't matter:
5357
// Context::SetAlignedPointerInEmbedderData() is backed by a FixedArray,

‎src/inspector_agent.cc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
#include "inspector_agent.h"
22

33
#include "inspector_io.h"
4-
#include "env.h"
5-
#include "env-inl.h"
6-
#include "node.h"
4+
#include "node_internals.h"
75
#include "v8-inspector.h"
86
#include "v8-platform.h"
9-
#include "util.h"
107
#include "zlib.h"
118

129
#include "libplatform/libplatform.h"

‎src/node.cc

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
#include "node.h"
2322
#include "node_buffer.h"
2423
#include "node_constants.h"
2524
#include "node_javascript.h"

‎src/node.h

-4
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,6 @@ NODE_EXTERN v8::Local<v8::Value> MakeCallback(
169169

170170
} // namespace node
171171

172-
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
173-
#include "node_internals.h"
174-
#endif
175-
176172
#include <assert.h>
177173
#include <stdint.h>
178174

‎src/node_api.cc

-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
#include <algorithm>
1515
#include <cmath>
1616
#include <vector>
17-
#include "uv.h"
1817
#include "node_api.h"
1918
#include "node_internals.h"
20-
#include "util.h"
2119

2220
#define NAPI_VERSION 1
2321

‎src/node_buffer.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
#ifndef SRC_NODE_BUFFER_H_
2323
#define SRC_NODE_BUFFER_H_
2424

25-
#include "node.h"
26-
#include "v8.h"
25+
#include "node_internals.h"
2726

2827
namespace node {
2928

‎src/node_constants.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

2222
#include "node_constants.h"
23-
#include "env.h"
24-
#include "env-inl.h"
23+
#include "node_internals.h"
2524

26-
#include "uv.h"
2725
#include "zlib.h"
2826

2927
#include <errno.h>

‎src/node_contextify.cc

-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,10 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
#include "node.h"
2322
#include "node_internals.h"
2423
#include "node_watchdog.h"
2524
#include "base-object.h"
2625
#include "base-object-inl.h"
27-
#include "env.h"
28-
#include "env-inl.h"
29-
#include "util.h"
30-
#include "util-inl.h"
3126
#include "v8-debug.h"
3227

3328
namespace node {

‎src/node_counters.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
2626

27-
#include "node.h"
27+
#include "node_internals.h"
2828

2929
#ifdef HAVE_PERFCTR
3030
#include "node_win32_perfctr_provider.h"

‎src/node_dtrace.cc

+1-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
#define NODE_GC_DONE(arg0, arg1, arg2)
4444
#endif
4545

46-
#include "env.h"
47-
#include "env-inl.h"
48-
49-
#include "util.h"
46+
#include "node_internals.h"
5047

5148
#include <string.h>
5249

‎src/node_dtrace.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
2626

27-
#include "node.h"
28-
#include "v8.h"
29-
#include "env.h"
27+
#include "node_internals.h"
3028

3129
extern "C" {
3230
/*

‎src/node_file.cc

-4
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,13 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
#include "node.h"
2322
#include "node_buffer.h"
2423
#include "node_internals.h"
2524
#include "node_stat_watcher.h"
2625

27-
#include "env.h"
28-
#include "env-inl.h"
2926
#include "req-wrap.h"
3027
#include "req-wrap-inl.h"
3128
#include "string_bytes.h"
32-
#include "util.h"
3329

3430
#include <fcntl.h>
3531
#include <sys/types.h>

‎src/node_i18n.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
2626

27-
#include "node.h"
27+
#include "node_internals.h"
2828
#include <string>
2929

3030
#if defined(NODE_HAVE_I18N_SUPPORT)

‎src/node_internals.h

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include "node.h"
2828
#include "util.h"
2929
#include "util-inl.h"
30+
#include "env.h"
31+
#include "env-inl.h"
3032
#include "uv.h"
3133
#include "v8.h"
3234
#include "tracing/trace_event.h"

‎src/node_javascript.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424

2525
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
2626

27-
#include "v8.h"
28-
#include "env.h"
27+
#include "node_internals.h"
2928

3029
namespace node {
3130

‎src/node_main.cc

+2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

2222
#include "node.h"
23+
#include <stdio.h>
2324

2425
#ifdef _WIN32
26+
#include <windows.h>
2527
#include <VersionHelpers.h>
2628
#include <WinError.h>
2729

‎src/node_os.cc

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
#include "node.h"
23-
#include "v8.h"
24-
#include "env.h"
25-
#include "env-inl.h"
22+
#include "node_internals.h"
2623
#include "string_bytes.h"
2724

2825
#include <errno.h>

‎src/node_perf.cc

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
#include "node.h"
2-
#include "v8.h"
3-
#include "env.h"
4-
#include "env-inl.h"
1+
#include "node_internals.h"
52
#include "node_perf.h"
6-
#include "uv.h"
73

84
#include <vector>
95

‎src/node_url.cc

-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#include "node_url.h"
2-
#include "node.h"
32
#include "node_internals.h"
4-
#include "env.h"
5-
#include "env-inl.h"
6-
#include "util.h"
7-
#include "util-inl.h"
8-
#include "v8.h"
93
#include "base-object.h"
104
#include "base-object-inl.h"
115
#include "node_i18n.h"

‎src/node_util.cc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
#include "node.h"
1+
#include "node_internals.h"
22
#include "node_watchdog.h"
3-
#include "v8.h"
4-
#include "env.h"
5-
#include "env-inl.h"
63

74
namespace node {
85
namespace util {

‎src/node_watchdog.cc

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
#include "node_watchdog.h"
2323
#include "node_internals.h"
24-
#include "util.h"
25-
#include "util-inl.h"
2624
#include <algorithm>
2725

2826
namespace node {

‎src/string_search.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
99

10-
#include "node.h"
10+
#include "node_internals.h"
1111
#include <string.h>
1212

1313
namespace node {

‎src/tls_wrap.cc

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
#include "node_internals.h"
3232
#include "stream_base.h"
3333
#include "stream_base-inl.h"
34-
#include "util.h"
35-
#include "util-inl.h"
3634

3735
namespace node {
3836

‎src/util.cc

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
#include "util.h"
2322
#include "string_bytes.h"
2423
#include "node_buffer.h"
2524
#include "node_internals.h"

‎test/cctest/node_test_fixture.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <stdlib.h>
55
#include "gtest/gtest.h"
66
#include "node.h"
7+
#include "node_platform.h"
78
#include "env.h"
89
#include "v8.h"
910
#include "libplatform/libplatform.h"

‎test/cctest/test_environment.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#include "node.h"
2-
#include "env.h"
3-
#include "v8.h"
1+
#include "node_internals.h"
42
#include "libplatform/libplatform.h"
53

64
#include <string>

0 commit comments

Comments
 (0)