diff --git a/doc/ref/jsonschema/schema_error.md b/doc/ref/jsonschema/schema_error.md
index b465c96936..68c6b047c0 100644
--- a/doc/ref/jsonschema/schema_error.md
+++ b/doc/ref/jsonschema/schema_error.md
@@ -1,7 +1,7 @@
 ### jsoncons::jsonschema::schema_error
 
 ```cpp
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 ```
 
 <br>
diff --git a/doc/ref/jsonschema/validation_error.md b/doc/ref/jsonschema/validation_error.md
index 4b64e48a51..a10767e2b2 100644
--- a/doc/ref/jsonschema/validation_error.md
+++ b/doc/ref/jsonschema/validation_error.md
@@ -1,7 +1,7 @@
 ### jsoncons::jsonschema::validation_error
 
 ```cpp
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 ```
 
 <br>
diff --git a/doc/ref/jsonschema/validation_output.md b/doc/ref/jsonschema/validation_output.md
index f88469bc65..337533ec41 100644
--- a/doc/ref/jsonschema/validation_output.md
+++ b/doc/ref/jsonschema/validation_output.md
@@ -1,7 +1,7 @@
 ### jsoncons::jsonschema::validation_output
 
 ```cpp
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 ```
 
 <br>
diff --git a/include/jsoncons_ext/jsonschema/common/compilation_context.hpp b/include/jsoncons_ext/jsonschema/common/compilation_context.hpp
index c95e565f14..51f4ddc6c7 100644
--- a/include/jsoncons_ext/jsonschema/common/compilation_context.hpp
+++ b/include/jsoncons_ext/jsonschema/common/compilation_context.hpp
@@ -4,14 +4,14 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_JSONSCHEMA_COMPILATION_CONTEXT_HPP
-#define JSONCONS_JSONSCHEMA_COMPILATION_CONTEXT_HPP
+#ifndef JSONCONS_JSONSCHEMA_COMMON_COMPILATION_CONTEXT_HPP
+#define JSONCONS_JSONSCHEMA_COMMON_COMPILATION_CONTEXT_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/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 #include <jsoncons_ext/jsonschema/common/schema_location.hpp>
 
 namespace jsoncons {
diff --git a/include/jsoncons_ext/jsonschema/format_validator.hpp b/include/jsoncons_ext/jsonschema/common/format_validator.hpp
similarity index 99%
rename from include/jsoncons_ext/jsonschema/format_validator.hpp
rename to include/jsoncons_ext/jsonschema/common/format_validator.hpp
index 9f3b023208..09cf42a71d 100644
--- a/include/jsoncons_ext/jsonschema/format_validator.hpp
+++ b/include/jsoncons_ext/jsonschema/common/format_validator.hpp
@@ -4,14 +4,14 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_JSONSCHEMA_FORMAT_VALIDATOR_HPP
-#define JSONCONS_JSONSCHEMA_FORMAT_VALIDATOR_HPP
+#ifndef JSONCONS_JSONSCHEMA_COMMON_FORMAT_VALIDATOR_HPP
+#define JSONCONS_JSONSCHEMA_COMMON_FORMAT_VALIDATOR_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/common/json_schema.hpp>
+#include <jsoncons_ext/jsonschema/json_schema.hpp>
 #include <cassert>
 #include <set>
 #include <sstream>
diff --git a/include/jsoncons_ext/jsonschema/common/keyword_validator.hpp b/include/jsoncons_ext/jsonschema/common/keyword_validator.hpp
index c28019f1dd..7e9465437c 100644
--- a/include/jsoncons_ext/jsonschema/common/keyword_validator.hpp
+++ b/include/jsoncons_ext/jsonschema/common/keyword_validator.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 
 namespace jsoncons {
 namespace jsonschema {
diff --git a/include/jsoncons_ext/jsonschema/keywords.hpp b/include/jsoncons_ext/jsonschema/common/keywords.hpp
similarity index 99%
rename from include/jsoncons_ext/jsonschema/keywords.hpp
rename to include/jsoncons_ext/jsonschema/common/keywords.hpp
index d3eac571d0..8c8cad8e54 100644
--- a/include/jsoncons_ext/jsonschema/keywords.hpp
+++ b/include/jsoncons_ext/jsonschema/common/keywords.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/format_validator.hpp>
+#include <jsoncons_ext/jsonschema/common/format_validator.hpp>
 #include <jsoncons_ext/jsonschema/common/keyword_validator.hpp>
 #include <cassert>
 #include <set>
diff --git a/include/jsoncons_ext/jsonschema/common/schema_location.hpp b/include/jsoncons_ext/jsonschema/common/schema_location.hpp
index d11d8c3a24..e474a370a1 100644
--- a/include/jsoncons_ext/jsonschema/common/schema_location.hpp
+++ b/include/jsoncons_ext/jsonschema/common/schema_location.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 
 namespace jsoncons {
 namespace jsonschema {
diff --git a/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp b/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp
index 0c054c932f..e65351c110 100644
--- a/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp
+++ b/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp
@@ -11,8 +11,8 @@
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
 #include <jsoncons_ext/jsonschema/common/compilation_context.hpp>
-#include <jsoncons_ext/jsonschema/common/json_schema.hpp>
-#include <jsoncons_ext/jsonschema/keywords.hpp>
+#include <jsoncons_ext/jsonschema/json_schema.hpp>
+#include <jsoncons_ext/jsonschema/common/keywords.hpp>
 #include <jsoncons_ext/jsonschema/schema_version.hpp>
 #include <jsoncons_ext/jsonschema/common/schema_parser.hpp>
 #include <jsoncons_ext/jsonschema/draft7/schema_draft7.hpp>
diff --git a/include/jsoncons_ext/jsonschema/common/json_schema.hpp b/include/jsoncons_ext/jsonschema/json_schema.hpp
similarity index 96%
rename from include/jsoncons_ext/jsonschema/common/json_schema.hpp
rename to include/jsoncons_ext/jsonschema/json_schema.hpp
index 8e392a111b..eeaf9b9992 100644
--- a/include/jsoncons_ext/jsonschema/common/json_schema.hpp
+++ b/include/jsoncons_ext/jsonschema/json_schema.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 #include <jsoncons_ext/jsonschema/common/keyword_validator.hpp>
 
 namespace jsoncons {
diff --git a/include/jsoncons_ext/jsonschema/json_validator.hpp b/include/jsoncons_ext/jsonschema/json_validator.hpp
index 01b1e11038..57320a630f 100644
--- a/include/jsoncons_ext/jsonschema/json_validator.hpp
+++ b/include/jsoncons_ext/jsonschema/json_validator.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/json_schema.hpp>
+#include <jsoncons_ext/jsonschema/json_schema.hpp>
 #include <cassert>
 #include <set>
 #include <sstream>
diff --git a/include/jsoncons_ext/jsonschema/jsonschema.hpp b/include/jsoncons_ext/jsonschema/jsonschema.hpp
index 77ae5deb6c..e3ec8491ab 100644
--- a/include/jsoncons_ext/jsonschema/jsonschema.hpp
+++ b/include/jsoncons_ext/jsonschema/jsonschema.hpp
@@ -7,7 +7,7 @@
 #ifndef JSONCONS_JSONSCHEMA_JSONSCHEMA_HPP
 #define JSONCONS_JSONSCHEMA_JSONSCHEMA_HPP
 
-#include <jsoncons_ext/jsonschema/keywords.hpp>
+#include <jsoncons_ext/jsonschema/common/keywords.hpp>
 #include <jsoncons_ext/jsonschema/json_validator.hpp>
 #include <jsoncons_ext/jsonschema/schema_factory.hpp>
 
diff --git a/include/jsoncons_ext/jsonschema/common/jsonschema_error.hpp b/include/jsoncons_ext/jsonschema/jsonschema_error.hpp
similarity index 100%
rename from include/jsoncons_ext/jsonschema/common/jsonschema_error.hpp
rename to include/jsoncons_ext/jsonschema/jsonschema_error.hpp
diff --git a/test/jsonschema/src/format_validator_tests.cpp b/test/jsonschema/src/format_validator_tests.cpp
index c0b4b8f3b3..64f743da0b 100644
--- a/test/jsonschema/src/format_validator_tests.cpp
+++ b/test/jsonschema/src/format_validator_tests.cpp
@@ -11,7 +11,7 @@
 #include <fstream>
 #include <iostream>
 #include <regex>
-#include <jsoncons_ext/jsonschema/format_validator.hpp>
+#include <jsoncons_ext/jsonschema/common/format_validator.hpp>
 
 namespace jsonschema = jsoncons::jsonschema;