diff --git a/DEPENDENCIES b/DEPENDENCIES
index ad1384e9..63c6a963 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,6 +1,6 @@
 vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 9685d29e2e633d71319c64b1ab2fbceab865dbf3
-alterschema https://github.com/sourcemeta/alterschema 36dc1933bbbdbf1f2574c309e41f510f58874838
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 2d78929faf0f96110edfb67fa3ddf6916cf35ef7
+alterschema https://github.com/sourcemeta/alterschema 92e370ce9c1f0582014b54d43e388ee012dfe13d
 googletest https://github.com/google/googletest 987e225614755fec7253aa95bf959c09e0d380d7
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e
-noa https://github.com/sourcemeta/noa 837e1ff981f8df45d9e2977a50f5da61d8affed4
+noa https://github.com/sourcemeta/noa caad2e1ceedf9fd1a18686a6a6d1e2b9757ead75
diff --git a/src/compiler/include/sourcemeta/jsonbinpack/compiler.h b/src/compiler/include/sourcemeta/jsonbinpack/compiler.h
index 5d1ca275..e06b9683 100644
--- a/src/compiler/include/sourcemeta/jsonbinpack/compiler.h
+++ b/src/compiler/include/sourcemeta/jsonbinpack/compiler.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_JSONBINPACK_COMPILER_H_
 #define SOURCEMETA_JSONBINPACK_COMPILER_H_
 
-#include "compiler_export.h"
+#ifndef SOURCEMETA_JSONBINPACK_COMPILER_EXPORT
+#include <sourcemeta/jsonbinpack/compiler_export.h>
+#endif
 
 /// @defgroup compiler Compiler
 /// @brief The built-time schema compiler of JSON BinPack
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime.h
index 63d46664..24dcd001 100644
--- a/src/runtime/include/sourcemeta/jsonbinpack/runtime.h
+++ b/src/runtime/include/sourcemeta/jsonbinpack/runtime.h
@@ -10,7 +10,9 @@
 /// #include <sourcemeta/jsonbinpack/runtime.h>
 /// ```
 
-#include "runtime_export.h"
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
+#include <sourcemeta/jsonbinpack/runtime_export.h>
+#endif
 
 #include <sourcemeta/jsontoolkit/json.h>
 
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_decoder.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_decoder.h
index 4f1fc4c0..cc65efae 100644
--- a/src/runtime/include/sourcemeta/jsonbinpack/runtime_decoder.h
+++ b/src/runtime/include/sourcemeta/jsonbinpack/runtime_decoder.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_H_
 #define SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_H_
 
-#include "runtime_export.h"
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
+#include <sourcemeta/jsonbinpack/runtime_export.h>
+#endif
 
 #include <sourcemeta/jsonbinpack/runtime_encoding.h>
 #include <sourcemeta/jsonbinpack/runtime_input_stream.h>
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder.h
index b1ecde9d..5bd469a1 100644
--- a/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder.h
+++ b/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_H_
 #define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_H_
 
-#include "runtime_export.h"
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
+#include <sourcemeta/jsonbinpack/runtime_export.h>
+#endif
 
 #include <sourcemeta/jsonbinpack/runtime_encoder_cache.h>
 #include <sourcemeta/jsonbinpack/runtime_encoding.h>
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_cache.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_cache.h
index 7d730bc2..8740761d 100644
--- a/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_cache.h
+++ b/src/runtime/include/sourcemeta/jsonbinpack/runtime_encoder_cache.h
@@ -2,7 +2,9 @@
 #define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_CACHE_H_
 #ifndef DOXYGEN
 
-#include "runtime_export.h"
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
+#include <sourcemeta/jsonbinpack/runtime_export.h>
+#endif
 
 #include <sourcemeta/jsontoolkit/json.h>
 
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_input_stream.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_input_stream.h
index dc95f2ba..466ddea9 100644
--- a/src/runtime/include/sourcemeta/jsonbinpack/runtime_input_stream.h
+++ b/src/runtime/include/sourcemeta/jsonbinpack/runtime_input_stream.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_JSONBINPACK_RUNTIME_INPUT_STREAM_H_
 #define SOURCEMETA_JSONBINPACK_RUNTIME_INPUT_STREAM_H_
 
