Fix C++ guards in beast.

src/beast/beast/chrono/chrono_util.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CHRONO_UTIL_H_INCLUDED
+#ifndef BEAST_CHRONO_CHRONO_UTIL_H_INCLUDED
-#define BEAST_CHRONO_UTIL_H_INCLUDED
+#define BEAST_CHRONO_CHRONO_UTIL_H_INCLUDED
 
 // From Howard Hinnant
 // http://home.roadrunner.com/~hinnant/duration_io/chrono_util.html

src/beast/beast/config/SelectCompilerConfig.h

@@ -20,6 +20,9 @@
 // Ideas from boost
 
 // Intel
+#ifndef BEAST_CONFIG_SELECTCOMPILERCONFIG_H_INCLUDED
+#define BEAST_CONFIG_SELECTCOMPILERCONFIG_H_INCLUDED
+
 #if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
 #define BEAST_COMPILER_CONFIG "config/compiler/Intel.h"
 
@@ -42,3 +45,4 @@
 #error "Unsupported compiler."
 #endif
 
+#endif

src/beast/beast/config/SelectPlatformConfig.h

@@ -20,6 +20,9 @@
 // Ideas from boost
 
 // Android, which must be manually set by defining BEAST_ANDROID
+#ifndef BEAST_CONFIG_SELECTPLATFORMCONFIG_H_INCLUDED
+#define BEAST_CONFIG_SELECTPLATFORMCONFIG_H_INCLUDED
+
 #if defined(BEAST_ANDROID)
 #define BEAST_PLATFORM_CONFIG "config/platform/Android.h"
 
@@ -42,3 +45,4 @@
 #else
 #error "Unsupported platform."
 #endif
+#endif

src/beast/beast/config/compiler/VisualC.h

@@ -19,4 +19,8 @@
 
 // Microsoft Visual C++ compiler configuration
 
+#ifndef BEAST_CONFIG_COMPILER_VISUALC_H_INCLUDED
+#define BEAST_CONFIG_COMPILER_VISUALC_H_INCLUDED
+
 #include <beast/utility/noexcept.h>
+#endif

src/beast/beast/config/platform/Android.h

@@ -19,8 +19,12 @@
 
 // Android platform configuration
 
+#ifndef BEAST_CONFIG_PLATFORM_ANDROID_H_INCLUDED
+#define BEAST_CONFIG_PLATFORM_ANDROID_H_INCLUDED
+
 #ifdef BEAST_ANDROID
 #undef BEAST_ANDROID
 #endif
 #define BEAST_ANDROID 1
 
+#endif

src/beast/beast/container/buffer_view.h

