diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h
index bb7664412..ae7a394a8 100644
--- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h
+++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h
@@ -5,13 +5,12 @@
 #include <sourcemeta/core/jsonpointer_export.h>
 #endif
 
-#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/uri.h>
 
+#include <sourcemeta/core/json_hash.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer.h>
-#include <sourcemeta/core/jsonpointer_error.h>
 #include <sourcemeta/core/jsonpointer_pointer.h>
-#include <sourcemeta/core/jsonpointer_position.h>
 #include <sourcemeta/core/jsonpointer_subpointer_walker.h>
 #include <sourcemeta/core/jsonpointer_template.h>
 #include <sourcemeta/core/jsonpointer_walker.h>
diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h
index b8cc3cd5c..8f67d09e7 100644
--- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h
+++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h
@@ -5,10 +5,10 @@
 
 #include <algorithm>        // std::copy, std::equal
 #include <cassert>          // assert
+#include <cstddef>          // std::size_t
 #include <functional>       // std::reference_wrapper
 #include <initializer_list> // std::initializer_list
 #include <iterator>         // std::advance, std::back_inserter
-#include <sstream>          // std::basic_ostringstream
 #include <type_traits>      // std::enable_if_t, std::is_same_v
 #include <utility>          // std::move
 #include <vector>           // std::vector
diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h
index 6af0c84e0..268c32cfc 100644
--- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h
+++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h
@@ -5,9 +5,11 @@
 #include <sourcemeta/core/jsonpointer_export.h>
 #endif
 
-#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_hash.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer_pointer.h>
 
+#include <cstddef>  // std::size_t
 #include <cstdint>  // std::uint64_t
 #include <map>      // std::map
 #include <optional> // std::optional
diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h
index 85b40f9b0..348c97132 100644
--- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h
+++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h
@@ -4,8 +4,6 @@
 #include <cstddef>  // std::ptrdiff_t
 #include <iterator> // std::forward_iterator_tag
 