-#include "runtime_export.h"
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
+#include <sourcemeta/jsonbinpack/runtime_export.h>
+#endif
 
 #include <sourcemeta/jsontoolkit/json.h>
 
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_output_stream.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_output_stream.h
index fe58681a..7eff978c 100644
--- a/src/runtime/include/sourcemeta/jsonbinpack/runtime_output_stream.h
+++ b/src/runtime/include/sourcemeta/jsonbinpack/runtime_output_stream.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_JSONBINPACK_RUNTIME_OUTPUT_STREAM_H_
 #define SOURCEMETA_JSONBINPACK_RUNTIME_OUTPUT_STREAM_H_
 
-#include "runtime_export.h"
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
+#include <sourcemeta/jsonbinpack/runtime_export.h>
+#endif
 
 #include <sourcemeta/jsontoolkit/json.h>
 
diff --git a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_bundle.h b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_bundle.h
index f0fa2a1f..cfb7c145 100644
--- a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_bundle.h
+++ b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_bundle.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_ALTERSCHEMA_BUNDLE_H_
 #define SOURCEMETA_ALTERSCHEMA_BUNDLE_H_
 
-#include "engine_export.h"
+#ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_EXPORT
+#include <sourcemeta/alterschema/engine_export.h>
+#endif
 
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonpointer.h>
diff --git a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_rule.h b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_rule.h
index 35e79f10..9222a5e5 100644
--- a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_rule.h
+++ b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_rule.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_RULE_H_
 #define SOURCEMETA_ALTERSCHEMA_ENGINE_RULE_H_
 
-#include "engine_export.h"
+#ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_EXPORT
+#include <sourcemeta/alterschema/engine_export.h>
+#endif
 
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonpointer.h>
diff --git a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_transformer.h b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_transformer.h
index 80ebd1c8..0dec7f42 100644
--- a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_transformer.h
+++ b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_transformer.h
@@ -1,7 +1,9 @@
 #ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_TRANSFORMER_H_
 #define SOURCEMETA_ALTERSCHEMA_ENGINE_TRANSFORMER_H_
 
-#include "engine_export.h"
+#ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_EXPORT
+#include <sourcemeta/alterschema/engine_export.h>
+#endif
 
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonpointer.h>
diff --git a/vendor/alterschema/src/linter/include/sourcemeta/alterschema/linter.h b/vendor/alterschema/src/linter/include/sourcemeta/alterschema/linter.h
index 97379e9b..a1e56d93 100644
--- a/vendor/alterschema/src/linter/include/sourcemeta/alterschema/linter.h
+++ b/vendor/alterschema/src/linter/include/sourcemeta/alterschema/linter.h
@@ -10,7 +10,9 @@
 /// #include <sourcemeta/alterschema/linter.h>
 /// ```
 
-#include "linter_export.h"
+#ifndef SOURCEMETA_ALTERSCHEMA_LINTER_EXPORT
+#include <sourcemeta/alterschema/linter_export.h>
+#endif
 
 #include <sourcemeta/alterschema/engine.h>
 
diff --git a/vendor/alterschema/vendor/noa/cmake/noa/library.cmake b/vendor/alterschema/vendor/noa/cmake/noa/library.cmake
index 9868714d..bc746774 100644
--- a/vendor/alterschema/vendor/noa/cmake/noa/library.cmake
+++ b/vendor/alterschema/vendor/noa/cmake/noa/library.cmake
@@ -18,6 +18,7 @@ function(noa_library)
     set(INCLUDE_PREFIX "include/${NOA_LIBRARY_PROJECT}")
   endif()
 
+  set(EXPORT_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}_export.h")
   if(NOT NOA_LIBRARY_VARIANT)
     set(PUBLIC_HEADER "${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}.h")
   else()
@@ -25,7 +26,7 @@ function(noa_library)
   endif()
 
   if(NOA_LIBRARY_SOURCES)