@@ -0,0 +1,520 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
+#define BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
+
+#include <beast/Config.h>
+
+#include <array>
+#include <beast/cxx14/algorithm.h> // <algorithm>
+#include <cstddef>
+#include <iterator>
+#include <memory>
+#include <string>
+#include <vector>
+#include <beast/cxx14/type_traits.h> // <type_traits>
+
+namespace beast {
+
+namespace detail {
+
+template <class T, class U,
+    bool = std::is_const <std::remove_reference_t <T>>::value>
+struct apply_const
+{
+    typedef U type;
+};
+
+template <class T, class U>
+struct apply_const <T, U, true>
+{
+    typedef const U type;
+};
+
+// is_contiguous is true if C is a contiguous container
+template <class C>
+struct is_contiguous
+    : public std::false_type
+{
+};
+
+template <class C>
+struct is_contiguous <C const>
+    : public is_contiguous <C>
+{
+};
+
+template <class T, class Alloc>
+struct is_contiguous <std::vector <T, Alloc>>
+    : public std::true_type
+{
+};
+
+template <class CharT, class Traits, class Alloc>
+struct is_contiguous <std::basic_string<
+    CharT, Traits, Alloc>>
+    : public std::true_type
+{
+};
+
+template <class T, std::size_t N>
+struct is_contiguous <std::array<T, N>>
+    : public std::true_type
+{
+};
+
+// True if T is const or U is not const
+template <class T, class U>
+struct buffer_view_const_compatible : std::integral_constant <bool,
+    std::is_const<T>::value || ! std::is_const<U>::value
+>
+{
+};
+
+// True if T and U are the same or differ only in const, or
+// if T and U are equally sized integral types.
+template <class T, class U>
+struct buffer_view_ptr_compatible : std::integral_constant <bool,
+    (std::is_same <std::remove_const <T>, std::remove_const <U>>::value) ||
+        (std::is_integral <T>::value && std::is_integral <U>::value &&
+            sizeof (U) == sizeof (T))
+>
+{
+};
+
+// Determine if buffer_view <T, ..> is constructible from U*
+template <class T, class U>
+struct buffer_view_convertible : std::integral_constant <bool,
+    buffer_view_const_compatible <T, U>::value &&
+        buffer_view_ptr_compatible <T, U>::value
+>
+{
+};
+
+// True if C is a container that can be used to construct a buffer_view<T>
+template <class T, class C>
+struct buffer_view_container_compatible : std::integral_constant <bool,
+    is_contiguous <C>::value && buffer_view_convertible <T,
+        typename apply_const <C, typename C::value_type>::type>::value
+>
+{
+};
+
+} // detail
+
+struct buffer_view_default_tag
+{
+};
+
+//------------------------------------------------------------------------------
+
+/** A view into a range of contiguous container elements.
+
+    The size of the view is determined at the time of construction.
+    This tries to emulate the interface of std::vector as closely as possible,
+    with the constraint that the size of the container cannot be changed.
+
+    @tparam T The underlying element type. If T is const, member functions
+              which can modify elements are removed from the interface.
+
+    @tparam Tag A type used to prevent two views with the same T from being
+                comparable or assignable.
+*/
+template <
+    class T,
+    class Tag = buffer_view_default_tag
+>
+class buffer_view
+{
+private:
+    T* m_base;
+    std::size_t m_size;
+
+    static_assert (std::is_same <T, std::remove_reference_t <T>>::value,
+        "T may not be a reference type");
+
+    static_assert (! std::is_same <T, void>::value,
+        "T may not be void");
+
+    static_assert (std::is_same <std::add_const_t <T>,
+        std::remove_reference_t <T> const>::value,
+            "Expected std::add_const to produce T const");
+
+    template <class Iter>
+    void
+    assign (Iter first, Iter last) noexcept
+    {
+        typedef typename std::iterator_traits <Iter>::value_type U;
+
+        static_assert (detail::buffer_view_const_compatible <T, U>::value,
+            "Cannot convert from 'U const' to 'T', "
+                "conversion loses const qualifiers");
+
+        static_assert (detail::buffer_view_ptr_compatible <T, U>::value,
+            "Cannot convert from 'U*' to 'T*, "
+                "types are incompatible");
+
+        if (first == last)
+        {
+            m_base = nullptr;
+            m_size = 0;
+        }
+        else
+        {
+        #if 0
+            // fails on gcc
+            m_base = reinterpret_cast <T*> (
+                std::addressof (*first));
+        #else
+            m_base = reinterpret_cast <T*> (&*first);
+        #endif
+            m_size = std::distance (first, last);
+        }
+    }
+
+public:
+    typedef T value_type;
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+    typedef T& reference;
+    typedef T const& const_reference;
+    typedef T* pointer;
+    typedef T const* const_pointer;
+    typedef T* iterator;
+    typedef T const* const_iterator;
+    typedef std::reverse_iterator <iterator> reverse_iterator;
+    typedef std::reverse_iterator <const_iterator> const_reverse_iterator;
+
+    // default construct
+    buffer_view () noexcept
+        : m_base (nullptr)
+        , m_size (0)
+    {
+    }
+
+    // copy construct
+    template <class U,
+        class = std::enable_if_t <
+            detail::buffer_view_convertible <T, U>::value>
+    >
+    buffer_view (buffer_view <U, Tag> v) noexcept
+    {
+        assign (v.begin(), v.end());
+    }
+
+    // construct from container
+    template <class C,
+        class = std::enable_if_t <
+            detail::buffer_view_container_compatible <T, C>::value
+        >
+    >
+    buffer_view (C& c) noexcept
+    {
+        assign (c.begin(), c.end());
+    }
+
+    // construct from pointer range
+    template <class U,
+        class = std::enable_if_t <
+            detail::buffer_view_convertible <T, U>::value>
+    >
+    buffer_view (U* first, U* last) noexcept
+    {
+        assign (first, last);
+    }
+
+    // construct from base and size
+    template <class U,
+        class = std::enable_if_t <
+            detail::buffer_view_convertible <T, U>::value>
+    >
+    buffer_view (U* u, std::size_t n) noexcept
+        : m_base (u)
+        , m_size (n)
+    {
+    }
+
+    // assign from container
+    template <class C,
+        class = std::enable_if_t <
+            detail::buffer_view_container_compatible <T, C>::value
+        >
+    >
+    buffer_view&
+    operator= (C& c) noexcept
+    {
+        assign (c.begin(), c.end());
+        return *this;
+    }
+
+    //
+    // Element access
+    //
+
+    reference
+    at (size_type pos)
+    {
+        if (! (pos < size()))
+            throw std::out_of_range ("bad array index");
+        return m_base [pos];
+    }
+
+    const_reference
+    at (size_type pos) const
+    {
+        if (! (pos < size()))
+            throw std::out_of_range ("bad array index");
+        return m_base [pos];
+    }
+
+    reference
+    operator[] (size_type pos) noexcept
+    {
+        return m_base [pos];
+    }
+
+    const_reference
+    operator[] (size_type pos) const noexcept
+    {
+        return m_base [pos];
+    }
+
+    reference
+    back() noexcept
+    {
+        return m_base [m_size - 1];
+    }
+
+    const_reference
+    back() const noexcept
+    {
+        return m_base [m_size - 1];
+    }
+
+    reference
+    front() noexcept
+    {
+        return *m_base;
+    }
+
+    const_reference
+    front() const noexcept
+    {
+        return *m_base;
+    }
+
+    pointer
+    data() noexcept
+    {
+        return m_base;
+    }
+
+    const_pointer
+    data() const noexcept
+    {
+        return m_base;
+    }
+
+    //
+    // Iterators
+    //
+
+    iterator
+    begin() noexcept
+    {
+        return m_base;
+    }
+
+    const_iterator
+    begin() const noexcept
+    {
+        return m_base;
+    }
+
+    const_iterator
+    cbegin() const noexcept
+    {
+        return m_base;
+    }
+
+    iterator
+    end() noexcept
+    {
+        return m_base + m_size;
+    }
+
+    const_iterator
+    end() const noexcept
+    {
+        return m_base + m_size;
+    }
+
+    const_iterator
+    cend() const noexcept
+    {
+        return m_base + m_size;
+    }
+
+    reverse_iterator
+    rbegin() noexcept
+    {
+        return reverse_iterator (end());
+    }
+
+    const_reverse_iterator
+    rbegin() const noexcept
+    {
+        return const_reverse_iterator (cend());
+    }
+
+    const_reverse_iterator
+    crbegin() const noexcept
+    {
+        return const_reverse_iterator (cend());
+    }
+
+    reverse_iterator
+    rend() noexcept
+    {
+        return reverse_iterator (begin());
+    }
+
+    const_reverse_iterator
+    rend() const noexcept
+    {
+        return const_reverse_iterator (cbegin());
+    }
+
+    const_reverse_iterator
+    crend() const noexcept
+    {
+        return const_reverse_iterator (cbegin());
+    }
+
+    //
+    // Capacity
+    //
+
+    bool
+    empty() const noexcept
+    {
+        return m_size == 0;
+    }
+
+    size_type
+    size() const noexcept
+    {
+        return m_size;
+    }
+
+    size_type
+    max_size() const noexcept
+    {
+        return size();
+    }
+
+    size_type
+    capacity() const noexcept
+    {
+        return size();
+    }
+
+    //
+    // Modifiers
+    //
+
+    template <class U, class K>
+    friend void swap (buffer_view <U, K>& lhs,
+        buffer_view <U, K>& rhs) noexcept;
+};
+
+//------------------------------------------------------------------------------
+
+template <class T, class Tag>
+inline
+bool
+operator== (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return std::equal (
+        lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend());
+}
+
+template <class T, class Tag>
+inline
+bool
+operator!= (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return ! (lhs == rhs);
+}
+
+template <class T, class Tag>
+inline
+bool
+operator< (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return std::lexicographical_compare (
+        lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend());
+}
+
+template <class T, class Tag>
+inline
+bool
+operator>= (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return ! (lhs < rhs);
+}
+
+template <class T, class Tag>
+inline
+bool
+operator> (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return rhs < lhs;
+}
+
+template <class T, class Tag>
+inline
+bool
+operator<= (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return ! (rhs < lhs);
+}
+
+template <class T, class Tag>
+inline
+void
+swap (buffer_view <T, Tag>& lhs, buffer_view <T, Tag>& rhs) noexcept
+{
+    std::swap (lhs.m_base, rhs.m_base);
+    std::swap (lhs.m_size, rhs.m_size);
+}
+
+//------------------------------------------------------------------------------
+
+template <
+    class T,
+    class Tag = buffer_view_default_tag
+>
+using const_buffer_view = buffer_view <
+    std::add_const_t <T>, Tag>;
+
+}
+
+#endif