-#include <sourcemeta/core/jsonpointer_pointer.h>
-
 namespace sourcemeta::core {
 
 /// @ingroup jsonpointer
diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h
index 5081ac256..c79fb91f9 100644
--- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h
+++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h
@@ -1,17 +1,15 @@
 #ifndef SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_
 #define SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_
 
-#include <sourcemeta/core/jsonpointer_pointer.h>
-#include <sourcemeta/core/jsonpointer_token.h>
-
 #include <sourcemeta/core/regex.h>
 
-#include <algorithm> // std::copy, std::all_of
-#include <cassert>   // assert
-#include <iterator>  // std::back_inserter
-#include <optional>  // std::optional, std::nullopt
-#include <variant>   // std::variant, std::holds_alternative, std::get
-#include <vector>    // std::vector
+#include <algorithm>        // std::copy, std::all_of
+#include <cassert>          // assert
+#include <initializer_list> // std::initializer_list
+#include <iterator>         // std::back_inserter
+#include <optional>         // std::optional, std::nullopt
+#include <variant>          // std::variant, std::holds_alternative, std::get
+#include <vector>           // std::vector
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h
index ef777d719..e97bff5c7 100644
--- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h
+++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_
 #define SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_
 
-#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_value.h>
 
 #include <cassert> // assert
 
diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h
index f7dec36c6..c31545ca8 100644
--- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h
+++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h
@@ -1,10 +1,10 @@
 #ifndef SOURCEMETA_CORE_JSONPOINTER_WALKER_H_
 #define SOURCEMETA_CORE_JSONPOINTER_WALKER_H_
 
-#include <vector> // std::vector
+#include <sourcemeta/core/json_value.h>
 
-#include <sourcemeta/core/json.h>
-#include <sourcemeta/core/jsonpointer_pointer.h>
+#include <cstddef> // std::size_t
+#include <vector>  // std::vector
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonpointer/jsonpointer.cc b/src/core/jsonpointer/jsonpointer.cc
index e221939a8..8851470e7 100644
--- a/src/core/jsonpointer/jsonpointer.cc
+++ b/src/core/jsonpointer/jsonpointer.cc
@@ -1,14 +1,20 @@
+#include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_hash.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer.h>
+#include <sourcemeta/core/jsonpointer_pointer.h>
+#include <sourcemeta/core/uri.h>
 
 #include "grammar.h"
 #include "parser.h"
 #include "stringify.h"
 
 #include <cassert>     // assert
-#include <functional>  // std::reference_wrapper
 #include <iterator>    // std::cbegin, std::cend, std::prev
 #include <memory>      // std::allocator
+#include <ostream>     // std::basic_ostream
 #include <sstream>     // std::basic_ostringstream, std::basic_stringstream
+#include <string>      // std::basic_string
 #include <type_traits> // std::is_same_v
 #include <utility>     // std::move
 
diff --git a/src/core/jsonpointer/parser.h b/src/core/jsonpointer/parser.h
index b1bd7eb2a..8918d67d3 100644
--- a/src/core/jsonpointer/parser.h
+++ b/src/core/jsonpointer/parser.h
@@ -3,9 +3,11 @@
 
 #include "grammar.h"
 
+#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/jsonpointer.h>
 #include <sourcemeta/core/jsonpointer_error.h>
-#include <sourcemeta/core/jsonpointer_pointer.h>
 
+#include <cstdint>   // std::uint64_t
 #include <istream>   // std::basic_istream
 #include <sstream>   // std::basic_stringstream
 #include <stdexcept> // std::out_of_range
diff --git a/src/core/jsonpointer/position.cc b/src/core/jsonpointer/position.cc
index afe9e1386..99a4eed37 100644
--- a/src/core/jsonpointer/position.cc
+++ b/src/core/jsonpointer/position.cc
@@ -1,6 +1,10 @@
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/jsonpointer_position.h>
 
-#include <cassert> // assert
+#include <cassert>  // assert
+#include <cstddef>  // std::size_t
+#include <cstdint>  // std::uint64_t
+#include <optional> // std::optional
 
 namespace sourcemeta::core {
 
diff --git a/src/core/jsonpointer/stringify.h b/src/core/jsonpointer/stringify.h
index d34f186ad..f3405656c 100644
--- a/src/core/jsonpointer/stringify.h
+++ b/src/core/jsonpointer/stringify.h
@@ -3,13 +3,15 @@
 
 #include "grammar.h"
 
-#include <sourcemeta/core/json.h>
-#include <sourcemeta/core/jsonpointer_pointer.h>
+#include <sourcemeta/core/json_value.h>
 #include <sourcemeta/core/uri.h>
 
+#include <cassert> // assert
+#include <ios>     // std::basic_ostream
 #include <ostream> // std::basic_ostream
 #include <sstream> // std::basic_istringstream
 #include <string>  // std::to_string, std::basic_string
+#include <variant> // std::holds_alternative
 
 namespace sourcemeta::core::internal {
 inline auto
diff --git a/test/jsonpointer/jsonpointer_error_test.cc b/test/jsonpointer/jsonpointer_error_test.cc
index e378e28e4..7245023c5 100644
--- a/test/jsonpointer/jsonpointer_error_test.cc
+++ b/test/jsonpointer/jsonpointer_error_test.cc
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
+#include <sourcemeta/core/jsonpointer_error.h>
 
 #include <exception>   // std::exception
 #include <string>      // std::string
diff --git a/test/jsonpointer/jsonpointer_parse_error_test.cc b/test/jsonpointer/jsonpointer_parse_error_test.cc
index 81d27e8a1..2b47978d6 100644
--- a/test/jsonpointer/jsonpointer_parse_error_test.cc
+++ b/test/jsonpointer/jsonpointer_parse_error_test.cc
@@ -4,7 +4,9 @@
 #include <string>
 
 #include <sourcemeta/core/json.h>
+#include <sourcemeta/core/json_error.h>
 #include <sourcemeta/core/jsonpointer.h>
+#include <sourcemeta/core/jsonpointer_error.h>
 
 #define EXPECT_JSON_PARSE_ERROR(input)                                         \
   try {                                                                        \
diff --git a/test/jsonpointer/jsonpointer_position_test.cc b/test/jsonpointer/jsonpointer_position_test.cc
index 1d6f8f99d..5468e486c 100644
--- a/test/jsonpointer/jsonpointer_position_test.cc
+++ b/test/jsonpointer/jsonpointer_position_test.cc
@@ -2,6 +2,7 @@
 
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
+#include <sourcemeta/core/jsonpointer_position.h>
 
 TEST(JSONPointer_position, track_1) {
   const auto input{R"JSON([
diff --git a/test/jsonpointer/jsonpointer_token_test.cc b/test/jsonpointer/jsonpointer_token_test.cc
index b9cb0033d..09389bbe9 100644
--- a/test/jsonpointer/jsonpointer_token_test.cc
+++ b/test/jsonpointer/jsonpointer_token_test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <type_traits>
 
diff --git a/test/jsonpointer/jsonpointer_weakpointer_test.cc b/test/jsonpointer/jsonpointer_weakpointer_test.cc
index b67e67e3b..eb7f44514 100644
--- a/test/jsonpointer/jsonpointer_weakpointer_test.cc
+++ b/test/jsonpointer/jsonpointer_weakpointer_test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonpointer.h>
 #include <type_traits>