diff --git a/base/cplusplus/test/inputs/json/misc/00ec5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/00ec5.json/default/quicktype.hpp
index e53928a..3590ece 100644
--- a/base/cplusplus/test/inputs/json/misc/00ec5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/00ec5.json/default/quicktype.hpp
@@ -303,45 +303,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Property & x);
-    void to_json(json & j, const Property & x);
+void from_json(const json & j, Property & x);
+void to_json(json & j, const Property & x);
 
-    void from_json(const json & j, Provider & x);
-    void to_json(json & j, const Provider & x);
+void from_json(const json & j, Provider & x);
+void to_json(json & j, const Provider & x);
 
-    void from_json(const json & j, Definitions & x);
-    void to_json(json & j, const Definitions & x);
+void from_json(const json & j, Definitions & x);
+void to_json(json & j, const Definitions & x);
 
-    void from_json(const json & j, Info & x);
-    void to_json(json & j, const Info & x);
+void from_json(const json & j, Info & x);
+void to_json(json & j, const Info & x);
 
-    void from_json(const json & j, Parameter & x);
-    void to_json(json & j, const Parameter & x);
+void from_json(const json & j, Parameter & x);
+void to_json(json & j, const Parameter & x);
 
-    void from_json(const json & j, Schema & x);
-    void to_json(json & j, const Schema & x);
+void from_json(const json & j, Schema & x);
+void to_json(json & j, const Schema & x);
 
-    void from_json(const json & j, The200 & x);
-    void to_json(json & j, const The200 & x);
+void from_json(const json & j, The200 & x);
+void to_json(json & j, const The200 & x);
 
-    void from_json(const json & j, Responses & x);
-    void to_json(json & j, const Responses & x);
+void from_json(const json & j, Responses & x);
+void to_json(json & j, const Responses & x);
 
-    void from_json(const json & j, Get & x);
-    void to_json(json & j, const Get & x);
+void from_json(const json & j, Get & x);
+void to_json(json & j, const Get & x);
 
-    void from_json(const json & j, BusinessServiceProvidersSearch & x);
-    void to_json(json & j, const BusinessServiceProvidersSearch & x);
+void from_json(const json & j, BusinessServiceProvidersSearch & x);
+void to_json(json & j, const BusinessServiceProvidersSearch & x);
 