src/beast/beast/container/cyclic_iterator.h

@@ -27,8 +27,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CYCLIC_ITERATOR_H_INCLUDED
+#ifndef BEAST_CONTAINER_CYCLIC_ITERATOR_H_INCLUDED
-#define BEAST_CYCLIC_ITERATOR_H_INCLUDED
+#define BEAST_CONTAINER_CYCLIC_ITERATOR_H_INCLUDED
 
 #include <iterator>
 #include <boost/iterator/iterator_facade.hpp>

src/beast/beast/container/detail/aged_associative_container.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CONTAINER_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
+#ifndef BEAST_CONTAINER_DETAIL_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
-#define BEAST_CONTAINER_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
+#define BEAST_CONTAINER_DETAIL_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
 
 #include <type_traits>
 

src/beast/beast/container/detail/aged_container_iterator.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CONTAINER_AGED_CONTAINER_ITERATOR_H_INCLUDED
+#ifndef BEAST_CONTAINER_DETAIL_AGED_CONTAINER_ITERATOR_H_INCLUDED
-#define BEAST_CONTAINER_AGED_CONTAINER_ITERATOR_H_INCLUDED
+#define BEAST_CONTAINER_DETAIL_AGED_CONTAINER_ITERATOR_H_INCLUDED
 
 #include <iterator>
 #include <type_traits>

src/beast/beast/container/detail/aged_ordered_container.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED
+#ifndef BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
-#define BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED
+#define BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
 
 #include <beast/container/detail/aged_container_iterator.h>
 #include <beast/container/detail/aged_associative_container.h>

src/beast/beast/container/detail/aged_unordered_container.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED
+#ifndef BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
-#define BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED
+#define BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
 
 #include <beast/container/detail/aged_container_iterator.h>
 #include <beast/container/detail/aged_associative_container.h>

src/beast/beast/crypto/impl/sha2/sha2.h

@@ -32,8 +32,8 @@
  * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
  */
 
-#ifndef __SHA2_H__
+#ifndef BEAST_CRYPTO_SHA2_SHA2_H_INCLUDED
-#define __SHA2_H__
+#define BEAST_CRYPTO_SHA2_SHA2_H_INCLUDED
 
 //#ifdef __cplusplus
 //extern "C" {

src/beast/beast/hash/impl/spookyv2.h

@@ -26,8 +26,8 @@
 // slower than MD5.
 //
 
-#ifndef BEAST_SPOOKYV2_H_INCLUDED
+#ifndef BEAST_HASH_SPOOKYV2_H_INCLUDED
-#define BEAST_SPOOKYV2_H_INCLUDED
+#define BEAST_HASH_SPOOKYV2_H_INCLUDED
 
 #include <stddef.h>
 

src/beast/beast/hash/impl/xxhash.h

@@ -57,8 +57,8 @@ It depends on successfully passing SMHasher test set.
 10 is a perfect score.
 */
 
