Fix includes everywhere (#1651)

Signed-off-by: Juan Cruz Viotti <[email protected]>

Author: jviotti

src/core/json/include/sourcemeta/core/json.h

@@ -5,6 +5,7 @@
 #include <sourcemeta/core/json_export.h>
 #endif
 
+#include <sourcemeta/core/json_error.h>
 #include <sourcemeta/core/json_value.h>
 
 #include <cstdint>    // std::uint64_t

src/core/json/json.cc

@@ -1,10 +1,10 @@
-#include "parser.h"
-#include "stringify.h"
-
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/json_error.h>
 #include <sourcemeta/core/json_value.h>
 
+#include "parser.h"
+#include "stringify.h"
+
 #include <cassert>      // assert
 #include <cstdint>      // std::uint64_t
 #include <filesystem>   // std::filesystem

src/core/json/parser.h

@@ -1,11 +1,11 @@
 #ifndef SOURCEMETA_CORE_JSON_PARSER_H_
 #define SOURCEMETA_CORE_JSON_PARSER_H_
 
-#include "grammar.h"
-
 #include <sourcemeta/core/json_error.h>
 #include <sourcemeta/core/json_value.h>
 
+#include "grammar.h"
+
 #include <cassert>    // assert
 #include <cctype>     // std::isxdigit
 #include <cstddef>    // std::size_t

src/core/json/stringify.h

@@ -1,10 +1,10 @@
 #ifndef SOURCEMETA_CORE_JSON_STRINGIFY_H_
 #define SOURCEMETA_CORE_JSON_STRINGIFY_H_
 
-#include "grammar.h"
-
 #include <sourcemeta/core/json_value.h>
 
+#include "grammar.h"
+
 #include <algorithm> // std::transform, std::sort
 #include <cstddef>   // std::size_t
 #include <cstdint>   // std::int64_t

src/core/jsonl/include/sourcemeta/core/jsonl.h

@@ -5,7 +5,8 @@
 #include <sourcemeta/core/jsonl_export.h>
 #endif
 
-#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/json.h>
+
 #include <sourcemeta/core/jsonl_iterator.h>
 
 #include <istream> // std::basic_istream

src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h

@@ -5,12 +5,12 @@
 #include <sourcemeta/core/jsonpointer_export.h>
 #endif
 
+#include <sourcemeta/core/json.h>
 #include <sourcemeta/core/uri.h>
 
-#include <sourcemeta/core/json_hash.h>
-#include <sourcemeta/core/json_value.h>
-#include <sourcemeta/core/jsonpointer.h>
+#include <sourcemeta/core/jsonpointer_error.h>
 #include <sourcemeta/core/jsonpointer_pointer.h>
+#include <sourcemeta/core/jsonpointer_position.h>
 #include <sourcemeta/core/jsonpointer_subpointer_walker.h>
 #include <sourcemeta/core/jsonpointer_template.h>
 #include <sourcemeta/core/jsonpointer_walker.h>

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_error.h

@@ -5,7 +5,7 @@
 #include <sourcemeta/core/jsonpointer_export.h>
 #endif
 
-#include <sourcemeta/core/json_error.h>
+#include <sourcemeta/core/json.h>
 
 #include <cstdint> // std::uint64_t
 

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h

@@ -5,8 +5,8 @@
 #include <sourcemeta/core/jsonpointer_export.h>
 #endif
 
-#include <sourcemeta/core/json_hash.h>
-#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/json.h>
+
 #include <sourcemeta/core/jsonpointer_pointer.h>
 
 #include <cstddef>  // std::size_t

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h

@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_
 #define SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_
 
-#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/json.h>
 
 #include <cassert> // assert
 

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h

@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_CORE_JSONPOINTER_WALKER_H_
 #define SOURCEMETA_CORE_JSONPOINTER_WALKER_H_
 
-#include <sourcemeta/core/json_value.h>
+#include <sourcemeta/core/json.h>
 
 #include <cstddef> // std::size_t
 #include <vector>  // std::vector