Skip to content

Commit 774e42b

Browse files
addaleaxjasnell
authored andcommitted
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 7fa175f commit 774e42b

30 files changed

+25
-73
lines changed

src/async-wrap-inl.h

Lines changed: 0 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 1 addition & 4 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 1 addition & 2 deletions
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

0 commit comments

Comments
 (0)