-#ifndef BEAST_CONTAINER_XXHASH_H_INCLUDED
+#ifndef BEAST_HASH_XXHASH_H_INCLUDED
-#define BEAST_CONTAINER_XXHASH_H_INCLUDED
+#define BEAST_HASH_XXHASH_H_INCLUDED
 
 /*****************************
    Includes

src/beast/beast/hash/tests/hash_metrics.h

@@ -18,8 +18,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CONTAINER_TESTS_HASH_METRICS_H_INCLUDED
+#ifndef BEAST_HASH_HASH_METRICS_H_INCLUDED
-#define BEAST_CONTAINER_TESTS_HASH_METRICS_H_INCLUDED
+#define BEAST_HASH_HASH_METRICS_H_INCLUDED
 
 #include <algorithm>
 #include <cmath>

src/beast/beast/http/detail/header_traits.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_HTTP_HEADER_TRAITS_H_INCLUDED
+#ifndef BEAST_HTTP_DETAIL_HEADER_TRAITS_H_INCLUDED
-#define BEAST_HTTP_HEADER_TRAITS_H_INCLUDED
+#define BEAST_HTTP_DETAIL_HEADER_TRAITS_H_INCLUDED
 
 #include <beast/utility/ci_char_traits.h>
 

src/beast/beast/http/impl/http-parser/http_parser.h

@@ -18,8 +18,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef http_parser_h
+#ifndef BEAST_HTTP_HTTP_PARSER_HTTP_PARSER_H_INCLUDED
-#define http_parser_h
+#define BEAST_HTTP_HTTP_PARSER_HTTP_PARSER_H_INCLUDED
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/beast/beast/module/asio/AsyncObject.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_ASYNCOBJECT_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_ASYNCOBJECT_H_INCLUDED
-#define BEAST_ASIO_ASYNCOBJECT_H_INCLUDED
+#define BEAST_MODULE_ASIO_ASYNCOBJECT_H_INCLUDED
 
 #include <atomic>
 #include <cassert>

src/beast/beast/module/asio/BoostIncludes.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_SYSTEM_BOOSTINCLUDES_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_BOOSTINCLUDES_H_INCLUDED
-#define BEAST_ASIO_SYSTEM_BOOSTINCLUDES_H_INCLUDED
+#define BEAST_MODULE_ASIO_BOOSTINCLUDES_H_INCLUDED
 
 // Make sure we take care of fixing boost::bind oddities first.
 #if !defined(BEAST_CORE_H_INCLUDED)

src/beast/beast/module/asio/HTTPField.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_HTTPFIELD_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPFIELD_H_INCLUDED
-#define BEAST_ASIO_HTTPFIELD_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPFIELD_H_INCLUDED
 
 #include <beast/strings/String.h>
 

src/beast/beast/module/asio/HTTPHeaders.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_HTTPHEADERS_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPHEADERS_H_INCLUDED
-#define BEAST_ASIO_HTTPHEADERS_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPHEADERS_H_INCLUDED
 
 #include <beast/module/asio/HTTPField.h>
 #include <beast/module/core/text/StringPairArray.h>

src/beast/beast/module/asio/HTTPMessage.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPMESSAGE_H_INCLUDED
-#define BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPMESSAGE_H_INCLUDED
 
 #include <beast/module/asio/HTTPHeaders.h>
 #include <beast/module/asio/HTTPVersion.h>

src/beast/beast/module/asio/HTTPParser.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_HTTPPARSER_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPPARSER_H_INCLUDED
-#define BEAST_ASIO_HTTPPARSER_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPPARSER_H_INCLUDED
 
 #include <beast/module/asio/HTTPRequest.h>
 #include <beast/module/asio/HTTPResponse.h>

src/beast/beast/module/asio/HTTPParserImpl.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_HTTPPARSERIMPL_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPPARSERIMPL_H_INCLUDED
-#define BEAST_HTTPPARSERIMPL_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPPARSERIMPL_H_INCLUDED
 
 #include <beast/http/impl/joyent_parser.h>
 #include <boost/asio/buffer.hpp>

src/beast/beast/module/asio/HTTPRequest.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_HTTPREQUEST_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPREQUEST_H_INCLUDED
-#define BEAST_ASIO_HTTPREQUEST_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPREQUEST_H_INCLUDED
 
 #include <beast/module/asio/HTTPMessage.h>
 

src/beast/beast/module/asio/HTTPRequestParser.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_HTTP_REQUESTPARSER_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPREQUESTPARSER_H_INCLUDED
-#define BEAST_HTTP_REQUESTPARSER_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPREQUESTPARSER_H_INCLUDED
 
 #include <beast/module/asio/HTTPParser.h>
 

src/beast/beast/module/asio/HTTPResponse.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_HTTPRESPONSE_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPRESPONSE_H_INCLUDED
-#define BEAST_ASIO_HTTPRESPONSE_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPRESPONSE_H_INCLUDED
 
 #include <beast/module/asio/HTTPMessage.h>
 

src/beast/beast/module/asio/HTTPResponseParser.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_HTTP_RESPONSEPARSER_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPRESPONSEPARSER_H_INCLUDED
-#define BEAST_HTTP_RESPONSEPARSER_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPRESPONSEPARSER_H_INCLUDED
 
 #include <beast/module/asio/HTTPParser.h>
 

src/beast/beast/module/asio/HTTPVersion.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_HTTPVERSION_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_HTTPVERSION_H_INCLUDED
-#define BEAST_ASIO_HTTPVERSION_H_INCLUDED
+#define BEAST_MODULE_ASIO_HTTPVERSION_H_INCLUDED
 
 namespace beast {
 

src/beast/beast/module/asio/OpenSSLIncludes.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_SYSTEM_OPENSSLINCLUDES_H_INCLUDED
+#ifndef BEAST_MODULE_ASIO_OPENSSLINCLUDES_H_INCLUDED
-#define BEAST_ASIO_SYSTEM_OPENSSLINCLUDES_H_INCLUDED
+#define BEAST_MODULE_ASIO_OPENSSLINCLUDES_H_INCLUDED
 
 #define OPENSSL_THREAD_DEFINES
 #include <openssl/opensslconf.h>

src/beast/beast/module/core/containers/Array.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ARRAY_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_CONTAINERS_ARRAY_H_INCLUDED
-#define BEAST_ARRAY_H_INCLUDED
+#define BEAST_MODULE_CORE_CONTAINERS_ARRAY_H_INCLUDED
 
 #include <beast/module/core/containers/ArrayAllocationBase.h>
 #include <beast/module/core/containers/ElementComparator.h>

src/beast/beast/module/core/containers/ArrayAllocationBase.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ARRAYALLOCATIONBASE_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_CONTAINERS_ARRAYALLOCATIONBASE_H_INCLUDED
-#define BEAST_ARRAYALLOCATIONBASE_H_INCLUDED
+#define BEAST_MODULE_CORE_CONTAINERS_ARRAYALLOCATIONBASE_H_INCLUDED
 
 #include <beast/HeapBlock.h>
 

src/beast/beast/module/core/containers/ElementComparator.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ELEMENTCOMPARATOR_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_CONTAINERS_ELEMENTCOMPARATOR_H_INCLUDED
-#define BEAST_ELEMENTCOMPARATOR_H_INCLUDED
+#define BEAST_MODULE_CORE_CONTAINERS_ELEMENTCOMPARATOR_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/core.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_CORE_H_INCLUDED
-#define BEAST_CORE_H_INCLUDED
+#define BEAST_MODULE_CORE_CORE_H_INCLUDED
 
 // TargetPlatform.h should not use anything from BeastConfig.h
 #include <beast/Config.h>

src/beast/beast/module/core/diagnostic/FatalError.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_FATALERROR_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_FATALERROR_H_INCLUDED
-#define BEAST_CORE_FATALERROR_H_INCLUDED
+#define BEAST_MODULE_CORE_DIAGNOSTIC_FATALERROR_H_INCLUDED
 
 #include <beast/strings/String.h>
 

src/beast/beast/module/core/diagnostic/MeasureFunctionCallTime.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED
-#define BEAST_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED
+#define BEAST_MODULE_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/diagnostic/SemanticVersion.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SEMANTICVERSION_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_SEMANTICVERSION_H_INCLUDED
-#define BEAST_SEMANTICVERSION_H_INCLUDED
+#define BEAST_MODULE_CORE_DIAGNOSTIC_SEMANTICVERSION_H_INCLUDED
 
 #include <vector>
 #include <string>

src/beast/beast/module/core/diagnostic/UnitTestUtilities.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_UNITTESTUTILITIES_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_UNITTESTUTILITIES_H_INCLUDED
-#define BEAST_UNITTESTUTILITIES_H_INCLUDED
+#define BEAST_MODULE_CORE_DIAGNOSTIC_UNITTESTUTILITIES_H_INCLUDED
 
 #include <beast/module/core/files/File.h>
 #include <beast/module/core/maths/Random.h>

src/beast/beast/module/core/files/DirectoryIterator.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_DIRECTORYITERATOR_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_FILES_DIRECTORYITERATOR_H_INCLUDED
-#define BEAST_DIRECTORYITERATOR_H_INCLUDED
+#define BEAST_MODULE_CORE_FILES_DIRECTORYITERATOR_H_INCLUDED
 
 #include <memory>
 

src/beast/beast/module/core/files/File.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_FILE_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_FILES_FILE_H_INCLUDED
-#define BEAST_FILE_H_INCLUDED
+#define BEAST_MODULE_CORE_FILES_FILE_H_INCLUDED
 
 #include <beast/module/core/containers/Array.h>
 #include <beast/module/core/memory/MemoryBlock.h>

src/beast/beast/module/core/files/FileInputStream.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_FILEINPUTSTREAM_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_FILES_FILEINPUTSTREAM_H_INCLUDED
-#define BEAST_FILEINPUTSTREAM_H_INCLUDED
+#define BEAST_MODULE_CORE_FILES_FILEINPUTSTREAM_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/files/FileOutputStream.h

@@ -24,8 +24,8 @@
 namespace beast
 {
 
-#ifndef BEAST_FILEOUTPUTSTREAM_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_FILES_FILEOUTPUTSTREAM_H_INCLUDED
-#define BEAST_FILEOUTPUTSTREAM_H_INCLUDED
+#define BEAST_MODULE_CORE_FILES_FILEOUTPUTSTREAM_H_INCLUDED
 
 //==============================================================================
 /**

src/beast/beast/module/core/logging/Logger.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_LOGGER_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_LOGGING_LOGGER_H_INCLUDED
-#define BEAST_LOGGER_H_INCLUDED
+#define BEAST_MODULE_CORE_LOGGING_LOGGER_H_INCLUDED
 
 #include <beast/strings/String.h>
 

src/beast/beast/module/core/maths/Random.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_RANDOM_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_MATHS_RANDOM_H_INCLUDED
-#define BEAST_RANDOM_H_INCLUDED
+#define BEAST_MODULE_CORE_MATHS_RANDOM_H_INCLUDED
 
 #include <cstddef>
 #include <cstdint>

src/beast/beast/module/core/memory/MemoryBlock.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_MEMORYBLOCK_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_MEMORY_MEMORYBLOCK_H_INCLUDED
-#define BEAST_MEMORYBLOCK_H_INCLUDED
+#define BEAST_MODULE_CORE_MEMORY_MEMORYBLOCK_H_INCLUDED
 
 #include <beast/HeapBlock.h>
 #include <beast/utility/LeakChecked.h>

src/beast/beast/module/core/memory/SharedSingleton.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SHAREDSINGLETON_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_MEMORY_SHAREDSINGLETON_H_INCLUDED
-#define BEAST_SHAREDSINGLETON_H_INCLUDED
+#define BEAST_MODULE_CORE_MEMORY_SHAREDSINGLETON_H_INCLUDED
 
 #include <beast/threads/SpinLock.h>
 #include <beast/smart_ptr/SharedPtr.h>

src/beast/beast/module/core/misc/Result.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_RESULT_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_MISC_RESULT_H_INCLUDED
-#define BEAST_RESULT_H_INCLUDED
+#define BEAST_MODULE_CORE_MISC_RESULT_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/native/BasicNativeHeaders.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_NATIVE_BASICNATIVEHEADERS_H_INCLUDED
-#define BEAST_BASICNATIVEHEADERS_H_INCLUDED
+#define BEAST_MODULE_CORE_NATIVE_BASICNATIVEHEADERS_H_INCLUDED
 
 #include <beast/Config.h>
 

src/beast/beast/module/core/native/osx_ObjCHelpers.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_OSX_OBJCHELPERS_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_NATIVE_OSX_OBJCHELPERS_H_INCLUDED
-#define BEAST_OSX_OBJCHELPERS_H_INCLUDED
+#define BEAST_MODULE_CORE_NATIVE_OSX_OBJCHELPERS_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/native/posix_SharedCode.h

@@ -45,6 +45,9 @@ void CriticalSection::exit() const noexcept     { pthread_mutex_unlock (&mutex);
 
 void Process::terminate()
 {
+#ifndef BEAST_MODULE_CORE_NATIVE_POSIX_SHAREDCODE_H_INCLUDED
+#define BEAST_MODULE_CORE_NATIVE_POSIX_SHAREDCODE_H_INCLUDED
+
 #if BEAST_ANDROID || BEAST_BSD
    // http://www.unix.com/man-page/FreeBSD/2/_exit/
     ::_exit (EXIT_FAILURE);
@@ -459,3 +462,4 @@ std::int64_t File::getVolumeTotalSize() const
 }
 
 } // beast
+#endif

src/beast/beast/module/core/streams/FileInputSource.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_FILEINPUTSOURCE_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_STREAMS_FILEINPUTSOURCE_H_INCLUDED
-#define BEAST_FILEINPUTSOURCE_H_INCLUDED
+#define BEAST_MODULE_CORE_STREAMS_FILEINPUTSOURCE_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/streams/InputSource.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_INPUTSOURCE_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_STREAMS_INPUTSOURCE_H_INCLUDED
-#define BEAST_INPUTSOURCE_H_INCLUDED
+#define BEAST_MODULE_CORE_STREAMS_INPUTSOURCE_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/streams/InputStream.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_INPUTSTREAM_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_STREAMS_INPUTSTREAM_H_INCLUDED
-#define BEAST_INPUTSTREAM_H_INCLUDED
+#define BEAST_MODULE_CORE_STREAMS_INPUTSTREAM_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/streams/MemoryOutputStream.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_MEMORYOUTPUTSTREAM_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_STREAMS_MEMORYOUTPUTSTREAM_H_INCLUDED
-#define BEAST_MEMORYOUTPUTSTREAM_H_INCLUDED
+#define BEAST_MODULE_CORE_STREAMS_MEMORYOUTPUTSTREAM_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/streams/OutputStream.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_OUTPUTSTREAM_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_STREAMS_OUTPUTSTREAM_H_INCLUDED
-#define BEAST_OUTPUTSTREAM_H_INCLUDED
+#define BEAST_MODULE_CORE_STREAMS_OUTPUTSTREAM_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/system/StandardIncludes.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_STANDARDINCLUDES_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_SYSTEM_STANDARDINCLUDES_H_INCLUDED
-#define BEAST_STANDARDINCLUDES_H_INCLUDED
+#define BEAST_MODULE_CORE_SYSTEM_STANDARDINCLUDES_H_INCLUDED
 
 // Include some common OS headers..
 #if BEAST_MSVC

src/beast/beast/module/core/system/SystemStats.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SYSTEMSTATS_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_SYSTEM_SYSTEMSTATS_H_INCLUDED
-#define BEAST_SYSTEMSTATS_H_INCLUDED
+#define BEAST_MODULE_CORE_SYSTEM_SYSTEMSTATS_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/text/LexicalCast.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_LEXICALCAST_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED
-#define BEAST_LEXICALCAST_H_INCLUDED
+#define BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED
 
 #include <beast/Config.h>
 #include <algorithm>

src/beast/beast/module/core/text/StringArray.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_STRINGARRAY_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_TEXT_STRINGARRAY_H_INCLUDED
-#define BEAST_STRINGARRAY_H_INCLUDED
+#define BEAST_MODULE_CORE_TEXT_STRINGARRAY_H_INCLUDED
 
 #include <beast/strings/String.h>
 #include <beast/module/core/containers/Array.h>

src/beast/beast/module/core/text/StringPairArray.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_STRINGPAIRARRAY_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_TEXT_STRINGPAIRARRAY_H_INCLUDED
-#define BEAST_STRINGPAIRARRAY_H_INCLUDED
+#define BEAST_MODULE_CORE_TEXT_STRINGPAIRARRAY_H_INCLUDED
 
 #include <beast/module/core/text/StringArray.h>
 

src/beast/beast/module/core/thread/DeadlineTimer.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_DEADLINETIMER_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_THREAD_DEADLINETIMER_H_INCLUDED
-#define BEAST_DEADLINETIMER_H_INCLUDED
+#define BEAST_MODULE_CORE_THREAD_DEADLINETIMER_H_INCLUDED
 
 #include <beast/module/core/memory/SharedSingleton.h>
 

src/beast/beast/module/core/thread/MutexTraits.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_THREAD_MUTEXTRAITS_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_THREAD_MUTEXTRAITS_H_INCLUDED
-#define BEAST_CORE_THREAD_MUTEXTRAITS_H_INCLUDED
+#define BEAST_MODULE_CORE_THREAD_MUTEXTRAITS_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/thread/Workers.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_WORKERS_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_THREAD_WORKERS_H_INCLUDED
-#define BEAST_WORKERS_H_INCLUDED
+#define BEAST_MODULE_CORE_THREAD_WORKERS_H_INCLUDED
 
 #include <beast/threads/Thread.h>
 #include <beast/threads/semaphore.h>

src/beast/beast/module/core/thread/detail/ScopedLock.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED
-#define BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED
+#define BEAST_MODULE_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED
 
 #include <beast/module/beast_core/thread/MutexTraits.h>
 

src/beast/beast/module/core/threads/CriticalSection.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CRITICALSECTION_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_THREADS_CRITICALSECTION_H_INCLUDED
-#define BEAST_CRITICALSECTION_H_INCLUDED
+#define BEAST_MODULE_CORE_THREADS_CRITICALSECTION_H_INCLUDED
 
 #include <beast/module/core/threads/ScopedLock.h>
 #include <cstdint>

src/beast/beast/module/core/threads/Process.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_PROCESS_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_THREADS_PROCESS_H_INCLUDED
-#define BEAST_PROCESS_H_INCLUDED
+#define BEAST_MODULE_CORE_THREADS_PROCESS_H_INCLUDED
 
 namespace beast {
 

src/beast/beast/module/core/threads/ScopedLock.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SCOPEDLOCK_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_THREADS_SCOPEDLOCK_H_INCLUDED
-#define BEAST_SCOPEDLOCK_H_INCLUDED
+#define BEAST_MODULE_CORE_THREADS_SCOPEDLOCK_H_INCLUDED
 
 namespace beast
 {

src/beast/beast/module/core/time/AtExitHook.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_ATEXITHOOK_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_TIME_ATEXITHOOK_H_INCLUDED
-#define BEAST_CORE_ATEXITHOOK_H_INCLUDED
+#define BEAST_MODULE_CORE_TIME_ATEXITHOOK_H_INCLUDED
 
 #include <beast/intrusive/List.h>
 

src/beast/beast/module/core/time/Time.h

@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_TIME_H_INCLUDED
+#ifndef BEAST_MODULE_CORE_TIME_TIME_H_INCLUDED
-#define BEAST_TIME_H_INCLUDED
+#define BEAST_MODULE_CORE_TIME_TIME_H_INCLUDED
 
 #include <beast/chrono/RelativeTime.h>
 

src/beast/beast/module/sqdb/api/backend.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_BACKEND_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_BACKEND_H_INCLUDED
-#define BEAST_SQDB_BACKEND_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_BACKEND_H_INCLUDED
 
 #include <cstdint>
 

src/beast/beast/module/sqdb/api/blob.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_BLOB_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_BLOB_H_INCLUDED
-#define BEAST_SQDB_BLOB_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_BLOB_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/api/into.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_INTO_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_INTO_H_INCLUDED
-#define BEAST_SQDB_INTO_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_INTO_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/api/session.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_SESSION_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_SESSION_H_INCLUDED
-#define BEAST_SQDB_SESSION_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_SESSION_H_INCLUDED
 
 #include <beast/smart_ptr/SharedPtr.h>
 #include <beast/module/core/memory/SharedSingleton.h>

src/beast/beast/module/sqdb/api/statement.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_STATEMENT_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_STATEMENT_H_INCLUDED
-#define BEAST_SQDB_STATEMENT_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_STATEMENT_H_INCLUDED
 
 #include <memory>
 

src/beast/beast/module/sqdb/api/transaction.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_TRANSACTION_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_TRANSACTION_H_INCLUDED
-#define BEAST_SQDB_TRANSACTION_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_TRANSACTION_H_INCLUDED
 
 #include <beast/utility/Error.h>
 

src/beast/beast/module/sqdb/api/type_conversion_traits.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_TYPE_CONVERSION_TRAITS_H_INCLUDED
-#define BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_TYPE_CONVERSION_TRAITS_H_INCLUDED
 
 #include <beast/module/core/time/Time.h>
 

src/beast/beast/module/sqdb/api/use.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_USE_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_API_USE_H_INCLUDED
-#define BEAST_SQDB_USE_H_INCLUDED
+#define BEAST_MODULE_SQDB_API_USE_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/error_codes.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_ERROR_CODES_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_ERROR_CODES_H_INCLUDED
-#define BEAST_SQDB_DETAIL_ERROR_CODES_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_ERROR_CODES_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/exchange_traits.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED
-#define BEAST_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/into_type.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_INTO_TYPE_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_INTO_TYPE_H_INCLUDED
-#define BEAST_SQDB_DETAIL_INTO_TYPE_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_INTO_TYPE_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/once_temp_type.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED
-#define BEAST_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/prepare_temp_type.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED
-#define BEAST_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/ref_counted_prepare_info.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED
-#define BEAST_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED
 
 #include <vector>
 

src/beast/beast/module/sqdb/detail/ref_counted_statement.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED
-#define BEAST_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/statement_imp.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED
-#define BEAST_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/type_conversion.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED
-#define BEAST_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/type_ptr.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_TYPE_PTR_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_TYPE_PTR_H_INCLUDED
-#define BEAST_SQDB_DETAIL_TYPE_PTR_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_TYPE_PTR_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/detail/use_type.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_DETAIL_USE_TYPE_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_DETAIL_USE_TYPE_H_INCLUDED
-#define BEAST_SQDB_DETAIL_USE_TYPE_H_INCLUDED
+#define BEAST_MODULE_SQDB_DETAIL_USE_TYPE_H_INCLUDED
 
 namespace beast {
 namespace sqdb {

src/beast/beast/module/sqdb/sqdb.h

@@ -57,8 +57,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQDB_H_INCLUDED
+#ifndef BEAST_MODULE_SQDB_SQDB_H_INCLUDED
-#define BEAST_SQDB_H_INCLUDED
+#define BEAST_MODULE_SQDB_SQDB_H_INCLUDED
 
 /** An embedded database wrapper with an intuitive, type-safe interface.
 

src/beast/beast/module/sqlite/sqlite.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SQLITE_H_INCLUDED
+#ifndef BEAST_MODULE_SQLITE_SQLITE_H_INCLUDED
-#define BEAST_SQLITE_H_INCLUDED
+#define BEAST_MODULE_SQLITE_SQLITE_H_INCLUDED
 
 /**  A self-contained, serverless, zero configuration, transactional SQL engine.
 

src/beast/beast/module/sqlite/sqlite/sqlite3.h

@@ -30,8 +30,9 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 */
-#ifndef _SQLITE3_H_
+#ifndef BEAST_MODULE_SQLITE_SQLITE3_H_INCLUDED
-#define _SQLITE3_H_
+#define BEAST_MODULE_SQLITE_SQLITE3_H_INCLUDED
+
 #include <stdarg.h>     /* Needed for the definition of va_list */
 
 /*

src/beast/beast/module/sqlite/sqlite/sqlite3ext.h

@@ -15,8 +15,9 @@
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
 */
