Header file tidying

CHANGELOG.md

@@ -4,6 +4,7 @@ Version 78:
 * Documentation work
 * Use make_unique_noinit
 * Fix warning in zlib
+* Header file tidying
 
 HTTP:
 

include/beast/core.hpp

@@ -21,7 +21,9 @@
 #include <beast/core/error.hpp>
 #include <beast/core/file.hpp>
 #include <beast/core/file_base.hpp>
+#include <beast/core/file_posix.hpp>
 #include <beast/core/file_stdio.hpp>
+#include <beast/core/file_win32.hpp>
 #include <beast/core/flat_buffer.hpp>
 #include <beast/core/handler_alloc.hpp>
 #include <beast/core/handler_ptr.hpp>
@@ -31,8 +33,8 @@
 #include <beast/core/span.hpp>
 #include <beast/core/static_buffer.hpp>
 #include <beast/core/static_string.hpp>
-#include <beast/core/string_param.hpp>
 #include <beast/core/string.hpp>
+#include <beast/core/string_param.hpp>
 #include <beast/core/type_traits.hpp>
 
 #endif

include/beast/core/file.hpp

@@ -8,6 +8,7 @@
 #ifndef BEAST_CORE_FILE_HPP
 #define BEAST_CORE_FILE_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/file_base.hpp>
 #include <beast/core/file_posix.hpp>
 #include <beast/core/file_stdio.hpp>

include/beast/core/file_base.hpp

@@ -8,6 +8,7 @@
 #ifndef BEAST_CORE_FILE_BASE_HPP
 #define BEAST_CORE_FILE_BASE_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/string.hpp>
 
 namespace beast {

include/beast/core/file_stdio.hpp

@@ -8,6 +8,7 @@
 #ifndef BEAST_CORE_FILE_STDIO_HPP
 #define BEAST_CORE_FILE_STDIO_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 #include <beast/core/file_base.hpp>
 #include <cstdio>

include/beast/core/read_size.hpp

@@ -8,6 +8,7 @@
 #ifndef BEAST_READ_SIZE_HELPER_HPP
 #define BEAST_READ_SIZE_HELPER_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/type_traits.hpp>
 #include <boost/throw_exception.hpp>
 

include/beast/core/string.hpp

@@ -8,6 +8,7 @@
 #ifndef BEAST_STRING_HPP
 #define BEAST_STRING_HPP
 
+#include <beast/config.hpp>
 #include <boost/version.hpp>
 #ifndef BEAST_NO_BOOST_STRING_VIEW
 # if BOOST_VERSION >= 106400

include/beast/http.hpp

@@ -28,8 +28,8 @@
 #include <beast/http/string_body.hpp>
 #include <beast/http/string_view_body.hpp>
 #include <beast/http/type_traits.hpp>
-#include <beast/http/verb.hpp>
 #include <beast/http/vector_body.hpp>
+#include <beast/http/verb.hpp>
 #include <beast/http/write.hpp>
 
 #endif

include/beast/http/file_body.hpp

@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_FILE_BODY_HPP
 #define BEAST_HTTP_FILE_BODY_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 #include <beast/core/file.hpp>
 #include <beast/core/type_traits.hpp>

include/beast/zlib.hpp

@@ -11,6 +11,8 @@
 #include <beast/config.hpp>
 
 #include <beast/zlib/deflate_stream.hpp>
+#include <beast/zlib/error.hpp>
 #include <beast/zlib/inflate_stream.hpp>
+#include <beast/zlib/zlib.hpp>
 
 #endif

include/beast/zlib/deflate_stream.hpp

@@ -4,6 +4,23 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+
+#ifndef BEAST_ZLIB_DEFLATE_STREAM_HPP
+#define BEAST_ZLIB_DEFLATE_STREAM_HPP
+
+#include <beast/config.hpp>
+#include <beast/zlib/error.hpp>
+#include <beast/zlib/zlib.hpp>
+#include <beast/zlib/detail/deflate_stream.hpp>
+#include <algorithm>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <memory>
+
+namespace beast {
+namespace zlib {
+
 // This is a derivative work based on Zlib, copyright below:
 /*
     Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -32,22 +49,6 @@
     (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
-#ifndef BEAST_ZLIB_DEFLATE_STREAM_HPP
-#define BEAST_ZLIB_DEFLATE_STREAM_HPP
-
-#include <beast/config.hpp>
-#include <beast/zlib/error.hpp>
-#include <beast/zlib/zlib.hpp>
-#include <beast/zlib/detail/deflate_stream.hpp>
-#include <algorithm>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <memory>
-
-namespace beast {
-namespace zlib {
-
 /** Raw deflate compressor.
 
     This is a port of zlib's "deflate" functionality to C++.

include/beast/zlib/error.hpp

@@ -4,6 +4,16 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+
+#ifndef BEAST_ZLIB_ERROR_HPP
+#define BEAST_ZLIB_ERROR_HPP
+
+#include <beast/config.hpp>
+#include <beast/core/error.hpp>
+
+namespace beast {
+namespace zlib {
+
 // This is a derivative work based on Zlib, copyright below:
 /*
     Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -32,15 +42,6 @@
     (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
-#ifndef BEAST_ZLIB_ERROR_HPP
-#define BEAST_ZLIB_ERROR_HPP
-
-#include <beast/config.hpp>
-#include <beast/core/error.hpp>
-
-namespace beast {
-namespace zlib {
-
 /** Error codes returned by the codec.
 */
 enum class error

include/beast/zlib/inflate_stream.hpp

@@ -4,6 +4,13 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+
+#ifndef BEAST_ZLIB_INFLATE_STREAM_HPP
+#define BEAST_ZLIB_INFLATE_STREAM_HPP
+
+#include <beast/config.hpp>
+#include <beast/zlib/detail/inflate_stream.hpp>
+
 // This is a derivative work based on Zlib, copyright below:
 /*
     Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -32,12 +39,6 @@
     (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
-#ifndef BEAST_ZLIB_INFLATE_STREAM_HPP
-#define BEAST_ZLIB_INFLATE_STREAM_HPP
-
-#include <beast/config.hpp>
-#include <beast/zlib/detail/inflate_stream.hpp>
-
 namespace beast {
 namespace zlib {
 

include/beast/zlib/zlib.hpp

@@ -4,6 +4,14 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+
+#ifndef BEAST_ZLIB_ZLIB_HPP
+#define BEAST_ZLIB_ZLIB_HPP
+
+#include <beast/config.hpp>
+#include <cstdint>
+#include <cstdlib>
+
 // This is a derivative work based on Zlib, copyright below:
 /*
     Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -32,13 +40,6 @@
     (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
-#ifndef BEAST_ZLIB_ZLIB_HPP
-#define BEAST_ZLIB_ZLIB_HPP
-
-#include <beast/config.hpp>
-#include <cstdint>
-#include <cstdlib>
-
 namespace beast {
 namespace zlib {