Move declarations for #70.

include/tao/json/basic_value.hpp

@@ -26,6 +26,7 @@
 #include "internal/single.hpp"
 #include "internal/type_traits.hpp"
 
+#include "binary.hpp"
 #include "binary_view.hpp"
 #include "forward.hpp"
 #include "message_extension.hpp"

include/tao/json/binary.hpp

@@ -9,6 +9,12 @@
 
 #include "external/pegtl/internal/always_false.hpp"
 
+namespace tao
+{
+   using binary = std::vector< std::byte >;
+
+}  // namespace tao
+
 namespace tao::json
 {
    namespace internal

include/tao/json/forward.hpp

@@ -4,48 +4,41 @@
 #ifndef TAO_JSON_FORWARD_HPP
 #define TAO_JSON_FORWARD_HPP
 
-#include <cstddef>
-#include <vector>
-
-namespace tao
+namespace tao::json
 {
-   using binary = std::vector< std::byte >;
-
-   namespace json
+   namespace events
    {
-      namespace events
-      {
-         class virtual_base;
+      class virtual_base;
 
-      }  // namespace events
+   }  // namespace events
 
-      template< typename T, typename = void >
-      struct traits
-      {};
+   template< typename T, typename = void >
+   struct traits
+   {};
 
-      template< template< typename... > class Traits >
-      class basic_value;
+   template< template< typename... > class Traits >
+   class basic_value;
 
-      using producer_t = void ( * )( events::virtual_base&, const void* );
+   using value = basic_value< traits >;
 
-      namespace internal
-      {
-         struct opaque_ptr_t
-         {
-            const void* data;
-            producer_t producer;
-         };
+   using producer_t = void ( * )( events::virtual_base&, const void* );
 
-         template< template< typename... > class Traits >
-         struct single;
+   namespace internal
+   {
+      struct opaque_ptr_t
+      {
+         const void* data;
+         producer_t producer;
+      };
 
-         template< template< typename... > class Traits >
-         struct pair;
+      template< template< typename... > class Traits >
+      struct single;
 
-      }  // namespace internal
+      template< template< typename... > class Traits >
+      struct pair;
 
-   }  // namespace json
+   }  // namespace internal
 
-}  // namespace tao
+}  // namespace tao::json
 
 #endif

include/tao/json/value.hpp

@@ -5,13 +5,8 @@
 #define TAO_JSON_VALUE_HPP
 
 #include "basic_value.hpp"
+#include "forward.hpp"
 #include "operators.hpp"
 #include "traits.hpp"
 
-namespace tao::json
-{
-   using value = basic_value< traits >;
-
-}  // namespace tao::json
-
 #endif