diff --git a/src/core/jsonschema/bundle.cc b/src/core/jsonschema/bundle.cc
index 72eeb86b2..a294ce731 100644
--- a/src/core/jsonschema/bundle.cc
+++ b/src/core/jsonschema/bundle.cc
@@ -1,8 +1,16 @@
+#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
-
-#include <cassert> // assert
-#include <sstream> // std::ostringstream
-#include <utility> // std::move
+#include <sourcemeta/core/jsonschema_error.h>
+#include <sourcemeta/core/jsonschema_frame.h>
+#include <sourcemeta/core/jsonschema_types.h>
+
+#include <cassert>  // assert
+#include <cstddef>  // std::size_t
+#include <optional> // std::nullopt
+#include <sstream>  // std::ostringstream
+#include <string>   // std::string
+#include <utility>  // std::move
 
 namespace {
 
diff --git a/src/core/jsonschema/frame.cc b/src/core/jsonschema/frame.cc
index baa387682..9dc29beb9 100644
--- a/src/core/jsonschema/frame.cc
+++ b/src/core/jsonschema/frame.cc
@@ -1,10 +1,21 @@
+#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
+#include <sourcemeta/core/jsonschema_frame.h>
+#include <sourcemeta/core/jsonschema_types.h>
+#include <sourcemeta/core/jsonschema_walker.h>
+#include <sourcemeta/core/uri.h>
 
 #include <algorithm>  // std::sort, std::all_of, std::any_of
 #include <cassert>    // assert
+#include <cstddef>    // std::size_t
+#include <cstdint>    // std::uint8_t
 #include <functional> // std::less
+#include <iterator>   // std::next
 #include <map>        // std::map
 #include <optional>   // std::optional
+#include <ostream>    // std::ostream
 #include <set>        // std::set
 #include <sstream>    // std::ostringstream
 #include <utility>    // std::pair, std::move
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h
index 1297c4abc..76bbaee44 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h
@@ -5,20 +5,22 @@
 #include <sourcemeta/core/jsonschema_export.h>
 #endif
 
-#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json.h> // NOLINT(misc-include-cleaner) Public header needs it
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer.h>
 
+// NOLINTBEGIN(misc-include-cleaner)
 #include <sourcemeta/core/jsonschema_error.h>
 #include <sourcemeta/core/jsonschema_frame.h>
 #include <sourcemeta/core/jsonschema_resolver.h>
-#include <sourcemeta/core/jsonschema_transform.h>
 #include <sourcemeta/core/jsonschema_types.h>
 #include <sourcemeta/core/jsonschema_walker.h>
+// NOLINTEND(misc-include-cleaner)
+
+#include <sourcemeta/core/uri.h>
 
 #include <cstdint>     // std::uint8_t
-#include <functional>  // std::function
 #include <optional>    // std::optional, std::nullopt
-#include <set>         // std::set
 #include <string>      // std::string
 #include <string_view> // std::string_view
 
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h
index c7041ef85..55eea3fd6 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h
@@ -6,11 +6,11 @@
 #endif
 
 #include <sourcemeta/core/jsonpointer.h>
-#include <sourcemeta/core/uri.h>
 
-#include <exception> // std::exception
-#include <string>    // std::string
-#include <utility>   // std::move
+#include <exception>   // std::exception
+#include <string>      // std::string
+#include <string_view> // std::string_view
+#include <utility>     // std::move
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h
index b24524366..edeffc100 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h
@@ -5,23 +5,18 @@
 #include <sourcemeta/core/jsonschema_export.h>
 #endif
 
-#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer.h>
-
-#include <sourcemeta/core/jsonschema_resolver.h>
 #include <sourcemeta/core/jsonschema_types.h>
-#include <sourcemeta/core/jsonschema_walker.h>
 
-#include <cstdint>       // std::uint8_t
-#include <functional>    // std::reference_wrapper
-#include <map>           // std::map
-#include <optional>      // std::optional
-#include <ostream>       // std::ostream
-#include <set>           // std::set
-#include <tuple>         // std::tuple
-#include <unordered_set> // std::unordered_set
-#include <utility>       // std::pair
-#include <vector>        // std::vector
+#include <cstdint>    // std::uint8_t
+#include <functional> // std::reference_wrapper
+#include <map>        // std::map
+#include <optional>   // std::optional
+#include <ostream>    // std::ostream
+#include <set>        // std::set
+#include <utility>    // std::pair
+#include <vector>     // std::vector
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h
index 05e83f38a..4ab8f92ee 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h
@@ -6,12 +6,14 @@
 #endif
 
 #include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonschema_types.h>
 
 #include <filesystem>  // std::filesystem
 #include <functional>  // std::function
 #include <map>         // std::map
 #include <optional>    // std::optional
+#include <string>      // std::string
 #include <string_view> // std::string_view
 
 namespace sourcemeta::core {
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h
index 74b872545..183e5c4c9 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h
@@ -5,11 +5,10 @@
 #include <sourcemeta/core/jsonschema_export.h>
 #endif
 
-#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer.h>
-#include <sourcemeta/core/uri.h>
-
-#include <sourcemeta/core/jsonschema_resolver.h>
+#include <sourcemeta/core/jsonschema_frame.h>
+#include <sourcemeta/core/jsonschema_types.h>
 
 #include <cassert>     // assert
 #include <concepts>    // std::derived_from
@@ -17,12 +16,10 @@
 #include <map>         // std::map
 #include <memory>      // std::make_unique, std::unique_ptr
 #include <optional>    // std::optional, std::nullopt
-#include <set>         // std::set
 #include <string>      // std::string
 #include <string_view> // std::string_view
 #include <utility>     // std::move, std::forward, std::pair
 #include <variant>     // std::variant
-#include <vector>      // std::vector
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h
index b723bc39c..d9f14b506 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_
 #define SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_
 
-#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/uri.h>
 
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h
index 8bc87e1b6..d78a92373 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h
@@ -5,15 +5,12 @@
 #include <sourcemeta/core/jsonschema_export.h>
 #endif
 
-#include <sourcemeta/core/json.h>
-
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonschema_types.h>
 
-#include <cstdint>     // std::uint64_t
-#include <optional>    // std::optional
-#include <string>      // std::string
-#include <string_view> // std::string_view
-#include <vector>      // std::vector
+#include <optional> // std::optional
+#include <string>   // std::string
+#include <vector>   // std::vector
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonschema/jsonschema.cc b/src/core/jsonschema/jsonschema.cc
index a947ab561..a32c5ca3f 100644
--- a/src/core/jsonschema/jsonschema.cc
+++ b/src/core/jsonschema/jsonschema.cc
@@ -1,11 +1,22 @@
+#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
+#include <sourcemeta/core/jsonschema_frame.h>
+#include <sourcemeta/core/jsonschema_types.h>
+#include <sourcemeta/core/jsonschema_walker.h>
+#include <sourcemeta/core/uri.h>
 
 #include <cassert>     // assert
 #include <cstdint>     // std::uint64_t
 #include <functional>  // std::less
 #include <limits>      // std::numeric_limits
+#include <map>         // std::map
 #include <numeric>     // std::accumulate
+#include <optional>    // std::optional
 #include <sstream>     // std::ostringstream
+#include <string>      // std::string
+#include <string_view> // std::string_view
 #include <type_traits> // std::remove_reference_t
 #include <utility>     // std::move
 
diff --git a/src/core/jsonschema/official_resolver.in.cc b/src/core/jsonschema/official_resolver.in.cc
index 3b4bdf415..1ab8a11de 100644
--- a/src/core/jsonschema/official_resolver.in.cc
+++ b/src/core/jsonschema/official_resolver.in.cc
@@ -1,5 +1,10 @@
+#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonschema.h>
 
+#include <optional>    // std::optional
+#include <string_view> // std::string_view
+
 auto sourcemeta::core::schema_official_resolver(std::string_view identifier)
     -> std::optional<sourcemeta::core::JSON> {
   // JSON Schema 2020-12
diff --git a/src/core/jsonschema/official_walker.cc b/src/core/jsonschema/official_walker.cc
index 65afea448..c9ac5eb0a 100644
--- a/src/core/jsonschema/official_walker.cc
+++ b/src/core/jsonschema/official_walker.cc
@@ -1,4 +1,8 @@
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_types.h>
+
+#include <optional>    // std::nullopt
+#include <string_view> // std::string_view
 
 auto sourcemeta::core::schema_official_walker(
     std::string_view keyword,
diff --git a/src/core/jsonschema/resolver.cc b/src/core/jsonschema/resolver.cc
index 13e5759a9..edd7b2d82 100644
--- a/src/core/jsonschema/resolver.cc
+++ b/src/core/jsonschema/resolver.cc
@@ -1,9 +1,21 @@
+#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
-
-#include <algorithm> // std::transform
-#include <cassert>   // assert
-#include <cctype>    // std::tolower
-#include <sstream>   // std::ostringstream
+#include <sourcemeta/core/jsonschema_error.h>
+#include <sourcemeta/core/jsonschema_frame.h>
+#include <sourcemeta/core/jsonschema_resolver.h>
+#include <sourcemeta/core/jsonschema_types.h>
+
+#include <algorithm>   // std::transform
+#include <cassert>     // assert
+#include <cctype>      // std::tolower
+#include <filesystem>  // std::filesystem
+#include <functional>  // std::function
+#include <optional>    // std::optional
+#include <sstream>     // std::ostringstream
+#include <string>      // std::string
+#include <string_view> // std::string_view
+#include <utility>     // std::move
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonschema/transformer.cc b/src/core/jsonschema/transformer.cc
index 9c7d401c9..8664fa5cf 100644
--- a/src/core/jsonschema/transformer.cc
+++ b/src/core/jsonschema/transformer.cc
@@ -1,10 +1,19 @@
+#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
+#include <sourcemeta/core/jsonschema_frame.h>
+#include <sourcemeta/core/jsonschema_transform.h>
+#include <sourcemeta/core/jsonschema_types.h>
 
 #include <cassert>   // assert
+#include <optional>  // std::optional
 #include <set>       // std::set
 #include <sstream>   // std::ostringstream
 #include <stdexcept> // std::runtime_error
+#include <string>    // std::string
 #include <utility>   // std::move, std::pair
+#include <variant>   // std::holds_alternative, std::get_if
 
 namespace {
 
diff --git a/src/core/jsonschema/walker.cc b/src/core/jsonschema/walker.cc
index ec5492831..f7386cd4c 100644
--- a/src/core/jsonschema/walker.cc
+++ b/src/core/jsonschema/walker.cc
@@ -1,7 +1,17 @@
+#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_types.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include <algorithm> // std::max, std::sort
 #include <cassert>   // assert
+#include <cstddef>   // std::size_t
+#include <cstdint>   // std::uint8_t
+#include <optional>  // std::optional
+#include <string>    // std::string
+#include <utility>   // std::move
+#include <vector>    // std::vector
 
 namespace {
 enum class SchemaWalkerType_t : std::uint8_t { Deep, Flat };
diff --git a/src/extension/alterschema/alterschema.cc b/src/extension/alterschema/alterschema.cc
index 30cdc7691..788f29784 100644
--- a/src/extension/alterschema/alterschema.cc
+++ b/src/extension/alterschema/alterschema.cc
@@ -1,4 +1,5 @@
 #include <sourcemeta/core/alterschema.h>
+#include <sourcemeta/core/jsonschema_transform.h>
 
 #include <cassert> // assert
 
diff --git a/src/extension/alterschema/include/sourcemeta/core/alterschema.h b/src/extension/alterschema/include/sourcemeta/core/alterschema.h
index 8c4bf3e5d..46c338774 100644
--- a/src/extension/alterschema/include/sourcemeta/core/alterschema.h
+++ b/src/extension/alterschema/include/sourcemeta/core/alterschema.h
@@ -15,6 +15,7 @@
 #endif
 
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_transform.h>
 
 namespace sourcemeta::core {
 
diff --git a/test/jsonschema/jsonschema_base_dialect_test.cc b/test/jsonschema/jsonschema_base_dialect_test.cc
index 048adb415..c4bbf96f9 100644
--- a/test/jsonschema/jsonschema_base_dialect_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string> // std::string
 
diff --git a/test/jsonschema/jsonschema_bundle_2019_09_test.cc b/test/jsonschema/jsonschema_bundle_2019_09_test.cc
index f64f0c355..c0e33a240 100644
--- a/test/jsonschema/jsonschema_bundle_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_bundle_2019_09_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_2020_12_test.cc b/test/jsonschema/jsonschema_bundle_2020_12_test.cc
index e06205753..eb17dd1c9 100644
--- a/test/jsonschema/jsonschema_bundle_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_bundle_2020_12_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_draft0_test.cc b/test/jsonschema/jsonschema_bundle_draft0_test.cc
index 46066124f..9a332007c 100644
--- a/test/jsonschema/jsonschema_bundle_draft0_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft0_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_draft1_test.cc b/test/jsonschema/jsonschema_bundle_draft1_test.cc
index 63f590c45..2d409d9a8 100644
--- a/test/jsonschema/jsonschema_bundle_draft1_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft1_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_draft2_test.cc b/test/jsonschema/jsonschema_bundle_draft2_test.cc
index 59eeafbb1..c460303af 100644
--- a/test/jsonschema/jsonschema_bundle_draft2_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft2_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_draft3_test.cc b/test/jsonschema/jsonschema_bundle_draft3_test.cc
index af014f2a0..b69689202 100644
--- a/test/jsonschema/jsonschema_bundle_draft3_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft3_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_draft4_test.cc b/test/jsonschema/jsonschema_bundle_draft4_test.cc
index 1891ff525..37b53b285 100644
--- a/test/jsonschema/jsonschema_bundle_draft4_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft4_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_draft6_test.cc b/test/jsonschema/jsonschema_bundle_draft6_test.cc
index 46fb51097..ca83bcc0a 100644
--- a/test/jsonschema/jsonschema_bundle_draft6_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft6_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_draft7_test.cc b/test/jsonschema/jsonschema_bundle_draft7_test.cc
index c38dc0912..e3b2fedb2 100644
--- a/test/jsonschema/jsonschema_bundle_draft7_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft7_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_bundle_test.cc b/test/jsonschema/jsonschema_bundle_test.cc
index 1d2942feb..def10cf2a 100644
--- a/test/jsonschema/jsonschema_bundle_test.cc
+++ b/test/jsonschema/jsonschema_bundle_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>      // std::string
 #include <string_view> // std::string_view
diff --git a/test/jsonschema/jsonschema_error_test.cc b/test/jsonschema/jsonschema_error_test.cc
index 81c888dc1..eca887be0 100644
--- a/test/jsonschema/jsonschema_error_test.cc
+++ b/test/jsonschema/jsonschema_error_test.cc
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <exception>   // std::exception
 #include <string>      // std::string
diff --git a/test/jsonschema/jsonschema_flat_file_resolver_test.cc b/test/jsonschema/jsonschema_flat_file_resolver_test.cc
index 49159ab2e..f8a779ebf 100644
--- a/test/jsonschema/jsonschema_flat_file_resolver_test.cc
+++ b/test/jsonschema/jsonschema_flat_file_resolver_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
+#include <sourcemeta/core/jsonschema_resolver.h>
 
 TEST(JSONSchema_SchemaFlatFileResolver, empty_no_fallback) {
   sourcemeta::core::SchemaFlatFileResolver resolver;
diff --git a/test/jsonschema/jsonschema_format_test.cc b/test/jsonschema/jsonschema_format_test.cc
index d53b421d0..a24d38459 100644
--- a/test/jsonschema/jsonschema_format_test.cc
+++ b/test/jsonschema/jsonschema_format_test.cc
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
 
 #include <sstream>
diff --git a/test/jsonschema/jsonschema_frame_2019_09_test.cc b/test/jsonschema/jsonschema_frame_2019_09_test.cc
index 44c21d2ae..253352569 100644
--- a/test/jsonschema/jsonschema_frame_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_frame_2019_09_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_2020_12_test.cc b/test/jsonschema/jsonschema_frame_2020_12_test.cc
index fbeda375b..88733ae90 100644
--- a/test/jsonschema/jsonschema_frame_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_frame_2020_12_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_draft0_test.cc b/test/jsonschema/jsonschema_frame_draft0_test.cc
index d8af0b414..e18dede24 100644
--- a/test/jsonschema/jsonschema_frame_draft0_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft0_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_draft1_test.cc b/test/jsonschema/jsonschema_frame_draft1_test.cc
index e39149acd..1fa9b95ba 100644
--- a/test/jsonschema/jsonschema_frame_draft1_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft1_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_draft2_test.cc b/test/jsonschema/jsonschema_frame_draft2_test.cc
index 69d85e52d..5194f9c32 100644
--- a/test/jsonschema/jsonschema_frame_draft2_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft2_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_draft3_test.cc b/test/jsonschema/jsonschema_frame_draft3_test.cc
index c633fd97c..7629c35af 100644
--- a/test/jsonschema/jsonschema_frame_draft3_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft3_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_draft4_test.cc b/test/jsonschema/jsonschema_frame_draft4_test.cc
index 8aff462d7..5e5714fbf 100644
--- a/test/jsonschema/jsonschema_frame_draft4_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft4_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_draft6_test.cc b/test/jsonschema/jsonschema_frame_draft6_test.cc
index 93a0a4c6d..138a1166b 100644
--- a/test/jsonschema/jsonschema_frame_draft6_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft6_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_draft7_test.cc b/test/jsonschema/jsonschema_frame_draft7_test.cc
index 1a9801784..6586c3c79 100644
--- a/test/jsonschema/jsonschema_frame_draft7_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft7_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_frame_test.cc b/test/jsonschema/jsonschema_frame_test.cc
index 0feff574a..ac6432f48 100644
--- a/test/jsonschema/jsonschema_frame_test.cc
+++ b/test/jsonschema/jsonschema_frame_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <set>
 #include <sstream>
diff --git a/test/jsonschema/jsonschema_identify_test.cc b/test/jsonschema/jsonschema_identify_test.cc
index ad292345c..4cfb569bc 100644
--- a/test/jsonschema/jsonschema_identify_test.cc
+++ b/test/jsonschema/jsonschema_identify_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 TEST(JSONSchema_identify, boolean_no_dialect) {
   const sourcemeta::core::JSON document{true};
diff --git a/test/jsonschema/jsonschema_keyword_iterator_test.cc b/test/jsonschema/jsonschema_keyword_iterator_test.cc
index 6b118d437..e73fdb65f 100644
--- a/test/jsonschema/jsonschema_keyword_iterator_test.cc
+++ b/test/jsonschema/jsonschema_keyword_iterator_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include <vector>
 
diff --git a/test/jsonschema/jsonschema_map_resolver_test.cc b/test/jsonschema/jsonschema_map_resolver_test.cc
index cd837dbb0..21e7fc5ee 100644
--- a/test/jsonschema/jsonschema_map_resolver_test.cc
+++ b/test/jsonschema/jsonschema_map_resolver_test.cc
@@ -1,6 +1,9 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
+#include <sourcemeta/core/jsonschema_resolver.h>
 
 #include <unordered_set>
 
diff --git a/test/jsonschema/jsonschema_metaschema_test.cc b/test/jsonschema/jsonschema_metaschema_test.cc
index a3a122e62..4fdf9a2f9 100644
--- a/test/jsonschema/jsonschema_metaschema_test.cc
+++ b/test/jsonschema/jsonschema_metaschema_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 TEST(JSONSchema_metaschema, example_2020_12) {
   const auto schema{sourcemeta::core::parse_json(R"JSON({
diff --git a/test/jsonschema/jsonschema_official_walker_2019_09_test.cc b/test/jsonschema/jsonschema_official_walker_2019_09_test.cc
index f511c287d..ec359947a 100644
--- a/test/jsonschema/jsonschema_official_walker_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_2019_09_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include <algorithm>
 
diff --git a/test/jsonschema/jsonschema_official_walker_2020_12_test.cc b/test/jsonschema/jsonschema_official_walker_2020_12_test.cc
index 0338edfc2..9680ea56c 100644
--- a/test/jsonschema/jsonschema_official_walker_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_2020_12_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include <algorithm>
 
diff --git a/test/jsonschema/jsonschema_official_walker_draft0_test.cc b/test/jsonschema/jsonschema_official_walker_draft0_test.cc
index 7d077344f..3609a6c42 100644
--- a/test/jsonschema/jsonschema_official_walker_draft0_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_draft0_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_official_walker_draft1_test.cc b/test/jsonschema/jsonschema_official_walker_draft1_test.cc
index c605edca6..d918b0e6f 100644
--- a/test/jsonschema/jsonschema_official_walker_draft1_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_draft1_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_official_walker_draft2_test.cc b/test/jsonschema/jsonschema_official_walker_draft2_test.cc
index 528103905..5845127c9 100644
--- a/test/jsonschema/jsonschema_official_walker_draft2_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_draft2_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_official_walker_draft3_test.cc b/test/jsonschema/jsonschema_official_walker_draft3_test.cc
index 23bb9ee73..d1b3166f0 100644
--- a/test/jsonschema/jsonschema_official_walker_draft3_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_draft3_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_official_walker_draft4_test.cc b/test/jsonschema/jsonschema_official_walker_draft4_test.cc
index b85a8f695..69d259299 100644
--- a/test/jsonschema/jsonschema_official_walker_draft4_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_draft4_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_official_walker_draft6_test.cc b/test/jsonschema/jsonschema_official_walker_draft6_test.cc
index 6c9ee385a..80ebae0d5 100644
--- a/test/jsonschema/jsonschema_official_walker_draft6_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_draft6_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_official_walker_draft7_test.cc b/test/jsonschema/jsonschema_official_walker_draft7_test.cc
index 9d3456fe1..b2f121ad5 100644
--- a/test/jsonschema/jsonschema_official_walker_draft7_test.cc
+++ b/test/jsonschema/jsonschema_official_walker_draft7_test.cc
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include "jsonschema_test_utils.h"
 
diff --git a/test/jsonschema/jsonschema_relativize_test.cc b/test/jsonschema/jsonschema_relativize_test.cc
index 95e1da8db..ad93bf1e2 100644
--- a/test/jsonschema/jsonschema_relativize_test.cc
+++ b/test/jsonschema/jsonschema_relativize_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 TEST(JSONSchema_relativize, draft4_1) {
   auto schema = sourcemeta::core::parse_json(R"JSON({
diff --git a/test/jsonschema/jsonschema_transform_rules.h b/test/jsonschema/jsonschema_transform_rules.h
index 95a34ef03..017ee6616 100644
--- a/test/jsonschema/jsonschema_transform_rules.h
+++ b/test/jsonschema/jsonschema_transform_rules.h
@@ -2,6 +2,7 @@
 #define SOURCEMETA_CORE_JSONSCHEMA_TEST_TRANSFORM_RULES_H_
 
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_transform.h>
 
 class ExampleRule1 final : public sourcemeta::core::SchemaTransformRule {
 public:
diff --git a/test/jsonschema/jsonschema_transformer_test.cc b/test/jsonschema/jsonschema_transformer_test.cc
index 90feacd03..4a6c27c89 100644
--- a/test/jsonschema/jsonschema_transformer_test.cc
+++ b/test/jsonschema/jsonschema_transformer_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string>
 #include <tuple>
diff --git a/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc b/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc
index 60bbe34b3..4a8dfa58a 100644
--- a/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 #include <string> // std::string
 
diff --git a/test/jsonschema/jsonschema_vocabulary_test.cc b/test/jsonschema/jsonschema_vocabulary_test.cc
index bb2ffd576..b70d226be 100644
--- a/test/jsonschema/jsonschema_vocabulary_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 TEST(JSONSchema_vocabulary, core_vocabularies_boolean_without_default) {
   const sourcemeta::core::JSON document{true};
diff --git a/test/jsonschema/jsonschema_walker_test.cc b/test/jsonschema/jsonschema_walker_test.cc
index 0d792b347..dd26197c7 100644
--- a/test/jsonschema/jsonschema_walker_test.cc
+++ b/test/jsonschema/jsonschema_walker_test.cc
@@ -3,6 +3,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_walker.h>
 
 #include <vector>
 
diff --git a/test/jsonschema/jsonschema_wrap_test.cc b/test/jsonschema/jsonschema_wrap_test.cc
index c5bc3ffdd..9a664d2ec 100644
--- a/test/jsonschema/jsonschema_wrap_test.cc
+++ b/test/jsonschema/jsonschema_wrap_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
+#include <sourcemeta/core/jsonschema_error.h>
 
 TEST(JSONSchema_wrap, identifier_without_fragment) {
   const auto identifier{"https://www.example.com"};