diff --git a/src/dawn/CPPLINT.cfg b/src/dawn/CPPLINT.cfg
index 27dc5d4ec9..ad70cb4776 100644
--- a/src/dawn/CPPLINT.cfg
+++ b/src/dawn/CPPLINT.cfg
@@ -1,5 +1,4 @@
 filter=-build/header_guard
-filter=-build/include_directory
 filter=-build/include_order
 filter=-build/include_what_you_use
 filter=-build/namespaces
diff --git a/src/dawn/node/CMakeLists.txt b/src/dawn/node/CMakeLists.txt
index 6c2344ccb0..558362a20b 100644
--- a/src/dawn/node/CMakeLists.txt
+++ b/src/dawn/node/CMakeLists.txt
@@ -73,8 +73,8 @@ set_target_properties(dawn_node PROPERTIES
 target_link_libraries(dawn_node dawn_node_binding dawn_node_interop dawn_native dawncpp dawn_proc)
 target_include_directories(dawn_node PRIVATE
     "${CMAKE_SOURCE_DIR}"
+    "${DAWN_THIRD_PARTY_DIR}"
     "${NODE_API_HEADERS_DIR}/include"
-    "${NODE_ADDON_API_DIR}"
     "${GEN_DIR}"
 )
 
diff --git a/src/dawn/node/binding/AsyncRunner.h b/src/dawn/node/binding/AsyncRunner.h
index 9b1fcf496d..c1fe57de8f 100644
--- a/src/dawn/node/binding/AsyncRunner.h
+++ b/src/dawn/node/binding/AsyncRunner.h
@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 
 namespace wgpu::binding {
 
diff --git a/src/dawn/node/binding/CMakeLists.txt b/src/dawn/node/binding/CMakeLists.txt
index 9c6e7ea54c..2bf586b301 100644
--- a/src/dawn/node/binding/CMakeLists.txt
+++ b/src/dawn/node/binding/CMakeLists.txt
@@ -71,8 +71,8 @@ common_compile_options(dawn_node_binding)
 target_include_directories(dawn_node_binding
     PRIVATE
         "${CMAKE_SOURCE_DIR}"
+        "${DAWN_THIRD_PARTY_DIR}"
         "${NODE_API_HEADERS_DIR}/include"
-        "${NODE_ADDON_API_DIR}"
         "${GEN_DIR}"
 )
 
diff --git a/src/dawn/node/binding/Converter.h b/src/dawn/node/binding/Converter.h
index 17754cbdeb..180a06a2d0 100644
--- a/src/dawn/node/binding/Converter.h
+++ b/src/dawn/node/binding/Converter.h
@@ -20,7 +20,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/Errors.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
diff --git a/src/dawn/node/binding/Errors.h b/src/dawn/node/binding/Errors.h
index 742df1f461..10938128c8 100644
--- a/src/dawn/node/binding/Errors.h
+++ b/src/dawn/node/binding/Errors.h
@@ -15,7 +15,7 @@
 #ifndef DAWN_NODE_BINDING_ERRORS_H_
 #define DAWN_NODE_BINDING_ERRORS_H_
 
-#include "napi.h"
+#include "node-addon-api/napi.h"
 
 namespace wgpu::binding {
 
diff --git a/src/dawn/node/binding/GPU.h b/src/dawn/node/binding/GPU.h
index de6b140ee0..f31635fe43 100644
--- a/src/dawn/node/binding/GPU.h
+++ b/src/dawn/node/binding/GPU.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/Flags.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
diff --git a/src/dawn/node/binding/GPUAdapter.h b/src/dawn/node/binding/GPUAdapter.h
index de03234cc6..aa97a8ad92 100644
--- a/src/dawn/node/binding/GPUAdapter.h
+++ b/src/dawn/node/binding/GPUAdapter.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUBindGroup.h b/src/dawn/node/binding/GPUBindGroup.h
index 54b005acb3..d5e12c7563 100644
--- a/src/dawn/node/binding/GPUBindGroup.h
+++ b/src/dawn/node/binding/GPUBindGroup.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUBindGroupLayout.h b/src/dawn/node/binding/GPUBindGroupLayout.h
index b461176ab5..f6ad9c65ec 100644
--- a/src/dawn/node/binding/GPUBindGroupLayout.h
+++ b/src/dawn/node/binding/GPUBindGroupLayout.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUBuffer.h b/src/dawn/node/binding/GPUBuffer.h
index 5f8ac4e5b8..11443c8c79 100644
--- a/src/dawn/node/binding/GPUBuffer.h
+++ b/src/dawn/node/binding/GPUBuffer.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
diff --git a/src/dawn/node/binding/GPUCommandBuffer.h b/src/dawn/node/binding/GPUCommandBuffer.h
index 86b33a2ff2..d2555bcd33 100644
--- a/src/dawn/node/binding/GPUCommandBuffer.h
+++ b/src/dawn/node/binding/GPUCommandBuffer.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUCommandEncoder.h b/src/dawn/node/binding/GPUCommandEncoder.h
index 714e58e68a..edd796d057 100644
--- a/src/dawn/node/binding/GPUCommandEncoder.h
+++ b/src/dawn/node/binding/GPUCommandEncoder.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUComputePassEncoder.h b/src/dawn/node/binding/GPUComputePassEncoder.h
index 8b325cb758..72f2cd6e58 100644
--- a/src/dawn/node/binding/GPUComputePassEncoder.h
+++ b/src/dawn/node/binding/GPUComputePassEncoder.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUComputePipeline.h b/src/dawn/node/binding/GPUComputePipeline.h
index b102ceebf9..ec68422f5c 100644
--- a/src/dawn/node/binding/GPUComputePipeline.h
+++ b/src/dawn/node/binding/GPUComputePipeline.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUDevice.h b/src/dawn/node/binding/GPUDevice.h
index e3215bdee3..ac331338ca 100644
--- a/src/dawn/node/binding/GPUDevice.h
+++ b/src/dawn/node/binding/GPUDevice.h
@@ -16,7 +16,7 @@
 #define DAWN_NODE_BINDING_GPUDEVICE_H_
 
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
diff --git a/src/dawn/node/binding/GPUPipelineLayout.h b/src/dawn/node/binding/GPUPipelineLayout.h
index a9c3bb6da9..3ffbb09783 100644
--- a/src/dawn/node/binding/GPUPipelineLayout.h
+++ b/src/dawn/node/binding/GPUPipelineLayout.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUQuerySet.h b/src/dawn/node/binding/GPUQuerySet.h
index 2ae99eb3a2..f853103fb8 100644
--- a/src/dawn/node/binding/GPUQuerySet.h
+++ b/src/dawn/node/binding/GPUQuerySet.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUQueue.h b/src/dawn/node/binding/GPUQueue.h
index 819897890c..ceef531c52 100644
--- a/src/dawn/node/binding/GPUQueue.h
+++ b/src/dawn/node/binding/GPUQueue.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
diff --git a/src/dawn/node/binding/GPURenderBundle.h b/src/dawn/node/binding/GPURenderBundle.h
index c3ffd6e040..4d7c41ebe2 100644
--- a/src/dawn/node/binding/GPURenderBundle.h
+++ b/src/dawn/node/binding/GPURenderBundle.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPURenderBundleEncoder.h b/src/dawn/node/binding/GPURenderBundleEncoder.h
index eee792e0d9..a59a20a104 100644
--- a/src/dawn/node/binding/GPURenderBundleEncoder.h
+++ b/src/dawn/node/binding/GPURenderBundleEncoder.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPURenderPassEncoder.h b/src/dawn/node/binding/GPURenderPassEncoder.h
index bbd8012cb4..ee2b855956 100644
--- a/src/dawn/node/binding/GPURenderPassEncoder.h
+++ b/src/dawn/node/binding/GPURenderPassEncoder.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPURenderPipeline.h b/src/dawn/node/binding/GPURenderPipeline.h
index f58d025f9c..ab521f8c79 100644
--- a/src/dawn/node/binding/GPURenderPipeline.h
+++ b/src/dawn/node/binding/GPURenderPipeline.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUSampler.h b/src/dawn/node/binding/GPUSampler.h
index e6d792ec32..ded83b5819 100644
--- a/src/dawn/node/binding/GPUSampler.h
+++ b/src/dawn/node/binding/GPUSampler.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUShaderModule.h b/src/dawn/node/binding/GPUShaderModule.h
index 17d9c7f2f3..89bfea295b 100644
--- a/src/dawn/node/binding/GPUShaderModule.h
+++ b/src/dawn/node/binding/GPUShaderModule.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
diff --git a/src/dawn/node/binding/GPUSupportedLimits.h b/src/dawn/node/binding/GPUSupportedLimits.h
index e571c67c37..0f3071df3c 100644
--- a/src/dawn/node/binding/GPUSupportedLimits.h
+++ b/src/dawn/node/binding/GPUSupportedLimits.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUTexture.h b/src/dawn/node/binding/GPUTexture.h
index 70fff12f5b..464a763bab 100644
--- a/src/dawn/node/binding/GPUTexture.h
+++ b/src/dawn/node/binding/GPUTexture.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUTextureView.h b/src/dawn/node/binding/GPUTextureView.h
index ceb750aa0d..e749cfabac 100644
--- a/src/dawn/node/binding/GPUTextureView.h
+++ b/src/dawn/node/binding/GPUTextureView.h
@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/interop/CMakeLists.txt b/src/dawn/node/interop/CMakeLists.txt
index e888a94871..1199636099 100644
--- a/src/dawn/node/interop/CMakeLists.txt
+++ b/src/dawn/node/interop/CMakeLists.txt
@@ -52,8 +52,8 @@ common_compile_options(dawn_node_interop)
 target_include_directories(dawn_node_interop
     PRIVATE
         "${CMAKE_SOURCE_DIR}"
+        "${DAWN_THIRD_PARTY_DIR}"
         "${NODE_API_HEADERS_DIR}/include"
-        "${NODE_ADDON_API_DIR}"
         "${GEN_DIR}"
 )
 
diff --git a/src/dawn/node/interop/Core.h b/src/dawn/node/interop/Core.h
index b3bda97d67..ed2388c250 100644
--- a/src/dawn/node/interop/Core.h
+++ b/src/dawn/node/interop/Core.h
@@ -26,7 +26,7 @@
 #include <variant>
 #include <vector>
 
-#include "napi.h"
+#include "node-addon-api/napi.h"
 
 #include "src/dawn/node/utils/Debug.h"