-#ifndef _SQLITE3EXT_H_
+#ifndef BEAST_MODULE_SQLITE_SQLITE3EXT_H_INCLUDED
-#define _SQLITE3EXT_H_
+#define BEAST_MODULE_SQLITE_SQLITE3EXT_H_INCLUDED
+
 #include "sqlite3.h"
 
 typedef struct sqlite3_api_routines sqlite3_api_routines;

src/beast/beast/nudb/detail/arena.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_ARENA_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_ARENA_H_INCLUDED
-#define BEAST_NUDB_ARENA_H_INCLUDED
+#define BEAST_NUDB_DETAIL_ARENA_H_INCLUDED
 
 #include <beast/nudb/detail/config.h>
 #include <algorithm>

src/beast/beast/nudb/detail/bucket.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_BUCKET_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_BUCKET_H_INCLUDED
-#define BEAST_NUDB_BUCKET_H_INCLUDED
+#define BEAST_NUDB_DETAIL_BUCKET_H_INCLUDED
 
 #include <beast/nudb/error.h>
 #include <beast/nudb/detail/bulkio.h>

src/beast/beast/nudb/detail/buffers.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_BUFFERS_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_BUFFERS_H_INCLUDED
-#define BEAST_NUDB_BUFFERS_H_INCLUDED
+#define BEAST_NUDB_DETAIL_BUFFERS_H_INCLUDED
 
 #include <beast/nudb/detail/config.h>
 #include <atomic>