-    set(ABSOLUTE_PRIVATE_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/${NOA_LIBRARY_NAME}_export.h")
+    set(ABSOLUTE_PRIVATE_HEADERS "${EXPORT_HEADER_PATH}")
   else()
     set(ABSOLUTE_PRIVATE_HEADERS)
   endif()
@@ -100,7 +101,7 @@ function(noa_library)
   if(NOA_LIBRARY_SOURCES)
     include(GenerateExportHeader)
     generate_export_header(${TARGET_NAME}
-      EXPORT_FILE_NAME ${NOA_LIBRARY_NAME}_export.h)
+      EXPORT_FILE_NAME ${EXPORT_HEADER_PATH})
     set_target_properties(${TARGET_NAME}
       PROPERTIES
         SOVERSION "${PROJECT_VERSION_MAJOR}"
@@ -108,7 +109,7 @@ function(noa_library)
 
     # To find the generated files
     target_include_directories(${TARGET_NAME}
-      PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+      PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
   endif()
 endfunction()
 
diff --git a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json.h b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json.h
index 88224e69..18c589ef 100644
--- a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json.h
+++ b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSON_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSON_EXPORT
-#include "json_export.h"
+#include <sourcemeta/jsontoolkit/json_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json_error.h>
diff --git a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_error.h b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_error.h
index 4e9b341a..eb7e90c6 100644
--- a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_error.h
+++ b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_error.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSON_ERROR_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSON_EXPORT
-#include "json_export.h"
+#include <sourcemeta/jsontoolkit/json_export.h>
 #endif
 
 #include <cstdint>    // std::uint64_t
diff --git a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_value.h b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_value.h
index 005561f7..a5e9fb92 100644
--- a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_value.h
+++ b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_value.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSON_VALUE_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSON_EXPORT
-#include "json_export.h"
+#include <sourcemeta/jsontoolkit/json_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json_array.h>
diff --git a/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl.h b/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl.h
index 813210f8..d54a60e4 100644
--- a/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl.h
+++ b/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONL_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONL_EXPORT
-#include "jsonl_export.h"
+#include <sourcemeta/jsontoolkit/jsonl_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl_iterator.h b/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl_iterator.h
index 6e2d31b7..41ef4ab2 100644
--- a/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl_iterator.h
+++ b/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl_iterator.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONL_ITERATOR_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONL_EXPORT
-#include "jsonl_export.h"
+#include <sourcemeta/jsontoolkit/jsonl_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer.h b/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer.h
index 2cd68d9a..c79eebea 100644
--- a/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer.h
+++ b/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONPOINTER_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONPOINTER_EXPORT
-#include "jsonpointer_export.h"
+#include <sourcemeta/jsontoolkit/jsonpointer_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer_error.h b/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer_error.h
index 71b08a12..29b9812f 100644
--- a/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer_error.h
+++ b/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer_error.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONPOINTER_ERROR_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONPOINTER_EXPORT
-#include "jsonpointer_export.h"
+#include <sourcemeta/jsontoolkit/jsonpointer_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json_error.h>
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h
index 54e0d9fe..9a981943 100644
--- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h
+++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT
-#include "jsonschema_export.h"
+#include <sourcemeta/jsontoolkit/jsonschema_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_anchor.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_anchor.h
index a55d0c7c..aaf565bd 100644
--- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_anchor.h
+++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_anchor.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_ANCHOR_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT
-#include "jsonschema_export.h"
+#include <sourcemeta/jsontoolkit/jsonschema_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_bundle.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_bundle.h
index bacca953..345510bc 100644
--- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_bundle.h
+++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_bundle.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_BUNDLE_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT
-#include "jsonschema_export.h"
+#include <sourcemeta/jsontoolkit/jsonschema_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_error.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_error.h
index 887563f5..a2ca383a 100644
--- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_error.h
+++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_error.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_ERROR_H
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT
-#include "jsonschema_export.h"
+#include <sourcemeta/jsontoolkit/jsonschema_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/jsonpointer.h>
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_reference.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_reference.h
index 3f4ff6af..4eac5268 100644
--- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_reference.h
+++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_reference.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_REFERENCE_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT
-#include "jsonschema_export.h"
+#include <sourcemeta/jsontoolkit/jsonschema_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/jsonpointer.h>
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h
index d1cb51d8..9bd3cd09 100644
--- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h
+++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_RESOLVER_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT
-#include "jsonschema_export.h"
+#include <sourcemeta/jsontoolkit/jsonschema_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_walker.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_walker.h
index 625a7f82..e271a41f 100644
--- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_walker.h
+++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_walker.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_WALKER_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT
-#include "jsonschema_export.h"
+#include <sourcemeta/jsontoolkit/jsonschema_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/json.h>
diff --git a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h
index b9ee2d4c..c698abfd 100644
--- a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h
+++ b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_URI_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_URI_EXPORT
-#include "uri_export.h"
+#include <sourcemeta/jsontoolkit/uri_export.h>
 #endif
 
 #include <sourcemeta/jsontoolkit/uri_error.h>
diff --git a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri_error.h b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri_error.h
index 8062f450..d0313870 100644
--- a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri_error.h
+++ b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri_error.h
@@ -2,7 +2,7 @@
 #define SOURCEMETA_JSONTOOLKIT_URI_ERROR_H_
 
 #ifndef SOURCEMETA_JSONTOOLKIT_URI_EXPORT
-#include "uri_export.h"
+#include <sourcemeta/jsontoolkit/uri_export.h>
 #endif
 
 #include <cstdint>   // std::uint64_t
diff --git a/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake b/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake
index 9868714d..bc746774 100644
--- a/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake
+++ b/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake
@@ -18,6 +18,7 @@ function(noa_library)
     set(INCLUDE_PREFIX "include/${NOA_LIBRARY_PROJECT}")
   endif()
 
+  set(EXPORT_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}_export.h")
   if(NOT NOA_LIBRARY_VARIANT)
     set(PUBLIC_HEADER "${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}.h")
   else()
@@ -25,7 +26,7 @@ function(noa_library)
   endif()
 
   if(NOA_LIBRARY_SOURCES)
-    set(ABSOLUTE_PRIVATE_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/${NOA_LIBRARY_NAME}_export.h")
+    set(ABSOLUTE_PRIVATE_HEADERS "${EXPORT_HEADER_PATH}")
   else()
     set(ABSOLUTE_PRIVATE_HEADERS)
   endif()
@@ -100,7 +101,7 @@ function(noa_library)
   if(NOA_LIBRARY_SOURCES)
     include(GenerateExportHeader)
     generate_export_header(${TARGET_NAME}
-      EXPORT_FILE_NAME ${NOA_LIBRARY_NAME}_export.h)
+      EXPORT_FILE_NAME ${EXPORT_HEADER_PATH})
     set_target_properties(${TARGET_NAME}
       PROPERTIES
         SOVERSION "${PROJECT_VERSION_MAJOR}"
@@ -108,7 +109,7 @@ function(noa_library)
 
     # To find the generated files
     target_include_directories(${TARGET_NAME}
-      PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+      PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
   endif()
 endfunction()
 
diff --git a/vendor/noa/cmake/noa/library.cmake b/vendor/noa/cmake/noa/library.cmake
index 9868714d..bc746774 100644
--- a/vendor/noa/cmake/noa/library.cmake
+++ b/vendor/noa/cmake/noa/library.cmake
@@ -18,6 +18,7 @@ function(noa_library)
     set(INCLUDE_PREFIX "include/${NOA_LIBRARY_PROJECT}")
   endif()
 
+  set(EXPORT_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}_export.h")
   if(NOT NOA_LIBRARY_VARIANT)
     set(PUBLIC_HEADER "${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}.h")
   else()
@@ -25,7 +26,7 @@ function(noa_library)
   endif()
 
   if(NOA_LIBRARY_SOURCES)
-    set(ABSOLUTE_PRIVATE_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/${NOA_LIBRARY_NAME}_export.h")
+    set(ABSOLUTE_PRIVATE_HEADERS "${EXPORT_HEADER_PATH}")
   else()
     set(ABSOLUTE_PRIVATE_HEADERS)
   endif()
@@ -100,7 +101,7 @@ function(noa_library)
   if(NOA_LIBRARY_SOURCES)
     include(GenerateExportHeader)
     generate_export_header(${TARGET_NAME}
-      EXPORT_FILE_NAME ${NOA_LIBRARY_NAME}_export.h)
+      EXPORT_FILE_NAME ${EXPORT_HEADER_PATH})
     set_target_properties(${TARGET_NAME}
       PROPERTIES
         SOVERSION "${PROJECT_VERSION_MAJOR}"
@@ -108,7 +109,7 @@ function(noa_library)
 
     # To find the generated files
     target_include_directories(${TARGET_NAME}
-      PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+      PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
   endif()
 endfunction()