diff --git a/include/jsoncons/basic_json.hpp b/include/jsoncons/basic_json.hpp
index 427d9ae80..b766e8111 100644
--- a/include/jsoncons/basic_json.hpp
+++ b/include/jsoncons/basic_json.hpp
@@ -41,6 +41,7 @@
 #include <jsoncons/json_type_traits.hpp>
 #include <jsoncons/pretty_print.hpp>
 #include <jsoncons/ser_context.hpp>
+#include <jsoncons/source.hpp>
 #include <jsoncons/tag_type.hpp>
 #include <jsoncons/utility/bigint.hpp>
 #include <jsoncons/utility/heap_string.hpp>
diff --git a/include/jsoncons/decode_json.hpp b/include/jsoncons/decode_json.hpp
index 753358380..b50c7abf0 100644
--- a/include/jsoncons/decode_json.hpp
+++ b/include/jsoncons/decode_json.hpp
@@ -13,9 +13,11 @@
 
 #include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/allocator_set.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/decode_traits.hpp>
 #include <jsoncons/json_cursor.hpp>
 #include <jsoncons/basic_json.hpp>
+#include <jsoncons/source.hpp>
 
 namespace jsoncons {
 
diff --git a/include/jsoncons/json_cursor.hpp b/include/jsoncons/json_cursor.hpp
index fd8abf478..162555f3a 100644
--- a/include/jsoncons/json_cursor.hpp
+++ b/include/jsoncons/json_cursor.hpp
@@ -16,6 +16,7 @@
 #include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/byte_string.hpp>
 #include <jsoncons/config/jsoncons_config.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/json_exception.hpp>
 #include <jsoncons/json_parser.hpp>
 #include <jsoncons/json_visitor.hpp>
diff --git a/include/jsoncons/staj_event.hpp b/include/jsoncons/staj_event.hpp
index 9469f0514..673e73721 100644
--- a/include/jsoncons/staj_event.hpp
+++ b/include/jsoncons/staj_event.hpp
@@ -17,6 +17,7 @@
 #include <type_traits> // std::enable_if
 
 #include <jsoncons/config/compiler_support.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/detail/write_number.hpp>
 #include <jsoncons/item_event_visitor.hpp>
 #include <jsoncons/json_exception.hpp>
diff --git a/include/jsoncons/staj_event_reader.hpp b/include/jsoncons/staj_event_reader.hpp
index 783724213..9442b0240 100644
--- a/include/jsoncons/staj_event_reader.hpp
+++ b/include/jsoncons/staj_event_reader.hpp
@@ -15,6 +15,7 @@
 #include <memory> // std::allocator
 #include <system_error>
 
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/detail/write_number.hpp>
 #include <jsoncons/item_event_visitor.hpp>
 #include <jsoncons/json_parser.hpp>
diff --git a/include/jsoncons_ext/bson/bson_encoder.hpp b/include/jsoncons_ext/bson/bson_encoder.hpp
index 0cda96f32..18791a738 100644
--- a/include/jsoncons_ext/bson/bson_encoder.hpp
+++ b/include/jsoncons_ext/bson/bson_encoder.hpp
@@ -19,7 +19,6 @@
 
 #include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/config/jsoncons_config.hpp>
-#include <jsoncons/detail/parse_number.hpp>
 #include <jsoncons/byte_string.hpp>
 #include <jsoncons/json_visitor.hpp>
 #include <jsoncons/ser_context.hpp>
diff --git a/include/jsoncons_ext/bson/bson_oid.hpp b/include/jsoncons_ext/bson/bson_oid.hpp
index 909f77b40..78cab400d 100644
--- a/include/jsoncons_ext/bson/bson_oid.hpp
+++ b/include/jsoncons_ext/bson/bson_oid.hpp
@@ -31,8 +31,6 @@
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
-#include <ctype.h>
-#include <system_error>
 #include <type_traits>
 
 #include <jsoncons/config/jsoncons_config.hpp>
diff --git a/include/jsoncons_ext/bson/bson_type.hpp b/include/jsoncons_ext/bson/bson_type.hpp
index e95277325..b89c77675 100644
--- a/include/jsoncons_ext/bson/bson_type.hpp
+++ b/include/jsoncons_ext/bson/bson_type.hpp
@@ -9,8 +9,6 @@
 
 #include <cstdint>
 
-#include <jsoncons/config/jsoncons_config.hpp>
-
 namespace jsoncons { namespace bson {
 
     namespace bson_type
diff --git a/include/jsoncons_ext/bson/decode_bson.hpp b/include/jsoncons_ext/bson/decode_bson.hpp
index ccc1d5981..589ae0b62 100644
--- a/include/jsoncons_ext/bson/decode_bson.hpp
+++ b/include/jsoncons_ext/bson/decode_bson.hpp
@@ -15,8 +15,10 @@
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/basic_json.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/json_decoder.hpp>
 #include <jsoncons/decode_traits.hpp>
+#include <jsoncons/source.hpp>
 
 #include <jsoncons_ext/bson/bson_cursor.hpp>
 #include <jsoncons_ext/bson/bson_options.hpp>
diff --git a/include/jsoncons_ext/cbor/decode_cbor.hpp b/include/jsoncons_ext/cbor/decode_cbor.hpp
index 47264c9d4..94d8cd8ba 100644
--- a/include/jsoncons_ext/cbor/decode_cbor.hpp
+++ b/include/jsoncons_ext/cbor/decode_cbor.hpp
@@ -14,9 +14,11 @@
 #include <jsoncons/allocator_set.hpp>
 #include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/config/jsoncons_config.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/decode_traits.hpp>
 #include <jsoncons/json_filter.hpp>
 #include <jsoncons/basic_json.hpp>
+#include <jsoncons/source.hpp>
 
 #include <jsoncons_ext/cbor/cbor_cursor.hpp>
 #include <jsoncons_ext/cbor/cbor_reader.hpp>
diff --git a/include/jsoncons_ext/csv/decode_csv.hpp b/include/jsoncons_ext/csv/decode_csv.hpp
index fc36aba72..7e703c40b 100644
--- a/include/jsoncons_ext/csv/decode_csv.hpp
+++ b/include/jsoncons_ext/csv/decode_csv.hpp
@@ -11,6 +11,7 @@
 #include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/basic_json.hpp>
 #include <jsoncons/decode_traits.hpp>
+#include <jsoncons/source.hpp>
 
 #include <jsoncons_ext/csv/csv_cursor.hpp>
 #include <jsoncons_ext/csv/csv_encoder.hpp>
diff --git a/include/jsoncons_ext/jsonpatch/jsonpatch.hpp b/include/jsoncons_ext/jsonpatch/jsonpatch.hpp
index 2f8ff1153..8392a286f 100644
--- a/include/jsoncons_ext/jsonpatch/jsonpatch.hpp
+++ b/include/jsoncons_ext/jsonpatch/jsonpatch.hpp
@@ -11,7 +11,6 @@
 #include <cstddef>
 #include <string>
 #include <system_error>
-#include <type_traits>
 #include <utility> // std::move
 #include <vector> 
 
diff --git a/include/jsoncons_ext/jsonpath/expression.hpp b/include/jsoncons_ext/jsonpath/expression.hpp
index b8fc1d5cd..e42b8ccc6 100644
--- a/include/jsoncons_ext/jsonpath/expression.hpp
+++ b/include/jsoncons_ext/jsonpath/expression.hpp
@@ -12,12 +12,10 @@
 #include <exception>
 #include <functional>
 #include <memory>
-#include <set> // std::set
 #include <string> // std::basic_string
 #include <system_error>
 #include <type_traits>
 #include <unordered_map> // std::unordered_map
-#include <unordered_set> // std::unordered_set
 #include <utility> // std::move
 #include <vector> // std::vector
 
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp b/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
index 3b5b18973..be15cf11f 100644
--- a/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
+++ b/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
@@ -10,7 +10,6 @@
 #include <algorithm> // std::reverse
 #include <cstddef>
 #include <memory>
-#include <string>
 #include <system_error>
 #include <type_traits> // std::is_const
 #include <utility> // std::move
@@ -23,10 +22,8 @@
 
 #include <jsoncons_ext/jsonpath/expression.hpp>
 #include <jsoncons_ext/jsonpath/json_location.hpp>
-#include <jsoncons_ext/jsonpath/jsonpath_error.hpp>
 #include <jsoncons_ext/jsonpath/jsonpath_parser.hpp>
 #include <jsoncons_ext/jsonpath/path_node.hpp>
-#include <jsoncons_ext/jsonpath/jsonpath_selector.hpp>
 
 namespace jsoncons { 
 namespace jsonpath {
diff --git a/include/jsoncons_ext/jsonpath/path_node.hpp b/include/jsoncons_ext/jsonpath/path_node.hpp
index ff1babf6d..19df09b86 100644
--- a/include/jsoncons_ext/jsonpath/path_node.hpp
+++ b/include/jsoncons_ext/jsonpath/path_node.hpp
@@ -17,7 +17,6 @@
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/detail/write_number.hpp>
 #include <jsoncons/json_type.hpp>
-#include <jsoncons_ext/jsonpath/jsonpath_error.hpp>
 #include <jsoncons_ext/jsonpath/jsonpath_utilities.hpp>
 
 namespace jsoncons { 
diff --git a/include/jsoncons_ext/jsonschema/common/keyword_validators.hpp b/include/jsoncons_ext/jsonschema/common/keyword_validators.hpp
index 0ab78800c..545d84fa0 100644
--- a/include/jsoncons_ext/jsonschema/common/keyword_validators.hpp
+++ b/include/jsoncons_ext/jsonschema/common/keyword_validators.hpp
@@ -16,10 +16,12 @@
 #include <string>
 #include <system_error>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/byte_string.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/json_reader.hpp>
 #include <jsoncons/tag_type.hpp>
 #include <jsoncons/utility/unicode_traits.hpp>
diff --git a/include/jsoncons_ext/msgpack/decode_msgpack.hpp b/include/jsoncons_ext/msgpack/decode_msgpack.hpp
index 28cbbd8da..08f9eb5d9 100644
--- a/include/jsoncons_ext/msgpack/decode_msgpack.hpp
+++ b/include/jsoncons_ext/msgpack/decode_msgpack.hpp
@@ -14,7 +14,9 @@
 #include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/basic_json.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/decode_traits.hpp>
+#include <jsoncons/source.hpp>
 
 #include <jsoncons_ext/msgpack/msgpack_cursor.hpp>
 #include <jsoncons_ext/msgpack/msgpack_encoder.hpp>
diff --git a/include/jsoncons_ext/ubjson/decode_ubjson.hpp b/include/jsoncons_ext/ubjson/decode_ubjson.hpp
index 886ad488c..9f11db3b3 100644
--- a/include/jsoncons_ext/ubjson/decode_ubjson.hpp
+++ b/include/jsoncons_ext/ubjson/decode_ubjson.hpp
@@ -14,7 +14,10 @@
 #include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/basic_json.hpp>
+#include <jsoncons/conv_error.hpp>
 #include <jsoncons/decode_traits.hpp>
+#include <jsoncons/json_decoder.hpp>
+#include <jsoncons/source.hpp>
 
 #include <jsoncons_ext/ubjson/ubjson_cursor.hpp>
 #include <jsoncons_ext/ubjson/ubjson_reader.hpp>