diff --git a/src/beast/beast/intrusive/List.h b/src/beast/beast/intrusive/List.h
index 6aee1afc03..0b64fb6e43 100644
--- a/src/beast/beast/intrusive/List.h
+++ b/src/beast/beast/intrusive/List.h
@@ -46,8 +46,7 @@ class ListNode
 private:
     typedef T value_type;
 
-    template <typename, typename>
-    friend class List;
+    friend class List<T, Tag>;
 
     template <typename>
     friend class ListIterator;
diff --git a/src/beast/beast/net/BufferType.h b/src/beast/beast/net/BufferType.h
index 4e3ab14785..a94990a3bf 100644
--- a/src/beast/beast/net/BufferType.h
+++ b/src/beast/beast/net/BufferType.h
@@ -53,7 +53,7 @@ public:
 
     template <bool OtherIsConst>
     BufferType (BufferType <OtherIsConst> const& other)
-        : m_data (other.cast <pointer_type> ())
+        : m_data (other.template cast <pointer_type> ())
         , m_size (other.size ())
     {
     }
@@ -75,7 +75,7 @@ public:
     BufferType& operator= (
         BufferType <OtherIsConst> const& other) noexcept
     {
-        m_data = other.cast <pointer_type> ();
+        m_data = other.template cast <pointer_type> ();
         m_size = other.size ();
         return *this;
     }
diff --git a/src/beast/beast/smart_ptr/SharedPtr.h b/src/beast/beast/smart_ptr/SharedPtr.h
index f1ce3754ce..36370897f6 100644
--- a/src/beast/beast/smart_ptr/SharedPtr.h
+++ b/src/beast/beast/smart_ptr/SharedPtr.h
@@ -164,7 +164,7 @@ public:
 
     template <class U>
     SharedPtr (SharedPtr <U>&& sp) noexcept
-        : m_p (sp.swap <U> (nullptr))
+        : m_p (sp.template swap <U> (nullptr))
     {
     }
     /** @} */
@@ -185,7 +185,7 @@ public:
     template <class U>
     SharedPtr& operator= (SharedPtr <U>&& sp)
     {
-        return assign (sp.swap <U> (nullptr));
+        return assign (sp.template swap <U> (nullptr));
     }
     /** @} */
 #endif
diff --git a/src/beast/beast/utility/PropertyStream.h b/src/beast/beast/utility/PropertyStream.h
index 653ceb8827..2871499718 100644
--- a/src/beast/beast/utility/PropertyStream.h
+++ b/src/beast/beast/utility/PropertyStream.h
@@ -110,11 +110,11 @@ private:
 class PropertyStream::Proxy
 {
 private:
-    Map* m_map;
+	Map const* m_map;
     std::string m_key;
 
 public:
-    Proxy (Map& map, std::string const& key);
+    Proxy (Map const& map, std::string const& key);
 
     template <typename Value>
     Proxy& operator= (Value value);
diff --git a/src/beast/beast/utility/impl/PropertyStream.cpp b/src/beast/beast/utility/impl/PropertyStream.cpp
index 239ba4f67f..7afab58f36 100644
--- a/src/beast/beast/utility/impl/PropertyStream.cpp
+++ b/src/beast/beast/utility/impl/PropertyStream.cpp
@@ -56,7 +56,7 @@ PropertyStream::Source& PropertyStream::Item::operator* () const
 //------------------------------------------------------------------------------
 
 PropertyStream::Proxy::Proxy (
-    Map& map, std::string const& key)
+    Map const& map, std::string const& key)
     : m_map (&map)
     , m_key (key)
 {
diff --git a/src/beast/modules/beast_core/native/mac_Network.mm b/src/beast/modules/beast_core/native/mac_Network.mm
index 2d40d49808..4002e97ab0 100644
--- a/src/beast/modules/beast_core/native/mac_Network.mm
+++ b/src/beast/modules/beast_core/native/mac_Network.mm
@@ -21,6 +21,8 @@
 */
 //==============================================================================
 
+#include "../network/URL.h"
+
 void MACAddress::findAllAddresses (Array<MACAddress>& result)
 {
     ifaddrs* addrs = nullptr;
diff --git a/src/beast/modules/beast_sqlite/beast_sqlite.h b/src/beast/modules/beast_sqlite/beast_sqlite.h
index ed63472e82..7c6f837757 100644
--- a/src/beast/modules/beast_sqlite/beast_sqlite.h
+++ b/src/beast/modules/beast_sqlite/beast_sqlite.h
@@ -30,7 +30,7 @@
           see BeastConfig.h.
 */
 
-#include "../../../beast/beast/config/PlatformConfig.h"
+#include "../../beast/config/PlatformConfig.h"
 
 #if BEAST_IOS || BEAST_MAC
 # define BEAST_HAVE_NATIVE_SQLITE 1