diff --git a/ports/node-api-headers/portfile.cmake b/ports/node-api-headers/portfile.cmake
index 356e752aad..798541629f 100644
--- a/ports/node-api-headers/portfile.cmake
+++ b/ports/node-api-headers/portfile.cmake
@@ -12,7 +12,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
   vcpkg_cmake_install()
 endif()
 
-file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME "node")
+file(INSTALL "${SOURCE_PATH}/include/js_native_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(INSTALL "${SOURCE_PATH}/include/js_native_api_types.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(INSTALL "${SOURCE_PATH}/include/node_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(INSTALL "${SOURCE_PATH}/include/node_api_types.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
diff --git a/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in b/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in
index 7eb5751fca..d43c74f91a 100644
--- a/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in
+++ b/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in
@@ -5,7 +5,7 @@ if(NOT TARGET unofficial::node-api-headers::node-api-headers)
     add_library(unofficial::node-api-headers::node-api-headers INTERFACE IMPORTED)
   endif()
 
-  set(node-api-headers_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../include/node)
+  set(node-api-headers_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../include)
 
   set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${node-api-headers_INCLUDE_DIR}"
diff --git a/ports/node-api-headers/vcpkg.json b/ports/node-api-headers/vcpkg.json
index 7624dbaba3..0a8ab4a967 100644
--- a/ports/node-api-headers/vcpkg.json
+++ b/ports/node-api-headers/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "node-api-headers",
   "version": "1.9.0",
+  "port-version": 1,
   "description": "NodeJS API for writing modules in C++",
   "homepage": "https://nodejs.org/api/addons.html",
   "license": "MIT",
diff --git a/scripts/test_ports/vcpkg-ci-node-addon-api/portfile.cmake b/scripts/test_ports/vcpkg-ci-node-addon-api/portfile.cmake
new file mode 100644
index 0000000000..8a2079b217
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-node-addon-api/portfile.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${CURRENT_PORT_DIR}/project"
+)
+vcpkg_cmake_build()
diff --git a/scripts/test_ports/vcpkg-ci-node-addon-api/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-node-addon-api/project/CMakeLists.txt
new file mode 100644
index 0000000000..e93f4cba15
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-node-addon-api/project/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.16)
+project(vcpkg-ci-node-addon-api)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+add_definitions(-DNAPI_VERSION=3)
+
+find_package(unofficial-node-addon-api CONFIG REQUIRED)
+
+add_library(hello SHARED hello.cpp)
+set_target_properties(hello PROPERTIES PREFIX "" SUFFIX ".node")
+target_link_libraries(hello PRIVATE unofficial::node-addon-api::node-addon-api)
diff --git a/scripts/test_ports/vcpkg-ci-node-addon-api/project/hello.cpp b/scripts/test_ports/vcpkg-ci-node-addon-api/project/hello.cpp
new file mode 100644
index 0000000000..0957f53c93
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-node-addon-api/project/hello.cpp
@@ -0,0 +1,14 @@
+#include <napi.h>
+
+Napi::String Method(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  return Napi::String::New(env, "world");
+}
+
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+  exports.Set(Napi::String::New(env, "hello"),
+              Napi::Function::New(env, Method));
+  return exports;
+}
+
+NODE_API_MODULE(hello, Init)
diff --git a/scripts/test_ports/vcpkg-ci-node-addon-api/vcpkg.json b/scripts/test_ports/vcpkg-ci-node-addon-api/vcpkg.json
new file mode 100644
index 0000000000..d65881109c
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-node-addon-api/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "vcpkg-ci-node-addon-api",
+  "version-string": "ci",
+  "description": "Validates node-addon-api",
+  "dependencies": [
+    "node-addon-api",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 0c6b39a973..c15358e07b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7110,7 +7110,7 @@
     },
     "node-api-headers": {
       "baseline": "1.9.0",
-      "port-version": 0
+      "port-version": 1
     },
     "nodesoup": {
       "baseline": "2023-06-12",
diff --git a/versions/n-/node-api-headers.json b/versions/n-/node-api-headers.json
index c852944627..f8f5317a8c 100644
--- a/versions/n-/node-api-headers.json
+++ b/versions/n-/node-api-headers.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c932f9cfcc93fbfe7051aa5dfb011a42120149d5",
+      "version": "1.9.0",
+      "port-version": 1
+    },
     {
       "git-tree": "2640aa78164a5df3f5513f113da234ead59b8d2a",
       "version": "1.9.0",