-    void from_json(const json & j, Paths & x);
-    void to_json(json & j, const Paths & x);
+void from_json(const json & j, Paths & x);
+void to_json(json & j, const Paths & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Property& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_type(j.at("type").get<Type>());
diff --git a/base/cplusplus/test/inputs/json/misc/010b1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/010b1.json/default/quicktype.hpp
index 6c7c16a..6b99a38 100644
--- a/base/cplusplus/test/inputs/json/misc/010b1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/010b1.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_country(j.at("country").get<Country>());
diff --git a/base/cplusplus/test/inputs/json/misc/016af.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/016af.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/016af.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/016af.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/033b1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/033b1.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/033b1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/033b1.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/050b0.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/050b0.json/default/quicktype.hpp
index 55e90c6..be5ec1b 100644
--- a/base/cplusplus/test/inputs/json/misc/050b0.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/050b0.json/default/quicktype.hpp
@@ -229,36 +229,37 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, OtherName & x);
-    void to_json(json & j, const OtherName & x);
+void from_json(const json & j, OtherName & x);
+void to_json(json & j, const OtherName & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
 
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
 
-    void from_json(const json & j, Note & x);
-    void to_json(json & j, const Note & x);
+void from_json(const json & j, Note & x);
+void to_json(json & j, const Note & x);
 
-    void from_json(const json & j, MediaType & x);
-    void to_json(json & j, const MediaType & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, MediaType & x);
+void to_json(json & j, const MediaType & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/06bee.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/06bee.json/default/quicktype.hpp
index 0d8faee..5fa8503 100644
--- a/base/cplusplus/test/inputs/json/misc/06bee.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/06bee.json/default/quicktype.hpp
@@ -156,33 +156,34 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
 
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
 
-    void from_json(const json & j, Note & x);
-    void to_json(json & j, const Note & x);
+void from_json(const json & j, Note & x);
+void to_json(json & j, const Note & x);
 
-    void from_json(const json & j, MediaType & x);
-    void to_json(json & j, const MediaType & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, MediaType & x);
+void to_json(json & j, const MediaType & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/07540.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/07540.json/default/quicktype.hpp
index 0b0e5d1..e402907 100644
--- a/base/cplusplus/test/inputs/json/misc/07540.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/07540.json/default/quicktype.hpp
@@ -57,12 +57,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Cookies & x);
-    void to_json(json & j, const Cookies & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Cookies & x);
+void to_json(json & j, const Cookies & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Cookies& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/0779f.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/0779f.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/0779f.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/0779f.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/07c75.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/07c75.json/default/quicktype.hpp
index 091dd79..a23b483 100644
--- a/base/cplusplus/test/inputs/json/misc/07c75.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/07c75.json/default/quicktype.hpp
@@ -146,18 +146,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
-
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/09f54.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/09f54.json/default/quicktype.hpp
index 30ee480..40e5858 100644
--- a/base/cplusplus/test/inputs/json/misc/09f54.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/09f54.json/default/quicktype.hpp
@@ -100,15 +100,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Description & x);
-    void to_json(json & j, const Description & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Description & x);
+void to_json(json & j, const Description & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Datum& x) {
         x.set_anomaly(j.at("anomaly").get<std::string>());
         x.set_value(j.at("value").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/0a358.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/0a358.json/default/quicktype.hpp
index cee7d5e..ee18b5d 100644
--- a/base/cplusplus/test/inputs/json/misc/0a358.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/0a358.json/default/quicktype.hpp
@@ -126,15 +126,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Facets & x);
-    void to_json(json & j, const Facets & x);
+void from_json(const json & j, Facets & x);
+void to_json(json & j, const Facets & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Facets& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/0a91a.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/0a91a.json/default/quicktype.hpp
index a892bab..8686319 100644
--- a/base/cplusplus/test/inputs/json/misc/0a91a.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/0a91a.json/default/quicktype.hpp
@@ -1096,45 +1096,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Actor & x);
-    void to_json(json & j, const Actor & x);
+void from_json(const json & j, Actor & x);
+void to_json(json & j, const Actor & x);
 
-    void from_json(const json & j, Author & x);
-    void to_json(json & j, const Author & x);
+void from_json(const json & j, Author & x);
+void to_json(json & j, const Author & x);
 
-    void from_json(const json & j, Commit & x);
-    void to_json(json & j, const Commit & x);
+void from_json(const json & j, Commit & x);
+void to_json(json & j, const Commit & x);
 
-    void from_json(const json & j, MergedBy & x);
-    void to_json(json & j, const MergedBy & x);
+void from_json(const json & j, MergedBy & x);
+void to_json(json & j, const MergedBy & x);
 
-    void from_json(const json & j, BaseRepo & x);
-    void to_json(json & j, const BaseRepo & x);
+void from_json(const json & j, BaseRepo & x);
+void to_json(json & j, const BaseRepo & x);
 
-    void from_json(const json & j, Base & x);
-    void to_json(json & j, const Base & x);
+void from_json(const json & j, Base & x);
+void to_json(json & j, const Base & x);
 
-    void from_json(const json & j, Comments & x);
-    void to_json(json & j, const Comments & x);
+void from_json(const json & j, Comments & x);
+void to_json(json & j, const Comments & x);
 
-    void from_json(const json & j, Links & x);
-    void to_json(json & j, const Links & x);
+void from_json(const json & j, Links & x);
+void to_json(json & j, const Links & x);
 
-    void from_json(const json & j, PullRequest & x);
-    void to_json(json & j, const PullRequest & x);
+void from_json(const json & j, PullRequest & x);
+void to_json(json & j, const PullRequest & x);
 
-    void from_json(const json & j, Payload & x);
-    void to_json(json & j, const Payload & x);
+void from_json(const json & j, Payload & x);
+void to_json(json & j, const Payload & x);
 
-    void from_json(const json & j, TopLevelRepo & x);
-    void to_json(json & j, const TopLevelRepo & x);
+void from_json(const json & j, TopLevelRepo & x);
+void to_json(json & j, const TopLevelRepo & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Actor& x) {
         x.set_avatar_url(j.at("avatar_url").get<std::string>());
         x.set_display_login(get_stack_optional<std::string>(j, "display_login"));
diff --git a/base/cplusplus/test/inputs/json/misc/0b91a.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/0b91a.json/default/quicktype.hpp
index 83438d9..553ae19 100644
--- a/base/cplusplus/test/inputs/json/misc/0b91a.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/0b91a.json/default/quicktype.hpp
@@ -217,24 +217,25 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, ResponseInfo & x);
-    void to_json(json & j, const ResponseInfo & x);
+void from_json(const json & j, ResponseInfo & x);
+void to_json(json & j, const ResponseInfo & x);
 
-    void from_json(const json & j, Resultset & x);
-    void to_json(json & j, const Resultset & x);
+void from_json(const json & j, Resultset & x);
+void to_json(json & j, const Resultset & x);
 
-    void from_json(const json & j, Metadata & x);
-    void to_json(json & j, const Metadata & x);
+void from_json(const json & j, Metadata & x);
+void to_json(json & j, const Metadata & x);
 
-    void from_json(const json & j, Component & x);
-    void to_json(json & j, const Component & x);
+void from_json(const json & j, Component & x);
+void to_json(json & j, const Component & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, ResponseInfo& x) {
         x.set_developer_message(j.at("developerMessage").get<std::string>());
         x.set_status(j.at("status").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/0cffa.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/0cffa.json/default/quicktype.hpp
index 3c9d153..358fb88 100644
--- a/base/cplusplus/test/inputs/json/misc/0cffa.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/0cffa.json/default/quicktype.hpp
@@ -566,45 +566,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, The480_WStill & x);
-    void to_json(json & j, const The480_WStill & x);
+void from_json(const json & j, The480_WStill & x);
+void to_json(json & j, const The480_WStill & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, Username & x);
-    void to_json(json & j, const Username & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, Username & x);
+void to_json(json & j, const Username & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, The480_WStill& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/0e0c2.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/0e0c2.json/default/quicktype.hpp
index eb8ee8b..c33b13e 100644
--- a/base/cplusplus/test/inputs/json/misc/0e0c2.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/0e0c2.json/default/quicktype.hpp
@@ -391,39 +391,40 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Collection & x);
-    void to_json(json & j, const Collection & x);
+void from_json(const json & j, Collection & x);
+void to_json(json & j, const Collection & x);
 
-    void from_json(const json & j, Detail & x);
-    void to_json(json & j, const Detail & x);
+void from_json(const json & j, Detail & x);
+void to_json(json & j, const Detail & x);
 
-    void from_json(const json & j, FavMovie & x);
-    void to_json(json & j, const FavMovie & x);
+void from_json(const json & j, FavMovie & x);
+void to_json(json & j, const FavMovie & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Video & x);
-    void to_json(json & j, const Video & x);
+void from_json(const json & j, Video & x);
+void to_json(json & j, const Video & x);
 
-    void from_json(const json & j, VoteScore & x);
-    void to_json(json & j, const VoteScore & x);
+void from_json(const json & j, VoteScore & x);
+void to_json(json & j, const VoteScore & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, DetailLanguage & x);
-    void to_json(json & j, const DetailLanguage & x);
+void from_json(const json & j, DetailLanguage & x);
+void to_json(json & j, const DetailLanguage & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, ResultLanguage & x);
-    void to_json(json & j, const ResultLanguage & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, ResultLanguage & x);
+void to_json(json & j, const ResultLanguage & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Collection& x) {
         x.set_id(j.at("id").get<int64_t>());
         x.set_movies(j.at("movies").get<std::vector<int64_t>>());
diff --git a/base/cplusplus/test/inputs/json/misc/0fecf.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/0fecf.json/default/quicktype.hpp
index 1cc1632..8e46034 100644
--- a/base/cplusplus/test/inputs/json/misc/0fecf.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/0fecf.json/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_countries(j.at("countries").get<std::vector<std::string>>());
     }
diff --git a/base/cplusplus/test/inputs/json/misc/10be4.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/10be4.json/default/quicktype.hpp
index 8721457..6257824 100644
--- a/base/cplusplus/test/inputs/json/misc/10be4.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/10be4.json/default/quicktype.hpp
@@ -229,36 +229,37 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, OtherName & x);
-    void to_json(json & j, const OtherName & x);
+void from_json(const json & j, OtherName & x);
+void to_json(json & j, const OtherName & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
 
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
 
-    void from_json(const json & j, Note & x);
-    void to_json(json & j, const Note & x);
+void from_json(const json & j, Note & x);
+void to_json(json & j, const Note & x);
 
-    void from_json(const json & j, MediaType & x);
-    void to_json(json & j, const MediaType & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, MediaType & x);
+void to_json(json & j, const MediaType & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/112b5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/112b5.json/default/quicktype.hpp
index 194b0b1..5e20b6a 100644
--- a/base/cplusplus/test/inputs/json/misc/112b5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/112b5.json/default/quicktype.hpp
@@ -101,15 +101,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Args & x);
-    void to_json(json & j, const Args & x);
+void from_json(const json & j, Args & x);
+void to_json(json & j, const Args & x);
 
-    void from_json(const json & j, Headers & x);
-    void to_json(json & j, const Headers & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Headers & x);
+void to_json(json & j, const Headers & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Args& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/127a1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/127a1.json/default/quicktype.hpp
index a7438b3..7ce745b 100644
--- a/base/cplusplus/test/inputs/json/misc/127a1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/127a1.json/default/quicktype.hpp
@@ -566,45 +566,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, The480_WStill & x);
-    void to_json(json & j, const The480_WStill & x);
+void from_json(const json & j, The480_WStill & x);
+void to_json(json & j, const The480_WStill & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, Username & x);
-    void to_json(json & j, const Username & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, Username & x);
+void to_json(json & j, const Username & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, The480_WStill& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/13d8d.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/13d8d.json/default/quicktype.hpp
index 6942d24..01d41bf 100644
--- a/base/cplusplus/test/inputs/json/misc/13d8d.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/13d8d.json/default/quicktype.hpp
@@ -151,18 +151,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Street & x);
-    void to_json(json & j, const Street & x);
+void from_json(const json & j, Street & x);
+void to_json(json & j, const Street & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, OutcomeStatus & x);
-    void to_json(json & j, const OutcomeStatus & x);
-
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, OutcomeStatus & x);
+void to_json(json & j, const OutcomeStatus & x);
 
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Street& x) {
         x.set_id(j.at("id").get<int64_t>());
         x.set_name(j.at("name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/14d38.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/14d38.json/default/quicktype.hpp
index 960bf9f..dedb0ed 100644
--- a/base/cplusplus/test/inputs/json/misc/14d38.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/14d38.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Headers & x);
-    void to_json(json & j, const Headers & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Headers & x);
+void to_json(json & j, const Headers & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Headers& x) {
         x.set_accept_encoding(j.at("Accept-Encoding").get<std::string>());
         x.set_connection(j.at("Connection").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/167d6.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/167d6.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/167d6.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/167d6.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/16bc5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/16bc5.json/default/quicktype.hpp
index 3abda70..b5fffa1 100644
--- a/base/cplusplus/test/inputs/json/misc/16bc5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/16bc5.json/default/quicktype.hpp
@@ -459,48 +459,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/176f1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/176f1.json/default/quicktype.hpp
index 2fb8f51..0643c59 100644
--- a/base/cplusplus/test/inputs/json/misc/176f1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/176f1.json/default/quicktype.hpp
@@ -205,21 +205,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Footnote & x);
-    void to_json(json & j, const Footnote & x);
+void from_json(const json & j, Footnote & x);
+void to_json(json & j, const Footnote & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Series & x);
-    void to_json(json & j, const Series & x);
+void from_json(const json & j, Series & x);
+void to_json(json & j, const Series & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Footnote& x) {
         x.set_code(get_stack_optional<std::string>(j, "code"));
         x.set_text(get_stack_optional<std::string>(j, "text"));
diff --git a/base/cplusplus/test/inputs/json/misc/1a7f5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/1a7f5.json/default/quicktype.hpp
index 6c7c16a..6b99a38 100644
--- a/base/cplusplus/test/inputs/json/misc/1a7f5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/1a7f5.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_country(j.at("country").get<Country>());
diff --git a/base/cplusplus/test/inputs/json/misc/1b28c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/1b28c.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/1b28c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/1b28c.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/1b409.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/1b409.json/default/quicktype.hpp
index 77172c4..714bb40 100644
--- a/base/cplusplus/test/inputs/json/misc/1b409.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/1b409.json/default/quicktype.hpp
@@ -389,42 +389,43 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Extra & x);
-    void to_json(json & j, const Extra & x);
+void from_json(const json & j, Extra & x);
+void to_json(json & j, const Extra & x);
 
-    void from_json(const json & j, Person & x);
-    void to_json(json & j, const Person & x);
+void from_json(const json & j, Person & x);
+void to_json(json & j, const Person & x);
 
-    void from_json(const json & j, Object & x);
-    void to_json(json & j, const Object & x);
+void from_json(const json & j, Object & x);
+void to_json(json & j, const Object & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Party & x);
-    void to_json(json & j, const Party & x);
+void from_json(const json & j, Party & x);
+void to_json(json & j, const Party & x);
 
-    void from_json(const json & j, Gender & x);
-    void to_json(json & j, const Gender & x);
+void from_json(const json & j, Gender & x);
+void to_json(json & j, const Gender & x);
 
-    void from_json(const json & j, GenderLabel & x);
-    void to_json(json & j, const GenderLabel & x);
+void from_json(const json & j, GenderLabel & x);
+void to_json(json & j, const GenderLabel & x);
 
-    void from_json(const json & j, Namemod & x);
-    void to_json(json & j, const Namemod & x);
+void from_json(const json & j, Namemod & x);
+void to_json(json & j, const Namemod & x);
 
-    void from_json(const json & j, RoleType & x);
-    void to_json(json & j, const RoleType & x);
+void from_json(const json & j, RoleType & x);
+void to_json(json & j, const RoleType & x);
 
-    void from_json(const json & j, RoleTypeLabel & x);
-    void to_json(json & j, const RoleTypeLabel & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, RoleTypeLabel & x);
+void to_json(json & j, const RoleTypeLabel & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Meta& x) {
         x.set_limit(j.at("limit").get<int64_t>());
         x.set_offset(j.at("offset").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/2465e.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/2465e.json/default/quicktype.hpp
index 8208d0f..ddbf8c2 100644
--- a/base/cplusplus/test/inputs/json/misc/2465e.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/2465e.json/default/quicktype.hpp
@@ -340,45 +340,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Annotations & x);
-    void to_json(json & j, const Annotations & x);
+void from_json(const json & j, Annotations & x);
+void to_json(json & j, const Annotations & x);
 
-    void from_json(const json & j, Properties & x);
-    void to_json(json & j, const Properties & x);
+void from_json(const json & j, Properties & x);
+void to_json(json & j, const Properties & x);
 
-    void from_json(const json & j, Taxonomy & x);
-    void to_json(json & j, const Taxonomy & x);
+void from_json(const json & j, Taxonomy & x);
+void to_json(json & j, const Taxonomy & x);
 
-    void from_json(const json & j, Definitions & x);
-    void to_json(json & j, const Definitions & x);
+void from_json(const json & j, Definitions & x);
+void to_json(json & j, const Definitions & x);
 
-    void from_json(const json & j, Info & x);
-    void to_json(json & j, const Info & x);
+void from_json(const json & j, Info & x);
+void to_json(json & j, const Info & x);
 
-    void from_json(const json & j, Parameter & x);
-    void to_json(json & j, const Parameter & x);
+void from_json(const json & j, Parameter & x);
+void to_json(json & j, const Parameter & x);
 
-    void from_json(const json & j, Schema & x);
-    void to_json(json & j, const Schema & x);
+void from_json(const json & j, Schema & x);
+void to_json(json & j, const Schema & x);
 
-    void from_json(const json & j, The200 & x);
-    void to_json(json & j, const The200 & x);
+void from_json(const json & j, The200 & x);
+void to_json(json & j, const The200 & x);
 
-    void from_json(const json & j, Responses & x);
-    void to_json(json & j, const Responses & x);
+void from_json(const json & j, Responses & x);
+void to_json(json & j, const Responses & x);
 
-    void from_json(const json & j, Get & x);
-    void to_json(json & j, const Get & x);
+void from_json(const json & j, Get & x);
+void to_json(json & j, const Get & x);
 
-    void from_json(const json & j, ItaTaxonomiesSearch & x);
-    void to_json(json & j, const ItaTaxonomiesSearch & x);
+void from_json(const json & j, ItaTaxonomiesSearch & x);
+void to_json(json & j, const ItaTaxonomiesSearch & x);
 
-    void from_json(const json & j, Paths & x);
-    void to_json(json & j, const Paths & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Paths & x);
+void to_json(json & j, const Paths & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Annotations& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_type(j.at("type").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/24f52.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/24f52.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/24f52.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/24f52.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/262f0.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/262f0.json/default/quicktype.hpp
index 9ad2306..fbe3a53 100644
--- a/base/cplusplus/test/inputs/json/misc/262f0.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/262f0.json/default/quicktype.hpp
@@ -461,51 +461,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/26b49.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/26b49.json/default/quicktype.hpp
index 55a54f3..db740fa 100644
--- a/base/cplusplus/test/inputs/json/misc/26b49.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/26b49.json/default/quicktype.hpp
@@ -569,42 +569,43 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, The480_WStill & x);
-    void to_json(json & j, const The480_WStill & x);
+void from_json(const json & j, The480_WStill & x);
+void to_json(json & j, const The480_WStill & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, The480_WStill& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/27332.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/27332.json/default/quicktype.hpp
index 34ed906..ed8fdd9 100644
--- a/base/cplusplus/test/inputs/json/misc/27332.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/27332.json/default/quicktype.hpp
@@ -689,60 +689,61 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Oembed & x);
-    void to_json(json & j, const Oembed & x);
+void from_json(const json & j, Oembed & x);
+void to_json(json & j, const Oembed & x);
 
-    void from_json(const json & j, Media & x);
-    void to_json(json & j, const Media & x);
+void from_json(const json & j, Media & x);
+void to_json(json & j, const Media & x);
 
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, Source & x);
-    void to_json(json & j, const Source & x);
+void from_json(const json & j, Source & x);
+void to_json(json & j, const Source & x);
 
-    void from_json(const json & j, Variants & x);
-    void to_json(json & j, const Variants & x);
+void from_json(const json & j, Variants & x);
+void to_json(json & j, const Variants & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Preview & x);
-    void to_json(json & j, const Preview & x);
+void from_json(const json & j, Preview & x);
+void to_json(json & j, const Preview & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Domain & x);
-    void to_json(json & j, const Domain & x);
+void from_json(const json & j, Domain & x);
+void to_json(json & j, const Domain & x);
 
-    void from_json(const json & j, PostHint & x);
-    void to_json(json & j, const PostHint & x);
+void from_json(const json & j, PostHint & x);
+void to_json(json & j, const PostHint & x);
 
-    void from_json(const json & j, Subreddit & x);
-    void to_json(json & j, const Subreddit & x);
+void from_json(const json & j, Subreddit & x);
+void to_json(json & j, const Subreddit & x);
 
-    void from_json(const json & j, SubredditId & x);
-    void to_json(json & j, const SubredditId & x);
+void from_json(const json & j, SubredditId & x);
+void to_json(json & j, const SubredditId & x);
 
-    void from_json(const json & j, SubredditNamePrefixed & x);
-    void to_json(json & j, const SubredditNamePrefixed & x);
+void from_json(const json & j, SubredditNamePrefixed & x);
+void to_json(json & j, const SubredditNamePrefixed & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Oembed& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_height(j.at("height").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/2d4e2.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/2d4e2.json/default/quicktype.hpp
index 4b5efe5..ac86266 100644
--- a/base/cplusplus/test/inputs/json/misc/2d4e2.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/2d4e2.json/default/quicktype.hpp
@@ -408,54 +408,55 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Extra & x);
-    void to_json(json & j, const Extra & x);
+void from_json(const json & j, Extra & x);
+void to_json(json & j, const Extra & x);
 
-    void from_json(const json & j, Person & x);
-    void to_json(json & j, const Person & x);
+void from_json(const json & j, Person & x);
+void to_json(json & j, const Person & x);
 
-    void from_json(const json & j, Object & x);
-    void to_json(json & j, const Object & x);
+void from_json(const json & j, Object & x);
+void to_json(json & j, const Object & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Party & x);
-    void to_json(json & j, const Party & x);
+void from_json(const json & j, Party & x);
+void to_json(json & j, const Party & x);
 
-    void from_json(const json & j, Gender & x);
-    void to_json(json & j, const Gender & x);
+void from_json(const json & j, Gender & x);
+void to_json(json & j, const Gender & x);
 
-    void from_json(const json & j, GenderLabel & x);
-    void to_json(json & j, const GenderLabel & x);
+void from_json(const json & j, GenderLabel & x);
+void to_json(json & j, const GenderLabel & x);
 
-    void from_json(const json & j, Namemod & x);
-    void to_json(json & j, const Namemod & x);
+void from_json(const json & j, Namemod & x);
+void to_json(json & j, const Namemod & x);
 
-    void from_json(const json & j, RoleType & x);
-    void to_json(json & j, const RoleType & x);
+void from_json(const json & j, RoleType & x);
+void to_json(json & j, const RoleType & x);
 
-    void from_json(const json & j, RoleTypeLabel & x);
-    void to_json(json & j, const RoleTypeLabel & x);
+void from_json(const json & j, RoleTypeLabel & x);
+void to_json(json & j, const RoleTypeLabel & x);
 
-    void from_json(const json & j, SenatorClass & x);
-    void to_json(json & j, const SenatorClass & x);
+void from_json(const json & j, SenatorClass & x);
+void to_json(json & j, const SenatorClass & x);
 
-    void from_json(const json & j, SenatorClassLabel & x);
-    void to_json(json & j, const SenatorClassLabel & x);
+void from_json(const json & j, SenatorClassLabel & x);
+void to_json(json & j, const SenatorClassLabel & x);
 
-    void from_json(const json & j, SenatorRank & x);
-    void to_json(json & j, const SenatorRank & x);
+void from_json(const json & j, SenatorRank & x);
+void to_json(json & j, const SenatorRank & x);
 
-    void from_json(const json & j, SenatorRankLabel & x);
-    void to_json(json & j, const SenatorRankLabel & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, SenatorRankLabel & x);
+void to_json(json & j, const SenatorRankLabel & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Meta& x) {
         x.set_limit(j.at("limit").get<int64_t>());
         x.set_offset(j.at("offset").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/31189.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/31189.json/default/quicktype.hpp
index 5d83d67..328f763 100644
--- a/base/cplusplus/test/inputs/json/misc/31189.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/31189.json/default/quicktype.hpp
@@ -201,18 +201,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Rates & x);
-    void to_json(json & j, const Rates & x);
+void from_json(const json & j, Rates & x);
+void to_json(json & j, const Rates & x);
 
-    void from_json(const json & j, Period & x);
-    void to_json(json & j, const Period & x);
+void from_json(const json & j, Period & x);
+void to_json(json & j, const Period & x);
 
-    void from_json(const json & j, Rate & x);
-    void to_json(json & j, const Rate & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Rate & x);
+void to_json(json & j, const Rate & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Rates& x) {
         x.set_parking(get_stack_optional<double>(j, "parking"));
         x.set_reduced(get_stack_optional<double>(j, "reduced"));
diff --git a/base/cplusplus/test/inputs/json/misc/32431.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/32431.json/default/quicktype.hpp
index 02f0fb6..6d6d622 100644
--- a/base/cplusplus/test/inputs/json/misc/32431.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/32431.json/default/quicktype.hpp
@@ -351,36 +351,37 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Geometry & x);
-    void to_json(json & j, const Geometry & x);
+void from_json(const json & j, Geometry & x);
+void to_json(json & j, const Geometry & x);
 
-    void from_json(const json & j, Properties & x);
-    void to_json(json & j, const Properties & x);
+void from_json(const json & j, Properties & x);
+void to_json(json & j, const Properties & x);
 
-    void from_json(const json & j, Feature & x);
-    void to_json(json & j, const Feature & x);
+void from_json(const json & j, Feature & x);
+void to_json(json & j, const Feature & x);
 
-    void from_json(const json & j, Metadata & x);
-    void to_json(json & j, const Metadata & x);
+void from_json(const json & j, Metadata & x);
+void to_json(json & j, const Metadata & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, GeometryType & x);
-    void to_json(json & j, const GeometryType & x);
+void from_json(const json & j, GeometryType & x);
+void to_json(json & j, const GeometryType & x);
 
-    void from_json(const json & j, MagType & x);
-    void to_json(json & j, const MagType & x);
+void from_json(const json & j, MagType & x);
+void to_json(json & j, const MagType & x);
 
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, PropertiesType & x);
-    void to_json(json & j, const PropertiesType & x);
-
-    void from_json(const json & j, FeatureType & x);
-    void to_json(json & j, const FeatureType & x);
+void from_json(const json & j, PropertiesType & x);
+void to_json(json & j, const PropertiesType & x);
 
+void from_json(const json & j, FeatureType & x);
+void to_json(json & j, const FeatureType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Geometry& x) {
         x.set_coordinates(j.at("coordinates").get<std::vector<double>>());
         x.set_type(j.at("type").get<GeometryType>());
diff --git a/base/cplusplus/test/inputs/json/misc/32d5c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/32d5c.json/default/quicktype.hpp
index faa04f4..5703eaf 100644
--- a/base/cplusplus/test/inputs/json/misc/32d5c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/32d5c.json/default/quicktype.hpp
@@ -139,9 +139,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_birth_date(get_stack_optional<std::string>(j, "BirthDate"));
         x.set_birth_date_is_protected(j.at("BirthDateIsProtected").get<bool>());
diff --git a/base/cplusplus/test/inputs/json/misc/337ed.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/337ed.json/default/quicktype.hpp
index e03a986..03487de 100644
--- a/base/cplusplus/test/inputs/json/misc/337ed.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/337ed.json/default/quicktype.hpp
@@ -350,27 +350,28 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Facets & x);
-    void to_json(json & j, const Facets & x);
+void from_json(const json & j, Facets & x);
+void to_json(json & j, const Facets & x);
 
-    void from_json(const json & j, CustomIncome & x);
-    void to_json(json & j, const CustomIncome & x);
+void from_json(const json & j, CustomIncome & x);
+void to_json(json & j, const CustomIncome & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, CustomIncomeType & x);
-    void to_json(json & j, const CustomIncomeType & x);
-
-    void from_json(const json & j, ResultType & x);
-    void to_json(json & j, const ResultType & x);
+void from_json(const json & j, CustomIncomeType & x);
+void to_json(json & j, const CustomIncomeType & x);
 
+void from_json(const json & j, ResultType & x);
+void to_json(json & j, const ResultType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Facets& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/34702.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/34702.json/default/quicktype.hpp
index 690b00a..66b0e2f 100644
--- a/base/cplusplus/test/inputs/json/misc/34702.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/34702.json/default/quicktype.hpp
@@ -298,42 +298,43 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, CrsProperties & x);
-    void to_json(json & j, const CrsProperties & x);
+void from_json(const json & j, CrsProperties & x);
+void to_json(json & j, const CrsProperties & x);
 
-    void from_json(const json & j, Crs & x);
-    void to_json(json & j, const Crs & x);
+void from_json(const json & j, Crs & x);
+void to_json(json & j, const Crs & x);
 
-    void from_json(const json & j, Geometry & x);
-    void to_json(json & j, const Geometry & x);
+void from_json(const json & j, Geometry & x);
+void to_json(json & j, const Geometry & x);
 
-    void from_json(const json & j, FeatureProperties & x);
-    void to_json(json & j, const FeatureProperties & x);
+void from_json(const json & j, FeatureProperties & x);
+void to_json(json & j, const FeatureProperties & x);
 
-    void from_json(const json & j, Feature & x);
-    void to_json(json & j, const Feature & x);
+void from_json(const json & j, Feature & x);
+void to_json(json & j, const Feature & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, GeometryType & x);
-    void to_json(json & j, const GeometryType & x);
+void from_json(const json & j, GeometryType & x);
+void to_json(json & j, const GeometryType & x);
 
-    void from_json(const json & j, GeometryName & x);
-    void to_json(json & j, const GeometryName & x);
+void from_json(const json & j, GeometryName & x);
+void to_json(json & j, const GeometryName & x);
 
-    void from_json(const json & j, FireBanR & x);
-    void to_json(json & j, const FireBanR & x);
+void from_json(const json & j, FireBanR & x);
+void to_json(json & j, const FireBanR & x);
 
-    void from_json(const json & j, Region & x);
-    void to_json(json & j, const Region & x);
+void from_json(const json & j, Region & x);
+void to_json(json & j, const Region & x);
 
-    void from_json(const json & j, PropertiesType & x);
-    void to_json(json & j, const PropertiesType & x);
-
-    void from_json(const json & j, FeatureType & x);
-    void to_json(json & j, const FeatureType & x);
+void from_json(const json & j, PropertiesType & x);
+void to_json(json & j, const PropertiesType & x);
 
+void from_json(const json & j, FeatureType & x);
+void to_json(json & j, const FeatureType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, CrsProperties& x) {
         x.set_name(j.at("name").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/misc/3536b.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/3536b.json/default/quicktype.hpp
index 05b6f31..fe8328a 100644
--- a/base/cplusplus/test/inputs/json/misc/3536b.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/3536b.json/default/quicktype.hpp
@@ -150,24 +150,25 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
-
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
 
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/3659d.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/3659d.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/3659d.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/3659d.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/36d5d.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/36d5d.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/36d5d.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/36d5d.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/3a6b3.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/3a6b3.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/3a6b3.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/3a6b3.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/3e9a3.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/3e9a3.json/default/quicktype.hpp
index 2fb8f51..0643c59 100644
--- a/base/cplusplus/test/inputs/json/misc/3e9a3.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/3e9a3.json/default/quicktype.hpp
@@ -205,21 +205,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Footnote & x);
-    void to_json(json & j, const Footnote & x);
+void from_json(const json & j, Footnote & x);
+void to_json(json & j, const Footnote & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Series & x);
-    void to_json(json & j, const Series & x);
+void from_json(const json & j, Series & x);
+void to_json(json & j, const Series & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Footnote& x) {
         x.set_code(get_stack_optional<std::string>(j, "code"));
         x.set_text(get_stack_optional<std::string>(j, "text"));
diff --git a/base/cplusplus/test/inputs/json/misc/3f1ce.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/3f1ce.json/default/quicktype.hpp
index 56178f2..caf93d6 100644
--- a/base/cplusplus/test/inputs/json/misc/3f1ce.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/3f1ce.json/default/quicktype.hpp
@@ -461,51 +461,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/437e7.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/437e7.json/default/quicktype.hpp
index 9981c9d..5b2a27b 100644
--- a/base/cplusplus/test/inputs/json/misc/437e7.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/437e7.json/default/quicktype.hpp
@@ -554,42 +554,43 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Downsized & x);
-    void to_json(json & j, const Downsized & x);
+void from_json(const json & j, Downsized & x);
+void to_json(json & j, const Downsized & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Downsized& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/43970.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/43970.json/default/quicktype.hpp
index 0a34a32..5b964e6 100644
--- a/base/cplusplus/test/inputs/json/misc/43970.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/43970.json/default/quicktype.hpp
@@ -59,9 +59,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_id(j.at("ID").get<int64_t>());
         x.set_name(j.at("Name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/43eaf.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/43eaf.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/43eaf.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/43eaf.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/458db.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/458db.json/default/quicktype.hpp
index 9bf7920..cc930bc 100644
--- a/base/cplusplus/test/inputs/json/misc/458db.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/458db.json/default/quicktype.hpp
@@ -214,27 +214,28 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, ResponseInfo & x);
-    void to_json(json & j, const ResponseInfo & x);
+void from_json(const json & j, ResponseInfo & x);
+void to_json(json & j, const ResponseInfo & x);
 
-    void from_json(const json & j, Resultset & x);
-    void to_json(json & j, const Resultset & x);
+void from_json(const json & j, Resultset & x);
+void to_json(json & j, const Resultset & x);
 
-    void from_json(const json & j, Metadata & x);
-    void to_json(json & j, const Metadata & x);
+void from_json(const json & j, Metadata & x);
+void to_json(json & j, const Metadata & x);
 
-    void from_json(const json & j, Component & x);
-    void to_json(json & j, const Component & x);
+void from_json(const json & j, Component & x);
+void to_json(json & j, const Component & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Name & x);
-    void to_json(json & j, const Name & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Name & x);
+void to_json(json & j, const Name & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, ResponseInfo& x) {
         x.set_developer_message(j.at("developerMessage").get<std::string>());
         x.set_status(j.at("status").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/4961a.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/4961a.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/4961a.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/4961a.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/4a0d7.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/4a0d7.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/4a0d7.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/4a0d7.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/4a455.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/4a455.json/default/quicktype.hpp
index cc47286..4c0cdfc 100644
--- a/base/cplusplus/test/inputs/json/misc/4a455.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/4a455.json/default/quicktype.hpp
@@ -193,33 +193,34 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, CrsProperties & x);
-    void to_json(json & j, const CrsProperties & x);
+void from_json(const json & j, CrsProperties & x);
+void to_json(json & j, const CrsProperties & x);
 
-    void from_json(const json & j, Crs & x);
-    void to_json(json & j, const Crs & x);
+void from_json(const json & j, Crs & x);
+void to_json(json & j, const Crs & x);
 
-    void from_json(const json & j, Geometry & x);
-    void to_json(json & j, const Geometry & x);
+void from_json(const json & j, Geometry & x);
+void to_json(json & j, const Geometry & x);
 
-    void from_json(const json & j, FeatureProperties & x);
-    void to_json(json & j, const FeatureProperties & x);
+void from_json(const json & j, FeatureProperties & x);
+void to_json(json & j, const FeatureProperties & x);
 
-    void from_json(const json & j, Feature & x);
-    void to_json(json & j, const Feature & x);
+void from_json(const json & j, Feature & x);
+void to_json(json & j, const Feature & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, GeometryType & x);
-    void to_json(json & j, const GeometryType & x);
+void from_json(const json & j, GeometryType & x);
+void to_json(json & j, const GeometryType & x);
 
-    void from_json(const json & j, GeometryName & x);
-    void to_json(json & j, const GeometryName & x);
-
-    void from_json(const json & j, FeatureType & x);
-    void to_json(json & j, const FeatureType & x);
+void from_json(const json & j, GeometryName & x);
+void to_json(json & j, const GeometryName & x);
 
+void from_json(const json & j, FeatureType & x);
+void to_json(json & j, const FeatureType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, CrsProperties& x) {
         x.set_name(j.at("name").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/misc/4c547.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/4c547.json/default/quicktype.hpp
index 3abda70..b5fffa1 100644
--- a/base/cplusplus/test/inputs/json/misc/4c547.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/4c547.json/default/quicktype.hpp
@@ -459,48 +459,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/4d6fb.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/4d6fb.json/default/quicktype.hpp
index d0fd688..49815d1 100644
--- a/base/cplusplus/test/inputs/json/misc/4d6fb.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/4d6fb.json/default/quicktype.hpp
@@ -698,57 +698,58 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Oembed & x);
-    void to_json(json & j, const Oembed & x);
+void from_json(const json & j, Oembed & x);
+void to_json(json & j, const Oembed & x);
 
-    void from_json(const json & j, Media & x);
-    void to_json(json & j, const Media & x);
+void from_json(const json & j, Media & x);
+void to_json(json & j, const Media & x);
 
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, Source & x);
-    void to_json(json & j, const Source & x);
+void from_json(const json & j, Source & x);
+void to_json(json & j, const Source & x);
 
-    void from_json(const json & j, Variants & x);
-    void to_json(json & j, const Variants & x);
+void from_json(const json & j, Variants & x);
+void to_json(json & j, const Variants & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Preview & x);
-    void to_json(json & j, const Preview & x);
+void from_json(const json & j, Preview & x);
+void to_json(json & j, const Preview & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, PostHint & x);
-    void to_json(json & j, const PostHint & x);
+void from_json(const json & j, PostHint & x);
+void to_json(json & j, const PostHint & x);
 
-    void from_json(const json & j, Subreddit & x);
-    void to_json(json & j, const Subreddit & x);
+void from_json(const json & j, Subreddit & x);
+void to_json(json & j, const Subreddit & x);
 
-    void from_json(const json & j, SubredditId & x);
-    void to_json(json & j, const SubredditId & x);
+void from_json(const json & j, SubredditId & x);
+void to_json(json & j, const SubredditId & x);
 
-    void from_json(const json & j, SubredditNamePrefixed & x);
-    void to_json(json & j, const SubredditNamePrefixed & x);
+void from_json(const json & j, SubredditNamePrefixed & x);
+void to_json(json & j, const SubredditNamePrefixed & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Oembed& x) {
         x.set_author_name(j.at("author_name").get<std::string>());
         x.set_author_url(j.at("author_url").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/4e336.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/4e336.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/4e336.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/4e336.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/54147.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/54147.json/default/quicktype.hpp
index 3e42013..787c66d 100644
--- a/base/cplusplus/test/inputs/json/misc/54147.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/54147.json/default/quicktype.hpp
@@ -116,15 +116,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Args & x);
-    void to_json(json & j, const Args & x);
+void from_json(const json & j, Args & x);
+void to_json(json & j, const Args & x);
 
-    void from_json(const json & j, Headers & x);
-    void to_json(json & j, const Headers & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Headers & x);
+void to_json(json & j, const Headers & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Args& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/54d32.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/54d32.json/default/quicktype.hpp
index 9a53c98..cc535ed 100644
--- a/base/cplusplus/test/inputs/json/misc/54d32.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/54d32.json/default/quicktype.hpp
@@ -128,18 +128,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Facets & x);
-    void to_json(json & j, const Facets & x);
+void from_json(const json & j, Facets & x);
+void to_json(json & j, const Facets & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Facets& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/570ec.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/570ec.json/default/quicktype.hpp
index 7591455..399ce0d 100644
--- a/base/cplusplus/test/inputs/json/misc/570ec.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/570ec.json/default/quicktype.hpp
@@ -222,24 +222,25 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, OtherName & x);
-    void to_json(json & j, const OtherName & x);
+void from_json(const json & j, OtherName & x);
+void to_json(json & j, const OtherName & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/5dd0d.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/5dd0d.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/5dd0d.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/5dd0d.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/5eae5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/5eae5.json/default/quicktype.hpp
index a6c73a2..b156d07 100644
--- a/base/cplusplus/test/inputs/json/misc/5eae5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/5eae5.json/default/quicktype.hpp
@@ -64,9 +64,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_date(j.at("Date").get<std::string>());
         x.set_id(j.at("ID").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/5eb20.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/5eb20.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/5eb20.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/5eb20.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/5f3a1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/5f3a1.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/5f3a1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/5f3a1.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/61b66.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/61b66.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/61b66.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/61b66.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/6260a.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/6260a.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/6260a.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/6260a.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/65dec.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/65dec.json/default/quicktype.hpp
index 8b4269a..0ed2dab 100644
--- a/base/cplusplus/test/inputs/json/misc/65dec.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/65dec.json/default/quicktype.hpp
@@ -353,36 +353,37 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, LegalityElement & x);
-    void to_json(json & j, const LegalityElement & x);
+void from_json(const json & j, LegalityElement & x);
+void to_json(json & j, const LegalityElement & x);
 
-    void from_json(const json & j, Ruling & x);
-    void to_json(json & j, const Ruling & x);
+void from_json(const json & j, Ruling & x);
+void to_json(json & j, const Ruling & x);
 
-    void from_json(const json & j, Card & x);
-    void to_json(json & j, const Card & x);
+void from_json(const json & j, Card & x);
+void to_json(json & j, const Card & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, ColorIdentity & x);
-    void to_json(json & j, const ColorIdentity & x);
+void from_json(const json & j, ColorIdentity & x);
+void to_json(json & j, const ColorIdentity & x);
 
-    void from_json(const json & j, Watermark & x);
-    void to_json(json & j, const Watermark & x);
+void from_json(const json & j, Watermark & x);
+void to_json(json & j, const Watermark & x);
 
-    void from_json(const json & j, Layout & x);
-    void to_json(json & j, const Layout & x);
+void from_json(const json & j, Layout & x);
+void to_json(json & j, const Layout & x);
 
-    void from_json(const json & j, LegalityEnum & x);
-    void to_json(json & j, const LegalityEnum & x);
+void from_json(const json & j, LegalityEnum & x);
+void to_json(json & j, const LegalityEnum & x);
 
-    void from_json(const json & j, Rarity & x);
-    void to_json(json & j, const Rarity & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Rarity & x);
+void to_json(json & j, const Rarity & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, LegalityElement& x) {
         x.set_format(j.at("format").get<std::string>());
         x.set_legality(j.at("legality").get<LegalityEnum>());
diff --git a/base/cplusplus/test/inputs/json/misc/66121.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/66121.json/default/quicktype.hpp
index 1868c8c..3b6dccd 100644
--- a/base/cplusplus/test/inputs/json/misc/66121.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/66121.json/default/quicktype.hpp
@@ -211,33 +211,34 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
 
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
 
-    void from_json(const json & j, Note & x);
-    void to_json(json & j, const Note & x);
+void from_json(const json & j, Note & x);
+void to_json(json & j, const Note & x);
 
-    void from_json(const json & j, MediaType & x);
-    void to_json(json & j, const MediaType & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, MediaType & x);
+void to_json(json & j, const MediaType & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/6617c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/6617c.json/default/quicktype.hpp
index d02b58b..91778fa 100644
--- a/base/cplusplus/test/inputs/json/misc/6617c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/6617c.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, IssPosition & x);
-    void to_json(json & j, const IssPosition & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, IssPosition & x);
+void to_json(json & j, const IssPosition & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, IssPosition& x) {
         x.set_latitude(j.at("latitude").get<std::string>());
         x.set_longitude(j.at("longitude").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/67c03.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/67c03.json/default/quicktype.hpp
index 1f3af7f..874dc20 100644
--- a/base/cplusplus/test/inputs/json/misc/67c03.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/67c03.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Person & x);
-    void to_json(json & j, const Person & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Person & x);
+void to_json(json & j, const Person & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Person& x) {
         x.set_craft(j.at("craft").get<std::string>());
         x.set_name(j.at("name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/68c30.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/68c30.json/default/quicktype.hpp
index 08c99fa..187cec0 100644
--- a/base/cplusplus/test/inputs/json/misc/68c30.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/68c30.json/default/quicktype.hpp
@@ -184,18 +184,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Out & x);
-    void to_json(json & j, const Out & x);
+void from_json(const json & j, Out & x);
+void to_json(json & j, const Out & x);
 
-    void from_json(const json & j, Input & x);
-    void to_json(json & j, const Input & x);
+void from_json(const json & j, Input & x);
+void to_json(json & j, const Input & x);
 
-    void from_json(const json & j, Tx & x);
-    void to_json(json & j, const Tx & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Tx & x);
+void to_json(json & j, const Tx & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Out& x) {
         x.set_addr(j.at("addr").get<std::string>());
         x.set_n(j.at("n").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/6c155.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/6c155.json/default/quicktype.hpp
index 4cd0473..769780d 100644
--- a/base/cplusplus/test/inputs/json/misc/6c155.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/6c155.json/default/quicktype.hpp
@@ -276,27 +276,28 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, ResponseInfo & x);
-    void to_json(json & j, const ResponseInfo & x);
+void from_json(const json & j, ResponseInfo & x);
+void to_json(json & j, const ResponseInfo & x);
 
-    void from_json(const json & j, Resultset & x);
-    void to_json(json & j, const Resultset & x);
+void from_json(const json & j, Resultset & x);
+void to_json(json & j, const Resultset & x);
 
-    void from_json(const json & j, Metadata & x);
-    void to_json(json & j, const Metadata & x);
+void from_json(const json & j, Metadata & x);
+void to_json(json & j, const Metadata & x);
 
-    void from_json(const json & j, Component & x);
-    void to_json(json & j, const Component & x);
+void from_json(const json & j, Component & x);
+void to_json(json & j, const Component & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, ResponseInfo& x) {
         x.set_developer_message(j.at("developerMessage").get<std::string>());
         x.set_status(j.at("status").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/6de06.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/6de06.json/default/quicktype.hpp
index 87d3808..7d2f28b 100644
--- a/base/cplusplus/test/inputs/json/misc/6de06.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/6de06.json/default/quicktype.hpp
@@ -719,51 +719,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Oembed & x);
-    void to_json(json & j, const Oembed & x);
+void from_json(const json & j, Oembed & x);
+void to_json(json & j, const Oembed & x);
 
-    void from_json(const json & j, Media & x);
-    void to_json(json & j, const Media & x);
+void from_json(const json & j, Media & x);
+void to_json(json & j, const Media & x);
 
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, Source & x);
-    void to_json(json & j, const Source & x);
+void from_json(const json & j, Source & x);
+void to_json(json & j, const Source & x);
 
-    void from_json(const json & j, Gif & x);
-    void to_json(json & j, const Gif & x);
+void from_json(const json & j, Gif & x);
+void to_json(json & j, const Gif & x);
 
-    void from_json(const json & j, Variants & x);
-    void to_json(json & j, const Variants & x);
+void from_json(const json & j, Variants & x);
+void to_json(json & j, const Variants & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Preview & x);
-    void to_json(json & j, const Preview & x);
+void from_json(const json & j, Preview & x);
+void to_json(json & j, const Preview & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, PostHint & x);
-    void to_json(json & j, const PostHint & x);
+void from_json(const json & j, PostHint & x);
+void to_json(json & j, const PostHint & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Oembed& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_height(j.at("height").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/6dec6.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/6dec6.json/default/quicktype.hpp
index 8a91b73..a27badb 100644
--- a/base/cplusplus/test/inputs/json/misc/6dec6.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/6dec6.json/default/quicktype.hpp
@@ -461,51 +461,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/6eb00.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/6eb00.json/default/quicktype.hpp
index 99b3c37..eb246b8 100644
--- a/base/cplusplus/test/inputs/json/misc/6eb00.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/6eb00.json/default/quicktype.hpp
@@ -59,9 +59,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_directorate_id(j.at("DirectorateID").get<int64_t>());
         x.set_id(j.at("Id").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/70c77.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/70c77.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/70c77.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/70c77.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/734ad.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/734ad.json/default/quicktype.hpp
index 811d3d9..8633434 100644
--- a/base/cplusplus/test/inputs/json/misc/734ad.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/734ad.json/default/quicktype.hpp
@@ -427,18 +427,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Facets & x);
-    void to_json(json & j, const Facets & x);
+void from_json(const json & j, Facets & x);
+void to_json(json & j, const Facets & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Facets& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/75912.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/75912.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/75912.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/75912.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/7681c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/7681c.json/default/quicktype.hpp
index d5299de..113cec1 100644
--- a/base/cplusplus/test/inputs/json/misc/7681c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/7681c.json/default/quicktype.hpp
@@ -566,45 +566,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, The480_WStill & x);
-    void to_json(json & j, const The480_WStill & x);
+void from_json(const json & j, The480_WStill & x);
+void to_json(json & j, const The480_WStill & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, Username & x);
-    void to_json(json & j, const Username & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, Username & x);
+void to_json(json & j, const Username & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, The480_WStill& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/76ae1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/76ae1.json/default/quicktype.hpp
index 2b9cac0..0f7c7ff 100644
--- a/base/cplusplus/test/inputs/json/misc/76ae1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/76ae1.json/default/quicktype.hpp
@@ -784,90 +784,91 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Property & x);
-    void to_json(json & j, const Property & x);
+void from_json(const json & j, Property & x);
+void to_json(json & j, const Property & x);
 
-    void from_json(const json & j, Article & x);
-    void to_json(json & j, const Article & x);
+void from_json(const json & j, Article & x);
+void to_json(json & j, const Article & x);
 
-    void from_json(const json & j, DeMinimisProperties & x);
-    void to_json(json & j, const DeMinimisProperties & x);
+void from_json(const json & j, DeMinimisProperties & x);
+void to_json(json & j, const DeMinimisProperties & x);
 
-    void from_json(const json & j, DeMinimis & x);
-    void to_json(json & j, const DeMinimis & x);
+void from_json(const json & j, DeMinimis & x);
+void to_json(json & j, const DeMinimis & x);
 
-    void from_json(const json & j, FaqProperties & x);
-    void to_json(json & j, const FaqProperties & x);
+void from_json(const json & j, FaqProperties & x);
+void to_json(json & j, const FaqProperties & x);
 
-    void from_json(const json & j, Faq & x);
-    void to_json(json & j, const Faq & x);
+void from_json(const json & j, Faq & x);
+void to_json(json & j, const Faq & x);
 
-    void from_json(const json & j, ReportProperties & x);
-    void to_json(json & j, const ReportProperties & x);
+void from_json(const json & j, ReportProperties & x);
+void to_json(json & j, const ReportProperties & x);
 
-    void from_json(const json & j, Report & x);
-    void to_json(json & j, const Report & x);
+void from_json(const json & j, Report & x);
+void to_json(json & j, const Report & x);
 
-    void from_json(const json & j, TaxonomyProperties & x);
-    void to_json(json & j, const TaxonomyProperties & x);
+void from_json(const json & j, TaxonomyProperties & x);
+void to_json(json & j, const TaxonomyProperties & x);
 
-    void from_json(const json & j, Taxonomy & x);
-    void to_json(json & j, const Taxonomy & x);
+void from_json(const json & j, Taxonomy & x);
+void to_json(json & j, const Taxonomy & x);
 
-    void from_json(const json & j, Definitions & x);
-    void to_json(json & j, const Definitions & x);
+void from_json(const json & j, Definitions & x);
+void to_json(json & j, const Definitions & x);
 
-    void from_json(const json & j, Info & x);
-    void to_json(json & j, const Info & x);
+void from_json(const json & j, Info & x);
+void to_json(json & j, const Info & x);
 
-    void from_json(const json & j, Parameter & x);
-    void to_json(json & j, const Parameter & x);
+void from_json(const json & j, Parameter & x);
+void to_json(json & j, const Parameter & x);
 
-    void from_json(const json & j, ItemsClass & x);
-    void to_json(json & j, const ItemsClass & x);
+void from_json(const json & j, ItemsClass & x);
+void to_json(json & j, const ItemsClass & x);
 
-    void from_json(const json & j, Purple200 & x);
-    void to_json(json & j, const Purple200 & x);
+void from_json(const json & j, Purple200 & x);
+void to_json(json & j, const Purple200 & x);
 
-    void from_json(const json & j, PurpleResponses & x);
-    void to_json(json & j, const PurpleResponses & x);
+void from_json(const json & j, PurpleResponses & x);
+void to_json(json & j, const PurpleResponses & x);
 
-    void from_json(const json & j, BusinessServiceProvidersSearchGet & x);
-    void to_json(json & j, const BusinessServiceProvidersSearchGet & x);
+void from_json(const json & j, BusinessServiceProvidersSearchGet & x);
+void to_json(json & j, const BusinessServiceProvidersSearchGet & x);
 
-    void from_json(const json & j, BusinessServiceProvidersSearchClass & x);
-    void to_json(json & j, const BusinessServiceProvidersSearchClass & x);
+void from_json(const json & j, BusinessServiceProvidersSearchClass & x);
+void to_json(json & j, const BusinessServiceProvidersSearchClass & x);
 
-    void from_json(const json & j, PurpleSchema & x);
-    void to_json(json & j, const PurpleSchema & x);
+void from_json(const json & j, PurpleSchema & x);
+void to_json(json & j, const PurpleSchema & x);
 
-    void from_json(const json & j, Fluffy200 & x);
-    void to_json(json & j, const Fluffy200 & x);
+void from_json(const json & j, Fluffy200 & x);
+void to_json(json & j, const Fluffy200 & x);
 
-    void from_json(const json & j, FluffyResponses & x);
-    void to_json(json & j, const FluffyResponses & x);
+void from_json(const json & j, FluffyResponses & x);
+void to_json(json & j, const FluffyResponses & x);
 
-    void from_json(const json & j, ConsolidatedScreeningListSearchGet & x);
-    void to_json(json & j, const ConsolidatedScreeningListSearchGet & x);
+void from_json(const json & j, ConsolidatedScreeningListSearchGet & x);
+void to_json(json & j, const ConsolidatedScreeningListSearchGet & x);
 
-    void from_json(const json & j, ConsolidatedScreeningListSearchClass & x);
-    void to_json(json & j, const ConsolidatedScreeningListSearchClass & x);
+void from_json(const json & j, ConsolidatedScreeningListSearchClass & x);
+void to_json(json & j, const ConsolidatedScreeningListSearchClass & x);
 
-    void from_json(const json & j, Paths & x);
-    void to_json(json & j, const Paths & x);
+void from_json(const json & j, Paths & x);
+void to_json(json & j, const Paths & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, FormatEnum & x);
-    void to_json(json & j, const FormatEnum & x);
+void from_json(const json & j, FormatEnum & x);
+void to_json(json & j, const FormatEnum & x);
 
-    void from_json(const json & j, In & x);
-    void to_json(json & j, const In & x);
-
-    void from_json(const json & j, SchemaType & x);
-    void to_json(json & j, const SchemaType & x);
+void from_json(const json & j, In & x);
+void to_json(json & j, const In & x);
 
+void from_json(const json & j, SchemaType & x);
+void to_json(json & j, const SchemaType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Property& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_type(j.at("type").get<FormatEnum>());
diff --git a/base/cplusplus/test/inputs/json/misc/77392.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/77392.json/default/quicktype.hpp
index c3468a2..35561a8 100644
--- a/base/cplusplus/test/inputs/json/misc/77392.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/77392.json/default/quicktype.hpp
@@ -155,15 +155,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, OrbitClass & x);
-    void to_json(json & j, const OrbitClass & x);
-
-    void from_json(const json & j, Pha & x);
-    void to_json(json & j, const Pha & x);
+void from_json(const json & j, OrbitClass & x);
+void to_json(json & j, const OrbitClass & x);
 
+void from_json(const json & j, Pha & x);
+void to_json(json & j, const Pha & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_designation(j.at("designation").get<std::string>());
         x.set_discovery_date(j.at("discovery_date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/7d397.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/7d397.json/default/quicktype.hpp
index 3abba84..11ee61f 100644
--- a/base/cplusplus/test/inputs/json/misc/7d397.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/7d397.json/default/quicktype.hpp
@@ -324,51 +324,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Property & x);
-    void to_json(json & j, const Property & x);
+void from_json(const json & j, Property & x);
+void to_json(json & j, const Property & x);
 
-    void from_json(const json & j, List & x);
-    void to_json(json & j, const List & x);
+void from_json(const json & j, List & x);
+void to_json(json & j, const List & x);
 
-    void from_json(const json & j, Definitions & x);
-    void to_json(json & j, const Definitions & x);
+void from_json(const json & j, Definitions & x);
+void to_json(json & j, const Definitions & x);
 
-    void from_json(const json & j, Info & x);
-    void to_json(json & j, const Info & x);
+void from_json(const json & j, Info & x);
+void to_json(json & j, const Info & x);
 
-    void from_json(const json & j, Parameter & x);
-    void to_json(json & j, const Parameter & x);
+void from_json(const json & j, Parameter & x);
+void to_json(json & j, const Parameter & x);
 
-    void from_json(const json & j, Items & x);
-    void to_json(json & j, const Items & x);
+void from_json(const json & j, Items & x);
+void to_json(json & j, const Items & x);
 
-    void from_json(const json & j, Schema & x);
-    void to_json(json & j, const Schema & x);
+void from_json(const json & j, Schema & x);
+void to_json(json & j, const Schema & x);
 
-    void from_json(const json & j, The200 & x);
-    void to_json(json & j, const The200 & x);
+void from_json(const json & j, The200 & x);
+void to_json(json & j, const The200 & x);
 
-    void from_json(const json & j, Responses & x);
-    void to_json(json & j, const Responses & x);
+void from_json(const json & j, Responses & x);
+void to_json(json & j, const Responses & x);
 
-    void from_json(const json & j, Get & x);
-    void to_json(json & j, const Get & x);
+void from_json(const json & j, Get & x);
+void to_json(json & j, const Get & x);
 
-    void from_json(const json & j, ConsolidatedScreeningListSearch & x);
-    void to_json(json & j, const ConsolidatedScreeningListSearch & x);
+void from_json(const json & j, ConsolidatedScreeningListSearch & x);
+void to_json(json & j, const ConsolidatedScreeningListSearch & x);
 
-    void from_json(const json & j, Paths & x);
-    void to_json(json & j, const Paths & x);
+void from_json(const json & j, Paths & x);
+void to_json(json & j, const Paths & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, In & x);
-    void to_json(json & j, const In & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, In & x);
+void to_json(json & j, const In & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Property& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_type(j.at("type").get<Type>());
diff --git a/base/cplusplus/test/inputs/json/misc/7d722.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/7d722.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/7d722.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/7d722.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/7df41.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/7df41.json/default/quicktype.hpp
index 210b318..d0615b3 100644
--- a/base/cplusplus/test/inputs/json/misc/7df41.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/7df41.json/default/quicktype.hpp
@@ -91,12 +91,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Pc & x);
-    void to_json(json & j, const Pc & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Pc & x);
+void to_json(json & j, const Pc & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Pc& x) {
         x.set_count(j.at("count").get<int64_t>());
         x.set_label(j.at("label").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/7dfa6.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/7dfa6.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/7dfa6.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/7dfa6.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/7eb30.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/7eb30.json/default/quicktype.hpp
index cd5a38f..3f78217 100644
--- a/base/cplusplus/test/inputs/json/misc/7eb30.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/7eb30.json/default/quicktype.hpp
@@ -180,30 +180,31 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Group & x);
-    void to_json(json & j, const Group & x);
+void from_json(const json & j, Group & x);
+void to_json(json & j, const Group & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Code & x);
-    void to_json(json & j, const Code & x);
+void from_json(const json & j, Code & x);
+void to_json(json & j, const Code & x);
 
-    void from_json(const json & j, English & x);
-    void to_json(json & j, const English & x);
+void from_json(const json & j, English & x);
+void to_json(json & j, const English & x);
 
-    void from_json(const json & j, Thai & x);
-    void to_json(json & j, const Thai & x);
+void from_json(const json & j, Thai & x);
+void to_json(json & j, const Thai & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
-
-    void from_json(const json & j, Tel & x);
-    void to_json(json & j, const Tel & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
+void from_json(const json & j, Tel & x);
+void to_json(json & j, const Tel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Group& x) {
         x.set_code(j.at("code").get<Code>());
         x.set_english(j.at("english").get<English>());
diff --git a/base/cplusplus/test/inputs/json/misc/7f568.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/7f568.json/default/quicktype.hpp
index 9bc6850..f3d067b 100644
--- a/base/cplusplus/test/inputs/json/misc/7f568.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/7f568.json/default/quicktype.hpp
@@ -216,18 +216,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, File & x);
-    void to_json(json & j, const File & x);
+void from_json(const json & j, File & x);
+void to_json(json & j, const File & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Language & x);
-    void to_json(json & j, const Language & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Language & x);
+void to_json(json & j, const Language & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, File& x) {
         x.set_filename(j.at("filename").get<std::string>());
         x.set_language(get_stack_optional<Language>(j, "language"));
diff --git a/base/cplusplus/test/inputs/json/misc/80aff.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/80aff.json/default/quicktype.hpp
index 0803280..b47be7e 100644
--- a/base/cplusplus/test/inputs/json/misc/80aff.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/80aff.json/default/quicktype.hpp
@@ -186,15 +186,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Facets & x);
-    void to_json(json & j, const Facets & x);
+void from_json(const json & j, Facets & x);
+void to_json(json & j, const Facets & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Facets& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/82509.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/82509.json/default/quicktype.hpp
index e1fb545..afcd419 100644
--- a/base/cplusplus/test/inputs/json/misc/82509.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/82509.json/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_origin(j.at("origin").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/misc/8592b.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/8592b.json/default/quicktype.hpp
index b2ac1ee..b53f8e5 100644
--- a/base/cplusplus/test/inputs/json/misc/8592b.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/8592b.json/default/quicktype.hpp
@@ -577,51 +577,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, Source & x);
-    void to_json(json & j, const Source & x);
+void from_json(const json & j, Source & x);
+void to_json(json & j, const Source & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Preview & x);
-    void to_json(json & j, const Preview & x);
+void from_json(const json & j, Preview & x);
+void to_json(json & j, const Preview & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, PostHint & x);
-    void to_json(json & j, const PostHint & x);
+void from_json(const json & j, PostHint & x);
+void to_json(json & j, const PostHint & x);
 
-    void from_json(const json & j, Subreddit & x);
-    void to_json(json & j, const Subreddit & x);
+void from_json(const json & j, Subreddit & x);
+void to_json(json & j, const Subreddit & x);
 
-    void from_json(const json & j, SubredditId & x);
-    void to_json(json & j, const SubredditId & x);
+void from_json(const json & j, SubredditId & x);
+void to_json(json & j, const SubredditId & x);
 
-    void from_json(const json & j, SubredditNamePrefixed & x);
-    void to_json(json & j, const SubredditNamePrefixed & x);
+void from_json(const json & j, SubredditNamePrefixed & x);
+void to_json(json & j, const SubredditNamePrefixed & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
-    void from_json(const json & j, SuggestedSort & x);
-    void to_json(json & j, const SuggestedSort & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SuggestedSort & x);
+void to_json(json & j, const SuggestedSort & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, MediaEmbed& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/88130.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/88130.json/default/quicktype.hpp
index 3abda70..b5fffa1 100644
--- a/base/cplusplus/test/inputs/json/misc/88130.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/88130.json/default/quicktype.hpp
@@ -459,48 +459,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/8a62c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/8a62c.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/8a62c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/8a62c.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/908db.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/908db.json/default/quicktype.hpp
index 6bb50a2..087d4f0 100644
--- a/base/cplusplus/test/inputs/json/misc/908db.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/908db.json/default/quicktype.hpp
@@ -80,15 +80,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, StateState & x);
-    void to_json(json & j, const StateState & x);
+void from_json(const json & j, StateState & x);
+void to_json(json & j, const StateState & x);
 
-    void from_json(const json & j, StateElement & x);
-    void to_json(json & j, const StateElement & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, StateElement & x);
+void to_json(json & j, const StateElement & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, StateState& x) {
         x.set_state_id(j.at("state_id").get<std::string>());
         x.set_state_name(j.at("state_name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/9617f.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/9617f.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/9617f.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/9617f.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/96f7c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/96f7c.json/default/quicktype.hpp
index 1610f1a..d39e91f 100644
--- a/base/cplusplus/test/inputs/json/misc/96f7c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/96f7c.json/default/quicktype.hpp
@@ -72,9 +72,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_git(j.at("git").get<std::vector<std::string>>());
         x.set_github_services_sha(j.at("github_services_sha").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/9847b.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/9847b.json/default/quicktype.hpp
index 0e09f6a..5adbab8 100644
--- a/base/cplusplus/test/inputs/json/misc/9847b.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/9847b.json/default/quicktype.hpp
@@ -54,9 +54,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_id(j.at("id").get<std::string>());
         x.set_name(j.at("name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/9929c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/9929c.json/default/quicktype.hpp
index 3abda70..b5fffa1 100644
--- a/base/cplusplus/test/inputs/json/misc/9929c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/9929c.json/default/quicktype.hpp
@@ -459,48 +459,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/996bd.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/996bd.json/default/quicktype.hpp
index 137a625..01e807a 100644
--- a/base/cplusplus/test/inputs/json/misc/996bd.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/996bd.json/default/quicktype.hpp
@@ -209,30 +209,31 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
 
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
 
-    void from_json(const json & j, MediaType & x);
-    void to_json(json & j, const MediaType & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, MediaType & x);
+void to_json(json & j, const MediaType & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/9a503.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/9a503.json/default/quicktype.hpp
index f0ab1a2..4f08401 100644
--- a/base/cplusplus/test/inputs/json/misc/9a503.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/9a503.json/default/quicktype.hpp
@@ -148,21 +148,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/9ac3b.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/9ac3b.json/default/quicktype.hpp
index ae670bf..76430fd 100644
--- a/base/cplusplus/test/inputs/json/misc/9ac3b.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/9ac3b.json/default/quicktype.hpp
@@ -209,21 +209,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Facets & x);
-    void to_json(json & j, const Facets & x);
+void from_json(const json & j, Facets & x);
+void to_json(json & j, const Facets & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Facets& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/9eed5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/9eed5.json/default/quicktype.hpp
index 52f491d..7d23e56 100644
--- a/base/cplusplus/test/inputs/json/misc/9eed5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/9eed5.json/default/quicktype.hpp
@@ -148,21 +148,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/a1eca.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/a1eca.json/default/quicktype.hpp
index 3abda70..b5fffa1 100644
--- a/base/cplusplus/test/inputs/json/misc/a1eca.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/a1eca.json/default/quicktype.hpp
@@ -459,48 +459,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/a45b0.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/a45b0.json/default/quicktype.hpp
index 6c7c16a..6b99a38 100644
--- a/base/cplusplus/test/inputs/json/misc/a45b0.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/a45b0.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_country(j.at("country").get<Country>());
diff --git a/base/cplusplus/test/inputs/json/misc/a71df.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/a71df.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/a71df.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/a71df.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/a9691.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/a9691.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/a9691.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/a9691.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/ab0d1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/ab0d1.json/default/quicktype.hpp
index 6c7c16a..6b99a38 100644
--- a/base/cplusplus/test/inputs/json/misc/ab0d1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/ab0d1.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_country(j.at("country").get<Country>());
diff --git a/base/cplusplus/test/inputs/json/misc/abb4b.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/abb4b.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/abb4b.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/abb4b.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/ac944.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/ac944.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/ac944.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/ac944.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/ad8be.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/ad8be.json/default/quicktype.hpp
index 8721457..6257824 100644
--- a/base/cplusplus/test/inputs/json/misc/ad8be.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/ad8be.json/default/quicktype.hpp
@@ -229,36 +229,37 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Identifier & x);
-    void to_json(json & j, const Identifier & x);
+void from_json(const json & j, Identifier & x);
+void to_json(json & j, const Identifier & x);
 
-    void from_json(const json & j, Link & x);
-    void to_json(json & j, const Link & x);
+void from_json(const json & j, Link & x);
+void to_json(json & j, const Link & x);
 
-    void from_json(const json & j, OtherName & x);
-    void to_json(json & j, const OtherName & x);
+void from_json(const json & j, OtherName & x);
+void to_json(json & j, const OtherName & x);
 
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Scheme & x);
-    void to_json(json & j, const Scheme & x);
+void from_json(const json & j, Scheme & x);
+void to_json(json & j, const Scheme & x);
 
-    void from_json(const json & j, Keyword & x);
-    void to_json(json & j, const Keyword & x);
+void from_json(const json & j, Keyword & x);
+void to_json(json & j, const Keyword & x);
 
-    void from_json(const json & j, Note & x);
-    void to_json(json & j, const Note & x);
+void from_json(const json & j, Note & x);
+void to_json(json & j, const Note & x);
 
-    void from_json(const json & j, MediaType & x);
-    void to_json(json & j, const MediaType & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, MediaType & x);
+void to_json(json & j, const MediaType & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Identifier& x) {
         x.set_identifier(j.at("identifier").get<std::string>());
         x.set_scheme(j.at("scheme").get<Scheme>());
diff --git a/base/cplusplus/test/inputs/json/misc/ae7f0.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/ae7f0.json/default/quicktype.hpp
index a7c1671..f659743 100644
--- a/base/cplusplus/test/inputs/json/misc/ae7f0.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/ae7f0.json/default/quicktype.hpp
@@ -485,39 +485,40 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Domain & x);
-    void to_json(json & j, const Domain & x);
+void from_json(const json & j, Domain & x);
+void to_json(json & j, const Domain & x);
 
-    void from_json(const json & j, Subreddit & x);
-    void to_json(json & j, const Subreddit & x);
+void from_json(const json & j, Subreddit & x);
+void to_json(json & j, const Subreddit & x);
 
-    void from_json(const json & j, SubredditId & x);
-    void to_json(json & j, const SubredditId & x);
+void from_json(const json & j, SubredditId & x);
+void to_json(json & j, const SubredditId & x);
 
-    void from_json(const json & j, SubredditNamePrefixed & x);
-    void to_json(json & j, const SubredditNamePrefixed & x);
+void from_json(const json & j, SubredditNamePrefixed & x);
+void to_json(json & j, const SubredditNamePrefixed & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, MediaEmbed& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/ae9ca.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/ae9ca.json/default/quicktype.hpp
index 07e2e50..a84d8e7 100644
--- a/base/cplusplus/test/inputs/json/misc/ae9ca.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/ae9ca.json/default/quicktype.hpp
@@ -169,33 +169,34 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Geometry & x);
-    void to_json(json & j, const Geometry & x);
+void from_json(const json & j, Geometry & x);
+void to_json(json & j, const Geometry & x);
 
-    void from_json(const json & j, Properties & x);
-    void to_json(json & j, const Properties & x);
+void from_json(const json & j, Properties & x);
+void to_json(json & j, const Properties & x);
 
-    void from_json(const json & j, Feature & x);
-    void to_json(json & j, const Feature & x);
+void from_json(const json & j, Feature & x);
+void to_json(json & j, const Feature & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, GeometryType & x);
-    void to_json(json & j, const GeometryType & x);
+void from_json(const json & j, GeometryType & x);
+void to_json(json & j, const GeometryType & x);
 
-    void from_json(const json & j, MaintainingAuthority & x);
-    void to_json(json & j, const MaintainingAuthority & x);
+void from_json(const json & j, MaintainingAuthority & x);
+void to_json(json & j, const MaintainingAuthority & x);
 
-    void from_json(const json & j, Class & x);
-    void to_json(json & j, const Class & x);
+void from_json(const json & j, Class & x);
+void to_json(json & j, const Class & x);
 
-    void from_json(const json & j, Ward & x);
-    void to_json(json & j, const Ward & x);
-
-    void from_json(const json & j, FeatureType & x);
-    void to_json(json & j, const FeatureType & x);
+void from_json(const json & j, Ward & x);
+void to_json(json & j, const Ward & x);
 
+void from_json(const json & j, FeatureType & x);
+void to_json(json & j, const FeatureType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Geometry& x) {
         x.set_coordinates(j.at("coordinates").get<std::vector<double>>());
         x.set_type(j.at("type").get<GeometryType>());
diff --git a/base/cplusplus/test/inputs/json/misc/af2d1.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/af2d1.json/default/quicktype.hpp
index 3e472f1..4987910 100644
--- a/base/cplusplus/test/inputs/json/misc/af2d1.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/af2d1.json/default/quicktype.hpp
@@ -410,54 +410,55 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, CrsProperties & x);
-    void to_json(json & j, const CrsProperties & x);
+void from_json(const json & j, CrsProperties & x);
+void to_json(json & j, const CrsProperties & x);
 
-    void from_json(const json & j, Crs & x);
-    void to_json(json & j, const Crs & x);
+void from_json(const json & j, Crs & x);
+void to_json(json & j, const Crs & x);
 
-    void from_json(const json & j, Geometry & x);
-    void to_json(json & j, const Geometry & x);
+void from_json(const json & j, Geometry & x);
+void to_json(json & j, const Geometry & x);
 
-    void from_json(const json & j, FeatureProperties & x);
-    void to_json(json & j, const FeatureProperties & x);
+void from_json(const json & j, FeatureProperties & x);
+void to_json(json & j, const FeatureProperties & x);
 
-    void from_json(const json & j, Feature & x);
-    void to_json(json & j, const Feature & x);
+void from_json(const json & j, Feature & x);
+void to_json(json & j, const Feature & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, GeometryType & x);
-    void to_json(json & j, const GeometryType & x);
+void from_json(const json & j, GeometryType & x);
+void to_json(json & j, const GeometryType & x);
 
-    void from_json(const json & j, GeometryName & x);
-    void to_json(json & j, const GeometryName & x);
+void from_json(const json & j, GeometryName & x);
+void to_json(json & j, const GeometryName & x);
 
-    void from_json(const json & j, AddImprov & x);
-    void to_json(json & j, const AddImprov & x);
+void from_json(const json & j, AddImprov & x);
+void to_json(json & j, const AddImprov & x);
 
-    void from_json(const json & j, FundingBa & x);
-    void to_json(json & j, const FundingBa & x);
+void from_json(const json & j, FundingBa & x);
+void to_json(json & j, const FundingBa & x);
 
-    void from_json(const json & j, LevelAccu & x);
-    void to_json(json & j, const LevelAccu & x);
+void from_json(const json & j, LevelAccu & x);
+void to_json(json & j, const LevelAccu & x);
 
-    void from_json(const json & j, Material & x);
-    void to_json(json & j, const Material & x);
+void from_json(const json & j, Material & x);
+void to_json(json & j, const Material & x);
 
-    void from_json(const json & j, MiSymbolo & x);
-    void to_json(json & j, const MiSymbolo & x);
+void from_json(const json & j, MiSymbolo & x);
+void to_json(json & j, const MiSymbolo & x);
 
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, PropertiesType & x);
-    void to_json(json & j, const PropertiesType & x);
-
-    void from_json(const json & j, FeatureType & x);
-    void to_json(json & j, const FeatureType & x);
+void from_json(const json & j, PropertiesType & x);
+void to_json(json & j, const PropertiesType & x);
 
+void from_json(const json & j, FeatureType & x);
+void to_json(json & j, const FeatureType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, CrsProperties& x) {
         x.set_name(j.at("name").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/misc/b4865.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/b4865.json/default/quicktype.hpp
index 6e33948..5db0bf8 100644
--- a/base/cplusplus/test/inputs/json/misc/b4865.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/b4865.json/default/quicktype.hpp
@@ -186,21 +186,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Geolocation & x);
-    void to_json(json & j, const Geolocation & x);
+void from_json(const json & j, Geolocation & x);
+void to_json(json & j, const Geolocation & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, Fall & x);
-    void to_json(json & j, const Fall & x);
+void from_json(const json & j, Fall & x);
+void to_json(json & j, const Fall & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, Nametype & x);
-    void to_json(json & j, const Nametype & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, Nametype & x);
+void to_json(json & j, const Nametype & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Geolocation& x) {
         x.set_coordinates(j.at("coordinates").get<std::vector<double>>());
         x.set_type(j.at("type").get<Type>());
diff --git a/base/cplusplus/test/inputs/json/misc/b6f2c.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/b6f2c.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/b6f2c.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/b6f2c.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/b6fe5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/b6fe5.json/default/quicktype.hpp
index 0cf7f89..fac9bc4 100644
--- a/base/cplusplus/test/inputs/json/misc/b6fe5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/b6fe5.json/default/quicktype.hpp
@@ -62,9 +62,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_group(j.at("group").get<std::string>());
         x.set_movie(j.at("movie").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/b9f64.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/b9f64.json/default/quicktype.hpp
index 2faab45..fbe1547 100644
--- a/base/cplusplus/test/inputs/json/misc/b9f64.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/b9f64.json/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_user_agent(j.at("user-agent").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/misc/bb1ec.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/bb1ec.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/bb1ec.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/bb1ec.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/be234.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/be234.json/default/quicktype.hpp
index a0df32f..2ec54ed 100644
--- a/base/cplusplus/test/inputs/json/misc/be234.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/be234.json/default/quicktype.hpp
@@ -723,63 +723,64 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Oembed & x);
-    void to_json(json & j, const Oembed & x);
+void from_json(const json & j, Oembed & x);
+void to_json(json & j, const Oembed & x);
 
-    void from_json(const json & j, Media & x);
-    void to_json(json & j, const Media & x);
+void from_json(const json & j, Media & x);
+void to_json(json & j, const Media & x);
 
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, Source & x);
-    void to_json(json & j, const Source & x);
+void from_json(const json & j, Source & x);
+void to_json(json & j, const Source & x);
 
-    void from_json(const json & j, Gif & x);
-    void to_json(json & j, const Gif & x);
+void from_json(const json & j, Gif & x);
+void to_json(json & j, const Gif & x);
 
-    void from_json(const json & j, Variants & x);
-    void to_json(json & j, const Variants & x);
+void from_json(const json & j, Variants & x);
+void to_json(json & j, const Variants & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Preview & x);
-    void to_json(json & j, const Preview & x);
+void from_json(const json & j, Preview & x);
+void to_json(json & j, const Preview & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Domain & x);
-    void to_json(json & j, const Domain & x);
+void from_json(const json & j, Domain & x);
+void to_json(json & j, const Domain & x);
 
-    void from_json(const json & j, PostHint & x);
-    void to_json(json & j, const PostHint & x);
+void from_json(const json & j, PostHint & x);
+void to_json(json & j, const PostHint & x);
 
-    void from_json(const json & j, Subreddit & x);
-    void to_json(json & j, const Subreddit & x);
+void from_json(const json & j, Subreddit & x);
+void to_json(json & j, const Subreddit & x);
 
-    void from_json(const json & j, SubredditId & x);
-    void to_json(json & j, const SubredditId & x);
+void from_json(const json & j, SubredditId & x);
+void to_json(json & j, const SubredditId & x);
 
-    void from_json(const json & j, SubredditNamePrefixed & x);
-    void to_json(json & j, const SubredditNamePrefixed & x);
+void from_json(const json & j, SubredditNamePrefixed & x);
+void to_json(json & j, const SubredditNamePrefixed & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Oembed& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_height(j.at("height").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/c0356.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/c0356.json/default/quicktype.hpp
index d834c38..64ef262 100644
--- a/base/cplusplus/test/inputs/json/misc/c0356.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/c0356.json/default/quicktype.hpp
@@ -95,15 +95,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Description & x);
-    void to_json(json & j, const Description & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Description & x);
+void to_json(json & j, const Description & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Datum& x) {
         x.set_anomaly(j.at("anomaly").get<std::string>());
         x.set_value(j.at("value").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/c0a3a.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/c0a3a.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/c0a3a.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/c0a3a.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/c3303.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/c3303.json/default/quicktype.hpp
index 226f3c0..7b3971b 100644
--- a/base/cplusplus/test/inputs/json/misc/c3303.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/c3303.json/default/quicktype.hpp
@@ -561,45 +561,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, The480_WStill & x);
-    void to_json(json & j, const The480_WStill & x);
+void from_json(const json & j, The480_WStill & x);
+void to_json(json & j, const The480_WStill & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, Username & x);
-    void to_json(json & j, const Username & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, Username & x);
+void to_json(json & j, const Username & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, The480_WStill& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/c6cfd.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/c6cfd.json/default/quicktype.hpp
index cc1081a..61ae7dd 100644
--- a/base/cplusplus/test/inputs/json/misc/c6cfd.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/c6cfd.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Country& x) {
         x.set_code(j.at("code").get<std::string>());
         x.set_name(j.at("name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/cb0cc.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/cb0cc.json/default/quicktype.hpp
index 15de1ec..9bec850 100644
--- a/base/cplusplus/test/inputs/json/misc/cb0cc.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/cb0cc.json/default/quicktype.hpp
@@ -169,18 +169,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Laureate & x);
-    void to_json(json & j, const Laureate & x);
+void from_json(const json & j, Laureate & x);
+void to_json(json & j, const Laureate & x);
 
-    void from_json(const json & j, Prize & x);
-    void to_json(json & j, const Prize & x);
+void from_json(const json & j, Prize & x);
+void to_json(json & j, const Prize & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Category & x);
-    void to_json(json & j, const Category & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Category & x);
+void to_json(json & j, const Category & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Laureate& x) {
         x.set_firstname(j.at("firstname").get<std::string>());
         x.set_id(j.at("id").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/cb81e.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/cb81e.json/default/quicktype.hpp
index 64e5641..dfb05da 100644
--- a/base/cplusplus/test/inputs/json/misc/cb81e.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/cb81e.json/default/quicktype.hpp
@@ -81,12 +81,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Description & x);
-    void to_json(json & j, const Description & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Description & x);
+void to_json(json & j, const Description & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Description& x) {
         x.set_base_period(j.at("base_period").get<std::string>());
         x.set_missing(j.at("missing").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/ccd18.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/ccd18.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/ccd18.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/ccd18.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/cd238.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/cd238.json/default/quicktype.hpp
index 6763a65..5d39298 100644
--- a/base/cplusplus/test/inputs/json/misc/cd238.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/cd238.json/default/quicktype.hpp
@@ -194,18 +194,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Status & x);
-    void to_json(json & j, const Status & x);
+void from_json(const json & j, Status & x);
+void to_json(json & j, const Status & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Weather & x);
-    void to_json(json & j, const Weather & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Weather & x);
+void to_json(json & j, const Weather & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Status& x) {
         x.set_avg_delay(j.at("avgDelay").get<std::string>());
         x.set_closure_begin(j.at("closureBegin").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/cd463.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/cd463.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/cd463.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/cd463.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/cf0d8.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/cf0d8.json/default/quicktype.hpp
index 3abda70..b5fffa1 100644
--- a/base/cplusplus/test/inputs/json/misc/cf0d8.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/cf0d8.json/default/quicktype.hpp
@@ -459,48 +459,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/cfbce.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/cfbce.json/default/quicktype.hpp
index 8404ce3..c7442db 100644
--- a/base/cplusplus/test/inputs/json/misc/cfbce.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/cfbce.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_base(j.at("base").get<std::string>());
         x.set_date(j.at("date").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/d0908.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/d0908.json/default/quicktype.hpp
index 5cc9330..6fe5159 100644
--- a/base/cplusplus/test/inputs/json/misc/d0908.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/d0908.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TotalPopulation & x);
-    void to_json(json & j, const TotalPopulation & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TotalPopulation & x);
+void to_json(json & j, const TotalPopulation & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TotalPopulation& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_population(j.at("population").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/d23d5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/d23d5.json/default/quicktype.hpp
index 87ad431..03f7b23 100644
--- a/base/cplusplus/test/inputs/json/misc/d23d5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/d23d5.json/default/quicktype.hpp
@@ -181,15 +181,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Facets & x);
-    void to_json(json & j, const Facets & x);
+void from_json(const json & j, Facets & x);
+void to_json(json & j, const Facets & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Facets& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/dbfb3.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/dbfb3.json/default/quicktype.hpp
index fb38fbd..9fc2d30 100644
--- a/base/cplusplus/test/inputs/json/misc/dbfb3.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/dbfb3.json/default/quicktype.hpp
@@ -461,51 +461,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/dc44f.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/dc44f.json/default/quicktype.hpp
index 8a1b5e2..6fe39bb 100644
--- a/base/cplusplus/test/inputs/json/misc/dc44f.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/dc44f.json/default/quicktype.hpp
@@ -355,45 +355,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, LegalityElement & x);
-    void to_json(json & j, const LegalityElement & x);
+void from_json(const json & j, LegalityElement & x);
+void to_json(json & j, const LegalityElement & x);
 
-    void from_json(const json & j, Ruling & x);
-    void to_json(json & j, const Ruling & x);
+void from_json(const json & j, Ruling & x);
+void to_json(json & j, const Ruling & x);
 
-    void from_json(const json & j, Card & x);
-    void to_json(json & j, const Card & x);
+void from_json(const json & j, Card & x);
+void to_json(json & j, const Card & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Booster & x);
-    void to_json(json & j, const Booster & x);
+void from_json(const json & j, Booster & x);
+void to_json(json & j, const Booster & x);
 
-    void from_json(const json & j, ColorIdentity & x);
-    void to_json(json & j, const ColorIdentity & x);
+void from_json(const json & j, ColorIdentity & x);
+void to_json(json & j, const ColorIdentity & x);
 
-    void from_json(const json & j, Color & x);
-    void to_json(json & j, const Color & x);
+void from_json(const json & j, Color & x);
+void to_json(json & j, const Color & x);
 
-    void from_json(const json & j, Layout & x);
-    void to_json(json & j, const Layout & x);
+void from_json(const json & j, Layout & x);
+void to_json(json & j, const Layout & x);
 
-    void from_json(const json & j, Format & x);
-    void to_json(json & j, const Format & x);
+void from_json(const json & j, Format & x);
+void to_json(json & j, const Format & x);
 
-    void from_json(const json & j, LegalityEnum & x);
-    void to_json(json & j, const LegalityEnum & x);
+void from_json(const json & j, LegalityEnum & x);
+void to_json(json & j, const LegalityEnum & x);
 
-    void from_json(const json & j, Rarity & x);
-    void to_json(json & j, const Rarity & x);
+void from_json(const json & j, Rarity & x);
+void to_json(json & j, const Rarity & x);
 
-    void from_json(const json & j, Supertype & x);
-    void to_json(json & j, const Supertype & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Supertype & x);
+void to_json(json & j, const Supertype & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, LegalityElement& x) {
         x.set_format(j.at("format").get<Format>());
         x.set_legality(j.at("legality").get<LegalityEnum>());
diff --git a/base/cplusplus/test/inputs/json/misc/dd1ce.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/dd1ce.json/default/quicktype.hpp
index 8a1b5e2..6fe39bb 100644
--- a/base/cplusplus/test/inputs/json/misc/dd1ce.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/dd1ce.json/default/quicktype.hpp
@@ -355,45 +355,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, LegalityElement & x);
-    void to_json(json & j, const LegalityElement & x);
+void from_json(const json & j, LegalityElement & x);
+void to_json(json & j, const LegalityElement & x);
 
-    void from_json(const json & j, Ruling & x);
-    void to_json(json & j, const Ruling & x);
+void from_json(const json & j, Ruling & x);
+void to_json(json & j, const Ruling & x);
 
-    void from_json(const json & j, Card & x);
-    void to_json(json & j, const Card & x);
+void from_json(const json & j, Card & x);
+void to_json(json & j, const Card & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Booster & x);
-    void to_json(json & j, const Booster & x);
+void from_json(const json & j, Booster & x);
+void to_json(json & j, const Booster & x);
 
-    void from_json(const json & j, ColorIdentity & x);
-    void to_json(json & j, const ColorIdentity & x);
+void from_json(const json & j, ColorIdentity & x);
+void to_json(json & j, const ColorIdentity & x);
 
-    void from_json(const json & j, Color & x);
-    void to_json(json & j, const Color & x);
+void from_json(const json & j, Color & x);
+void to_json(json & j, const Color & x);
 
-    void from_json(const json & j, Layout & x);
-    void to_json(json & j, const Layout & x);
+void from_json(const json & j, Layout & x);
+void to_json(json & j, const Layout & x);
 
-    void from_json(const json & j, Format & x);
-    void to_json(json & j, const Format & x);
+void from_json(const json & j, Format & x);
+void to_json(json & j, const Format & x);
 
-    void from_json(const json & j, LegalityEnum & x);
-    void to_json(json & j, const LegalityEnum & x);
+void from_json(const json & j, LegalityEnum & x);
+void to_json(json & j, const LegalityEnum & x);
 
-    void from_json(const json & j, Rarity & x);
-    void to_json(json & j, const Rarity & x);
+void from_json(const json & j, Rarity & x);
+void to_json(json & j, const Rarity & x);
 
-    void from_json(const json & j, Supertype & x);
-    void to_json(json & j, const Supertype & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Supertype & x);
+void to_json(json & j, const Supertype & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, LegalityElement& x) {
         x.set_format(j.at("format").get<Format>());
         x.set_legality(j.at("legality").get<LegalityEnum>());
diff --git a/base/cplusplus/test/inputs/json/misc/dec3a.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/dec3a.json/default/quicktype.hpp
index 2780580..c55fd2d 100644
--- a/base/cplusplus/test/inputs/json/misc/dec3a.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/dec3a.json/default/quicktype.hpp
@@ -316,27 +316,28 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, ResponseInfo & x);
-    void to_json(json & j, const ResponseInfo & x);
+void from_json(const json & j, ResponseInfo & x);
+void to_json(json & j, const ResponseInfo & x);
 
-    void from_json(const json & j, Resultset & x);
-    void to_json(json & j, const Resultset & x);
+void from_json(const json & j, Resultset & x);
+void to_json(json & j, const Resultset & x);
 
-    void from_json(const json & j, Metadata & x);
-    void to_json(json & j, const Metadata & x);
+void from_json(const json & j, Metadata & x);
+void to_json(json & j, const Metadata & x);
 
-    void from_json(const json & j, HiringOrg & x);
-    void to_json(json & j, const HiringOrg & x);
+void from_json(const json & j, HiringOrg & x);
+void to_json(json & j, const HiringOrg & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, ResponseInfo& x) {
         x.set_developer_message(j.at("developerMessage").get<std::string>());
         x.set_status(j.at("status").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/df957.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/df957.json/default/quicktype.hpp
index 3abda70..b5fffa1 100644
--- a/base/cplusplus/test/inputs/json/misc/df957.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/df957.json/default/quicktype.hpp
@@ -459,48 +459,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/e0ac7.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/e0ac7.json/default/quicktype.hpp
index bb14262..5f5004d 100644
--- a/base/cplusplus/test/inputs/json/misc/e0ac7.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/e0ac7.json/default/quicktype.hpp
@@ -564,42 +564,43 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Downsized & x);
-    void to_json(json & j, const Downsized & x);
+void from_json(const json & j, Downsized & x);
+void to_json(json & j, const Downsized & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Downsized& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/e2915.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/e2915.json/default/quicktype.hpp
index ce7aa52..05c0643 100644
--- a/base/cplusplus/test/inputs/json/misc/e2915.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/e2915.json/default/quicktype.hpp
@@ -461,51 +461,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Astronomy & x);
-    void to_json(json & j, const Astronomy & x);
+void from_json(const json & j, Astronomy & x);
+void to_json(json & j, const Astronomy & x);
 
-    void from_json(const json & j, Atmosphere & x);
-    void to_json(json & j, const Atmosphere & x);
+void from_json(const json & j, Atmosphere & x);
+void to_json(json & j, const Atmosphere & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Condition & x);
-    void to_json(json & j, const Condition & x);
+void from_json(const json & j, Condition & x);
+void to_json(json & j, const Condition & x);
 
-    void from_json(const json & j, Forecast & x);
-    void to_json(json & j, const Forecast & x);
+void from_json(const json & j, Forecast & x);
+void to_json(json & j, const Forecast & x);
 
-    void from_json(const json & j, Guid & x);
-    void to_json(json & j, const Guid & x);
+void from_json(const json & j, Guid & x);
+void to_json(json & j, const Guid & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Location & x);
-    void to_json(json & j, const Location & x);
+void from_json(const json & j, Location & x);
+void to_json(json & j, const Location & x);
 
-    void from_json(const json & j, Units & x);
-    void to_json(json & j, const Units & x);
+void from_json(const json & j, Units & x);
+void to_json(json & j, const Units & x);
 
-    void from_json(const json & j, Wind & x);
-    void to_json(json & j, const Wind & x);
+void from_json(const json & j, Wind & x);
+void to_json(json & j, const Wind & x);
 
-    void from_json(const json & j, Channel & x);
-    void to_json(json & j, const Channel & x);
+void from_json(const json & j, Channel & x);
+void to_json(json & j, const Channel & x);
 
-    void from_json(const json & j, Results & x);
-    void to_json(json & j, const Results & x);
+void from_json(const json & j, Results & x);
+void to_json(json & j, const Results & x);
 
-    void from_json(const json & j, Query & x);
-    void to_json(json & j, const Query & x);
+void from_json(const json & j, Query & x);
+void to_json(json & j, const Query & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Text & x);
-    void to_json(json & j, const Text & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Text & x);
+void to_json(json & j, const Text & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Astronomy& x) {
         x.set_sunrise(j.at("sunrise").get<std::string>());
         x.set_sunset(j.at("sunset").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/e2a58.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/e2a58.json/default/quicktype.hpp
index 1e810ee..91100e8 100644
--- a/base/cplusplus/test/inputs/json/misc/e2a58.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/e2a58.json/default/quicktype.hpp
@@ -54,9 +54,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_date(j.at("date").get<std::string>());
         x.set_stop_and_search(j.at("stop-and-search").get<std::vector<std::string>>());
diff --git a/base/cplusplus/test/inputs/json/misc/e324e.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/e324e.json/default/quicktype.hpp
index 7b60c3b..24a3480 100644
--- a/base/cplusplus/test/inputs/json/misc/e324e.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/e324e.json/default/quicktype.hpp
@@ -322,48 +322,49 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Property & x);
-    void to_json(json & j, const Property & x);
+void from_json(const json & j, Property & x);
+void to_json(json & j, const Property & x);
 
-    void from_json(const json & j, Rate & x);
-    void to_json(json & j, const Rate & x);
+void from_json(const json & j, Rate & x);
+void to_json(json & j, const Rate & x);
 
-    void from_json(const json & j, Definitions & x);
-    void to_json(json & j, const Definitions & x);
+void from_json(const json & j, Definitions & x);
+void to_json(json & j, const Definitions & x);
 
-    void from_json(const json & j, Info & x);
-    void to_json(json & j, const Info & x);
+void from_json(const json & j, Info & x);
+void to_json(json & j, const Info & x);
 
-    void from_json(const json & j, Parameter & x);
-    void to_json(json & j, const Parameter & x);
+void from_json(const json & j, Parameter & x);
+void to_json(json & j, const Parameter & x);
 
-    void from_json(const json & j, Items & x);
-    void to_json(json & j, const Items & x);
+void from_json(const json & j, Items & x);
+void to_json(json & j, const Items & x);
 
-    void from_json(const json & j, Schema & x);
-    void to_json(json & j, const Schema & x);
+void from_json(const json & j, Schema & x);
+void to_json(json & j, const Schema & x);
 
-    void from_json(const json & j, The200 & x);
-    void to_json(json & j, const The200 & x);
+void from_json(const json & j, The200 & x);
+void to_json(json & j, const The200 & x);
 
-    void from_json(const json & j, Responses & x);
-    void to_json(json & j, const Responses & x);
+void from_json(const json & j, Responses & x);
+void to_json(json & j, const Responses & x);
 
-    void from_json(const json & j, Get & x);
-    void to_json(json & j, const Get & x);
+void from_json(const json & j, Get & x);
+void to_json(json & j, const Get & x);
 
-    void from_json(const json & j, TariffRatesSearch & x);
-    void to_json(json & j, const TariffRatesSearch & x);
+void from_json(const json & j, TariffRatesSearch & x);
+void to_json(json & j, const TariffRatesSearch & x);
 
-    void from_json(const json & j, Paths & x);
-    void to_json(json & j, const Paths & x);
+void from_json(const json & j, Paths & x);
+void to_json(json & j, const Paths & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Property& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_type(j.at("type").get<Type>());
diff --git a/base/cplusplus/test/inputs/json/misc/e64a0.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/e64a0.json/default/quicktype.hpp
index 194b0b1..5e20b6a 100644
--- a/base/cplusplus/test/inputs/json/misc/e64a0.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/e64a0.json/default/quicktype.hpp
@@ -101,15 +101,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Args & x);
-    void to_json(json & j, const Args & x);
+void from_json(const json & j, Args & x);
+void to_json(json & j, const Args & x);
 
-    void from_json(const json & j, Headers & x);
-    void to_json(json & j, const Headers & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Headers & x);
+void to_json(json & j, const Headers & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Args& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/e8a0b.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/e8a0b.json/default/quicktype.hpp
index 6c7c16a..6b99a38 100644
--- a/base/cplusplus/test/inputs/json/misc/e8a0b.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/e8a0b.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_country(j.at("country").get<Country>());
diff --git a/base/cplusplus/test/inputs/json/misc/e8b04.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/e8b04.json/default/quicktype.hpp
index e9f7ec3..48a3d4d 100644
--- a/base/cplusplus/test/inputs/json/misc/e8b04.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/e8b04.json/default/quicktype.hpp
@@ -945,144 +945,145 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Grant & x);
-    void to_json(json & j, const Grant & x);
+void from_json(const json & j, Grant & x);
+void to_json(json & j, const Grant & x);
 
-    void from_json(const json & j, Test & x);
-    void to_json(json & j, const Test & x);
+void from_json(const json & j, Test & x);
+void to_json(json & j, const Test & x);
 
-    void from_json(const json & j, CustomFields & x);
-    void to_json(json & j, const CustomFields & x);
+void from_json(const json & j, CustomFields & x);
+void to_json(json & j, const CustomFields & x);
 
-    void from_json(const json & j, Group & x);
-    void to_json(json & j, const Group & x);
+void from_json(const json & j, Group & x);
+void to_json(json & j, const Group & x);
 
-    void from_json(const json & j, Order & x);
-    void to_json(json & j, const Order & x);
+void from_json(const json & j, Order & x);
+void to_json(json & j, const Order & x);
 
-    void from_json(const json & j, Select & x);
-    void to_json(json & j, const Select & x);
+void from_json(const json & j, Select & x);
+void to_json(json & j, const Select & x);
 
-    void from_json(const json & j, TableColumnId & x);
-    void to_json(json & j, const TableColumnId & x);
+void from_json(const json & j, TableColumnId & x);
+void to_json(json & j, const TableColumnId & x);
 
-    void from_json(const json & j, ChildMetadata & x);
-    void to_json(json & j, const ChildMetadata & x);
+void from_json(const json & j, ChildMetadata & x);
+void to_json(json & j, const ChildMetadata & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, Where & x);
-    void to_json(json & j, const Where & x);
+void from_json(const json & j, Where & x);
+void to_json(json & j, const Where & x);
 
-    void from_json(const json & j, JsonQuery & x);
-    void to_json(json & j, const JsonQuery & x);
+void from_json(const json & j, JsonQuery & x);
+void to_json(json & j, const JsonQuery & x);
 
-    void from_json(const json & j, PurpleVisible & x);
-    void to_json(json & j, const PurpleVisible & x);
+void from_json(const json & j, PurpleVisible & x);
+void to_json(json & j, const PurpleVisible & x);
 
-    void from_json(const json & j, MetadataRenderTypeConfig & x);
-    void to_json(json & j, const MetadataRenderTypeConfig & x);
+void from_json(const json & j, MetadataRenderTypeConfig & x);
+void to_json(json & j, const MetadataRenderTypeConfig & x);
 
-    void from_json(const json & j, Field & x);
-    void to_json(json & j, const Field & x);
+void from_json(const json & j, Field & x);
+void to_json(json & j, const Field & x);
 
-    void from_json(const json & j, Row & x);
-    void to_json(json & j, const Row & x);
+void from_json(const json & j, Row & x);
+void to_json(json & j, const Row & x);
 
-    void from_json(const json & j, Styles & x);
-    void to_json(json & j, const Styles & x);
+void from_json(const json & j, Styles & x);
+void to_json(json & j, const Styles & x);
 
-    void from_json(const json & j, Column & x);
-    void to_json(json & j, const Column & x);
+void from_json(const json & j, Column & x);
+void to_json(json & j, const Column & x);
 
-    void from_json(const json & j, FatRow & x);
-    void to_json(json & j, const FatRow & x);
+void from_json(const json & j, FatRow & x);
+void to_json(json & j, const FatRow & x);
 
-    void from_json(const json & j, RichRendererConfigs & x);
-    void to_json(json & j, const RichRendererConfigs & x);
+void from_json(const json & j, RichRendererConfigs & x);
+void to_json(json & j, const RichRendererConfigs & x);
 
-    void from_json(const json & j, AccessPoints & x);
-    void to_json(json & j, const AccessPoints & x);
+void from_json(const json & j, AccessPoints & x);
+void to_json(json & j, const AccessPoints & x);
 
-    void from_json(const json & j, FluffyVisible & x);
-    void to_json(json & j, const FluffyVisible & x);
+void from_json(const json & j, FluffyVisible & x);
+void to_json(json & j, const FluffyVisible & x);
 
-    void from_json(const json & j, V1ArchivedPropertiesRenderTypeConfig & x);
-    void to_json(json & j, const V1ArchivedPropertiesRenderTypeConfig & x);
+void from_json(const json & j, V1ArchivedPropertiesRenderTypeConfig & x);
+void to_json(json & j, const V1ArchivedPropertiesRenderTypeConfig & x);
 
-    void from_json(const json & j, V1ArchivedProperties & x);
-    void to_json(json & j, const V1ArchivedProperties & x);
+void from_json(const json & j, V1ArchivedProperties & x);
+void to_json(json & j, const V1ArchivedProperties & x);
 
-    void from_json(const json & j, TopLevelMetadata & x);
-    void to_json(json & j, const TopLevelMetadata & x);
+void from_json(const json & j, TopLevelMetadata & x);
+void to_json(json & j, const TopLevelMetadata & x);
 
-    void from_json(const json & j, Owner & x);
-    void to_json(json & j, const Owner & x);
+void from_json(const json & j, Owner & x);
+void to_json(json & j, const Owner & x);
 
-    void from_json(const json & j, Ratings & x);
-    void to_json(json & j, const Ratings & x);
+void from_json(const json & j, Ratings & x);
+void to_json(json & j, const Ratings & x);
 
-    void from_json(const json & j, TableAuthor & x);
-    void to_json(json & j, const TableAuthor & x);
+void from_json(const json & j, TableAuthor & x);
+void to_json(json & j, const TableAuthor & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
-    void from_json(const json & j, DisplayType & x);
-    void to_json(json & j, const DisplayType & x);
+void from_json(const json & j, DisplayType & x);
+void to_json(json & j, const DisplayType & x);
 
-    void from_json(const json & j, TopLevelFlag & x);
-    void to_json(json & j, const TopLevelFlag & x);
+void from_json(const json & j, TopLevelFlag & x);
+void to_json(json & j, const TopLevelFlag & x);
 
-    void from_json(const json & j, GrantFlag & x);
-    void to_json(json & j, const GrantFlag & x);
+void from_json(const json & j, GrantFlag & x);
+void to_json(json & j, const GrantFlag & x);
 
-    void from_json(const json & j, GrantType & x);
-    void to_json(json & j, const GrantType & x);
+void from_json(const json & j, GrantType & x);
+void to_json(json & j, const GrantType & x);
 
-    void from_json(const json & j, OrderColumnFieldName & x);
-    void to_json(json & j, const OrderColumnFieldName & x);
+void from_json(const json & j, OrderColumnFieldName & x);
+void to_json(json & j, const OrderColumnFieldName & x);
 
-    void from_json(const json & j, ChildOperator & x);
-    void to_json(json & j, const ChildOperator & x);
+void from_json(const json & j, ChildOperator & x);
+void to_json(json & j, const ChildOperator & x);
 
-    void from_json(const json & j, ChildColumnFieldName & x);
-    void to_json(json & j, const ChildColumnFieldName & x);
+void from_json(const json & j, ChildColumnFieldName & x);
+void to_json(json & j, const ChildColumnFieldName & x);
 
-    void from_json(const json & j, MetadataOperator & x);
-    void to_json(json & j, const MetadataOperator & x);
+void from_json(const json & j, MetadataOperator & x);
+void to_json(json & j, const MetadataOperator & x);
 
-    void from_json(const json & j, WhereOperator & x);
-    void to_json(json & j, const WhereOperator & x);
+void from_json(const json & j, WhereOperator & x);
+void to_json(json & j, const WhereOperator & x);
 
-    void from_json(const json & j, FieldType & x);
-    void to_json(json & j, const FieldType & x);
+void from_json(const json & j, FieldType & x);
+void to_json(json & j, const FieldType & x);
 
-    void from_json(const json & j, Width & x);
-    void to_json(json & j, const Width & x);
+void from_json(const json & j, Width & x);
+void to_json(json & j, const Width & x);
 
-    void from_json(const json & j, ModifyingViewUid & x);
-    void to_json(json & j, const ModifyingViewUid & x);
+void from_json(const json & j, ModifyingViewUid & x);
+void to_json(json & j, const ModifyingViewUid & x);
 
-    void from_json(const json & j, RoleName & x);
-    void to_json(json & j, const RoleName & x);
+void from_json(const json & j, RoleName & x);
+void to_json(json & j, const RoleName & x);
 
-    void from_json(const json & j, Provenance & x);
-    void to_json(json & j, const Provenance & x);
+void from_json(const json & j, Provenance & x);
+void to_json(json & j, const Provenance & x);
 
-    void from_json(const json & j, PublicationStage & x);
-    void to_json(json & j, const PublicationStage & x);
+void from_json(const json & j, PublicationStage & x);
+void to_json(json & j, const PublicationStage & x);
 
-    void from_json(const json & j, Right & x);
-    void to_json(json & j, const Right & x);
+void from_json(const json & j, Right & x);
+void to_json(json & j, const Right & x);
 
-    void from_json(const json & j, RowsUpdatedBy & x);
-    void to_json(json & j, const RowsUpdatedBy & x);
-
-    void from_json(const json & j, ViewType & x);
-    void to_json(json & j, const ViewType & x);
+void from_json(const json & j, RowsUpdatedBy & x);
+void to_json(json & j, const RowsUpdatedBy & x);
 
+void from_json(const json & j, ViewType & x);
+void to_json(json & j, const ViewType & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Grant& x) {
         x.set_flags(j.at("flags").get<std::vector<GrantFlag>>());
         x.set_inherited(j.at("inherited").get<bool>());
diff --git a/base/cplusplus/test/inputs/json/misc/f22f5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/f22f5.json/default/quicktype.hpp
index 3c9a8bb..ad1d4f1 100644
--- a/base/cplusplus/test/inputs/json/misc/f22f5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/f22f5.json/default/quicktype.hpp
@@ -483,36 +483,37 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Subreddit & x);
-    void to_json(json & j, const Subreddit & x);
+void from_json(const json & j, Subreddit & x);
+void to_json(json & j, const Subreddit & x);
 
-    void from_json(const json & j, SubredditId & x);
-    void to_json(json & j, const SubredditId & x);
+void from_json(const json & j, SubredditId & x);
+void to_json(json & j, const SubredditId & x);
 
-    void from_json(const json & j, SubredditNamePrefixed & x);
-    void to_json(json & j, const SubredditNamePrefixed & x);
+void from_json(const json & j, SubredditNamePrefixed & x);
+void to_json(json & j, const SubredditNamePrefixed & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, MediaEmbed& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/misc/f3139.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/f3139.json/default/quicktype.hpp
index 0e09f6a..5adbab8 100644
--- a/base/cplusplus/test/inputs/json/misc/f3139.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/f3139.json/default/quicktype.hpp
@@ -54,9 +54,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_id(j.at("id").get<std::string>());
         x.set_name(j.at("name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/f3edf.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/f3edf.json/default/quicktype.hpp
index 6c7c16a..6b99a38 100644
--- a/base/cplusplus/test/inputs/json/misc/f3edf.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/f3edf.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_country(j.at("country").get<Country>());
diff --git a/base/cplusplus/test/inputs/json/misc/f466a.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/f466a.json/default/quicktype.hpp
index 6c7c16a..6b99a38 100644
--- a/base/cplusplus/test/inputs/json/misc/f466a.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/f466a.json/default/quicktype.hpp
@@ -76,12 +76,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Country & x);
-    void to_json(json & j, const Country & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Country & x);
+void to_json(json & j, const Country & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_country(j.at("country").get<Country>());
diff --git a/base/cplusplus/test/inputs/json/misc/f6a65.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/f6a65.json/default/quicktype.hpp
index 9be999b..6b4b676 100644
--- a/base/cplusplus/test/inputs/json/misc/f6a65.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/f6a65.json/default/quicktype.hpp
@@ -566,45 +566,46 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, The480_WStill & x);
-    void to_json(json & j, const The480_WStill & x);
+void from_json(const json & j, The480_WStill & x);
+void to_json(json & j, const The480_WStill & x);
 
-    void from_json(const json & j, DownsizedSmall & x);
-    void to_json(json & j, const DownsizedSmall & x);
+void from_json(const json & j, DownsizedSmall & x);
+void to_json(json & j, const DownsizedSmall & x);
 
-    void from_json(const json & j, FixedHeight & x);
-    void to_json(json & j, const FixedHeight & x);
+void from_json(const json & j, FixedHeight & x);
+void to_json(json & j, const FixedHeight & x);
 
-    void from_json(const json & j, Looping & x);
-    void to_json(json & j, const Looping & x);
+void from_json(const json & j, Looping & x);
+void to_json(json & j, const Looping & x);
 
-    void from_json(const json & j, Images & x);
-    void to_json(json & j, const Images & x);
+void from_json(const json & j, Images & x);
+void to_json(json & j, const Images & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Pagination & x);
-    void to_json(json & j, const Pagination & x);
+void from_json(const json & j, Pagination & x);
+void to_json(json & j, const Pagination & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
-
-    void from_json(const json & j, Username & x);
-    void to_json(json & j, const Username & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
+void from_json(const json & j, Username & x);
+void to_json(json & j, const Username & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, The480_WStill& x) {
         x.set_height(j.at("height").get<std::string>());
         x.set_size(get_stack_optional<std::string>(j, "size"));
diff --git a/base/cplusplus/test/inputs/json/misc/f82d9.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/f82d9.json/default/quicktype.hpp
index 9494329..7145aa9 100644
--- a/base/cplusplus/test/inputs/json/misc/f82d9.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/f82d9.json/default/quicktype.hpp
@@ -381,51 +381,52 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, ClickUrl & x);
-    void to_json(json & j, const ClickUrl & x);
+void from_json(const json & j, ClickUrl & x);
+void to_json(json & j, const ClickUrl & x);
 
-    void from_json(const json & j, Properties & x);
-    void to_json(json & j, const Properties & x);
+void from_json(const json & j, Properties & x);
+void to_json(json & j, const Properties & x);
 
-    void from_json(const json & j, Report & x);
-    void to_json(json & j, const Report & x);
+void from_json(const json & j, Report & x);
+void to_json(json & j, const Report & x);
 
-    void from_json(const json & j, Definitions & x);
-    void to_json(json & j, const Definitions & x);
+void from_json(const json & j, Definitions & x);
+void to_json(json & j, const Definitions & x);
 
-    void from_json(const json & j, Info & x);
-    void to_json(json & j, const Info & x);
+void from_json(const json & j, Info & x);
+void to_json(json & j, const Info & x);
 
-    void from_json(const json & j, Parameter & x);
-    void to_json(json & j, const Parameter & x);
+void from_json(const json & j, Parameter & x);
+void to_json(json & j, const Parameter & x);
 
-    void from_json(const json & j, Items & x);
-    void to_json(json & j, const Items & x);
+void from_json(const json & j, Items & x);
+void to_json(json & j, const Items & x);
 
-    void from_json(const json & j, Schema & x);
-    void to_json(json & j, const Schema & x);
+void from_json(const json & j, Schema & x);
+void to_json(json & j, const Schema & x);
 
-    void from_json(const json & j, The200 & x);
-    void to_json(json & j, const The200 & x);
+void from_json(const json & j, The200 & x);
+void to_json(json & j, const The200 & x);
 
-    void from_json(const json & j, Responses & x);
-    void to_json(json & j, const Responses & x);
+void from_json(const json & j, Responses & x);
+void to_json(json & j, const Responses & x);
 
-    void from_json(const json & j, Get & x);
-    void to_json(json & j, const Get & x);
+void from_json(const json & j, Get & x);
+void to_json(json & j, const Get & x);
 
-    void from_json(const json & j, MarketResearchLibrarySearch & x);
-    void to_json(json & j, const MarketResearchLibrarySearch & x);
+void from_json(const json & j, MarketResearchLibrarySearch & x);
+void to_json(json & j, const MarketResearchLibrarySearch & x);
 
-    void from_json(const json & j, Paths & x);
-    void to_json(json & j, const Paths & x);
+void from_json(const json & j, Paths & x);
+void to_json(json & j, const Paths & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, ClickUrl& x) {
         x.set_description(j.at("description").get<std::string>());
         x.set_type(j.at("type").get<Type>());
diff --git a/base/cplusplus/test/inputs/json/misc/f974d.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/f974d.json/default/quicktype.hpp
index 4a6e1cc..969dbdf 100644
--- a/base/cplusplus/test/inputs/json/misc/f974d.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/f974d.json/default/quicktype.hpp
@@ -67,9 +67,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_block_index(j.at("block_index").get<int64_t>());
         x.set_hash(j.at("hash").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/misc/faff5.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/faff5.json/default/quicktype.hpp
index 309fc4b..7b80505 100644
--- a/base/cplusplus/test/inputs/json/misc/faff5.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/faff5.json/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Response & x);
-    void to_json(json & j, const Response & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Response & x);
+void to_json(json & j, const Response & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Response& x) {
         x.set_player_count(j.at("player_count").get<int64_t>());
         x.set_result(j.at("result").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/misc/fd329.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/misc/fd329.json/default/quicktype.hpp
index 30ee480..40e5858 100644
--- a/base/cplusplus/test/inputs/json/misc/fd329.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/misc/fd329.json/default/quicktype.hpp
@@ -100,15 +100,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Description & x);
-    void to_json(json & j, const Description & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Description & x);
+void to_json(json & j, const Description & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Datum& x) {
         x.set_anomaly(j.at("anomaly").get<std::string>());
         x.set_value(j.at("value").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/blns-object.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/blns-object.json/default/quicktype.hpp
index 5d63848..be2260d 100644
--- a/base/cplusplus/test/inputs/json/priority/blns-object.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/blns-object.json/default/quicktype.hpp
@@ -3004,18 +3004,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, A & x);
-    void to_json(json & j, const A & x);
+void from_json(const json & j, A & x);
+void to_json(json & j, const A & x);
 
-    void from_json(const json & j, B & x);
-    void to_json(json & j, const B & x);
+void from_json(const json & j, B & x);
+void to_json(json & j, const B & x);
 
-    void from_json(const json & j, C & x);
-    void to_json(json & j, const C & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, C & x);
+void to_json(json & j, const C & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, A& x) {
         x.set_12(j.at("パーティーへ行かないか").get<std::string>());
         x.set_13(j.at("和製漢語").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/bug2037.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug2037.json/default/quicktype.hpp
index 741b7dd..fe330ea 100644
--- a/base/cplusplus/test/inputs/json/priority/bug2037.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug2037.json/default/quicktype.hpp
@@ -85,18 +85,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Reward & x);
-    void to_json(json & j, const Reward & x);
+void from_json(const json & j, Reward & x);
+void to_json(json & j, const Reward & x);
 
-    void from_json(const json & j, Objective & x);
-    void to_json(json & j, const Objective & x);
+void from_json(const json & j, Objective & x);
+void to_json(json & j, const Objective & x);
 
-    void from_json(const json & j, MissionSpec & x);
-    void to_json(json & j, const MissionSpec & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, MissionSpec & x);
+void to_json(json & j, const MissionSpec & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Reward& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/priority/bug2521.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug2521.json/default/quicktype.hpp
index 0fe792a..b779e72 100644
--- a/base/cplusplus/test/inputs/json/priority/bug2521.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug2521.json/default/quicktype.hpp
@@ -123,12 +123,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Option & x);
-    void to_json(json & j, const Option & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Option & x);
+void to_json(json & j, const Option & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Option& x) {
         x.set_foo(get_stack_optional<std::string>(j, "foo"));
         x.set_name(j.at("name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/bug2521.json/wstring-use-wstring--3909ec5a1524/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug2521.json/wstring-use-wstring--3909ec5a1524/quicktype.hpp
index 2fccb72..9f08c0a 100644
--- a/base/cplusplus/test/inputs/json/priority/bug2521.json/wstring-use-wstring--3909ec5a1524/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug2521.json/wstring-use-wstring--3909ec5a1524/quicktype.hpp
@@ -193,12 +193,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Option & x);
-    void to_json(json & j, const Option & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Option & x);
+void to_json(json & j, const Option & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Option& x) {
         x.set_foo(Utf16_Utf8<std::optional<std::string>, std::optional<std::wstring>>::convert(get_stack_optional<std::string>(j, Utf16_Utf8<std::wstring, std::string>::convert(L"foo"))));
         x.set_name(Utf16_Utf8<std::string, std::wstring>::convert(j.at(Utf16_Utf8<std::wstring, std::string>::convert(L"name")).get<std::string>()));
diff --git a/base/cplusplus/test/inputs/json/priority/bug2590.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug2590.json/default/quicktype.hpp
index 69e0929..59bbce6 100644
--- a/base/cplusplus/test/inputs/json/priority/bug2590.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug2590.json/default/quicktype.hpp
@@ -125,12 +125,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Invoice & x);
-    void to_json(json & j, const Invoice & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Invoice & x);
+void to_json(json & j, const Invoice & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Invoice& x) {
         x.set_created_at(get_stack_optional<std::string>(j, "createdAt"));
         x.set_due_date(get_stack_optional<std::string>(j, "dueDate"));
diff --git a/base/cplusplus/test/inputs/json/priority/bug2663.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug2663.json/default/quicktype.hpp
index 27f51b5..675a8f7 100644
--- a/base/cplusplus/test/inputs/json/priority/bug2663.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug2663.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_birthday(j.at("birthday").get<std::string>());
         x.set_last_seen(j.at("lastSeen").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/bug2793.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug2793.json/default/quicktype.hpp
index 330c6fe..26d2404 100644
--- a/base/cplusplus/test/inputs/json/priority/bug2793.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug2793.json/default/quicktype.hpp
@@ -81,15 +81,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Hints & x);
-    void to_json(json & j, const Hints & x);
+void from_json(const json & j, Hints & x);
+void to_json(json & j, const Hints & x);
 
-    void from_json(const json & j, Labels & x);
-    void to_json(json & j, const Labels & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Labels & x);
+void to_json(json & j, const Labels & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Hints& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/priority/bug427.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug427.json/default/quicktype.hpp
index 0e21d06..6add0ab 100644
--- a/base/cplusplus/test/inputs/json/priority/bug427.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug427.json/default/quicktype.hpp
@@ -2491,213 +2491,214 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, PurpleComment & x);
-    void to_json(json & j, const PurpleComment & x);
+void from_json(const json & j, PurpleComment & x);
+void to_json(json & j, const PurpleComment & x);
 
-    void from_json(const json & j, PurpleFlags & x);
-    void to_json(json & j, const PurpleFlags & x);
+void from_json(const json & j, PurpleFlags & x);
+void to_json(json & j, const PurpleFlags & x);
 
-    void from_json(const json & j, GetSignatureFlags & x);
-    void to_json(json & j, const GetSignatureFlags & x);
+void from_json(const json & j, GetSignatureFlags & x);
+void to_json(json & j, const GetSignatureFlags & x);
 
-    void from_json(const json & j, ElementType & x);
-    void to_json(json & j, const ElementType & x);
+void from_json(const json & j, ElementType & x);
+void to_json(json & j, const ElementType & x);
 
-    void from_json(const json & j, FluffyComment & x);
-    void to_json(json & j, const FluffyComment & x);
+void from_json(const json & j, FluffyComment & x);
+void to_json(json & j, const FluffyComment & x);
 
-    void from_json(const json & j, FluffyFlags & x);
-    void to_json(json & j, const FluffyFlags & x);
+void from_json(const json & j, FluffyFlags & x);
+void to_json(json & j, const FluffyFlags & x);
 
-    void from_json(const json & j, Source & x);
-    void to_json(json & j, const Source & x);
+void from_json(const json & j, Source & x);
+void to_json(json & j, const Source & x);
 
-    void from_json(const json & j, GetSignatureComment & x);
-    void to_json(json & j, const GetSignatureComment & x);
+void from_json(const json & j, GetSignatureComment & x);
+void to_json(json & j, const GetSignatureComment & x);
 
-    void from_json(const json & j, Group & x);
-    void to_json(json & j, const Group & x);
+void from_json(const json & j, Group & x);
+void to_json(json & j, const Group & x);
 
-    void from_json(const json & j, TentacledComment & x);
-    void to_json(json & j, const TentacledComment & x);
+void from_json(const json & j, TentacledComment & x);
+void to_json(json & j, const TentacledComment & x);
 
-    void from_json(const json & j, TentacledFlags & x);
-    void to_json(json & j, const TentacledFlags & x);
+void from_json(const json & j, TentacledFlags & x);
+void to_json(json & j, const TentacledFlags & x);
 
-    void from_json(const json & j, FluffyType & x);
-    void to_json(json & j, const FluffyType & x);
+void from_json(const json & j, FluffyType & x);
+void to_json(json & j, const FluffyType & x);
 
-    void from_json(const json & j, GetSignatureParameter & x);
-    void to_json(json & j, const GetSignatureParameter & x);
+void from_json(const json & j, GetSignatureParameter & x);
+void to_json(json & j, const GetSignatureParameter & x);
 
-    void from_json(const json & j, GetSignatureType & x);
-    void to_json(json & j, const GetSignatureType & x);
+void from_json(const json & j, GetSignatureType & x);
+void to_json(json & j, const GetSignatureType & x);
 
-    void from_json(const json & j, IndexSignatureElement & x);
-    void to_json(json & j, const IndexSignatureElement & x);
+void from_json(const json & j, IndexSignatureElement & x);
+void to_json(json & j, const IndexSignatureElement & x);
 
-    void from_json(const json & j, PurpleType & x);
-    void to_json(json & j, const PurpleType & x);
+void from_json(const json & j, PurpleType & x);
+void to_json(json & j, const PurpleType & x);
 
-    void from_json(const json & j, GetSignatureChild & x);
-    void to_json(json & j, const GetSignatureChild & x);
+void from_json(const json & j, GetSignatureChild & x);
+void to_json(json & j, const GetSignatureChild & x);
 
-    void from_json(const json & j, GetSignature & x);
-    void to_json(json & j, const GetSignature & x);
+void from_json(const json & j, GetSignature & x);
+void to_json(json & j, const GetSignature & x);
 
-    void from_json(const json & j, PurpleDeclaration & x);
-    void to_json(json & j, const PurpleDeclaration & x);
+void from_json(const json & j, PurpleDeclaration & x);
+void to_json(json & j, const PurpleDeclaration & x);
 
-    void from_json(const json & j, TentacledType & x);
-    void to_json(json & j, const TentacledType & x);
+void from_json(const json & j, TentacledType & x);
+void to_json(json & j, const TentacledType & x);
 
-    void from_json(const json & j, PurpleSignature & x);
-    void to_json(json & j, const PurpleSignature & x);
+void from_json(const json & j, PurpleSignature & x);
+void to_json(json & j, const PurpleSignature & x);
 
-    void from_json(const json & j, TypeElement & x);
-    void to_json(json & j, const TypeElement & x);
+void from_json(const json & j, TypeElement & x);
+void to_json(json & j, const TypeElement & x);
 
-    void from_json(const json & j, TentacledChild & x);
-    void to_json(json & j, const TentacledChild & x);
+void from_json(const json & j, TentacledChild & x);
+void to_json(json & j, const TentacledChild & x);
 
-    void from_json(const json & j, Tag & x);
-    void to_json(json & j, const Tag & x);
+void from_json(const json & j, Tag & x);
+void to_json(json & j, const Tag & x);
 
-    void from_json(const json & j, StickyComment & x);
-    void to_json(json & j, const StickyComment & x);
+void from_json(const json & j, StickyComment & x);
+void to_json(json & j, const StickyComment & x);
 
-    void from_json(const json & j, StickyFlags & x);
-    void to_json(json & j, const StickyFlags & x);
+void from_json(const json & j, StickyFlags & x);
+void to_json(json & j, const StickyFlags & x);
 
-    void from_json(const json & j, ExtendedBy & x);
-    void to_json(json & j, const ExtendedBy & x);
+void from_json(const json & j, ExtendedBy & x);
+void to_json(json & j, const ExtendedBy & x);
 
-    void from_json(const json & j, IndigoFlags & x);
-    void to_json(json & j, const IndigoFlags & x);
+void from_json(const json & j, IndigoFlags & x);
+void to_json(json & j, const IndigoFlags & x);
 
-    void from_json(const json & j, StickyType & x);
-    void to_json(json & j, const StickyType & x);
+void from_json(const json & j, StickyType & x);
+void to_json(json & j, const StickyType & x);
 
-    void from_json(const json & j, PurpleParameter & x);
-    void to_json(json & j, const PurpleParameter & x);
+void from_json(const json & j, PurpleParameter & x);
+void to_json(json & j, const PurpleParameter & x);
 
-    void from_json(const json & j, FluffySignature & x);
-    void to_json(json & j, const FluffySignature & x);
+void from_json(const json & j, FluffySignature & x);
+void to_json(json & j, const FluffySignature & x);
 
-    void from_json(const json & j, IndecentType & x);
-    void to_json(json & j, const IndecentType & x);
+void from_json(const json & j, IndecentType & x);
+void to_json(json & j, const IndecentType & x);
 
-    void from_json(const json & j, StickyChild & x);
-    void to_json(json & j, const StickyChild & x);
+void from_json(const json & j, StickyChild & x);
+void to_json(json & j, const StickyChild & x);
 
-    void from_json(const json & j, HilariousType & x);
-    void to_json(json & j, const HilariousType & x);
+void from_json(const json & j, HilariousType & x);
+void to_json(json & j, const HilariousType & x);
 
-    void from_json(const json & j, IndexSignature & x);
-    void to_json(json & j, const IndexSignature & x);
+void from_json(const json & j, IndexSignature & x);
+void to_json(json & j, const IndexSignature & x);
 
-    void from_json(const json & j, IndigoComment & x);
-    void to_json(json & j, const IndigoComment & x);
+void from_json(const json & j, IndigoComment & x);
+void to_json(json & j, const IndigoComment & x);
 
-    void from_json(const json & j, FluffyParameter & x);
-    void to_json(json & j, const FluffyParameter & x);
+void from_json(const json & j, FluffyParameter & x);
+void to_json(json & j, const FluffyParameter & x);
 
-    void from_json(const json & j, TentacledSignature & x);
-    void to_json(json & j, const TentacledSignature & x);
+void from_json(const json & j, TentacledSignature & x);
+void to_json(json & j, const TentacledSignature & x);
 
-    void from_json(const json & j, FluffyDeclaration & x);
-    void to_json(json & j, const FluffyDeclaration & x);
+void from_json(const json & j, FluffyDeclaration & x);
+void to_json(json & j, const FluffyDeclaration & x);
 
-    void from_json(const json & j, PurpleTypeArgument & x);
-    void to_json(json & j, const PurpleTypeArgument & x);
+void from_json(const json & j, PurpleTypeArgument & x);
+void to_json(json & j, const PurpleTypeArgument & x);
 
-    void from_json(const json & j, IndigoType & x);
-    void to_json(json & j, const IndigoType & x);
+void from_json(const json & j, IndigoType & x);
+void to_json(json & j, const IndigoType & x);
 
-    void from_json(const json & j, FluffyChild & x);
-    void to_json(json & j, const FluffyChild & x);
+void from_json(const json & j, FluffyChild & x);
+void to_json(json & j, const FluffyChild & x);
 
-    void from_json(const json & j, IndecentFlags & x);
-    void to_json(json & j, const IndecentFlags & x);
+void from_json(const json & j, IndecentFlags & x);
+void to_json(json & j, const IndecentFlags & x);
 
-    void from_json(const json & j, IndigoChild & x);
-    void to_json(json & j, const IndigoChild & x);
+void from_json(const json & j, IndigoChild & x);
+void to_json(json & j, const IndigoChild & x);
 
-    void from_json(const json & j, TentacledDeclaration & x);
-    void to_json(json & j, const TentacledDeclaration & x);
+void from_json(const json & j, TentacledDeclaration & x);
+void to_json(json & j, const TentacledDeclaration & x);
 
-    void from_json(const json & j, AmbitiousType & x);
-    void to_json(json & j, const AmbitiousType & x);
+void from_json(const json & j, AmbitiousType & x);
+void to_json(json & j, const AmbitiousType & x);
 
-    void from_json(const json & j, TentacledParameter & x);
-    void to_json(json & j, const TentacledParameter & x);
+void from_json(const json & j, TentacledParameter & x);
+void to_json(json & j, const TentacledParameter & x);
 
-    void from_json(const json & j, CunningType & x);
-    void to_json(json & j, const CunningType & x);
+void from_json(const json & j, CunningType & x);
+void to_json(json & j, const CunningType & x);
 
-    void from_json(const json & j, StickySignature & x);
-    void to_json(json & j, const StickySignature & x);
+void from_json(const json & j, StickySignature & x);
+void to_json(json & j, const StickySignature & x);
 
-    void from_json(const json & j, IndigoDeclaration & x);
-    void to_json(json & j, const IndigoDeclaration & x);
+void from_json(const json & j, IndigoDeclaration & x);
+void to_json(json & j, const IndigoDeclaration & x);
 
-    void from_json(const json & j, FriskyType & x);
-    void to_json(json & j, const FriskyType & x);
+void from_json(const json & j, FriskyType & x);
+void to_json(json & j, const FriskyType & x);
 
-    void from_json(const json & j, IndecentChild & x);
-    void to_json(json & j, const IndecentChild & x);
+void from_json(const json & j, IndecentChild & x);
+void to_json(json & j, const IndecentChild & x);
 
-    void from_json(const json & j, StickyDeclaration & x);
-    void to_json(json & j, const StickyDeclaration & x);
+void from_json(const json & j, StickyDeclaration & x);
+void to_json(json & j, const StickyDeclaration & x);
 
-    void from_json(const json & j, FluffyTypeArgument & x);
-    void to_json(json & j, const FluffyTypeArgument & x);
+void from_json(const json & j, FluffyTypeArgument & x);
+void to_json(json & j, const FluffyTypeArgument & x);
 
-    void from_json(const json & j, MagentaType & x);
-    void to_json(json & j, const MagentaType & x);
+void from_json(const json & j, MagentaType & x);
+void to_json(json & j, const MagentaType & x);
 
-    void from_json(const json & j, MischievousType & x);
-    void to_json(json & j, const MischievousType & x);
+void from_json(const json & j, MischievousType & x);
+void to_json(json & j, const MischievousType & x);
 
-    void from_json(const json & j, TypeParameter & x);
-    void to_json(json & j, const TypeParameter & x);
+void from_json(const json & j, TypeParameter & x);
+void to_json(json & j, const TypeParameter & x);
 
-    void from_json(const json & j, PurpleChild & x);
-    void to_json(json & j, const PurpleChild & x);
+void from_json(const json & j, PurpleChild & x);
+void to_json(json & j, const PurpleChild & x);
 
-    void from_json(const json & j, IndecentComment & x);
-    void to_json(json & j, const IndecentComment & x);
+void from_json(const json & j, IndecentComment & x);
+void to_json(json & j, const IndecentComment & x);
 
-    void from_json(const json & j, TopLevelChild & x);
-    void to_json(json & j, const TopLevelChild & x);
+void from_json(const json & j, TopLevelChild & x);
+void to_json(json & j, const TopLevelChild & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, PurpleKindString & x);
-    void to_json(json & j, const PurpleKindString & x);
+void from_json(const json & j, PurpleKindString & x);
+void to_json(json & j, const PurpleKindString & x);
 
-    void from_json(const json & j, SignatureKindString & x);
-    void to_json(json & j, const SignatureKindString & x);
+void from_json(const json & j, SignatureKindString & x);
+void to_json(json & j, const SignatureKindString & x);
 
-    void from_json(const json & j, Name & x);
-    void to_json(json & j, const Name & x);
+void from_json(const json & j, Name & x);
+void to_json(json & j, const Name & x);
 
-    void from_json(const json & j, TypeEnum & x);
-    void to_json(json & j, const TypeEnum & x);
+void from_json(const json & j, TypeEnum & x);
+void to_json(json & j, const TypeEnum & x);
 
-    void from_json(const json & j, FileName & x);
-    void to_json(json & j, const FileName & x);
+void from_json(const json & j, FileName & x);
+void to_json(json & j, const FileName & x);
 
-    void from_json(const json & j, ParameterKindString & x);
-    void to_json(json & j, const ParameterKindString & x);
+void from_json(const json & j, ParameterKindString & x);
+void to_json(json & j, const ParameterKindString & x);
 
-    void from_json(const json & j, FluffyKindString & x);
-    void to_json(json & j, const FluffyKindString & x);
-
-    void from_json(const json & j, TentacledKindString & x);
-    void to_json(json & j, const TentacledKindString & x);
+void from_json(const json & j, FluffyKindString & x);
+void to_json(json & j, const FluffyKindString & x);
 
+void from_json(const json & j, TentacledKindString & x);
+void to_json(json & j, const TentacledKindString & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, PurpleComment& x) {
         x.set_short_text(j.at("shortText").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/priority/bug790.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug790.json/default/quicktype.hpp
index d36cadd..76c8ea2 100644
--- a/base/cplusplus/test/inputs/json/priority/bug790.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug790.json/default/quicktype.hpp
@@ -82,9 +82,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_children_data(j.at("children_data").get<std::vector<TopLevel>>());
         x.set_id(j.at("id").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/priority/bug855-short.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/bug855-short.json/default/quicktype.hpp
index c09f9b3..e752466 100644
--- a/base/cplusplus/test/inputs/json/priority/bug855-short.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/bug855-short.json/default/quicktype.hpp
@@ -69,9 +69,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelValue & x);
-    void to_json(json & j, const TopLevelValue & x);
-
+void from_json(const json & j, TopLevelValue & x);
+void to_json(json & j, const TopLevelValue & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelValue& x) {
         x.set_channel_id(j.at("channel_id").get<std::string>());
         x.set_channel_name(j.at("channel_name").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/coin-pairs.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/coin-pairs.json/default/quicktype.hpp
index 7600af7..1134ce7 100644
--- a/base/cplusplus/test/inputs/json/priority/coin-pairs.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/coin-pairs.json/default/quicktype.hpp
@@ -101,12 +101,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Pair & x);
-    void to_json(json & j, const Pair & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Pair & x);
+void to_json(json & j, const Pair & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Pair& x) {
         x.set_decimal_places(j.at("decimal_places").get<int64_t>());
         x.set_fee(j.at("fee").get<double>());
diff --git a/base/cplusplus/test/inputs/json/priority/combined-enum.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/combined-enum.json/default/quicktype.hpp
index 8a64e66..f146b2d 100644
--- a/base/cplusplus/test/inputs/json/priority/combined-enum.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/combined-enum.json/default/quicktype.hpp
@@ -68,15 +68,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Bar & x);
-    void to_json(json & j, const Bar & x);
+void from_json(const json & j, Bar & x);
+void to_json(json & j, const Bar & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, X & x);
-    void to_json(json & j, const X & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, X & x);
+void to_json(json & j, const X & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Bar& x) {
         x.set_x(j.at("x").get<X>());
     }
diff --git a/base/cplusplus/test/inputs/json/priority/direct-recursive.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/direct-recursive.json/default/quicktype.hpp
index 701bc16..2243e83 100644
--- a/base/cplusplus/test/inputs/json/priority/direct-recursive.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/direct-recursive.json/default/quicktype.hpp
@@ -124,9 +124,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_also(get_heap_optional<TopLevel>(j, "also"));
         x.set_bar(j.at("bar").get<bool>());
diff --git a/base/cplusplus/test/inputs/json/priority/empty-enum.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/empty-enum.json/default/quicktype.hpp
index cfbd1dd..6f370c5 100644
--- a/base/cplusplus/test/inputs/json/priority/empty-enum.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/empty-enum.json/default/quicktype.hpp
@@ -118,12 +118,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Foo & x);
-    void to_json(json & j, const Foo & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Foo & x);
+void to_json(json & j, const Foo & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Foo& x) {
         x.set_bar(get_stack_optional<std::string>(j, "bar"));
     }
diff --git a/base/cplusplus/test/inputs/json/priority/identifiers.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/identifiers.json/default/quicktype.hpp
index abb7306..1e1bbb8 100644
--- a/base/cplusplus/test/inputs/json/priority/identifiers.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/identifiers.json/default/quicktype.hpp
@@ -167,27 +167,28 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelBla & x);
-    void to_json(json & j, const TopLevelBla & x);
+void from_json(const json & j, TopLevelBla & x);
+void to_json(json & j, const TopLevelBla & x);
 
-    void from_json(const json & j, Empty & x);
-    void to_json(json & j, const Empty & x);
+void from_json(const json & j, Empty & x);
+void to_json(json & j, const Empty & x);
 
-    void from_json(const json & j, FooBla & x);
-    void to_json(json & j, const FooBla & x);
+void from_json(const json & j, FooBla & x);
+void to_json(json & j, const FooBla & x);
 
-    void from_json(const json & j, Foo & x);
-    void to_json(json & j, const Foo & x);
+void from_json(const json & j, Foo & x);
+void to_json(json & j, const Foo & x);
 
-    void from_json(const json & j, ThisIsAToughOne & x);
-    void to_json(json & j, const ThisIsAToughOne & x);
+void from_json(const json & j, ThisIsAToughOne & x);
+void to_json(json & j, const ThisIsAToughOne & x);
 
-    void from_json(const json & j, EmptyClass & x);
-    void to_json(json & j, const EmptyClass & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, EmptyClass & x);
+void to_json(json & j, const EmptyClass & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelBla& x) {
         x.set_bar(j.at("bar").get<int64_t>());
     }
diff --git a/base/cplusplus/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.hpp
index fc5eaca..07e03bc 100644
--- a/base/cplusplus/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.hpp
@@ -49,9 +49,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_key(j.at("key").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/priority/keywords.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/keywords.json/default/quicktype.hpp
index ed4a215..de32f56 100644
--- a/base/cplusplus/test/inputs/json/priority/keywords.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/keywords.json/default/quicktype.hpp
@@ -5443,861 +5443,862 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Abstract & x);
-    void to_json(json & j, const Abstract & x);
+void from_json(const json & j, Abstract & x);
+void to_json(json & j, const Abstract & x);
 
-    void from_json(const json & j, Any & x);
-    void to_json(json & j, const Any & x);
+void from_json(const json & j, Any & x);
+void to_json(json & j, const Any & x);
 
-    void from_json(const json & j, Array & x);
-    void to_json(json & j, const Array & x);
+void from_json(const json & j, Array & x);
+void to_json(json & j, const Array & x);
 
-    void from_json(const json & j, As & x);
-    void to_json(json & j, const As & x);
+void from_json(const json & j, As & x);
+void to_json(json & j, const As & x);
 
-    void from_json(const json & j, Assert & x);
-    void to_json(json & j, const Assert & x);
+void from_json(const json & j, Assert & x);
+void to_json(json & j, const Assert & x);
 
-    void from_json(const json & j, Associatedtype & x);
-    void to_json(json & j, const Associatedtype & x);
+void from_json(const json & j, Associatedtype & x);
+void to_json(json & j, const Associatedtype & x);
 
-    void from_json(const json & j, Associativity & x);
-    void to_json(json & j, const Associativity & x);
+void from_json(const json & j, Associativity & x);
+void to_json(json & j, const Associativity & x);
 
-    void from_json(const json & j, Async & x);
-    void to_json(json & j, const Async & x);
+void from_json(const json & j, Async & x);
+void to_json(json & j, const Async & x);
 
-    void from_json(const json & j, Atomic & x);
-    void to_json(json & j, const Atomic & x);
+void from_json(const json & j, Atomic & x);
+void to_json(json & j, const Atomic & x);
 
-    void from_json(const json & j, Await & x);
-    void to_json(json & j, const Await & x);
+void from_json(const json & j, Await & x);
+void to_json(json & j, const Await & x);
 
-    void from_json(const json & j, Base & x);
-    void to_json(json & j, const Base & x);
+void from_json(const json & j, Base & x);
+void to_json(json & j, const Base & x);
 
-    void from_json(const json & j, Boolean & x);
-    void to_json(json & j, const Boolean & x);
+void from_json(const json & j, Boolean & x);
+void to_json(json & j, const Boolean & x);
 
-    void from_json(const json & j, Bycopy & x);
-    void to_json(json & j, const Bycopy & x);
+void from_json(const json & j, Bycopy & x);
+void to_json(json & j, const Bycopy & x);
 
-    void from_json(const json & j, Byref & x);
-    void to_json(json & j, const Byref & x);
+void from_json(const json & j, Byref & x);
+void to_json(json & j, const Byref & x);
 
-    void from_json(const json & j, Byte & x);
-    void to_json(json & j, const Byte & x);
+void from_json(const json & j, Byte & x);
+void to_json(json & j, const Byte & x);
 
-    void from_json(const json & j, Chan & x);
-    void to_json(json & j, const Chan & x);
+void from_json(const json & j, Chan & x);
+void to_json(json & j, const Chan & x);
 
-    void from_json(const json & j, Checked & x);
-    void to_json(json & j, const Checked & x);
+void from_json(const json & j, Checked & x);
+void to_json(json & j, const Checked & x);
 
-    void from_json(const json & j, Clone & x);
-    void to_json(json & j, const Clone & x);
+void from_json(const json & j, Clone & x);
+void to_json(json & j, const Clone & x);
 
-    void from_json(const json & j, Complex & x);
-    void to_json(json & j, const Complex & x);
+void from_json(const json & j, Complex & x);
+void to_json(json & j, const Complex & x);
 
-    void from_json(const json & j, Console & x);
-    void to_json(json & j, const Console & x);
+void from_json(const json & j, Console & x);
+void to_json(json & j, const Console & x);
 
-    void from_json(const json & j, Constructor & x);
-    void to_json(json & j, const Constructor & x);
+void from_json(const json & j, Constructor & x);
+void to_json(json & j, const Constructor & x);
 
-    void from_json(const json & j, Convenience & x);
-    void to_json(json & j, const Convenience & x);
+void from_json(const json & j, Convenience & x);
+void to_json(json & j, const Convenience & x);
 
-    void from_json(const json & j, Convert & x);
-    void to_json(json & j, const Convert & x);
+void from_json(const json & j, Convert & x);
+void to_json(json & j, const Convert & x);
 
-    void from_json(const json & j, Converter & x);
-    void to_json(json & j, const Converter & x);
+void from_json(const json & j, Converter & x);
+void to_json(json & j, const Converter & x);
 
-    void from_json(const json & j, Date & x);
-    void to_json(json & j, const Date & x);
+void from_json(const json & j, Date & x);
+void to_json(json & j, const Date & x);
 
-    void from_json(const json & j, DateParseHandling & x);
-    void to_json(json & j, const DateParseHandling & x);
+void from_json(const json & j, DateParseHandling & x);
+void to_json(json & j, const DateParseHandling & x);
 
-    void from_json(const json & j, Debugger & x);
-    void to_json(json & j, const Debugger & x);
+void from_json(const json & j, Debugger & x);
+void to_json(json & j, const Debugger & x);
 
-    void from_json(const json & j, Decimal & x);
-    void to_json(json & j, const Decimal & x);
+void from_json(const json & j, Decimal & x);
+void to_json(json & j, const Decimal & x);
 
-    void from_json(const json & j, Declare & x);
-    void to_json(json & j, const Declare & x);
+void from_json(const json & j, Declare & x);
+void to_json(json & j, const Declare & x);
 
-    void from_json(const json & j, DecodeString & x);
-    void to_json(json & j, const DecodeString & x);
+void from_json(const json & j, DecodeString & x);
+void to_json(json & j, const DecodeString & x);
 
-    void from_json(const json & j, Empty & x);
-    void to_json(json & j, const Empty & x);
+void from_json(const json & j, Empty & x);
+void to_json(json & j, const Empty & x);
 
-    void from_json(const json & j, Obj1Bool & x);
-    void to_json(json & j, const Obj1Bool & x);
+void from_json(const json & j, Obj1Bool & x);
+void to_json(json & j, const Obj1Bool & x);
 
-    void from_json(const json & j, Imaginery & x);
-    void to_json(json & j, const Imaginery & x);
+void from_json(const json & j, Imaginery & x);
+void to_json(json & j, const Imaginery & x);
 
-    void from_json(const json & j, Alignas & x);
-    void to_json(json & j, const Alignas & x);
+void from_json(const json & j, Alignas & x);
+void to_json(json & j, const Alignas & x);
 
-    void from_json(const json & j, Alignof & x);
-    void to_json(json & j, const Alignof & x);
+void from_json(const json & j, Alignof & x);
+void to_json(json & j, const Alignof & x);
 
-    void from_json(const json & j, And & x);
-    void to_json(json & j, const And & x);
+void from_json(const json & j, And & x);
+void to_json(json & j, const And & x);
 
-    void from_json(const json & j, AndEq & x);
-    void to_json(json & j, const AndEq & x);
+void from_json(const json & j, AndEq & x);
+void to_json(json & j, const AndEq & x);
 
-    void from_json(const json & j, AnyClass & x);
-    void to_json(json & j, const AnyClass & x);
+void from_json(const json & j, AnyClass & x);
+void to_json(json & j, const AnyClass & x);
 
-    void from_json(const json & j, Asm & x);
-    void to_json(json & j, const Asm & x);
+void from_json(const json & j, Asm & x);
+void to_json(json & j, const Asm & x);
 
-    void from_json(const json & j, AtomicCancel & x);
-    void to_json(json & j, const AtomicCancel & x);
+void from_json(const json & j, AtomicCancel & x);
+void to_json(json & j, const AtomicCancel & x);
 
-    void from_json(const json & j, AtomicCommit & x);
-    void to_json(json & j, const AtomicCommit & x);
+void from_json(const json & j, AtomicCommit & x);
+void to_json(json & j, const AtomicCommit & x);
 
-    void from_json(const json & j, AtomicNoexcept & x);
-    void to_json(json & j, const AtomicNoexcept & x);
+void from_json(const json & j, AtomicNoexcept & x);
+void to_json(json & j, const AtomicNoexcept & x);
 
-    void from_json(const json & j, Auto & x);
-    void to_json(json & j, const Auto & x);
+void from_json(const json & j, Auto & x);
+void to_json(json & j, const Auto & x);
 
-    void from_json(const json & j, Bitand & x);
-    void to_json(json & j, const Bitand & x);
+void from_json(const json & j, Bitand & x);
+void to_json(json & j, const Bitand & x);
 
-    void from_json(const json & j, Bitor & x);
-    void to_json(json & j, const Bitor & x);
+void from_json(const json & j, Bitor & x);
+void to_json(json & j, const Bitor & x);
 
-    void from_json(const json & j, Bool & x);
-    void to_json(json & j, const Bool & x);
+void from_json(const json & j, Bool & x);
+void to_json(json & j, const Bool & x);
 
-    void from_json(const json & j, Break & x);
-    void to_json(json & j, const Break & x);
+void from_json(const json & j, Break & x);
+void to_json(json & j, const Break & x);
 
-    void from_json(const json & j, Case & x);
-    void to_json(json & j, const Case & x);
+void from_json(const json & j, Case & x);
+void to_json(json & j, const Case & x);
 
-    void from_json(const json & j, Catch & x);
-    void to_json(json & j, const Catch & x);
+void from_json(const json & j, Catch & x);
+void to_json(json & j, const Catch & x);
 
-    void from_json(const json & j, Char & x);
-    void to_json(json & j, const Char & x);
+void from_json(const json & j, Char & x);
+void to_json(json & j, const Char & x);
 
-    void from_json(const json & j, Char16T & x);
-    void to_json(json & j, const Char16T & x);
+void from_json(const json & j, Char16T & x);
+void to_json(json & j, const Char16T & x);
 
-    void from_json(const json & j, Char32T & x);
-    void to_json(json & j, const Char32T & x);
+void from_json(const json & j, Char32T & x);
+void to_json(json & j, const Char32T & x);
 
-    void from_json(const json & j, Class & x);
-    void to_json(json & j, const Class & x);
+void from_json(const json & j, Class & x);
+void to_json(json & j, const Class & x);
 
-    void from_json(const json & j, CoAwait & x);
-    void to_json(json & j, const CoAwait & x);
+void from_json(const json & j, CoAwait & x);
+void to_json(json & j, const CoAwait & x);
 
-    void from_json(const json & j, CoReturn & x);
-    void to_json(json & j, const CoReturn & x);
+void from_json(const json & j, CoReturn & x);
+void to_json(json & j, const CoReturn & x);
 
-    void from_json(const json & j, CoYield & x);
-    void to_json(json & j, const CoYield & x);
+void from_json(const json & j, CoYield & x);
+void to_json(json & j, const CoYield & x);
 
-    void from_json(const json & j, Compl & x);
-    void to_json(json & j, const Compl & x);
+void from_json(const json & j, Compl & x);
+void to_json(json & j, const Compl & x);
 
-    void from_json(const json & j, Concept & x);
-    void to_json(json & j, const Concept & x);
+void from_json(const json & j, Concept & x);
+void to_json(json & j, const Concept & x);
 
-    void from_json(const json & j, Const & x);
-    void to_json(json & j, const Const & x);
+void from_json(const json & j, Const & x);
+void to_json(json & j, const Const & x);
 
-    void from_json(const json & j, ConstCast & x);
-    void to_json(json & j, const ConstCast & x);
+void from_json(const json & j, ConstCast & x);
+void to_json(json & j, const ConstCast & x);
 
-    void from_json(const json & j, Constexpr & x);
-    void to_json(json & j, const Constexpr & x);
+void from_json(const json & j, Constexpr & x);
+void to_json(json & j, const Constexpr & x);
 
-    void from_json(const json & j, Continue & x);
-    void to_json(json & j, const Continue & x);
+void from_json(const json & j, Continue & x);
+void to_json(json & j, const Continue & x);
 
-    void from_json(const json & j, Decltype & x);
-    void to_json(json & j, const Decltype & x);
+void from_json(const json & j, Decltype & x);
+void to_json(json & j, const Decltype & x);
 
-    void from_json(const json & j, BoolClass & x);
-    void to_json(json & j, const BoolClass & x);
+void from_json(const json & j, BoolClass & x);
+void to_json(json & j, const BoolClass & x);
 
-    void from_json(const json & j, ClassClass & x);
-    void to_json(json & j, const ClassClass & x);
+void from_json(const json & j, ClassClass & x);
+void to_json(json & j, const ClassClass & x);
 
-    void from_json(const json & j, Obj1 & x);
-    void to_json(json & j, const Obj1 & x);
+void from_json(const json & j, Obj1 & x);
+void to_json(json & j, const Obj1 & x);
 
-    void from_json(const json & j, Def & x);
-    void to_json(json & j, const Def & x);
+void from_json(const json & j, Def & x);
+void to_json(json & j, const Def & x);
 
-    void from_json(const json & j, Defer & x);
-    void to_json(json & j, const Defer & x);
+void from_json(const json & j, Defer & x);
+void to_json(json & j, const Defer & x);
 
-    void from_json(const json & j, Deinit & x);
-    void to_json(json & j, const Deinit & x);
+void from_json(const json & j, Deinit & x);
+void to_json(json & j, const Deinit & x);
 
-    void from_json(const json & j, Del & x);
-    void to_json(json & j, const Del & x);
+void from_json(const json & j, Del & x);
+void to_json(json & j, const Del & x);
 
-    void from_json(const json & j, Delegate & x);
-    void to_json(json & j, const Delegate & x);
+void from_json(const json & j, Delegate & x);
+void to_json(json & j, const Delegate & x);
 
-    void from_json(const json & j, Dict & x);
-    void to_json(json & j, const Dict & x);
+void from_json(const json & j, Dict & x);
+void to_json(json & j, const Dict & x);
 
-    void from_json(const json & j, Dictionary & x);
-    void to_json(json & j, const Dictionary & x);
+void from_json(const json & j, Dictionary & x);
+void to_json(json & j, const Dictionary & x);
 
-    void from_json(const json & j, DidSet & x);
-    void to_json(json & j, const DidSet & x);
+void from_json(const json & j, DidSet & x);
+void to_json(json & j, const DidSet & x);
 
-    void from_json(const json & j, Dynamic & x);
-    void to_json(json & j, const Dynamic & x);
+void from_json(const json & j, Dynamic & x);
+void to_json(json & j, const Dynamic & x);
 
-    void from_json(const json & j, Elif & x);
-    void to_json(json & j, const Elif & x);
+void from_json(const json & j, Elif & x);
+void to_json(json & j, const Elif & x);
 
-    void from_json(const json & j, EncodeQuickType & x);
-    void to_json(json & j, const EncodeQuickType & x);
+void from_json(const json & j, EncodeQuickType & x);
+void to_json(json & j, const EncodeQuickType & x);
 
-    void from_json(const json & j, EqualityContract & x);
-    void to_json(json & j, const EqualityContract & x);
+void from_json(const json & j, EqualityContract & x);
+void to_json(json & j, const EqualityContract & x);
 
-    void from_json(const json & j, Event & x);
-    void to_json(json & j, const Event & x);
+void from_json(const json & j, Event & x);
+void to_json(json & j, const Event & x);
 
-    void from_json(const json & j, Except & x);
-    void to_json(json & j, const Except & x);
+void from_json(const json & j, Except & x);
+void to_json(json & j, const Except & x);
 
-    void from_json(const json & j, Exception & x);
-    void to_json(json & j, const Exception & x);
+void from_json(const json & j, Exception & x);
+void to_json(json & j, const Exception & x);
 
-    void from_json(const json & j, Exposing & x);
-    void to_json(json & j, const Exposing & x);
+void from_json(const json & j, Exposing & x);
+void to_json(json & j, const Exposing & x);
 
-    void from_json(const json & j, Extends & x);
-    void to_json(json & j, const Extends & x);
+void from_json(const json & j, Extends & x);
+void to_json(json & j, const Extends & x);
 
-    void from_json(const json & j, Extension & x);
-    void to_json(json & j, const Extension & x);
+void from_json(const json & j, Extension & x);
+void to_json(json & j, const Extension & x);
 
-    void from_json(const json & j, Fallthrough & x);
-    void to_json(json & j, const Fallthrough & x);
+void from_json(const json & j, Fallthrough & x);
+void to_json(json & j, const Fallthrough & x);
 
-    void from_json(const json & j, Fileprivate & x);
-    void to_json(json & j, const Fileprivate & x);
+void from_json(const json & j, Fileprivate & x);
+void to_json(json & j, const Fileprivate & x);
 
-    void from_json(const json & j, Finally & x);
-    void to_json(json & j, const Finally & x);
+void from_json(const json & j, Finally & x);
+void to_json(json & j, const Finally & x);
 
-    void from_json(const json & j, Fixed & x);
-    void to_json(json & j, const Fixed & x);
+void from_json(const json & j, Fixed & x);
+void to_json(json & j, const Fixed & x);
 
-    void from_json(const json & j, Foreach & x);
-    void to_json(json & j, const Foreach & x);
+void from_json(const json & j, Foreach & x);
+void to_json(json & j, const Foreach & x);
 
-    void from_json(const json & j, From & x);
-    void to_json(json & j, const From & x);
+void from_json(const json & j, From & x);
+void to_json(json & j, const From & x);
 
-    void from_json(const json & j, FromJson & x);
-    void to_json(json & j, const FromJson & x);
+void from_json(const json & j, FromJson & x);
+void to_json(json & j, const FromJson & x);
 
-    void from_json(const json & j, Func & x);
-    void to_json(json & j, const Func & x);
+void from_json(const json & j, Func & x);
+void to_json(json & j, const Func & x);
 
-    void from_json(const json & j, Function & x);
-    void to_json(json & j, const Function & x);
+void from_json(const json & j, Function & x);
+void to_json(json & j, const Function & x);
 
-    void from_json(const json & j, Get & x);
-    void to_json(json & j, const Get & x);
+void from_json(const json & j, Get & x);
+void to_json(json & j, const Get & x);
 
-    void from_json(const json & j, Global & x);
-    void to_json(json & j, const Global & x);
+void from_json(const json & j, Global & x);
+void to_json(json & j, const Global & x);
 
-    void from_json(const json & j, Go & x);
-    void to_json(json & j, const Go & x);
+void from_json(const json & j, Go & x);
+void to_json(json & j, const Go & x);
 
-    void from_json(const json & j, Guard & x);
-    void to_json(json & j, const Guard & x);
+void from_json(const json & j, Guard & x);
+void to_json(json & j, const Guard & x);
 
-    void from_json(const json & j, HasOwnProperty & x);
-    void to_json(json & j, const HasOwnProperty & x);
+void from_json(const json & j, HasOwnProperty & x);
+void to_json(json & j, const HasOwnProperty & x);
 
-    void from_json(const json & j, Id & x);
-    void to_json(json & j, const Id & x);
+void from_json(const json & j, Id & x);
+void to_json(json & j, const Id & x);
 
-    void from_json(const json & j, Imp & x);
-    void to_json(json & j, const Imp & x);
+void from_json(const json & j, Imp & x);
+void to_json(json & j, const Imp & x);
 
-    void from_json(const json & j, Implements & x);
-    void to_json(json & j, const Implements & x);
+void from_json(const json & j, Implements & x);
+void to_json(json & j, const Implements & x);
 
-    void from_json(const json & j, Implicit & x);
-    void to_json(json & j, const Implicit & x);
+void from_json(const json & j, Implicit & x);
+void to_json(json & j, const Implicit & x);
 
-    void from_json(const json & j, In & x);
-    void to_json(json & j, const In & x);
+void from_json(const json & j, In & x);
+void to_json(json & j, const In & x);
 
-    void from_json(const json & j, Indirect & x);
-    void to_json(json & j, const Indirect & x);
+void from_json(const json & j, Indirect & x);
+void to_json(json & j, const Indirect & x);
 
-    void from_json(const json & j, Infix & x);
-    void to_json(json & j, const Infix & x);
+void from_json(const json & j, Infix & x);
+void to_json(json & j, const Infix & x);
 
-    void from_json(const json & j, Init & x);
-    void to_json(json & j, const Init & x);
+void from_json(const json & j, Init & x);
+void to_json(json & j, const Init & x);
 
-    void from_json(const json & j, Inout & x);
-    void to_json(json & j, const Inout & x);
+void from_json(const json & j, Inout & x);
+void to_json(json & j, const Inout & x);
 
-    void from_json(const json & j, Instanceof & x);
-    void to_json(json & j, const Instanceof & x);
+void from_json(const json & j, Instanceof & x);
+void to_json(json & j, const Instanceof & x);
 
-    void from_json(const json & j, Interface & x);
-    void to_json(json & j, const Interface & x);
+void from_json(const json & j, Interface & x);
+void to_json(json & j, const Interface & x);
 
-    void from_json(const json & j, Internal & x);
-    void to_json(json & j, const Internal & x);
+void from_json(const json & j, Internal & x);
+void to_json(json & j, const Internal & x);
 
-    void from_json(const json & j, Default & x);
-    void to_json(json & j, const Default & x);
+void from_json(const json & j, Default & x);
+void to_json(json & j, const Default & x);
 
-    void from_json(const json & j, Delete & x);
-    void to_json(json & j, const Delete & x);
+void from_json(const json & j, Delete & x);
+void to_json(json & j, const Delete & x);
 
-    void from_json(const json & j, Do & x);
-    void to_json(json & j, const Do & x);
+void from_json(const json & j, Do & x);
+void to_json(json & j, const Do & x);
 
-    void from_json(const json & j, Double & x);
-    void to_json(json & j, const Double & x);
+void from_json(const json & j, Double & x);
+void to_json(json & j, const Double & x);
 
-    void from_json(const json & j, DynamicCast & x);
-    void to_json(json & j, const DynamicCast & x);
+void from_json(const json & j, DynamicCast & x);
+void to_json(json & j, const DynamicCast & x);
 
-    void from_json(const json & j, Else & x);
-    void to_json(json & j, const Else & x);
+void from_json(const json & j, Else & x);
+void to_json(json & j, const Else & x);
 
-    void from_json(const json & j, Enum & x);
-    void to_json(json & j, const Enum & x);
+void from_json(const json & j, Enum & x);
+void to_json(json & j, const Enum & x);
 
-    void from_json(const json & j, Explicit & x);
-    void to_json(json & j, const Explicit & x);
+void from_json(const json & j, Explicit & x);
+void to_json(json & j, const Explicit & x);
 
-    void from_json(const json & j, Export & x);
-    void to_json(json & j, const Export & x);
+void from_json(const json & j, Export & x);
+void to_json(json & j, const Export & x);
 
-    void from_json(const json & j, Extern & x);
-    void to_json(json & j, const Extern & x);
+void from_json(const json & j, Extern & x);
+void to_json(json & j, const Extern & x);
 
-    void from_json(const json & j, False & x);
-    void to_json(json & j, const False & x);
+void from_json(const json & j, False & x);
+void to_json(json & j, const False & x);
 
-    void from_json(const json & j, Final & x);
-    void to_json(json & j, const Final & x);
+void from_json(const json & j, Final & x);
+void to_json(json & j, const Final & x);
 
-    void from_json(const json & j, Float & x);
-    void to_json(json & j, const Float & x);
+void from_json(const json & j, Float & x);
+void to_json(json & j, const Float & x);
 
-    void from_json(const json & j, For & x);
-    void to_json(json & j, const For & x);
+void from_json(const json & j, For & x);
+void to_json(json & j, const For & x);
 
-    void from_json(const json & j, Friend & x);
-    void to_json(json & j, const Friend & x);
+void from_json(const json & j, Friend & x);
+void to_json(json & j, const Friend & x);
 
-    void from_json(const json & j, Goto & x);
-    void to_json(json & j, const Goto & x);
+void from_json(const json & j, Goto & x);
+void to_json(json & j, const Goto & x);
 
-    void from_json(const json & j, If & x);
-    void to_json(json & j, const If & x);
+void from_json(const json & j, If & x);
+void to_json(json & j, const If & x);
 
-    void from_json(const json & j, Import & x);
-    void to_json(json & j, const Import & x);
+void from_json(const json & j, Import & x);
+void to_json(json & j, const Import & x);
 
-    void from_json(const json & j, Inline & x);
-    void to_json(json & j, const Inline & x);
+void from_json(const json & j, Inline & x);
+void to_json(json & j, const Inline & x);
 
-    void from_json(const json & j, Int & x);
-    void to_json(json & j, const Int & x);
+void from_json(const json & j, Int & x);
+void to_json(json & j, const Int & x);
 
-    void from_json(const json & j, FalseClass & x);
-    void to_json(json & j, const FalseClass & x);
+void from_json(const json & j, FalseClass & x);
+void to_json(json & j, const FalseClass & x);
 
-    void from_json(const json & j, Obj2 & x);
-    void to_json(json & j, const Obj2 & x);
+void from_json(const json & j, Obj2 & x);
+void to_json(json & j, const Obj2 & x);
 
-    void from_json(const json & j, Is & x);
-    void to_json(json & j, const Is & x);
+void from_json(const json & j, Is & x);
+void to_json(json & j, const Is & x);
 
-    void from_json(const json & j, Iterable & x);
-    void to_json(json & j, const Iterable & x);
+void from_json(const json & j, Iterable & x);
+void to_json(json & j, const Iterable & x);
 
-    void from_json(const json & j, Jdec & x);
-    void to_json(json & j, const Jdec & x);
+void from_json(const json & j, Jdec & x);
+void to_json(json & j, const Jdec & x);
 
-    void from_json(const json & j, Jenc & x);
-    void to_json(json & j, const Jenc & x);
+void from_json(const json & j, Jenc & x);
+void to_json(json & j, const Jenc & x);
 
-    void from_json(const json & j, Jpipe & x);
-    void to_json(json & j, const Jpipe & x);
+void from_json(const json & j, Jpipe & x);
+void to_json(json & j, const Jpipe & x);
 
-    void from_json(const json & j, Json & x);
-    void to_json(json & j, const Json & x);
+void from_json(const json & j, Json & x);
+void to_json(json & j, const Json & x);
 
-    void from_json(const json & j, JsonConverter & x);
-    void to_json(json & j, const JsonConverter & x);
+void from_json(const json & j, JsonConverter & x);
+void to_json(json & j, const JsonConverter & x);
 
-    void from_json(const json & j, JsonSerializer & x);
-    void to_json(json & j, const JsonSerializer & x);
+void from_json(const json & j, JsonSerializer & x);
+void to_json(json & j, const JsonSerializer & x);
 
-    void from_json(const json & j, JsonToken & x);
-    void to_json(json & j, const JsonToken & x);
+void from_json(const json & j, JsonToken & x);
+void to_json(json & j, const JsonToken & x);
 
-    void from_json(const json & j, JsonWriter & x);
-    void to_json(json & j, const JsonWriter & x);
+void from_json(const json & j, JsonWriter & x);
+void to_json(json & j, const JsonWriter & x);
 
-    void from_json(const json & j, Lambda & x);
-    void to_json(json & j, const Lambda & x);
+void from_json(const json & j, Lambda & x);
+void to_json(json & j, const Lambda & x);
 
-    void from_json(const json & j, Lazy & x);
-    void to_json(json & j, const Lazy & x);
+void from_json(const json & j, Lazy & x);
+void to_json(json & j, const Lazy & x);
 
-    void from_json(const json & j, Left & x);
-    void to_json(json & j, const Left & x);
+void from_json(const json & j, Left & x);
+void to_json(json & j, const Left & x);
 
-    void from_json(const json & j, Let & x);
-    void to_json(json & j, const Let & x);
+void from_json(const json & j, Let & x);
+void to_json(json & j, const Let & x);
 
-    void from_json(const json & j, List & x);
-    void to_json(json & j, const List & x);
+void from_json(const json & j, List & x);
+void to_json(json & j, const List & x);
 
-    void from_json(const json & j, Lock & x);
-    void to_json(json & j, const Lock & x);
+void from_json(const json & j, Lock & x);
+void to_json(json & j, const Lock & x);
 
-    void from_json(const json & j, Map & x);
-    void to_json(json & j, const Map & x);
+void from_json(const json & j, Map & x);
+void to_json(json & j, const Map & x);
 
-    void from_json(const json & j, MetadataPropertyHandling & x);
-    void to_json(json & j, const MetadataPropertyHandling & x);
+void from_json(const json & j, MetadataPropertyHandling & x);
+void to_json(json & j, const MetadataPropertyHandling & x);
 
-    void from_json(const json & j, Mutating & x);
-    void to_json(json & j, const Mutating & x);
+void from_json(const json & j, Mutating & x);
+void to_json(json & j, const Mutating & x);
 
-    void from_json(const json & j, Native & x);
-    void to_json(json & j, const Native & x);
+void from_json(const json & j, Native & x);
+void to_json(json & j, const Native & x);
 
-    void from_json(const json & j, Newtonsoft & x);
-    void to_json(json & j, const Newtonsoft & x);
+void from_json(const json & j, Newtonsoft & x);
+void to_json(json & j, const Newtonsoft & x);
 
-    void from_json(const json & j, Nil & x);
-    void to_json(json & j, const Nil & x);
+void from_json(const json & j, Nil & x);
+void to_json(json & j, const Nil & x);
 
-    void from_json(const json & j, No & x);
-    void to_json(json & j, const No & x);
+void from_json(const json & j, No & x);
+void to_json(json & j, const No & x);
 
-    void from_json(const json & j, Nonatomic & x);
-    void to_json(json & j, const Nonatomic & x);
+void from_json(const json & j, Nonatomic & x);
+void to_json(json & j, const Nonatomic & x);
 
-    void from_json(const json & j, None & x);
-    void to_json(json & j, const None & x);
+void from_json(const json & j, None & x);
+void to_json(json & j, const None & x);
 
-    void from_json(const json & j, Nonlocal & x);
-    void to_json(json & j, const Nonlocal & x);
+void from_json(const json & j, Nonlocal & x);
+void to_json(json & j, const Nonlocal & x);
 
-    void from_json(const json & j, Nonmutating & x);
-    void to_json(json & j, const Nonmutating & x);
+void from_json(const json & j, Nonmutating & x);
+void to_json(json & j, const Nonmutating & x);
 
-    void from_json(const json & j, NsString & x);
-    void to_json(json & j, const NsString & x);
+void from_json(const json & j, NsString & x);
+void to_json(json & j, const NsString & x);
 
-    void from_json(const json & j, Null & x);
-    void to_json(json & j, const Null & x);
+void from_json(const json & j, Null & x);
+void to_json(json & j, const Null & x);
 
-    void from_json(const json & j, Number & x);
-    void to_json(json & j, const Number & x);
+void from_json(const json & j, Number & x);
+void to_json(json & j, const Number & x);
 
-    void from_json(const json & j, Long & x);
-    void to_json(json & j, const Long & x);
+void from_json(const json & j, Long & x);
+void to_json(json & j, const Long & x);
 
-    void from_json(const json & j, Module & x);
-    void to_json(json & j, const Module & x);
+void from_json(const json & j, Module & x);
+void to_json(json & j, const Module & x);
 
-    void from_json(const json & j, Mutable & x);
-    void to_json(json & j, const Mutable & x);
+void from_json(const json & j, Mutable & x);
+void to_json(json & j, const Mutable & x);
 
-    void from_json(const json & j, Namespace & x);
-    void to_json(json & j, const Namespace & x);
+void from_json(const json & j, Namespace & x);
+void to_json(json & j, const Namespace & x);
 
-    void from_json(const json & j, New & x);
-    void to_json(json & j, const New & x);
+void from_json(const json & j, New & x);
+void to_json(json & j, const New & x);
 
-    void from_json(const json & j, Noexcept & x);
-    void to_json(json & j, const Noexcept & x);
+void from_json(const json & j, Noexcept & x);
+void to_json(json & j, const Noexcept & x);
 
-    void from_json(const json & j, NoneClass & x);
-    void to_json(json & j, const NoneClass & x);
+void from_json(const json & j, NoneClass & x);
+void to_json(json & j, const NoneClass & x);
 
-    void from_json(const json & j, Not & x);
-    void to_json(json & j, const Not & x);
+void from_json(const json & j, Not & x);
+void to_json(json & j, const Not & x);
 
-    void from_json(const json & j, NotEq & x);
-    void to_json(json & j, const NotEq & x);
+void from_json(const json & j, NotEq & x);
+void to_json(json & j, const NotEq & x);
 
-    void from_json(const json & j, NullClass & x);
-    void to_json(json & j, const NullClass & x);
+void from_json(const json & j, NullClass & x);
+void to_json(json & j, const NullClass & x);
 
-    void from_json(const json & j, Nullptr & x);
-    void to_json(json & j, const Nullptr & x);
+void from_json(const json & j, Nullptr & x);
+void to_json(json & j, const Nullptr & x);
 
-    void from_json(const json & j, Operator & x);
-    void to_json(json & j, const Operator & x);
+void from_json(const json & j, Operator & x);
+void to_json(json & j, const Operator & x);
 
-    void from_json(const json & j, Or & x);
-    void to_json(json & j, const Or & x);
+void from_json(const json & j, Or & x);
+void to_json(json & j, const Or & x);
 
-    void from_json(const json & j, OrEq & x);
-    void to_json(json & j, const OrEq & x);
+void from_json(const json & j, OrEq & x);
+void to_json(json & j, const OrEq & x);
 
-    void from_json(const json & j, Override & x);
-    void to_json(json & j, const Override & x);
+void from_json(const json & j, Override & x);
+void to_json(json & j, const Override & x);
 
-    void from_json(const json & j, Private & x);
-    void to_json(json & j, const Private & x);
+void from_json(const json & j, Private & x);
+void to_json(json & j, const Private & x);
 
-    void from_json(const json & j, Protected & x);
-    void to_json(json & j, const Protected & x);
+void from_json(const json & j, Protected & x);
+void to_json(json & j, const Protected & x);
 
-    void from_json(const json & j, ProtocolClass & x);
-    void to_json(json & j, const ProtocolClass & x);
+void from_json(const json & j, ProtocolClass & x);
+void to_json(json & j, const ProtocolClass & x);
 
-    void from_json(const json & j, Object & x);
-    void to_json(json & j, const Object & x);
+void from_json(const json & j, Object & x);
+void to_json(json & j, const Object & x);
 
-    void from_json(const json & j, Of & x);
-    void to_json(json & j, const Of & x);
+void from_json(const json & j, Of & x);
+void to_json(json & j, const Of & x);
 
-    void from_json(const json & j, Oneway & x);
-    void to_json(json & j, const Oneway & x);
+void from_json(const json & j, Oneway & x);
+void to_json(json & j, const Oneway & x);
 
-    void from_json(const json & j, Open & x);
-    void to_json(json & j, const Open & x);
+void from_json(const json & j, Open & x);
+void to_json(json & j, const Open & x);
 
-    void from_json(const json & j, Optional & x);
-    void to_json(json & j, const Optional & x);
+void from_json(const json & j, Optional & x);
+void to_json(json & j, const Optional & x);
 
-    void from_json(const json & j, Out & x);
-    void to_json(json & j, const Out & x);
+void from_json(const json & j, Out & x);
+void to_json(json & j, const Out & x);
 
-    void from_json(const json & j, Package & x);
-    void to_json(json & j, const Package & x);
+void from_json(const json & j, Package & x);
+void to_json(json & j, const Package & x);
 
-    void from_json(const json & j, Params & x);
-    void to_json(json & j, const Params & x);
+void from_json(const json & j, Params & x);
+void to_json(json & j, const Params & x);
 
-    void from_json(const json & j, Pass & x);
-    void to_json(json & j, const Pass & x);
+void from_json(const json & j, Pass & x);
+void to_json(json & j, const Pass & x);
 
-    void from_json(const json & j, Port & x);
-    void to_json(json & j, const Port & x);
+void from_json(const json & j, Port & x);
+void to_json(json & j, const Port & x);
 
-    void from_json(const json & j, Postfix & x);
-    void to_json(json & j, const Postfix & x);
+void from_json(const json & j, Postfix & x);
+void to_json(json & j, const Postfix & x);
 
-    void from_json(const json & j, Precedence & x);
-    void to_json(json & j, const Precedence & x);
+void from_json(const json & j, Precedence & x);
+void to_json(json & j, const Precedence & x);
 
-    void from_json(const json & j, Prefix & x);
-    void to_json(json & j, const Prefix & x);
+void from_json(const json & j, Prefix & x);
+void to_json(json & j, const Prefix & x);
 
-    void from_json(const json & j, Print & x);
-    void to_json(json & j, const Print & x);
+void from_json(const json & j, Print & x);
+void to_json(json & j, const Print & x);
 
-    void from_json(const json & j, PrintMembers & x);
-    void to_json(json & j, const PrintMembers & x);
+void from_json(const json & j, PrintMembers & x);
+void to_json(json & j, const PrintMembers & x);
 
-    void from_json(const json & j, Printf & x);
-    void to_json(json & j, const Printf & x);
+void from_json(const json & j, Printf & x);
+void to_json(json & j, const Printf & x);
 
-    void from_json(const json & j, Protocol & x);
-    void to_json(json & j, const Protocol & x);
+void from_json(const json & j, Protocol & x);
+void to_json(json & j, const Protocol & x);
 
-    void from_json(const json & j, Obj3 & x);
-    void to_json(json & j, const Obj3 & x);
+void from_json(const json & j, Obj3 & x);
+void to_json(json & j, const Obj3 & x);
 
-    void from_json(const json & j, Public & x);
-    void to_json(json & j, const Public & x);
+void from_json(const json & j, Public & x);
+void to_json(json & j, const Public & x);
 
-    void from_json(const json & j, Register & x);
-    void to_json(json & j, const Register & x);
+void from_json(const json & j, Register & x);
+void to_json(json & j, const Register & x);
 
-    void from_json(const json & j, ReinterpretCast & x);
-    void to_json(json & j, const ReinterpretCast & x);
+void from_json(const json & j, ReinterpretCast & x);
+void to_json(json & j, const ReinterpretCast & x);
 
-    void from_json(const json & j, Requires & x);
-    void to_json(json & j, const Requires & x);
+void from_json(const json & j, Requires & x);
+void to_json(json & j, const Requires & x);
 
-    void from_json(const json & j, Return & x);
-    void to_json(json & j, const Return & x);
+void from_json(const json & j, Return & x);
+void to_json(json & j, const Return & x);
 
-    void from_json(const json & j, SelfClass & x);
-    void to_json(json & j, const SelfClass & x);
+void from_json(const json & j, SelfClass & x);
+void to_json(json & j, const SelfClass & x);
 
-    void from_json(const json & j, Short & x);
-    void to_json(json & j, const Short & x);
+void from_json(const json & j, Short & x);
+void to_json(json & j, const Short & x);
 
-    void from_json(const json & j, Signed & x);
-    void to_json(json & j, const Signed & x);
+void from_json(const json & j, Signed & x);
+void to_json(json & j, const Signed & x);
 
-    void from_json(const json & j, Sizeof & x);
-    void to_json(json & j, const Sizeof & x);
+void from_json(const json & j, Sizeof & x);
+void to_json(json & j, const Sizeof & x);
 
-    void from_json(const json & j, Static & x);
-    void to_json(json & j, const Static & x);
+void from_json(const json & j, Static & x);
+void to_json(json & j, const Static & x);
 
-    void from_json(const json & j, StaticAssert & x);
-    void to_json(json & j, const StaticAssert & x);
+void from_json(const json & j, StaticAssert & x);
+void to_json(json & j, const StaticAssert & x);
 
-    void from_json(const json & j, StaticCast & x);
-    void to_json(json & j, const StaticCast & x);
+void from_json(const json & j, StaticCast & x);
+void to_json(json & j, const StaticCast & x);
 
-    void from_json(const json & j, Struct & x);
-    void to_json(json & j, const Struct & x);
+void from_json(const json & j, Struct & x);
+void to_json(json & j, const Struct & x);
 
-    void from_json(const json & j, Switch & x);
-    void to_json(json & j, const Switch & x);
+void from_json(const json & j, Switch & x);
+void to_json(json & j, const Switch & x);
 
-    void from_json(const json & j, Synchronized & x);
-    void to_json(json & j, const Synchronized & x);
+void from_json(const json & j, Synchronized & x);
+void to_json(json & j, const Synchronized & x);
 
-    void from_json(const json & j, Template & x);
-    void to_json(json & j, const Template & x);
+void from_json(const json & j, Template & x);
+void to_json(json & j, const Template & x);
 
-    void from_json(const json & j, This & x);
-    void to_json(json & j, const This & x);
+void from_json(const json & j, This & x);
+void to_json(json & j, const This & x);
 
-    void from_json(const json & j, ThreadLocal & x);
-    void to_json(json & j, const ThreadLocal & x);
+void from_json(const json & j, ThreadLocal & x);
+void to_json(json & j, const ThreadLocal & x);
 
-    void from_json(const json & j, Throw & x);
-    void to_json(json & j, const Throw & x);
+void from_json(const json & j, Throw & x);
+void to_json(json & j, const Throw & x);
 
-    void from_json(const json & j, True & x);
-    void to_json(json & j, const True & x);
+void from_json(const json & j, True & x);
+void to_json(json & j, const True & x);
 
-    void from_json(const json & j, Try & x);
-    void to_json(json & j, const Try & x);
+void from_json(const json & j, Try & x);
+void to_json(json & j, const Try & x);
 
-    void from_json(const json & j, TypeClass & x);
-    void to_json(json & j, const TypeClass & x);
+void from_json(const json & j, TypeClass & x);
+void to_json(json & j, const TypeClass & x);
 
-    void from_json(const json & j, Typedef & x);
-    void to_json(json & j, const Typedef & x);
+void from_json(const json & j, Typedef & x);
+void to_json(json & j, const Typedef & x);
 
-    void from_json(const json & j, Typeid & x);
-    void to_json(json & j, const Typeid & x);
+void from_json(const json & j, Typeid & x);
+void to_json(json & j, const Typeid & x);
 
-    void from_json(const json & j, Typename & x);
-    void to_json(json & j, const Typename & x);
+void from_json(const json & j, Typename & x);
+void to_json(json & j, const Typename & x);
 
-    void from_json(const json & j, TrueClass & x);
-    void to_json(json & j, const TrueClass & x);
+void from_json(const json & j, TrueClass & x);
+void to_json(json & j, const TrueClass & x);
 
-    void from_json(const json & j, Quicktype & x);
-    void to_json(json & j, const Quicktype & x);
+void from_json(const json & j, Quicktype & x);
+void to_json(json & j, const Quicktype & x);
 
-    void from_json(const json & j, Raise & x);
-    void to_json(json & j, const Raise & x);
+void from_json(const json & j, Raise & x);
+void to_json(json & j, const Raise & x);
 
-    void from_json(const json & j, Range & x);
-    void to_json(json & j, const Range & x);
+void from_json(const json & j, Range & x);
+void to_json(json & j, const Range & x);
 
-    void from_json(const json & j, Readonly & x);
-    void to_json(json & j, const Readonly & x);
+void from_json(const json & j, Readonly & x);
+void to_json(json & j, const Readonly & x);
 
-    void from_json(const json & j, Ref & x);
-    void to_json(json & j, const Ref & x);
+void from_json(const json & j, Ref & x);
+void to_json(json & j, const Ref & x);
 
-    void from_json(const json & j, Repeat & x);
-    void to_json(json & j, const Repeat & x);
+void from_json(const json & j, Repeat & x);
+void to_json(json & j, const Repeat & x);
 
-    void from_json(const json & j, Require & x);
-    void to_json(json & j, const Require & x);
+void from_json(const json & j, Require & x);
+void to_json(json & j, const Require & x);
 
-    void from_json(const json & j, Required & x);
-    void to_json(json & j, const Required & x);
+void from_json(const json & j, Required & x);
+void to_json(json & j, const Required & x);
 
-    void from_json(const json & j, Restrict & x);
-    void to_json(json & j, const Restrict & x);
+void from_json(const json & j, Restrict & x);
+void to_json(json & j, const Restrict & x);
 
-    void from_json(const json & j, Retain & x);
-    void to_json(json & j, const Retain & x);
+void from_json(const json & j, Retain & x);
+void to_json(json & j, const Retain & x);
 
-    void from_json(const json & j, Rethrows & x);
-    void to_json(json & j, const Rethrows & x);
+void from_json(const json & j, Rethrows & x);
+void to_json(json & j, const Rethrows & x);
 
-    void from_json(const json & j, Right & x);
-    void to_json(json & j, const Right & x);
+void from_json(const json & j, Right & x);
+void to_json(json & j, const Right & x);
 
-    void from_json(const json & j, Sbyte & x);
-    void to_json(json & j, const Sbyte & x);
+void from_json(const json & j, Sbyte & x);
+void to_json(json & j, const Sbyte & x);
 
-    void from_json(const json & j, Sealed & x);
-    void to_json(json & j, const Sealed & x);
+void from_json(const json & j, Sealed & x);
+void to_json(json & j, const Sealed & x);
 
-    void from_json(const json & j, Sel & x);
-    void to_json(json & j, const Sel & x);
+void from_json(const json & j, Sel & x);
+void to_json(json & j, const Sel & x);
 
-    void from_json(const json & j, Select & x);
-    void to_json(json & j, const Select & x);
+void from_json(const json & j, Select & x);
+void to_json(json & j, const Select & x);
 
-    void from_json(const json & j, Self & x);
-    void to_json(json & j, const Self & x);
+void from_json(const json & j, Self & x);
+void to_json(json & j, const Self & x);
 
-    void from_json(const json & j, Serialize & x);
-    void to_json(json & j, const Serialize & x);
+void from_json(const json & j, Serialize & x);
+void to_json(json & j, const Serialize & x);
 
-    void from_json(const json & j, Set & x);
-    void to_json(json & j, const Set & x);
+void from_json(const json & j, Set & x);
+void to_json(json & j, const Set & x);
 
-    void from_json(const json & j, Stackalloc & x);
-    void to_json(json & j, const Stackalloc & x);
+void from_json(const json & j, Stackalloc & x);
+void to_json(json & j, const Stackalloc & x);
 
-    void from_json(const json & j, Strictfp & x);
-    void to_json(json & j, const Strictfp & x);
+void from_json(const json & j, Strictfp & x);
+void to_json(json & j, const Strictfp & x);
 
-    void from_json(const json & j, String & x);
-    void to_json(json & j, const String & x);
+void from_json(const json & j, String & x);
+void to_json(json & j, const String & x);
 
-    void from_json(const json & j, Subscript & x);
-    void to_json(json & j, const Subscript & x);
+void from_json(const json & j, Subscript & x);
+void to_json(json & j, const Subscript & x);
 
-    void from_json(const json & j, Super & x);
-    void to_json(json & j, const Super & x);
+void from_json(const json & j, Super & x);
+void to_json(json & j, const Super & x);
 
-    void from_json(const json & j, Symbol & x);
-    void to_json(json & j, const Symbol & x);
+void from_json(const json & j, Symbol & x);
+void to_json(json & j, const Symbol & x);
 
-    void from_json(const json & j, System & x);
-    void to_json(json & j, const System & x);
+void from_json(const json & j, System & x);
+void to_json(json & j, const System & x);
 
-    void from_json(const json & j, Then & x);
-    void to_json(json & j, const Then & x);
+void from_json(const json & j, Then & x);
+void to_json(json & j, const Then & x);
 
-    void from_json(const json & j, Throws & x);
-    void to_json(json & j, const Throws & x);
+void from_json(const json & j, Throws & x);
+void to_json(json & j, const Throws & x);
 
-    void from_json(const json & j, ToJson & x);
-    void to_json(json & j, const ToJson & x);
+void from_json(const json & j, ToJson & x);
+void to_json(json & j, const ToJson & x);
 
-    void from_json(const json & j, TopLevelClass & x);
-    void to_json(json & j, const TopLevelClass & x);
+void from_json(const json & j, TopLevelClass & x);
+void to_json(json & j, const TopLevelClass & x);
 
-    void from_json(const json & j, Transient & x);
-    void to_json(json & j, const Transient & x);
+void from_json(const json & j, Transient & x);
+void to_json(json & j, const Transient & x);
 
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
 
-    void from_json(const json & j, Typealias & x);
-    void to_json(json & j, const Typealias & x);
+void from_json(const json & j, Typealias & x);
+void to_json(json & j, const Typealias & x);
 
-    void from_json(const json & j, Typeof & x);
-    void to_json(json & j, const Typeof & x);
+void from_json(const json & j, Typeof & x);
+void to_json(json & j, const Typeof & x);
 
-    void from_json(const json & j, Uint & x);
-    void to_json(json & j, const Uint & x);
+void from_json(const json & j, Uint & x);
+void to_json(json & j, const Uint & x);
 
-    void from_json(const json & j, Ulong & x);
-    void to_json(json & j, const Ulong & x);
+void from_json(const json & j, Ulong & x);
+void to_json(json & j, const Ulong & x);
 
-    void from_json(const json & j, Unchecked & x);
-    void to_json(json & j, const Unchecked & x);
+void from_json(const json & j, Unchecked & x);
+void to_json(json & j, const Unchecked & x);
 
-    void from_json(const json & j, Undefined & x);
-    void to_json(json & j, const Undefined & x);
+void from_json(const json & j, Undefined & x);
+void to_json(json & j, const Undefined & x);
 
-    void from_json(const json & j, Obj4 & x);
-    void to_json(json & j, const Obj4 & x);
+void from_json(const json & j, Obj4 & x);
+void to_json(json & j, const Obj4 & x);
 
-    void from_json(const json & j, Union & x);
-    void to_json(json & j, const Union & x);
+void from_json(const json & j, Union & x);
+void to_json(json & j, const Union & x);
 
-    void from_json(const json & j, Unsigned & x);
-    void to_json(json & j, const Unsigned & x);
+void from_json(const json & j, Unsigned & x);
+void to_json(json & j, const Unsigned & x);
 
-    void from_json(const json & j, Using & x);
-    void to_json(json & j, const Using & x);
+void from_json(const json & j, Using & x);
+void to_json(json & j, const Using & x);
 
-    void from_json(const json & j, Virtual & x);
-    void to_json(json & j, const Virtual & x);
+void from_json(const json & j, Virtual & x);
+void to_json(json & j, const Virtual & x);
 
-    void from_json(const json & j, Void & x);
-    void to_json(json & j, const Void & x);
+void from_json(const json & j, Void & x);
+void to_json(json & j, const Void & x);
 
-    void from_json(const json & j, Volatile & x);
-    void to_json(json & j, const Volatile & x);
+void from_json(const json & j, Volatile & x);
+void to_json(json & j, const Volatile & x);
 
-    void from_json(const json & j, WcharT & x);
-    void to_json(json & j, const WcharT & x);
+void from_json(const json & j, WcharT & x);
+void to_json(json & j, const WcharT & x);
 
-    void from_json(const json & j, While & x);
-    void to_json(json & j, const While & x);
+void from_json(const json & j, While & x);
+void to_json(json & j, const While & x);
 
-    void from_json(const json & j, Xor & x);
-    void to_json(json & j, const Xor & x);
+void from_json(const json & j, Xor & x);
+void to_json(json & j, const Xor & x);
 
-    void from_json(const json & j, XorEq & x);
-    void to_json(json & j, const XorEq & x);
+void from_json(const json & j, XorEq & x);
+void to_json(json & j, const XorEq & x);
 
-    void from_json(const json & j, Unowned & x);
-    void to_json(json & j, const Unowned & x);
+void from_json(const json & j, Unowned & x);
+void to_json(json & j, const Unowned & x);
 
-    void from_json(const json & j, Unsafe & x);
-    void to_json(json & j, const Unsafe & x);
+void from_json(const json & j, Unsafe & x);
+void to_json(json & j, const Unsafe & x);
 
-    void from_json(const json & j, Ushort & x);
-    void to_json(json & j, const Ushort & x);
+void from_json(const json & j, Ushort & x);
+void to_json(json & j, const Ushort & x);
 
-    void from_json(const json & j, Var & x);
-    void to_json(json & j, const Var & x);
+void from_json(const json & j, Var & x);
+void to_json(json & j, const Var & x);
 
-    void from_json(const json & j, Weak & x);
-    void to_json(json & j, const Weak & x);
+void from_json(const json & j, Weak & x);
+void to_json(json & j, const Weak & x);
 
-    void from_json(const json & j, Where & x);
-    void to_json(json & j, const Where & x);
+void from_json(const json & j, Where & x);
+void to_json(json & j, const Where & x);
 
-    void from_json(const json & j, WillSet & x);
-    void to_json(json & j, const WillSet & x);
+void from_json(const json & j, WillSet & x);
+void to_json(json & j, const WillSet & x);
 
-    void from_json(const json & j, With & x);
-    void to_json(json & j, const With & x);
+void from_json(const json & j, With & x);
+void to_json(json & j, const With & x);
 
-    void from_json(const json & j, Yes & x);
-    void to_json(json & j, const Yes & x);
+void from_json(const json & j, Yes & x);
+void to_json(json & j, const Yes & x);
 
-    void from_json(const json & j, Yield & x);
-    void to_json(json & j, const Yield & x);
+void from_json(const json & j, Yield & x);
+void to_json(json & j, const Yield & x);
 
-    void from_json(const json & j, Obj5 & x);
-    void to_json(json & j, const Obj5 & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Obj5 & x);
+void to_json(json & j, const Obj5 & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Abstract& x) {
         x.set_abstract(j.at("abstract").get<int64_t>());
     }
diff --git a/base/cplusplus/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.hpp
index 1258719..59eecc3 100644
--- a/base/cplusplus/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.hpp
@@ -51,12 +51,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Category & x);
-    void to_json(json & j, const Category & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Category & x);
+void to_json(json & j, const Category & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_category(j.at("category").get<Category>());
     }
diff --git a/base/cplusplus/test/inputs/json/priority/list.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/list.json/default/quicktype.hpp
index 19f31f8..67b763b 100644
--- a/base/cplusplus/test/inputs/json/priority/list.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/list.json/default/quicktype.hpp
@@ -107,9 +107,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_data(j.at("data").get<int64_t>());
         x.set_next(get_heap_optional<TopLevel>(j, "next"));
diff --git a/base/cplusplus/test/inputs/json/priority/name-style.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/name-style.json/default/quicktype.hpp
index 7c285b9..0b1a6c6 100644
--- a/base/cplusplus/test/inputs/json/priority/name-style.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/name-style.json/default/quicktype.hpp
@@ -77,9 +77,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_an_easy_one(j.at("anEasyOne").get<int64_t>());
         x.set_is_mnist_letter(j.at("isMNISTLetter").get<bool>());
diff --git a/base/cplusplus/test/inputs/json/priority/nested-objects.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/nested-objects.json/default/quicktype.hpp
index eefbccd..dab65b7 100644
--- a/base/cplusplus/test/inputs/json/priority/nested-objects.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/nested-objects.json/default/quicktype.hpp
@@ -52,9 +52,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_a(j.at("a").get<std::map<std::string, int64_t>>());
         x.set_b(j.at("b").get<std::map<std::string, int64_t>>());
diff --git a/base/cplusplus/test/inputs/json/priority/number-map.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/number-map.json/default/quicktype.hpp
index 81dc9c5..d9bb69d 100644
--- a/base/cplusplus/test/inputs/json/priority/number-map.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/number-map.json/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(j.at("foo").get<std::map<std::string, double>>());
     }
diff --git a/base/cplusplus/test/inputs/json/priority/omit-empty.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/omit-empty.json/default/quicktype.hpp
index cea18bf..6e69b52 100644
--- a/base/cplusplus/test/inputs/json/priority/omit-empty.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/omit-empty.json/default/quicktype.hpp
@@ -123,12 +123,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Result & x);
-    void to_json(json & j, const Result & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Result & x);
+void to_json(json & j, const Result & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Result& x) {
         x.set_age(j.at("age").get<int64_t>());
         x.set_name(get_untyped(j, "name"));
diff --git a/base/cplusplus/test/inputs/json/priority/php-validation.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/php-validation.json/default/quicktype.hpp
index 46bd3ed..e4391f8 100644
--- a/base/cplusplus/test/inputs/json/priority/php-validation.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/php-validation.json/default/quicktype.hpp
@@ -67,9 +67,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_boolean(j.at("boolean").get<bool>());
         x.set_integer(j.at("integer").get<int64_t>());
diff --git a/base/cplusplus/test/inputs/json/priority/recursive.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/recursive.json/default/quicktype.hpp
index 657f717..ed7e233 100644
--- a/base/cplusplus/test/inputs/json/priority/recursive.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/recursive.json/default/quicktype.hpp
@@ -607,57 +607,58 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, LinkLink & x);
-    void to_json(json & j, const LinkLink & x);
+void from_json(const json & j, LinkLink & x);
+void to_json(json & j, const LinkLink & x);
 
-    void from_json(const json & j, LinkElement & x);
-    void to_json(json & j, const LinkElement & x);
+void from_json(const json & j, LinkElement & x);
+void to_json(json & j, const LinkElement & x);
 
-    void from_json(const json & j, CategoryThumbnail & x);
-    void to_json(json & j, const CategoryThumbnail & x);
+void from_json(const json & j, CategoryThumbnail & x);
+void to_json(json & j, const CategoryThumbnail & x);
 
-    void from_json(const json & j, Category & x);
-    void to_json(json & j, const Category & x);
+void from_json(const json & j, Category & x);
+void to_json(json & j, const Category & x);
 
-    void from_json(const json & j, Eonandyear & x);
-    void to_json(json & j, const Eonandyear & x);
+void from_json(const json & j, Eonandyear & x);
+void to_json(json & j, const Eonandyear & x);
 
-    void from_json(const json & j, Xmlschematype & x);
-    void to_json(json & j, const Xmlschematype & x);
+void from_json(const json & j, Xmlschematype & x);
+void to_json(json & j, const Xmlschematype & x);
 
-    void from_json(const json & j, Date & x);
-    void to_json(json & j, const Date & x);
+void from_json(const json & j, Date & x);
+void to_json(json & j, const Date & x);
 
-    void from_json(const json & j, Details & x);
-    void to_json(json & j, const Details & x);
+void from_json(const json & j, Details & x);
+void to_json(json & j, const Details & x);
 
-    void from_json(const json & j, Currency & x);
-    void to_json(json & j, const Currency & x);
+void from_json(const json & j, Currency & x);
+void to_json(json & j, const Currency & x);
 
-    void from_json(const json & j, Useraveragerating & x);
-    void to_json(json & j, const Useraveragerating & x);
+void from_json(const json & j, Useraveragerating & x);
+void to_json(json & j, const Useraveragerating & x);
 
-    void from_json(const json & j, Rating & x);
-    void to_json(json & j, const Rating & x);
+void from_json(const json & j, Rating & x);
+void to_json(json & j, const Rating & x);
 
-    void from_json(const json & j, Specification & x);
-    void to_json(json & j, const Specification & x);
+void from_json(const json & j, Specification & x);
+void to_json(json & j, const Specification & x);
 
-    void from_json(const json & j, Format & x);
-    void to_json(json & j, const Format & x);
+void from_json(const json & j, Format & x);
+void to_json(json & j, const Format & x);
 
-    void from_json(const json & j, FormatsClass & x);
-    void to_json(json & j, const FormatsClass & x);
+void from_json(const json & j, FormatsClass & x);
+void to_json(json & j, const FormatsClass & x);
 
-    void from_json(const json & j, ProductProduct & x);
-    void to_json(json & j, const ProductProduct & x);
+void from_json(const json & j, ProductProduct & x);
+void to_json(json & j, const ProductProduct & x);
 
-    void from_json(const json & j, ProductElement & x);
-    void to_json(json & j, const ProductElement & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, ProductElement & x);
+void to_json(json & j, const ProductElement & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, LinkLink& x) {
         x.set_type(j.at("type").get<std::string>());
         x.set_url(j.at("url").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/simple-identifiers.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/simple-identifiers.json/default/quicktype.hpp
index dec6a91..92ce963 100644
--- a/base/cplusplus/test/inputs/json/priority/simple-identifiers.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/simple-identifiers.json/default/quicktype.hpp
@@ -87,9 +87,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_empty(j.at("").get<std::string>());
         x.set_null(j.at("null").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/url.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/url.json/default/quicktype.hpp
index 8bf24e8..ba88270 100644
--- a/base/cplusplus/test/inputs/json/priority/url.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/url.json/default/quicktype.hpp
@@ -52,9 +52,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_from_url(j.at("fromURL").get<std::string>());
         x.set_url(j.at("url").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/priority/uuids.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/priority/uuids.json/default/quicktype.hpp
index b93cbc0..13908ec 100644
--- a/base/cplusplus/test/inputs/json/priority/uuids.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/priority/uuids.json/default/quicktype.hpp
@@ -72,9 +72,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_boolean_value(j.at("booleanValue").get<bool>());
         x.set_double_value(j.at("doubleValue").get<double>());
diff --git a/base/cplusplus/test/inputs/json/samples/bitcoin-block.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/bitcoin-block.json/default/quicktype.hpp
index 4a6e1cc..969dbdf 100644
--- a/base/cplusplus/test/inputs/json/samples/bitcoin-block.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/bitcoin-block.json/default/quicktype.hpp
@@ -67,9 +67,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_block_index(j.at("block_index").get<int64_t>());
         x.set_hash(j.at("hash").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/samples/getting-started.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/getting-started.json/default/quicktype.hpp
index 9d7bdda..a5ecd91 100644
--- a/base/cplusplus/test/inputs/json/samples/getting-started.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/getting-started.json/default/quicktype.hpp
@@ -52,9 +52,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_greeting(j.at("greeting").get<std::string>());
         x.set_instructions(j.at("instructions").get<std::vector<std::string>>());
diff --git a/base/cplusplus/test/inputs/json/samples/github-events.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/github-events.json/default/quicktype.hpp
index e9611ea..b60e474 100644
--- a/base/cplusplus/test/inputs/json/samples/github-events.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/github-events.json/default/quicktype.hpp
@@ -1419,60 +1419,61 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Actor & x);
-    void to_json(json & j, const Actor & x);
+void from_json(const json & j, Actor & x);
+void to_json(json & j, const Actor & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Comment & x);
-    void to_json(json & j, const Comment & x);
+void from_json(const json & j, Comment & x);
+void to_json(json & j, const Comment & x);
 
-    void from_json(const json & j, Author & x);
-    void to_json(json & j, const Author & x);
+void from_json(const json & j, Author & x);
+void to_json(json & j, const Author & x);
 
-    void from_json(const json & j, Commit & x);
-    void to_json(json & j, const Commit & x);
+void from_json(const json & j, Commit & x);
+void to_json(json & j, const Commit & x);
 
-    void from_json(const json & j, Label & x);
-    void to_json(json & j, const Label & x);
+void from_json(const json & j, Label & x);
+void to_json(json & j, const Label & x);
 
-    void from_json(const json & j, Milestone & x);
-    void to_json(json & j, const Milestone & x);
+void from_json(const json & j, Milestone & x);
+void to_json(json & j, const Milestone & x);
 
-    void from_json(const json & j, IssuePullRequest & x);
-    void to_json(json & j, const IssuePullRequest & x);
+void from_json(const json & j, IssuePullRequest & x);
+void to_json(json & j, const IssuePullRequest & x);
 
-    void from_json(const json & j, Issue & x);
-    void to_json(json & j, const Issue & x);
+void from_json(const json & j, Issue & x);
+void to_json(json & j, const Issue & x);
 
-    void from_json(const json & j, BaseRepo & x);
-    void to_json(json & j, const BaseRepo & x);
+void from_json(const json & j, BaseRepo & x);
+void to_json(json & j, const BaseRepo & x);
 
-    void from_json(const json & j, Base & x);
-    void to_json(json & j, const Base & x);
+void from_json(const json & j, Base & x);
+void to_json(json & j, const Base & x);
 
-    void from_json(const json & j, Comments & x);
-    void to_json(json & j, const Comments & x);
+void from_json(const json & j, Comments & x);
+void to_json(json & j, const Comments & x);
 
-    void from_json(const json & j, Links & x);
-    void to_json(json & j, const Links & x);
+void from_json(const json & j, Links & x);
+void to_json(json & j, const Links & x);
 
-    void from_json(const json & j, PayloadPullRequest & x);
-    void to_json(json & j, const PayloadPullRequest & x);
+void from_json(const json & j, PayloadPullRequest & x);
+void to_json(json & j, const PayloadPullRequest & x);
 
-    void from_json(const json & j, Payload & x);
-    void to_json(json & j, const Payload & x);
+void from_json(const json & j, Payload & x);
+void to_json(json & j, const Payload & x);
 
-    void from_json(const json & j, TopLevelRepo & x);
-    void to_json(json & j, const TopLevelRepo & x);
+void from_json(const json & j, TopLevelRepo & x);
+void to_json(json & j, const TopLevelRepo & x);
 
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Actor& x) {
         x.set_avatar_url(j.at("avatar_url").get<std::string>());
         x.set_display_login(get_stack_optional<std::string>(j, "display_login"));
diff --git a/base/cplusplus/test/inputs/json/samples/null-safe.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/null-safe.json/default/quicktype.hpp
index c15499b..5eb26e6 100644
--- a/base/cplusplus/test/inputs/json/samples/null-safe.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/null-safe.json/default/quicktype.hpp
@@ -156,15 +156,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Address & x);
-    void to_json(json & j, const Address & x);
+void from_json(const json & j, Address & x);
+void to_json(json & j, const Address & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Address& x) {
         x.set_city(j.at("city").get<std::string>());
         x.set_country(j.at("country").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/samples/pokedex.json/boost-true--bed8626e10e6/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/pokedex.json/boost-true--bed8626e10e6/quicktype.hpp
index 9ad570d..ab626b8 100644
--- a/base/cplusplus/test/inputs/json/samples/pokedex.json/boost-true--bed8626e10e6/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/pokedex.json/boost-true--bed8626e10e6/quicktype.hpp
@@ -222,21 +222,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Evolution & x);
-    void to_json(json & j, const Evolution & x);
+void from_json(const json & j, Evolution & x);
+void to_json(json & j, const Evolution & x);
 
-    void from_json(const json & j, Pokemon & x);
-    void to_json(json & j, const Pokemon & x);
+void from_json(const json & j, Pokemon & x);
+void to_json(json & j, const Pokemon & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Egg & x);
-    void to_json(json & j, const Egg & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Egg & x);
+void to_json(json & j, const Egg & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Evolution& x) {
         x.set_name(j.at("name").get<std::string>());
         x.set_num(j.at("num").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/samples/pokedex.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/pokedex.json/default/quicktype.hpp
index 7309fa3..58f670e 100644
--- a/base/cplusplus/test/inputs/json/samples/pokedex.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/pokedex.json/default/quicktype.hpp
@@ -221,21 +221,22 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Evolution & x);
-    void to_json(json & j, const Evolution & x);
+void from_json(const json & j, Evolution & x);
+void to_json(json & j, const Evolution & x);
 
-    void from_json(const json & j, Pokemon & x);
-    void to_json(json & j, const Pokemon & x);
+void from_json(const json & j, Pokemon & x);
+void to_json(json & j, const Pokemon & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Egg & x);
-    void to_json(json & j, const Egg & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Egg & x);
+void to_json(json & j, const Egg & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Evolution& x) {
         x.set_name(j.at("name").get<std::string>());
         x.set_num(j.at("num").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/samples/reddit.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/reddit.json/default/quicktype.hpp
index f195338..94f5f20 100644
--- a/base/cplusplus/test/inputs/json/samples/reddit.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/reddit.json/default/quicktype.hpp
@@ -627,60 +627,61 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, MediaEmbed & x);
-    void to_json(json & j, const MediaEmbed & x);
+void from_json(const json & j, MediaEmbed & x);
+void to_json(json & j, const MediaEmbed & x);
 
-    void from_json(const json & j, Source & x);
-    void to_json(json & j, const Source & x);
+void from_json(const json & j, Source & x);
+void to_json(json & j, const Source & x);
 
-    void from_json(const json & j, Gif & x);
-    void to_json(json & j, const Gif & x);
+void from_json(const json & j, Gif & x);
+void to_json(json & j, const Gif & x);
 
-    void from_json(const json & j, Variants & x);
-    void to_json(json & j, const Variants & x);
+void from_json(const json & j, Variants & x);
+void to_json(json & j, const Variants & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Preview & x);
-    void to_json(json & j, const Preview & x);
+void from_json(const json & j, Preview & x);
+void to_json(json & j, const Preview & x);
 
-    void from_json(const json & j, ChildData & x);
-    void to_json(json & j, const ChildData & x);
+void from_json(const json & j, ChildData & x);
+void to_json(json & j, const ChildData & x);
 
-    void from_json(const json & j, Child & x);
-    void to_json(json & j, const Child & x);
+void from_json(const json & j, Child & x);
+void to_json(json & j, const Child & x);
 
-    void from_json(const json & j, TopLevelData & x);
-    void to_json(json & j, const TopLevelData & x);
+void from_json(const json & j, TopLevelData & x);
+void to_json(json & j, const TopLevelData & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Domain & x);
-    void to_json(json & j, const Domain & x);
+void from_json(const json & j, Domain & x);
+void to_json(json & j, const Domain & x);
 
-    void from_json(const json & j, WhitelistStatus & x);
-    void to_json(json & j, const WhitelistStatus & x);
+void from_json(const json & j, WhitelistStatus & x);
+void to_json(json & j, const WhitelistStatus & x);
 
-    void from_json(const json & j, PostHint & x);
-    void to_json(json & j, const PostHint & x);
+void from_json(const json & j, PostHint & x);
+void to_json(json & j, const PostHint & x);
 
-    void from_json(const json & j, Subreddit & x);
-    void to_json(json & j, const Subreddit & x);
+void from_json(const json & j, Subreddit & x);
+void to_json(json & j, const Subreddit & x);
 
-    void from_json(const json & j, SubredditId & x);
-    void to_json(json & j, const SubredditId & x);
+void from_json(const json & j, SubredditId & x);
+void to_json(json & j, const SubredditId & x);
 
-    void from_json(const json & j, SubredditNamePrefixed & x);
-    void to_json(json & j, const SubredditNamePrefixed & x);
+void from_json(const json & j, SubredditNamePrefixed & x);
+void to_json(json & j, const SubredditNamePrefixed & x);
 
-    void from_json(const json & j, SubredditType & x);
-    void to_json(json & j, const SubredditType & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, SubredditType & x);
+void to_json(json & j, const SubredditType & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, MediaEmbed& x) {
         (void)j;
         (void)x;
diff --git a/base/cplusplus/test/inputs/json/samples/simple-object.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/simple-object.json/default/quicktype.hpp
index 8cb5a04..10391df 100644
--- a/base/cplusplus/test/inputs/json/samples/simple-object.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/simple-object.json/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_date(j.at("date").get<int64_t>());
         x.set_title(j.at("title").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/samples/spotify-album.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/spotify-album.json/default/quicktype.hpp
index a050e3e..922dfd1 100644
--- a/base/cplusplus/test/inputs/json/samples/spotify-album.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/spotify-album.json/default/quicktype.hpp
@@ -355,30 +355,31 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, ExternalUrls & x);
-    void to_json(json & j, const ExternalUrls & x);
+void from_json(const json & j, ExternalUrls & x);
+void to_json(json & j, const ExternalUrls & x);
 
-    void from_json(const json & j, Artist & x);
-    void to_json(json & j, const Artist & x);
+void from_json(const json & j, Artist & x);
+void to_json(json & j, const Artist & x);
 
-    void from_json(const json & j, Copyright & x);
-    void to_json(json & j, const Copyright & x);
+void from_json(const json & j, Copyright & x);
+void to_json(json & j, const Copyright & x);
 
-    void from_json(const json & j, ExternalIds & x);
-    void to_json(json & j, const ExternalIds & x);
+void from_json(const json & j, ExternalIds & x);
+void to_json(json & j, const ExternalIds & x);
 
-    void from_json(const json & j, Image & x);
-    void to_json(json & j, const Image & x);
+void from_json(const json & j, Image & x);
+void to_json(json & j, const Image & x);
 
-    void from_json(const json & j, Item & x);
-    void to_json(json & j, const Item & x);
+void from_json(const json & j, Item & x);
+void to_json(json & j, const Item & x);
 
-    void from_json(const json & j, Tracks & x);
-    void to_json(json & j, const Tracks & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Tracks & x);
+void to_json(json & j, const Tracks & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, ExternalUrls& x) {
         x.set_spotify(j.at("spotify").get<std::string>());
     }
diff --git a/base/cplusplus/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.hpp
index 30ee480..40e5858 100644
--- a/base/cplusplus/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.hpp
@@ -100,15 +100,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Datum & x);
-    void to_json(json & j, const Datum & x);
+void from_json(const json & j, Datum & x);
+void to_json(json & j, const Datum & x);
 
-    void from_json(const json & j, Description & x);
-    void to_json(json & j, const Description & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Description & x);
+void to_json(json & j, const Description & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Datum& x) {
         x.set_anomaly(j.at("anomaly").get<std::string>());
         x.set_value(j.at("value").get<std::string>());
diff --git a/base/cplusplus/test/inputs/json/samples/us-senators.json/default/quicktype.hpp b/head/cplusplus/test/inputs/json/samples/us-senators.json/default/quicktype.hpp
index f251000..99cc8ad 100644
--- a/base/cplusplus/test/inputs/json/samples/us-senators.json/default/quicktype.hpp
+++ b/head/cplusplus/test/inputs/json/samples/us-senators.json/default/quicktype.hpp
@@ -398,54 +398,55 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Meta & x);
-    void to_json(json & j, const Meta & x);
+void from_json(const json & j, Meta & x);
+void to_json(json & j, const Meta & x);
 
-    void from_json(const json & j, Extra & x);
-    void to_json(json & j, const Extra & x);
+void from_json(const json & j, Extra & x);
+void to_json(json & j, const Extra & x);
 
-    void from_json(const json & j, Person & x);
-    void to_json(json & j, const Person & x);
+void from_json(const json & j, Person & x);
+void to_json(json & j, const Person & x);
 
-    void from_json(const json & j, Object & x);
-    void to_json(json & j, const Object & x);
+void from_json(const json & j, Object & x);
+void to_json(json & j, const Object & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Party & x);
-    void to_json(json & j, const Party & x);
+void from_json(const json & j, Party & x);
+void to_json(json & j, const Party & x);
 
-    void from_json(const json & j, Gender & x);
-    void to_json(json & j, const Gender & x);
+void from_json(const json & j, Gender & x);
+void to_json(json & j, const Gender & x);
 
-    void from_json(const json & j, GenderLabel & x);
-    void to_json(json & j, const GenderLabel & x);
+void from_json(const json & j, GenderLabel & x);
+void to_json(json & j, const GenderLabel & x);
 
-    void from_json(const json & j, Namemod & x);
-    void to_json(json & j, const Namemod & x);
+void from_json(const json & j, Namemod & x);
+void to_json(json & j, const Namemod & x);
 
-    void from_json(const json & j, RoleType & x);
-    void to_json(json & j, const RoleType & x);
+void from_json(const json & j, RoleType & x);
+void to_json(json & j, const RoleType & x);
 
-    void from_json(const json & j, RoleTypeLabel & x);
-    void to_json(json & j, const RoleTypeLabel & x);
+void from_json(const json & j, RoleTypeLabel & x);
+void to_json(json & j, const RoleTypeLabel & x);
 
-    void from_json(const json & j, SenatorClass & x);
-    void to_json(json & j, const SenatorClass & x);
+void from_json(const json & j, SenatorClass & x);
+void to_json(json & j, const SenatorClass & x);
 
-    void from_json(const json & j, SenatorClassLabel & x);
-    void to_json(json & j, const SenatorClassLabel & x);
+void from_json(const json & j, SenatorClassLabel & x);
+void to_json(json & j, const SenatorClassLabel & x);
 
-    void from_json(const json & j, SenatorRank & x);
-    void to_json(json & j, const SenatorRank & x);
+void from_json(const json & j, SenatorRank & x);
+void to_json(json & j, const SenatorRank & x);
 
-    void from_json(const json & j, SenatorRankLabel & x);
-    void to_json(json & j, const SenatorRankLabel & x);
-
-    void from_json(const json & j, Title & x);
-    void to_json(json & j, const Title & x);
+void from_json(const json & j, SenatorRankLabel & x);
+void to_json(json & j, const SenatorRankLabel & x);
 
+void from_json(const json & j, Title & x);
+void to_json(json & j, const Title & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Meta& x) {
         x.set_limit(j.at("limit").get<int64_t>());
         x.set_offset(j.at("offset").get<int64_t>());
diff --git a/base/cplusplus-multi-source/test/inputs/json/samples/pokedex.json/default/Generators.hpp b/head/cplusplus-multi-source/test/inputs/json/samples/pokedex.json/default/Generators.hpp
index d80ceaf..028c47c 100644
--- a/base/cplusplus-multi-source/test/inputs/json/samples/pokedex.json/default/Generators.hpp
+++ b/head/cplusplus-multi-source/test/inputs/json/samples/pokedex.json/default/Generators.hpp
@@ -19,21 +19,22 @@
 #include "Egg.hpp"
 
 namespace quicktype {
-    void from_json(const json & j, Evolution & x);
-    void to_json(json & j, const Evolution & x);
+void from_json(const json & j, Evolution & x);
+void to_json(json & j, const Evolution & x);
 
-    void from_json(const json & j, Pokemon & x);
-    void to_json(json & j, const Pokemon & x);
+void from_json(const json & j, Pokemon & x);
+void to_json(json & j, const Pokemon & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Egg & x);
-    void to_json(json & j, const Egg & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Egg & x);
+void to_json(json & j, const Egg & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Evolution& x) {
         x.set_name(j.at("name").get<std::string>());
         x.set_num(j.at("num").get<std::string>());
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github1.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github1.graphql/default/quicktype.hpp
index c0442ca..9da7516 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github1.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github1.graphql/default/quicktype.hpp
@@ -154,18 +154,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, User& x) {
         x.set_login(j.at("login").get<std::string>());
         x.set_real_name(get_stack_optional<std::string>(j, "realName"));
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github2.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github2.graphql/default/quicktype.hpp
index bb7f890..cb5e867 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github2.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github2.graphql/default/quicktype.hpp
@@ -187,24 +187,25 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Repository & x);
-    void to_json(json & j, const Repository & x);
+void from_json(const json & j, Repository & x);
+void to_json(json & j, const Repository & x);
 
-    void from_json(const json & j, RepositoryConnection & x);
-    void to_json(json & j, const RepositoryConnection & x);
+void from_json(const json & j, RepositoryConnection & x);
+void to_json(json & j, const RepositoryConnection & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Repository& x) {
         x.set_name(j.at("name").get<std::string>());
     }
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github3.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github3.graphql/default/quicktype.hpp
index 4a1a463..85fc9a8 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github3.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github3.graphql/default/quicktype.hpp
@@ -197,30 +197,31 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, PullRequest & x);
-    void to_json(json & j, const PullRequest & x);
+void from_json(const json & j, PullRequest & x);
+void to_json(json & j, const PullRequest & x);
 
-    void from_json(const json & j, PullRequestConnection & x);
-    void to_json(json & j, const PullRequestConnection & x);
+void from_json(const json & j, PullRequestConnection & x);
+void to_json(json & j, const PullRequestConnection & x);
 
-    void from_json(const json & j, Repository & x);
-    void to_json(json & j, const Repository & x);
+void from_json(const json & j, Repository & x);
+void to_json(json & j, const Repository & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, PullRequestState & x);
-    void to_json(json & j, const PullRequestState & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, PullRequestState & x);
+void to_json(json & j, const PullRequestState & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, PullRequest& x) {
         x.set_state(j.at("state").get<PullRequestState>());
     }
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github4.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github4.graphql/default/quicktype.hpp
index 80324b6..7aa1e47 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github4.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github4.graphql/default/quicktype.hpp
@@ -201,30 +201,31 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, PullRequest & x);
-    void to_json(json & j, const PullRequest & x);
+void from_json(const json & j, PullRequest & x);
+void to_json(json & j, const PullRequest & x);
 
-    void from_json(const json & j, PullRequestConnection & x);
-    void to_json(json & j, const PullRequestConnection & x);
+void from_json(const json & j, PullRequestConnection & x);
+void to_json(json & j, const PullRequestConnection & x);
 
-    void from_json(const json & j, Repository & x);
-    void to_json(json & j, const Repository & x);
+void from_json(const json & j, Repository & x);
+void to_json(json & j, const Repository & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, PullRequestState & x);
-    void to_json(json & j, const PullRequestState & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, PullRequestState & x);
+void to_json(json & j, const PullRequestState & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, PullRequest& x) {
         x.set_state(j.at("state").get<PullRequestState>());
     }
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github5.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github5.graphql/default/quicktype.hpp
index fff41fc..9bbc0a6 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github5.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github5.graphql/default/quicktype.hpp
@@ -154,18 +154,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, User& x) {
         x.set_login(j.at("login").get<std::string>());
         x.set_name(get_stack_optional<std::string>(j, "name"));
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github6.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github6.graphql/default/quicktype.hpp
index 8c03735..fe45b28 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github6.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github6.graphql/default/quicktype.hpp
@@ -154,18 +154,19 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, UniformResourceLocatable & x);
-    void to_json(json & j, const UniformResourceLocatable & x);
+void from_json(const json & j, UniformResourceLocatable & x);
+void to_json(json & j, const UniformResourceLocatable & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, UniformResourceLocatable& x) {
         x.set_url(j.at("url").get<std::string>());
         x.set_login(get_stack_optional<std::string>(j, "login"));
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github7.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github7.graphql/default/quicktype.hpp
index 9117bed..22cbabd 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github7.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github7.graphql/default/quicktype.hpp
@@ -234,30 +234,31 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Connection & x);
-    void to_json(json & j, const Connection & x);
+void from_json(const json & j, Connection & x);
+void to_json(json & j, const Connection & x);
 
-    void from_json(const json & j, Repository & x);
-    void to_json(json & j, const Repository & x);
+void from_json(const json & j, Repository & x);
+void to_json(json & j, const Repository & x);
 
-    void from_json(const json & j, RepositoryEdge & x);
-    void to_json(json & j, const RepositoryEdge & x);
+void from_json(const json & j, RepositoryEdge & x);
+void to_json(json & j, const RepositoryEdge & x);
 
-    void from_json(const json & j, RepositoryConnection & x);
-    void to_json(json & j, const RepositoryConnection & x);
+void from_json(const json & j, RepositoryConnection & x);
+void to_json(json & j, const RepositoryConnection & x);
 
-    void from_json(const json & j, User & x);
-    void to_json(json & j, const User & x);
+void from_json(const json & j, User & x);
+void to_json(json & j, const User & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Connection& x) {
         x.set_total_count(j.at("totalCount").get<int64_t>());
     }
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github8.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github8.graphql/default/quicktype.hpp
index ce43498..66ba85b 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github8.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github8.graphql/default/quicktype.hpp
@@ -183,24 +183,25 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, IssueOrPullRequest & x);
-    void to_json(json & j, const IssueOrPullRequest & x);
+void from_json(const json & j, IssueOrPullRequest & x);
+void to_json(json & j, const IssueOrPullRequest & x);
 
-    void from_json(const json & j, Repository & x);
-    void to_json(json & j, const Repository & x);
+void from_json(const json & j, Repository & x);
+void to_json(json & j, const Repository & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, IssueState & x);
-    void to_json(json & j, const IssueState & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, IssueState & x);
+void to_json(json & j, const IssueState & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, IssueOrPullRequest& x) {
         x.set_title(get_stack_optional<std::string>(j, "title"));
         x.set_state(get_stack_optional<IssueState>(j, "state"));
diff --git a/base/graphql-cplusplus/test/inputs/graphql/github9.graphql/default/quicktype.hpp b/head/graphql-cplusplus/test/inputs/graphql/github9.graphql/default/quicktype.hpp
index dffaf9c..6912ed3 100644
--- a/base/graphql-cplusplus/test/inputs/graphql/github9.graphql/default/quicktype.hpp
+++ b/head/graphql-cplusplus/test/inputs/graphql/github9.graphql/default/quicktype.hpp
@@ -192,27 +192,28 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Reaction & x);
-    void to_json(json & j, const Reaction & x);
+void from_json(const json & j, Reaction & x);
+void to_json(json & j, const Reaction & x);
 
-    void from_json(const json & j, Reactable & x);
-    void to_json(json & j, const Reactable & x);
+void from_json(const json & j, Reactable & x);
+void to_json(json & j, const Reactable & x);
 
-    void from_json(const json & j, AddReactionPayload & x);
-    void to_json(json & j, const AddReactionPayload & x);
+void from_json(const json & j, AddReactionPayload & x);
+void to_json(json & j, const AddReactionPayload & x);
 
-    void from_json(const json & j, Data & x);
-    void to_json(json & j, const Data & x);
+void from_json(const json & j, Data & x);
+void to_json(json & j, const Data & x);
 
-    void from_json(const json & j, Error & x);
-    void to_json(json & j, const Error & x);
+void from_json(const json & j, Error & x);
+void to_json(json & j, const Error & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, ReactionContent & x);
-    void to_json(json & j, const ReactionContent & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, ReactionContent & x);
+void to_json(json & j, const ReactionContent & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Reaction& x) {
         x.set_content(j.at("content").get<ReactionContent>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/all-of-additional-properties-false.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/all-of-additional-properties-false.schema/default/quicktype.hpp
index 80f52f3..0ddf4d0 100644
--- a/base/schema-cplusplus/test/inputs/schema/all-of-additional-properties-false.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/all-of-additional-properties-false.schema/default/quicktype.hpp
@@ -123,15 +123,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Frequency & x);
-    void to_json(json & j, const Frequency & x);
-
-    void from_json(const json & j, Type & x);
-    void to_json(json & j, const Type & x);
+void from_json(const json & j, Frequency & x);
+void to_json(json & j, const Frequency & x);
 
+void from_json(const json & j, Type & x);
+void to_json(json & j, const Type & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_amount(j.at("amount").get<double>());
         x.set_frequency(j.at("frequency").get<Frequency>());
diff --git a/base/schema-cplusplus/test/inputs/schema/any.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/any.schema/default/quicktype.hpp
index 58713b5..ec54820 100644
--- a/base/schema-cplusplus/test/inputs/schema/any.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/any.schema/default/quicktype.hpp
@@ -52,9 +52,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(get_untyped(j, "foo"));
         x.set_values(j.at("values").get<std::map<std::string, nlohmann::json>>());
diff --git a/base/schema-cplusplus/test/inputs/schema/boolean-subschema.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/boolean-subschema.schema/default/quicktype.hpp
index b9a039c..1e5ecef 100644
--- a/base/schema-cplusplus/test/inputs/schema/boolean-subschema.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/boolean-subschema.schema/default/quicktype.hpp
@@ -119,9 +119,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_disallowed(get_untyped(j, "disallowed"));
         x.set_empty(j.at("empty").get<std::vector<nlohmann::json>>());
diff --git a/base/schema-cplusplus/test/inputs/schema/camelCase.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/camelCase.schema/default/quicktype.hpp
index ec78967..eef3535 100644
--- a/base/schema-cplusplus/test/inputs/schema/camelCase.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/camelCase.schema/default/quicktype.hpp
@@ -109,9 +109,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_my_property(get_stack_optional<std::string>(j, "myProperty"));
         x.set_second_property(get_stack_optional<std::string>(j, "secondProperty"));
diff --git a/base/schema-cplusplus/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.hpp
index 157453c..0da0215 100644
--- a/base/schema-cplusplus/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.hpp
@@ -61,12 +61,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_kind(j.at("kind").get<Kind>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/comment-injection-enum.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/comment-injection-enum.schema/default/quicktype.hpp
index fdafb33..5a90533 100644
--- a/base/schema-cplusplus/test/inputs/schema/comment-injection-enum.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/comment-injection-enum.schema/default/quicktype.hpp
@@ -67,12 +67,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_kind(j.at("kind").get<Kind>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.hpp
index 116daf8..5133f0e 100644
--- a/base/schema-cplusplus/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.hpp
@@ -59,9 +59,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_value(j.at("value").get<std::string>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/comment-injection.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/comment-injection.schema/default/quicktype.hpp
index 4e971d8..d8a0097 100644
--- a/base/schema-cplusplus/test/inputs/schema/comment-injection.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/comment-injection.schema/default/quicktype.hpp
@@ -156,9 +156,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_trailing_backslash(get_stack_optional<std::string>(j, "trailingBackslash"));
         x.set_trailing_quote(get_stack_optional<std::string>(j, "trailingQuote"));
diff --git a/base/schema-cplusplus/test/inputs/schema/const-non-string.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/const-non-string.schema/default/quicktype.hpp
index c07f15d..42342b3 100644
--- a/base/schema-cplusplus/test/inputs/schema/const-non-string.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/const-non-string.schema/default/quicktype.hpp
@@ -69,12 +69,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_amount(j.at("amount").get<int64_t>());
         x.set_enabled(j.at("enabled").get<bool>());
diff --git a/base/schema-cplusplus/test/inputs/schema/cut-enum.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/cut-enum.schema/default/quicktype.hpp
index 0466e7f..7a4e1de 100644
--- a/base/schema-cplusplus/test/inputs/schema/cut-enum.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/cut-enum.schema/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(j.at("foo").get<int64_t>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/date-time-or-string.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/date-time-or-string.schema/default/quicktype.hpp
index d105d51..455ab7a 100644
--- a/base/schema-cplusplus/test/inputs/schema/date-time-or-string.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/date-time-or-string.schema/default/quicktype.hpp
@@ -52,9 +52,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_bar(j.at("bar").get<std::string>());
         x.set_foo(j.at("foo").get<std::string>());
diff --git a/base/schema-cplusplus/test/inputs/schema/default-value.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/default-value.schema/default/quicktype.hpp
index 81d1664..8a22362 100644
--- a/base/schema-cplusplus/test/inputs/schema/default-value.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/default-value.schema/default/quicktype.hpp
@@ -50,9 +50,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_id(j.at("id").get<int64_t>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.hpp
index a5e29cb..b73d7c4 100644
--- a/base/schema-cplusplus/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.hpp
@@ -107,9 +107,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(get_stack_optional<bool>(j, "foo"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/enum-large.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/enum-large.schema/default/quicktype.hpp
index 6db7e77..9fd1a05 100644
--- a/base/schema-cplusplus/test/inputs/schema/enum-large.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/enum-large.schema/default/quicktype.hpp
@@ -57,15 +57,16 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Callsign & x);
-    void to_json(json & j, const Callsign & x);
-
-    void from_json(const json & j, Priority & x);
-    void to_json(json & j, const Priority & x);
+void from_json(const json & j, Callsign & x);
+void to_json(json & j, const Callsign & x);
 
+void from_json(const json & j, Priority & x);
+void to_json(json & j, const Priority & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_callsign(j.at("callsign").get<Callsign>());
         x.set_priority(j.at("priority").get<Priority>());
diff --git a/base/schema-cplusplus/test/inputs/schema/enum-with-null.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/enum-with-null.schema/default/quicktype.hpp
index 1ad1614..d6472ef 100644
--- a/base/schema-cplusplus/test/inputs/schema/enum-with-null.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/enum-with-null.schema/default/quicktype.hpp
@@ -104,12 +104,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Enum & x);
-    void to_json(json & j, const Enum & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Enum & x);
+void to_json(json & j, const Enum & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_top_level_enum(get_stack_optional<Enum>(j, "enum"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/enum-with-values.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/enum-with-values.schema/default/quicktype.hpp
index a376c87..bca88db 100644
--- a/base/schema-cplusplus/test/inputs/schema/enum-with-values.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/enum-with-values.schema/default/quicktype.hpp
@@ -49,12 +49,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Weekdays & x);
-    void to_json(json & j, const Weekdays & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Weekdays & x);
+void to_json(json & j, const Weekdays & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_weekdays(j.at("weekdays").get<Weekdays>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/go-schema-pattern-properties.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/go-schema-pattern-properties.schema/default/quicktype.hpp
index 08c0c22..4848413 100644
--- a/base/schema-cplusplus/test/inputs/schema/go-schema-pattern-properties.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/go-schema-pattern-properties.schema/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_map(j.at("map").get<std::map<std::string, int64_t>>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/haskell-enum-forbidden.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/haskell-enum-forbidden.schema/default/quicktype.hpp
index 21c69ac..0f54a52 100644
--- a/base/schema-cplusplus/test/inputs/schema/haskell-enum-forbidden.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/haskell-enum-forbidden.schema/default/quicktype.hpp
@@ -49,12 +49,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Health & x);
-    void to_json(json & j, const Health & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Health & x);
+void to_json(json & j, const Health & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_health(j.at("health").get<Health>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/id-no-address.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/id-no-address.schema/default/quicktype.hpp
index 5df9618..6014f21 100644
--- a/base/schema-cplusplus/test/inputs/schema/id-no-address.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/id-no-address.schema/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_item(j.at("item").get<int64_t>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/id-root.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/id-root.schema/default/quicktype.hpp
index 76faa13..79014b5 100644
--- a/base/schema-cplusplus/test/inputs/schema/id-root.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/id-root.schema/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_bar(j.at("bar").get<int64_t>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.hpp
index c89fb72..4d1681b 100644
--- a/base/schema-cplusplus/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.hpp
@@ -66,12 +66,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Cookie & x);
-    void to_json(json & j, const Cookie & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Cookie & x);
+void to_json(json & j, const Cookie & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Cookie& x) {
         x.set_name(j.at("name").get<std::string>());
         x.set_value(j.at("value").get<std::string>());
diff --git a/base/schema-cplusplus/test/inputs/schema/implicit-all-of.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/implicit-all-of.schema/default/quicktype.hpp
index 9339200..99d0dfd 100644
--- a/base/schema-cplusplus/test/inputs/schema/implicit-all-of.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/implicit-all-of.schema/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(j.at("foo").get<int64_t>());
         x.set_bar(j.at("bar").get<bool>());
diff --git a/base/schema-cplusplus/test/inputs/schema/implicit-one-of.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/implicit-one-of.schema/default/quicktype.hpp
index a3d2a4d..dc39702 100644
--- a/base/schema-cplusplus/test/inputs/schema/implicit-one-of.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/implicit-one-of.schema/default/quicktype.hpp
@@ -114,9 +114,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(j.at("foo").get<int64_t>());
         x.set_bar(get_stack_optional<bool>(j, "bar"));
diff --git a/base/schema-cplusplus/test/inputs/schema/integer-type.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/integer-type.schema/default/quicktype.hpp
index 05876bf..2849a9f 100644
--- a/base/schema-cplusplus/test/inputs/schema/integer-type.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/integer-type.schema/default/quicktype.hpp
@@ -235,9 +235,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_above_i32_max(j.at("above_i32_max").get<int64_t>());
         x.set_below_i32_min(j.at("below_i32_min").get<int64_t>());
diff --git a/base/schema-cplusplus/test/inputs/schema/intersection-nested.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/intersection-nested.schema/default/quicktype.hpp
index 5729b9a..67c98a1 100644
--- a/base/schema-cplusplus/test/inputs/schema/intersection-nested.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/intersection-nested.schema/default/quicktype.hpp
@@ -104,9 +104,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_intersection(get_stack_optional<double>(j, "intersection"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/intersection.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/intersection.schema/default/quicktype.hpp
index 7064c36..1e94301 100644
--- a/base/schema-cplusplus/test/inputs/schema/intersection.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/intersection.schema/default/quicktype.hpp
@@ -123,12 +123,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Intersection & x);
-    void to_json(json & j, const Intersection & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Intersection & x);
+void to_json(json & j, const Intersection & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Intersection& x) {
         x.set_foo(j.at("foo").get<double>());
         x.set_bar(get_stack_optional<std::string>(j, "bar"));
diff --git a/base/schema-cplusplus/test/inputs/schema/keyword-enum.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/keyword-enum.schema/default/quicktype.hpp
index ea610a6..7734944 100644
--- a/base/schema-cplusplus/test/inputs/schema/keyword-enum.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/keyword-enum.schema/default/quicktype.hpp
@@ -107,12 +107,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Enum & x);
-    void to_json(json & j, const Enum & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Enum & x);
+void to_json(json & j, const Enum & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_top_level_enum(get_stack_optional<Enum>(j, "enum"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/light.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/light.schema/default/quicktype.hpp
index df07a06..a488885 100644
--- a/base/schema-cplusplus/test/inputs/schema/light.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/light.schema/default/quicktype.hpp
@@ -71,12 +71,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, LightParams & x);
-    void to_json(json & j, const LightParams & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, LightParams & x);
+void to_json(json & j, const LightParams & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, LightParams& x) {
         x.set_app_id(j.at("app_id").get<std::string>());
         x.set_outlet_id(j.at("outlet_id").get<std::string>());
diff --git a/base/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp
index 789e1f7..20e66a3 100644
--- a/base/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp
@@ -107,9 +107,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_next(get_heap_optional<TopLevel>(j, "next"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/minmax-integer.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/minmax-integer.schema/default/quicktype.hpp
index 61a0149..0d3e9b2 100644
--- a/base/schema-cplusplus/test/inputs/schema/minmax-integer.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/minmax-integer.schema/default/quicktype.hpp
@@ -226,9 +226,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_free(j.at("free").get<int64_t>());
         x.set_intersection(j.at("intersection").get<int64_t>());
diff --git a/base/schema-cplusplus/test/inputs/schema/minmax.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/minmax.schema/default/quicktype.hpp
index 5c746da..d902daf 100644
--- a/base/schema-cplusplus/test/inputs/schema/minmax.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/minmax.schema/default/quicktype.hpp
@@ -226,9 +226,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_free(j.at("free").get<double>());
         x.set_intersection(j.at("intersection").get<double>());
diff --git a/base/schema-cplusplus/test/inputs/schema/non-standard-ref.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/non-standard-ref.schema/default/quicktype.hpp
index 3bc7d8e..8905079 100644
--- a/base/schema-cplusplus/test/inputs/schema/non-standard-ref.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/non-standard-ref.schema/default/quicktype.hpp
@@ -57,9 +57,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_bar(j.at("bar").get<int64_t>());
         x.set_foo(j.at("foo").get<int64_t>());
diff --git a/base/schema-cplusplus/test/inputs/schema/nullable-optional-one-of.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/nullable-optional-one-of.schema/default/quicktype.hpp
index d979673..870489b 100644
--- a/base/schema-cplusplus/test/inputs/schema/nullable-optional-one-of.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/nullable-optional-one-of.schema/default/quicktype.hpp
@@ -110,12 +110,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Kind & x);
-    void to_json(json & j, const Kind & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Kind & x);
+void to_json(json & j, const Kind & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_b(get_stack_optional<std::string>(j, "b"));
         x.set_kind(j.at("kind").get<Kind>());
diff --git a/base/schema-cplusplus/test/inputs/schema/object-type-required.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/object-type-required.schema/default/quicktype.hpp
index e942f35..700357e 100644
--- a/base/schema-cplusplus/test/inputs/schema/object-type-required.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/object-type-required.schema/default/quicktype.hpp
@@ -109,9 +109,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(j.at("foo").get<std::string>());
         x.set_bar(get_stack_optional<std::string>(j, "bar"));
diff --git a/base/schema-cplusplus/test/inputs/schema/optional-any.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/optional-any.schema/default/quicktype.hpp
index f87427a..57deb0e 100644
--- a/base/schema-cplusplus/test/inputs/schema/optional-any.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/optional-any.schema/default/quicktype.hpp
@@ -109,9 +109,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_bar(j.at("bar").get<bool>());
         x.set_foo(get_untyped(j, "foo"));
diff --git a/base/schema-cplusplus/test/inputs/schema/optional-any.schema/hide-null-optional-true--b100cdb5877d/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/optional-any.schema/hide-null-optional-true--b100cdb5877d/quicktype.hpp
index 5da02c5..e380e2b 100644
--- a/base/schema-cplusplus/test/inputs/schema/optional-any.schema/hide-null-optional-true--b100cdb5877d/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/optional-any.schema/hide-null-optional-true--b100cdb5877d/quicktype.hpp
@@ -109,9 +109,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_bar(j.at("bar").get<bool>());
         x.set_foo(get_untyped(j, "foo"));
diff --git a/base/schema-cplusplus/test/inputs/schema/optional-const-ref.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/optional-const-ref.schema/default/quicktype.hpp
index a751766..d00aeee 100644
--- a/base/schema-cplusplus/test/inputs/schema/optional-const-ref.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/optional-const-ref.schema/default/quicktype.hpp
@@ -295,12 +295,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Coordinate & x);
-    void to_json(json & j, const Coordinate & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Coordinate & x);
+void to_json(json & j, const Coordinate & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Coordinate& x) {
         x.set_latitude(j.at("latitude").get<double>());
         x.set_longitude(j.at("longitude").get<double>());
diff --git a/base/schema-cplusplus/test/inputs/schema/optional-constraints.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/optional-constraints.schema/default/quicktype.hpp
index 8c1a679..d829817 100644
--- a/base/schema-cplusplus/test/inputs/schema/optional-constraints.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/optional-constraints.schema/default/quicktype.hpp
@@ -266,9 +266,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_opt_double(get_stack_optional<double>(j, "optDouble"));
         x.set_opt_int(get_stack_optional<int64_t>(j, "optInt"));
diff --git a/base/schema-cplusplus/test/inputs/schema/optional-date-time.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/optional-date-time.schema/default/quicktype.hpp
index 80c49e4..1abe7af 100644
--- a/base/schema-cplusplus/test/inputs/schema/optional-date-time.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/optional-date-time.schema/default/quicktype.hpp
@@ -129,9 +129,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_optional_date(get_stack_optional<std::string>(j, "optional-date"));
         x.set_optional_date_time(get_stack_optional<std::string>(j, "optional-date-time"));
diff --git a/base/schema-cplusplus/test/inputs/schema/optional-enum.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/optional-enum.schema/default/quicktype.hpp
index ef2e864..182db44 100644
--- a/base/schema-cplusplus/test/inputs/schema/optional-enum.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/optional-enum.schema/default/quicktype.hpp
@@ -111,12 +111,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
-    void from_json(const json & j, Shortcut & x);
-    void to_json(json & j, const Shortcut & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
+void from_json(const json & j, Shortcut & x);
+void to_json(json & j, const Shortcut & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_name(j.at("name").get<std::string>());
         x.set_shortcut(get_stack_optional<Shortcut>(j, "shortcut"));
diff --git a/base/schema-cplusplus/test/inputs/schema/pattern.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/pattern.schema/default/quicktype.hpp
index 2038ad3..bf70e0e 100644
--- a/base/schema-cplusplus/test/inputs/schema/pattern.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/pattern.schema/default/quicktype.hpp
@@ -195,9 +195,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_pattern1(j.at("pattern1").get<std::string>());
         x.set_pattern2(j.at("pattern2").get<std::string>());
diff --git a/base/schema-cplusplus/test/inputs/schema/postman-collection.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/postman-collection.schema/default/quicktype.hpp
index 42ad6b6..ba83251 100644
--- a/base/schema-cplusplus/test/inputs/schema/postman-collection.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/postman-collection.schema/default/quicktype.hpp
@@ -131,12 +131,13 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Response & x);
-    void to_json(json & j, const Response & x);
-
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, Response & x);
+void to_json(json & j, const Response & x);
 
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Response& x) {
         x.set_body(get_stack_optional<std::string>(j, "body"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/ref-id-files.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/ref-id-files.schema/default/quicktype.hpp
index 0466e7f..7a4e1de 100644
--- a/base/schema-cplusplus/test/inputs/schema/ref-id-files.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/ref-id-files.schema/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(j.at("foo").get<int64_t>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp
index 789e1f7..20e66a3 100644
--- a/base/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp
@@ -107,9 +107,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_next(get_heap_optional<TopLevel>(j, "next"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/renaming-bug.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/renaming-bug.schema/default/quicktype.hpp
index 0eaeadc..94432ab 100644
--- a/base/schema-cplusplus/test/inputs/schema/renaming-bug.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/renaming-bug.schema/default/quicktype.hpp
@@ -520,54 +520,55 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, Color & x);
-    void to_json(json & j, const Color & x);
+void from_json(const json & j, Color & x);
+void to_json(json & j, const Color & x);
 
-    void from_json(const json & j, CircularShape & x);
-    void to_json(json & j, const CircularShape & x);
+void from_json(const json & j, CircularShape & x);
+void to_json(json & j, const CircularShape & x);
 
-    void from_json(const json & j, Part & x);
-    void to_json(json & j, const Part & x);
+void from_json(const json & j, Part & x);
+void to_json(json & j, const Part & x);
 
-    void from_json(const json & j, RectShape & x);
-    void to_json(json & j, const RectShape & x);
+void from_json(const json & j, RectShape & x);
+void to_json(json & j, const RectShape & x);
 
-    void from_json(const json & j, Geometry & x);
-    void to_json(json & j, const Geometry & x);
+void from_json(const json & j, Geometry & x);
+void to_json(json & j, const Geometry & x);
 
-    void from_json(const json & j, History & x);
-    void to_json(json & j, const History & x);
+void from_json(const json & j, History & x);
+void to_json(json & j, const History & x);
 
-    void from_json(const json & j, Shape & x);
-    void to_json(json & j, const Shape & x);
+void from_json(const json & j, Shape & x);
+void to_json(json & j, const Shape & x);
 
-    void from_json(const json & j, Berry & x);
-    void to_json(json & j, const Berry & x);
+void from_json(const json & j, Berry & x);
+void to_json(json & j, const Berry & x);
 
-    void from_json(const json & j, Fruit & x);
-    void to_json(json & j, const Fruit & x);
+void from_json(const json & j, Fruit & x);
+void to_json(json & j, const Fruit & x);
 
-    void from_json(const json & j, Limit & x);
-    void to_json(json & j, const Limit & x);
+void from_json(const json & j, Limit & x);
+void to_json(json & j, const Limit & x);
 
-    void from_json(const json & j, Speed & x);
-    void to_json(json & j, const Speed & x);
+void from_json(const json & j, Speed & x);
+void to_json(json & j, const Speed & x);
 
-    void from_json(const json & j, VehicleType & x);
-    void to_json(json & j, const VehicleType & x);
+void from_json(const json & j, VehicleType & x);
+void to_json(json & j, const VehicleType & x);
 
-    void from_json(const json & j, Vehicle & x);
-    void to_json(json & j, const Vehicle & x);
+void from_json(const json & j, Vehicle & x);
+void to_json(json & j, const Vehicle & x);
 
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
 
-    void from_json(const json & j, Axis & x);
-    void to_json(json & j, const Axis & x);
-
-    void from_json(const json & j, Name & x);
-    void to_json(json & j, const Name & x);
+void from_json(const json & j, Axis & x);
+void to_json(json & j, const Axis & x);
 
+void from_json(const json & j, Name & x);
+void to_json(json & j, const Name & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, Color& x) {
         x.set_rgb(get_stack_optional<double>(j, "rgb"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/required-draft3.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/required-draft3.schema/default/quicktype.hpp
index c8af299..a91c19c 100644
--- a/base/schema-cplusplus/test/inputs/schema/required-draft3.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/required-draft3.schema/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_longitude(j.at("longitude").get<double>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/required-non-properties.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/required-non-properties.schema/default/quicktype.hpp
index e265695..0bfacbf 100644
--- a/base/schema-cplusplus/test/inputs/schema/required-non-properties.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/required-non-properties.schema/default/quicktype.hpp
@@ -52,9 +52,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(j.at("foo").get<int64_t>());
         x.set_bar(get_untyped(j, "bar"));
diff --git a/base/schema-cplusplus/test/inputs/schema/required.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/required.schema/default/quicktype.hpp
index c8af299..a91c19c 100644
--- a/base/schema-cplusplus/test/inputs/schema/required.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/required.schema/default/quicktype.hpp
@@ -47,9 +47,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_longitude(j.at("longitude").get<double>());
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/schema-constraints.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/schema-constraints.schema/default/quicktype.hpp
index e0c6120..55860c1 100644
--- a/base/schema-cplusplus/test/inputs/schema/schema-constraints.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/schema-constraints.schema/default/quicktype.hpp
@@ -188,9 +188,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_min_max_length(j.at("minMaxLength").get<std::string>());
         x.set_percent(j.at("percent").get<double>());
diff --git a/base/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp
index 789e1f7..20e66a3 100644
--- a/base/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp
@@ -107,9 +107,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_next(get_heap_optional<TopLevel>(j, "next"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/strict-optional.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/strict-optional.schema/default/quicktype.hpp
index 0339d23..e5b2a5e 100644
--- a/base/schema-cplusplus/test/inputs/schema/strict-optional.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/strict-optional.schema/default/quicktype.hpp
@@ -102,9 +102,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_foo(get_stack_optional<double>(j, "foo"));
     }
diff --git a/base/schema-cplusplus/test/inputs/schema/top-level-array.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/top-level-array.schema/default/quicktype.hpp
index a79b40f..460e3b3 100644
--- a/base/schema-cplusplus/test/inputs/schema/top-level-array.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/top-level-array.schema/default/quicktype.hpp
@@ -54,9 +54,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TextClassificationOutputElement & x);
-    void to_json(json & j, const TextClassificationOutputElement & x);
-
+void from_json(const json & j, TextClassificationOutputElement & x);
+void to_json(json & j, const TextClassificationOutputElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TextClassificationOutputElement& x) {
         x.set_label(j.at("label").get<std::string>());
         x.set_score(j.at("score").get<double>());
diff --git a/base/schema-cplusplus/test/inputs/schema/top-level-enum.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/top-level-enum.schema/default/quicktype.hpp
index 84e2dc7..a6d0e8e 100644
--- a/base/schema-cplusplus/test/inputs/schema/top-level-enum.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/top-level-enum.schema/default/quicktype.hpp
@@ -35,9 +35,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel & x) {
         if (j == "one") x = TopLevel::ONE;
         else if (j == "three") x = TopLevel::THREE;
diff --git a/base/schema-cplusplus/test/inputs/schema/union.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/union.schema/default/quicktype.hpp
index ee7d4bf..ac6afd9 100644
--- a/base/schema-cplusplus/test/inputs/schema/union.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/union.schema/default/quicktype.hpp
@@ -116,9 +116,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevelElement & x);
-    void to_json(json & j, const TopLevelElement & x);
-
+void from_json(const json & j, TopLevelElement & x);
+void to_json(json & j, const TopLevelElement & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevelElement& x) {
         x.set_one(get_stack_optional<int64_t>(j, "one"));
         x.set_two(j.at("two").get<bool>());
diff --git a/base/schema-cplusplus/test/inputs/schema/uuid.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/uuid.schema/default/quicktype.hpp
index 866342b..58a69be 100644
--- a/base/schema-cplusplus/test/inputs/schema/uuid.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/uuid.schema/default/quicktype.hpp
@@ -128,9 +128,10 @@ namespace quicktype {
 }
 
 namespace quicktype {
-    void from_json(const json & j, TopLevel & x);
-    void to_json(json & j, const TopLevel & x);
-
+void from_json(const json & j, TopLevel & x);
+void to_json(json & j, const TopLevel & x);
+}
+namespace quicktype {
     inline void from_json(const json & j, TopLevel& x) {
         x.set_arr_nullable(get_stack_optional<std::vector<std::optional<std::string>>>(j, "arrNullable"));
         x.set_arr_one(get_stack_optional<std::vector<std::string>>(j, "arrOne"));