src/beast/beast/nudb/detail/bulkio.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_BULKIO_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_BULKIO_H_INCLUDED
-#define BEAST_NUDB_BULKIO_H_INCLUDED
+#define BEAST_NUDB_DETAIL_BULKIO_H_INCLUDED
 
 #include <beast/nudb/detail/config.h>
 #include <beast/nudb/detail/stream.h>

src/beast/beast/nudb/detail/cache.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_CACHE_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_CACHE_H_INCLUDED
-#define BEAST_NUDB_CACHE_H_INCLUDED
+#define BEAST_NUDB_DETAIL_CACHE_H_INCLUDED
 
 #include <beast/nudb/detail/arena.h>
 #include <beast/nudb/detail/bucket.h>

src/beast/beast/nudb/detail/config.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_CONFIG_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_CONFIG_H_INCLUDED
-#define BEAST_NUDB_CONFIG_H_INCLUDED
+#define BEAST_NUDB_DETAIL_CONFIG_H_INCLUDED
 
 #include <beast/hash/xxhasher.h>
 

src/beast/beast/nudb/detail/field.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_FIELD_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_FIELD_H_INCLUDED
-#define BEAST_NUDB_FIELD_H_INCLUDED
+#define BEAST_NUDB_DETAIL_FIELD_H_INCLUDED
 
 #include <beast/nudb/detail/config.h>
 #include <beast/nudb/detail/stream.h>

src/beast/beast/nudb/detail/format.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NUDB_FORMAT_H_INCLUDED
+#ifndef BEAST_NUDB_DETAIL_FORMAT_H_INCLUDED
-#define BEAST_NUDB_FORMAT_H_INCLUDED
+#define BEAST_NUDB_DETAIL_FORMAT_H_INCLUDED
 
 #include <beast/nudb/error.h>
 #include <beast/nudb/detail/field.h>