diff --git a/include/jsoncons_ext/jsonschema/compilation_context.hpp b/include/jsoncons_ext/jsonschema/common/compilation_context.hpp
similarity index 99%
rename from include/jsoncons_ext/jsonschema/compilation_context.hpp
rename to include/jsoncons_ext/jsonschema/common/compilation_context.hpp
index be4079b139..01abd08a4b 100644
--- a/include/jsoncons_ext/jsonschema/compilation_context.hpp
+++ b/include/jsoncons_ext/jsonschema/common/compilation_context.hpp
@@ -12,7 +12,7 @@
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
 #include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
-#include <jsoncons_ext/jsonschema/schema_location.hpp>
+#include <jsoncons_ext/jsonschema/common/schema_location.hpp>
 
 namespace jsoncons {
 namespace jsonschema {
diff --git a/include/jsoncons_ext/jsonschema/schema_location.hpp b/include/jsoncons_ext/jsonschema/common/schema_location.hpp
similarity index 100%
rename from include/jsoncons_ext/jsonschema/schema_location.hpp
rename to include/jsoncons_ext/jsonschema/common/schema_location.hpp
diff --git a/include/jsoncons_ext/jsonschema/schema_parser.hpp b/include/jsoncons_ext/jsonschema/common/schema_parser.hpp
similarity index 54%
rename from include/jsoncons_ext/jsonschema/schema_parser.hpp
rename to include/jsoncons_ext/jsonschema/common/schema_parser.hpp
index d23c81e85f..917a54e59d 100644
--- a/include/jsoncons_ext/jsonschema/schema_parser.hpp
+++ b/include/jsoncons_ext/jsonschema/common/schema_parser.hpp
@@ -4,16 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_JSONSCHEMA_SCHEMA_PARSER_HPP
-#define JSONCONS_JSONSCHEMA_SCHEMA_PARSER_HPP
-
-#include <jsoncons/config/jsoncons_config.hpp>
-#include <jsoncons/uri.hpp>
-#include <jsoncons/json.hpp>
-#include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
-#include <jsoncons_ext/jsonschema/schema_location.hpp>
-#include <jsoncons_ext/jsonschema/keyword_validator.hpp>
+#ifndef JSONCONS_JSONSCHEMA_COMMON_SCHEMA_PARSER_HPP
+#define JSONCONS_JSONSCHEMA_COMMON_SCHEMA_PARSER_HPP
 
 namespace jsoncons {
 namespace jsonschema {
@@ -31,4 +23,4 @@ namespace jsonschema {
 } // namespace jsonschema
 } // namespace jsoncons
 
-#endif // JSONCONS_JSONSCHEMA_SCHEMA_HPP
+#endif // JSONCONS_JSONSCHEMA_COMMON_SCHEMA_HPP
diff --git a/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp b/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp
index ca30a5bbe3..1753bd6062 100644
--- a/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp
+++ b/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp
@@ -7,16 +7,15 @@
 #ifndef JSONCONS_JSONSCHEMA_DRAFT7_SCHEMA_PARSER_IMPL_HPP
 #define JSONCONS_JSONSCHEMA_DRAFT7_SCHEMA_PARSER_IMPL_HPP
 
-#include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/compilation_context.hpp>
+#include <jsoncons_ext/jsonschema/common/compilation_context.hpp>
 #include <jsoncons_ext/jsonschema/json_schema.hpp>
 #include <jsoncons_ext/jsonschema/keywords.hpp>
-#include <jsoncons_ext/jsonschema/draft7/schema_draft7.hpp>
 #include <jsoncons_ext/jsonschema/schema_version.hpp>
-#include <jsoncons_ext/jsonschema/schema_parser.hpp>
+#include <jsoncons_ext/jsonschema/common/schema_parser.hpp>
+#include <jsoncons_ext/jsonschema/draft7/schema_draft7.hpp>
 #include <cassert>
 #include <set>
 #include <sstream>
diff --git a/include/jsoncons_ext/jsonschema/json_schema.hpp b/include/jsoncons_ext/jsonschema/json_schema.hpp
index 10fe6b75d4..03ea63ac52 100644
--- a/include/jsoncons_ext/jsonschema/json_schema.hpp
+++ b/include/jsoncons_ext/jsonschema/json_schema.hpp
@@ -12,7 +12,6 @@
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
 #include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
-#include <jsoncons_ext/jsonschema/schema_location.hpp>
 #include <jsoncons_ext/jsonschema/keyword_validator.hpp>
 
 namespace jsoncons {
diff --git a/include/jsoncons_ext/jsonschema/keyword_validator.hpp b/include/jsoncons_ext/jsonschema/keyword_validator.hpp
index d6b83044f5..7e9465437c 100644
--- a/include/jsoncons_ext/jsonschema/keyword_validator.hpp
+++ b/include/jsoncons_ext/jsonschema/keyword_validator.hpp
@@ -12,7 +12,6 @@
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
 #include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
-#include <jsoncons_ext/jsonschema/schema_location.hpp>
 
 namespace jsoncons {
 namespace jsonschema {