diff --git a/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.h b/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.h
index 8240c2e99a..71a42e91c4 100644
--- a/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.h
+++ b/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.h
@@ -30,7 +30,7 @@
 
     @ingroup beast_core
 */
-class BEAST_API OncePerSecond : Uncopyable
+class BEAST_API OncePerSecond : public Uncopyable
 {
 public:
     OncePerSecond ();
diff --git a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp
index b868937eb3..4888891eef 100644
--- a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp
@@ -43,7 +43,7 @@ struct FifoFreeStoreWithTLS::Header
 
 //------------------------------------------------------------------------------
 
-class FifoFreeStoreWithTLS::Page : LeakChecked <Page>, Uncopyable
+class FifoFreeStoreWithTLS::Page : LeakChecked <Page>, public Uncopyable
 {
 public:
     explicit Page (const size_t bytes) : m_refs (1)
@@ -94,7 +94,7 @@ private:
 
 //------------------------------------------------------------------------------
 
-class FifoFreeStoreWithTLS::PerThreadData : LeakChecked <PerThreadData>, Uncopyable
+class FifoFreeStoreWithTLS::PerThreadData : LeakChecked <PerThreadData>, public Uncopyable
 {
 public:
     explicit PerThreadData (FifoFreeStoreWithTLS* allocator)
diff --git a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp
index bc8d9b96d9..07502eefdf 100644
--- a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp
@@ -30,7 +30,7 @@ struct FifoFreeStoreWithoutTLS::Header
 
 //------------------------------------------------------------------------------
 
-class FifoFreeStoreWithoutTLS::Block : Uncopyable
+class FifoFreeStoreWithoutTLS::Block : public Uncopyable
 {
 public:
     explicit Block (const size_t bytes) : m_refs (1)
diff --git a/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h b/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h
index 77f19df07a..d6e8bbedaa 100644
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h
@@ -52,7 +52,7 @@
 
   @ingroup beast_concurrent
 */
-class BEAST_API ParallelFor : Uncopyable
+class BEAST_API ParallelFor : public Uncopyable
 {
 public:
     /** Create a parallel for loop.
@@ -153,7 +153,7 @@ private:
     };
 
     template <class Functor>
-    class IterationType : public Iteration, Uncopyable
+    class IterationType : public Iteration, public Uncopyable
     {
     public:
         explicit IterationType (Functor const& f) : m_f (f)
@@ -172,7 +172,7 @@ private:
 private:
     class LoopState
         : public AllocatedBy <ThreadGroup::AllocatorType>
-        , Uncopyable
+        , public Uncopyable
     {
     private:
         Iteration& m_iteration;
diff --git a/Subtrees/beast/modules/beast_basics/threads/beast_ReadWriteMutex.h b/Subtrees/beast/modules/beast_basics/threads/beast_ReadWriteMutex.h
index aea144a536..3ab273863d 100644
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ReadWriteMutex.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ReadWriteMutex.h
@@ -55,7 +55,7 @@
   @ingroup beast_concurrent
 */
 template <class LockType>
-struct GenericScopedReadLock : Uncopyable
+struct GenericScopedReadLock : public Uncopyable
 {
     inline explicit GenericScopedReadLock (LockType const& lock) noexcept
 :
@@ -81,7 +81,7 @@ private:
   @ingroup beast_concurrent
 */
 template <class LockType>
-struct GenericScopedWriteLock : Uncopyable
+struct GenericScopedWriteLock : public Uncopyable
 {
     inline explicit GenericScopedWriteLock (LockType const& lock) noexcept
 :
diff --git a/Subtrees/beast/modules/beast_basics/threads/beast_SerialFor.h b/Subtrees/beast/modules/beast_basics/threads/beast_SerialFor.h
index 5be1429af8..538a7110cc 100644
--- a/Subtrees/beast/modules/beast_basics/threads/beast_SerialFor.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_SerialFor.h
@@ -31,7 +31,7 @@
 
     @ingroup beast_core
 */
-class BEAST_API SerialFor : Uncopyable
+class BEAST_API SerialFor : public Uncopyable
 {
 public:
     /** Create a serial for loop.
diff --git a/Subtrees/beast/modules/beast_basics/threads/beast_SharedData.h b/Subtrees/beast/modules/beast_basics/threads/beast_SharedData.h
index f02649e4c2..3afc5b123a 100644
--- a/Subtrees/beast/modules/beast_basics/threads/beast_SharedData.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_SharedData.h
@@ -113,7 +113,7 @@
              See @ref CallQueue::queue().
 */
 template <class Object>
-class SharedData : Uncopyable
+class SharedData : public Uncopyable
 {
 public:
     class ReadAccess;
@@ -176,7 +176,7 @@ private:
     Use sparingly.
 */
 template <class Object>
-class SharedData <Object>::UnlockedAccess : Uncopyable
+class SharedData <Object>::UnlockedAccess : public Uncopyable
 {
 public:
     explicit UnlockedAccess (SharedData const& state)
@@ -205,7 +205,7 @@ private:
 
 /** Read only access to a SharedData */
 template <class Object>
-class SharedData <Object>::ReadAccess : Uncopyable
+class SharedData <Object>::ReadAccess : public Uncopyable
 {
 public:
     /** Create a ReadAccess from the specified SharedData */
@@ -242,7 +242,7 @@ private:
 
 /** Read/write access to a SharedData */
 template <class Object>
-class SharedData <Object>::WriteAccess : Uncopyable
+class SharedData <Object>::WriteAccess : public Uncopyable
 {
 public:
     explicit WriteAccess (SharedData& state)
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.h b/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.h
index f0fe0e571e..f90fea25f2 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.h
@@ -81,7 +81,7 @@
     };
     @endcode
 */
-class BEAST_API AbstractFifo : LeakChecked <AbstractFifo>, Uncopyable
+class BEAST_API AbstractFifo : LeakChecked <AbstractFifo>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_HashMap.h b/Subtrees/beast/modules/beast_core/containers/beast_HashMap.h
index 981a004256..6438bb3542 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_HashMap.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_HashMap.h
@@ -126,7 +126,7 @@ template <typename KeyType,
           class HashFunctionToUse = DefaultHashFunctions,
           class TypeOfCriticalSectionToUse = DummyCriticalSection>
 class HashMap
-    : Uncopyable
+    : public Uncopyable
     , LeakChecked <HashMap <KeyType,
                             ValueType,
                             HashFunctionToUse,
@@ -378,7 +378,7 @@ public:
 
 private:
     //==============================================================================
-    class HashEntry : Uncopyable
+    class HashEntry : public Uncopyable
     {
     public:
         HashEntry (KeyTypeParameter k, ValueTypeParameter val, HashEntry* const next)
@@ -414,7 +414,7 @@ public:
 
         @see HashMap
     */
-    class Iterator : LeakChecked <Iterator>, Uncopyable
+    class Iterator : LeakChecked <Iterator>, public Uncopyable
     {
     public:
         //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_LinkedListPointer.h b/Subtrees/beast/modules/beast_core/containers/beast_LinkedListPointer.h
index da6785669e..4d04ebe491 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_LinkedListPointer.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_LinkedListPointer.h
@@ -53,7 +53,7 @@
     @endcode
 */
 template <class ObjectType>
-class LinkedListPointer : Uncopyable
+class LinkedListPointer : public Uncopyable
 {
 public:
     //==============================================================================
@@ -330,7 +330,7 @@ public:
         list, and then repeatedly call Appender::append() to add items to the end
         of the list in O(1) time.
     */
-    class Appender : Uncopyable
+    class Appender : public Uncopyable
     {
     public:
         /** Creates an appender which will add items to the given list.
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_List.h b/Subtrees/beast/modules/beast_core/containers/beast_List.h
index 3d352d05e7..c187579b96 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_List.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_List.h
@@ -304,7 +304,7 @@ struct ListDefaultTag;
     @ingroup beast_core intrusive
 */
 template <class Element, class Tag = ListDefaultTag>
-class List : Uncopyable
+class List : public Uncopyable
 {
 public:
     typedef int size_type;
@@ -323,7 +323,7 @@ public:
         }
     };
 
-    class Node : Uncopyable
+    class Node : public Uncopyable
     {
     public:
         Node () { }
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_LockFreeQueue.h b/Subtrees/beast/modules/beast_core/containers/beast_LockFreeQueue.h
index e64649b1e1..64b83065ba 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_LockFreeQueue.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_LockFreeQueue.h
@@ -50,7 +50,7 @@ template <class Element, class Tag = LockFreeQueueDefaultTag>
 class LockFreeQueue
 {
 public:
-    class Node : Uncopyable
+    class Node : public Uncopyable
     {
     public:
         Node () { }
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_LockFreeStack.h b/Subtrees/beast/modules/beast_core/containers/beast_LockFreeStack.h
index d32a47e38e..c4b24739ff 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_LockFreeStack.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_LockFreeStack.h
@@ -39,10 +39,10 @@ struct LockFreeStackDefaultTag;
   @ingroup beast_core intrusive
 */
 template <class Element, class Tag = LockFreeStackDefaultTag>
-class LockFreeStack : Uncopyable
+class LockFreeStack : public Uncopyable
 {
 public:
-    class Node : Uncopyable
+    class Node : public Uncopyable
     {
     public:
         Node ()
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h b/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h
index 9049bf010b..684a253d8b 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h
@@ -48,7 +48,7 @@ template <class ObjectClass,
 
 class OwnedArray
     : LeakChecked <OwnedArray <ObjectClass, TypeOfCriticalSectionToUse> >
-    , Uncopyable
+    , public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_ScopedValueSetter.h b/Subtrees/beast/modules/beast_core/containers/beast_ScopedValueSetter.h
index 3709d6e721..840dbd8041 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_ScopedValueSetter.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_ScopedValueSetter.h
@@ -52,7 +52,7 @@
 
 */
 template <typename ValueType>
-class ScopedValueSetter : Uncopyable
+class ScopedValueSetter : public Uncopyable
 {
 public:
     /** Creates a ScopedValueSetter that will immediately change the specified value to the
diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h
index 6086757bf7..4821b2b260 100644
--- a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h
+++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h
@@ -31,7 +31,7 @@
     the process is terminated, a listener object gets notified so that the
     client application can perform logging or emit further diagnostics.
 */
-class FatalError : Uncopyable
+class FatalError : public Uncopyable
 {
 public:
     struct Reporter
diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_ProtectedCall.cpp b/Subtrees/beast/modules/beast_core/diagnostic/beast_ProtectedCall.cpp
index ae23396c45..0227a3c2a0 100644
--- a/Subtrees/beast/modules/beast_core/diagnostic/beast_ProtectedCall.cpp
+++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_ProtectedCall.cpp
@@ -38,7 +38,7 @@ namespace
 // While this object is in scope, any Windows SEH
 // exceptions will be caught and re-thrown as an Error object.
 //
-class ScopedPlatformExceptionCatcher : Uncopyable
+class ScopedPlatformExceptionCatcher : public Uncopyable
 {
 public:
     ScopedPlatformExceptionCatcher ()
diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h
index 9af564b803..546bd43a6d 100644
--- a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h
+++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h
@@ -331,7 +331,7 @@ private:
 
     @see UnitTest
 */
-class BEAST_API UnitTests : Uncopyable
+class BEAST_API UnitTests : public Uncopyable
 {
 public:
     struct Results
diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTestUtilities.h b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTestUtilities.h
index 234e7ac097..6f8234b483 100644
--- a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTestUtilities.h
+++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTestUtilities.h
@@ -109,7 +109,7 @@ public:
     @see UnitTest, UnitTests
 */
 
-class JUnitXMLFormatter : Uncopyable
+class JUnitXMLFormatter : public Uncopyable
 {
 public:
     JUnitXMLFormatter (UnitTests const& tests);
diff --git a/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.h b/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.h
index 144dca788c..80a5bd6ff5 100644
--- a/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.h
@@ -41,7 +41,7 @@
 
     It can also guess how far it's got using a wildly inaccurate algorithm.
 */
-class BEAST_API DirectoryIterator : LeakChecked <DirectoryIterator>, Uncopyable
+class BEAST_API DirectoryIterator : LeakChecked <DirectoryIterator>, public Uncopyable
 {
 public:
     //==============================================================================
@@ -116,7 +116,7 @@ public:
 
 private:
     //==============================================================================
-    class NativeIterator : LeakChecked <NativeIterator>, Uncopyable
+    class NativeIterator : LeakChecked <NativeIterator>, public Uncopyable
     {
     public:
         NativeIterator (const File& directory, const String& wildCard);
diff --git a/Subtrees/beast/modules/beast_core/files/beast_MemoryMappedFile.h b/Subtrees/beast/modules/beast_core/files/beast_MemoryMappedFile.h
index 56b6579148..98b3f6192c 100644
--- a/Subtrees/beast/modules/beast_core/files/beast_MemoryMappedFile.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_MemoryMappedFile.h
@@ -30,7 +30,7 @@
 /**
     Maps a file into virtual memory for easy reading and/or writing.
 */
-class BEAST_API MemoryMappedFile : LeakChecked <MemoryMappedFile>, Uncopyable
+class BEAST_API MemoryMappedFile : LeakChecked <MemoryMappedFile>, public Uncopyable
 {
 public:
     /** The read/write flags used when opening a memory mapped file. */
diff --git a/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.h b/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.h
index 2b7c9505c6..e17d6caced 100644
--- a/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.h
@@ -38,7 +38,7 @@
 
     @see FileInputStream, FileOutputStream
 */
-class BEAST_API  RandomAccessFile : Uncopyable, LeakChecked <RandomAccessFile>
+class BEAST_API  RandomAccessFile : public Uncopyable, LeakChecked <RandomAccessFile>
 {
 public:
     /** The type of an FileOffset.
diff --git a/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.h b/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.h
index b46371b482..62e8dd2307 100644
--- a/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.h
@@ -65,7 +65,7 @@
 
     @see File, FileOutputStream
 */
-class BEAST_API TemporaryFile : LeakChecked <TemporaryFile>, Uncopyable
+class BEAST_API TemporaryFile : LeakChecked <TemporaryFile>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/logging/beast_FileLogger.h b/Subtrees/beast/modules/beast_core/logging/beast_FileLogger.h
index d6cb1c6020..5647799672 100644
--- a/Subtrees/beast/modules/beast_core/logging/beast_FileLogger.h
+++ b/Subtrees/beast/modules/beast_core/logging/beast_FileLogger.h
@@ -38,7 +38,7 @@
 class BEAST_API FileLogger
     : public Logger
     , LeakChecked <FileLogger>
-    , Uncopyable
+    , public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/maths/beast_Expression.cpp b/Subtrees/beast/modules/beast_core/maths/beast_Expression.cpp
index 4558333631..ecd3630207 100644
--- a/Subtrees/beast/modules/beast_core/maths/beast_Expression.cpp
+++ b/Subtrees/beast/modules/beast_core/maths/beast_Expression.cpp
@@ -346,7 +346,7 @@ struct Expression::Helpers
         //==============================================================================
         class EvaluationVisitor
             : public Scope::Visitor
-            , Uncopyable
+            , public Uncopyable
         {
         public:
             EvaluationVisitor (const TermPtr& t, const int recursion)
@@ -361,7 +361,7 @@ struct Expression::Helpers
 
         class SymbolVisitingVisitor
             : public Scope::Visitor
-            , Uncopyable
+            , public Uncopyable
         {
         public:
             SymbolVisitingVisitor (const TermPtr& t, SymbolVisitor& v, const int recursion)
@@ -377,7 +377,7 @@ struct Expression::Helpers
 
         class SymbolRenamingVisitor
             : public Scope::Visitor
-            , Uncopyable
+            , public Uncopyable
         {
         public:
             SymbolRenamingVisitor (const TermPtr& t, const Expression::Symbol& symbol_, const String& newName_, const int recursionCount_)
@@ -607,7 +607,7 @@ struct Expression::Helpers
     //==============================================================================
     class SymbolCheckVisitor
         : public Term::SymbolVisitor
-        , Uncopyable
+        , public Uncopyable
     {
     public:
         SymbolCheckVisitor (const Symbol& symbol_) : wasFound (false), symbol (symbol_) {}
@@ -622,7 +622,7 @@ struct Expression::Helpers
     //==============================================================================
     class SymbolListVisitor
         : public Term::SymbolVisitor
-        , Uncopyable
+        , public Uncopyable
     {
     public:
         SymbolListVisitor (Array<Symbol>& list_) : list (list_) {}
@@ -633,7 +633,7 @@ struct Expression::Helpers
     };
 
     //==============================================================================
-    class Parser : Uncopyable
+    class Parser : public Uncopyable
     {
     public:
         //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/memory/beast_ByteOrder.h b/Subtrees/beast/modules/beast_core/memory/beast_ByteOrder.h
index b02eedf9d6..57cf4816cb 100644
--- a/Subtrees/beast/modules/beast_core/memory/beast_ByteOrder.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_ByteOrder.h
@@ -29,7 +29,7 @@
 /** Contains static methods for converting the byte order between different
     endiannesses.
 */
-class BEAST_API ByteOrder : Uncopyable
+class BEAST_API ByteOrder : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/memory/beast_HeapBlock.h b/Subtrees/beast/modules/beast_core/memory/beast_HeapBlock.h
index 074d3ecad2..dfedcca935 100644
--- a/Subtrees/beast/modules/beast_core/memory/beast_HeapBlock.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_HeapBlock.h
@@ -82,7 +82,7 @@ namespace HeapBlockHelper
     @see Array, OwnedArray, MemoryBlock
 */
 template <class ElementType, bool throwOnFailure = false>
-class HeapBlock : Uncopyable
+class HeapBlock : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/memory/beast_Memory.h b/Subtrees/beast/modules/beast_core/memory/beast_Memory.h
index 092113cd7a..cf87978c5c 100644
--- a/Subtrees/beast/modules/beast_core/memory/beast_Memory.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_Memory.h
@@ -65,7 +65,7 @@ inline Type* createCopyIfNotNull (const Type* pointer)     { return pointer != n
  /** A handy C++ wrapper that creates and deletes an NSAutoreleasePool object using RAII.
      You should use the BEAST_AUTORELEASEPOOL macro to create a local auto-release pool on the stack.
  */
- class BEAST_API ScopedAutoReleasePool : Uncopyable
+ class BEAST_API ScopedAutoReleasePool : public Uncopyable
  {
  public:
      ScopedAutoReleasePool();
diff --git a/Subtrees/beast/modules/beast_core/memory/beast_ScopedPointer.h b/Subtrees/beast/modules/beast_core/memory/beast_ScopedPointer.h
index e0bb516d29..32d8aa8327 100644
--- a/Subtrees/beast/modules/beast_core/memory/beast_ScopedPointer.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_ScopedPointer.h
@@ -62,7 +62,7 @@
     you'd need to return a raw pointer (or use a std::auto_ptr instead).
 */
 template <class ObjectType>
-class ScopedPointer : Uncopyable
+class ScopedPointer : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/memory/beast_SharedObject.h b/Subtrees/beast/modules/beast_core/memory/beast_SharedObject.h
index 2b5e46296e..87f3d4b255 100644
--- a/Subtrees/beast/modules/beast_core/memory/beast_SharedObject.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_SharedObject.h
@@ -88,7 +88,6 @@ public:
     /** Returns the object's current reference count. */
     inline int getReferenceCount() const noexcept       { return refCount.get(); }
 
-
 protected:
     //==============================================================================
     /** Creates the reference-counted object (with an initial ref count of zero). */
diff --git a/Subtrees/beast/modules/beast_core/memory/beast_WeakReference.h b/Subtrees/beast/modules/beast_core/memory/beast_WeakReference.h
index 8c4334a9c1..c96022618c 100644
--- a/Subtrees/beast/modules/beast_core/memory/beast_WeakReference.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_WeakReference.h
@@ -130,7 +130,7 @@ public:
     */
     class SharedPointer
         : public ReferenceCountingType
-        , Uncopyable
+        , public Uncopyable
     {
     public:
         explicit SharedPointer (ObjectType* const obj) noexcept : owner (obj) {}
@@ -150,7 +150,7 @@ public:
         See the WeakReference class notes for an example of how to use this class.
         @see WeakReference
     */
-    class Master : Uncopyable
+    class Master : public Uncopyable
     {
     public:
         Master() noexcept {}
diff --git a/Subtrees/beast/modules/beast_core/misc/beast_Main.h b/Subtrees/beast/modules/beast_core/misc/beast_Main.h
index 7a98c8579a..f167116855 100644
--- a/Subtrees/beast/modules/beast_core/misc/beast_Main.h
+++ b/Subtrees/beast/modules/beast_core/misc/beast_Main.h
@@ -25,7 +25,7 @@
     To use this, derive your class from @ref Main and implement the
     function run ();
 */
-class BEAST_API Main : Uncopyable
+class BEAST_API Main : public Uncopyable
 {
 public:
     Main ();
diff --git a/Subtrees/beast/modules/beast_core/misc/beast_WindowsRegistry.h b/Subtrees/beast/modules/beast_core/misc/beast_WindowsRegistry.h
index 86b95cd246..5a62729fed 100644
--- a/Subtrees/beast/modules/beast_core/misc/beast_WindowsRegistry.h
+++ b/Subtrees/beast/modules/beast_core/misc/beast_WindowsRegistry.h
@@ -30,7 +30,7 @@
     Contains some static helper functions for manipulating the MS Windows registry
     (Only available on Windows, of course!)
 */
-class WindowsRegistry : Uncopyable
+class WindowsRegistry : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/native/beast_android_Files.cpp b/Subtrees/beast/modules/beast_core/native/beast_android_Files.cpp
index 5a6c56674a..d5ca3facd0 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_android_Files.cpp
+++ b/Subtrees/beast/modules/beast_core/native/beast_android_Files.cpp
@@ -148,7 +148,7 @@ bool File::moveToTrash() const
 }
 
 //==============================================================================
-class DirectoryIterator::NativeIterator::Pimpl : Uncopyable
+class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable
 {
 public:
     Pimpl (const File& directory, const String& wildCard_)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_android_JNIHelpers.h b/Subtrees/beast/modules/beast_core/native/beast_android_JNIHelpers.h
index 4393f17fa5..68cc75b643 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_android_JNIHelpers.h
+++ b/Subtrees/beast/modules/beast_core/native/beast_android_JNIHelpers.h
@@ -167,7 +167,7 @@ namespace
 }
 
 //==============================================================================
-class JNIClassBase : Uncopyable
+class JNIClassBase : public Uncopyable
 {
 public:
     explicit JNIClassBase (const char* classPath);
diff --git a/Subtrees/beast/modules/beast_core/native/beast_bsd_Files.cpp b/Subtrees/beast/modules/beast_core/native/beast_bsd_Files.cpp
index ec8bccdb64..dc6c2dd0a2 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_bsd_Files.cpp
+++ b/Subtrees/beast/modules/beast_core/native/beast_bsd_Files.cpp
@@ -241,7 +241,7 @@ bool File::moveToTrash() const
 }
 
 //==============================================================================
-class DirectoryIterator::NativeIterator::Pimpl : Uncopyable
+class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable
 {
 public:
     Pimpl (const File& directory, const String& wildCard_)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_linux_Files.cpp b/Subtrees/beast/modules/beast_core/native/beast_linux_Files.cpp
index e29f551dca..d1253b92fb 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_linux_Files.cpp
+++ b/Subtrees/beast/modules/beast_core/native/beast_linux_Files.cpp
@@ -241,7 +241,7 @@ bool File::moveToTrash() const
 }
 
 //==============================================================================
-class DirectoryIterator::NativeIterator::Pimpl : Uncopyable
+class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable
 {
 public:
     Pimpl (const File& directory, const String& wildCard_)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_mac_Files.mm b/Subtrees/beast/modules/beast_core/native/beast_mac_Files.mm
index 183492670c..49115f75e4 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_mac_Files.mm
+++ b/Subtrees/beast/modules/beast_core/native/beast_mac_Files.mm
@@ -308,7 +308,7 @@ bool File::moveToTrash() const
 }
 
 //==============================================================================
-class DirectoryIterator::NativeIterator::Pimpl : Uncopyable
+class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable
 {
 public:
     Pimpl (const File& directory, const String& wildCard_)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_mac_Network.mm b/Subtrees/beast/modules/beast_core/native/beast_mac_Network.mm
index 8f3410185e..c549b5d443 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_mac_Network.mm
+++ b/Subtrees/beast/modules/beast_core/native/beast_mac_Network.mm
@@ -100,7 +100,7 @@ bool Process::openEmailWithAttachments (const String& targetEmailAddress,
 class URLConnectionState
    : public Thread
    , LeakChecked <URLConnectionState>
-   , Uncopyable
+   , public Uncopyable
 {
 public:
     URLConnectionState (NSURLRequest* req)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_osx_ObjCHelpers.h b/Subtrees/beast/modules/beast_core/native/beast_osx_ObjCHelpers.h
index 1f0c10e2e6..f8cd9a679f 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_osx_ObjCHelpers.h
+++ b/Subtrees/beast/modules/beast_core/native/beast_osx_ObjCHelpers.h
@@ -64,7 +64,7 @@ struct NSObjectRetainer
 
 //==============================================================================
 template <typename SuperclassType>
-struct ObjCClass : Uncopyable
+struct ObjCClass : public Uncopyable
 {
     ObjCClass (const char* nameRoot)
         : cls (objc_allocateClassPair ([SuperclassType class], getRandomisedName (nameRoot).toUTF8(), 0))
diff --git a/Subtrees/beast/modules/beast_core/native/beast_posix_NamedPipe.cpp b/Subtrees/beast/modules/beast_core/native/beast_posix_NamedPipe.cpp
index 07c2725d6e..227dbc79e1 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_posix_NamedPipe.cpp
+++ b/Subtrees/beast/modules/beast_core/native/beast_posix_NamedPipe.cpp
@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-class NamedPipe::Pimpl : LeakChecked <Pimpl>, Uncopyable
+class NamedPipe::Pimpl : LeakChecked <Pimpl>, public Uncopyable
 {
 public:
     Pimpl (const String& pipePath, bool createPipe)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_posix_SharedCode.h b/Subtrees/beast/modules/beast_core/native/beast_posix_SharedCode.h
index fd9d28b97f..b610dafebb 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_posix_SharedCode.h
+++ b/Subtrees/beast/modules/beast_core/native/beast_posix_SharedCode.h
@@ -1169,7 +1169,7 @@ void* DynamicLibrary::getFunction (const String& functionName) noexcept
 
 
 //==============================================================================
-class ChildProcess::ActiveProcess : LeakChecked <ActiveProcess>, Uncopyable
+class ChildProcess::ActiveProcess : LeakChecked <ActiveProcess>, public Uncopyable
 {
 public:
     ActiveProcess (const StringArray& arguments)
@@ -1298,7 +1298,7 @@ bool ChildProcess::kill()
 }
 
 //==============================================================================
-struct HighResolutionTimer::Pimpl : Uncopyable
+struct HighResolutionTimer::Pimpl : public Uncopyable
 {
     Pimpl (HighResolutionTimer& t)  : owner (t), thread (0), shouldStop (false)
     {
diff --git a/Subtrees/beast/modules/beast_core/native/beast_win32_Files.cpp b/Subtrees/beast/modules/beast_core/native/beast_win32_Files.cpp
index 302ba9a960..228fe566aa 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_win32_Files.cpp
+++ b/Subtrees/beast/modules/beast_core/native/beast_win32_Files.cpp
@@ -786,7 +786,7 @@ bool File::createLink (const String& description, const File& linkFileToCreate)
 //==============================================================================
 class DirectoryIterator::NativeIterator::Pimpl
     : LeakChecked <DirectoryIterator::NativeIterator::Pimpl>
-    , Uncopyable
+    , public Uncopyable
 {
 public:
     Pimpl (const File& directory, const String& wildCard)
@@ -888,7 +888,7 @@ void File::revealToUser() const
 }
 
 //==============================================================================
-class NamedPipe::Pimpl : LeakChecked <NamedPipe::Pimpl>, Uncopyable
+class NamedPipe::Pimpl : LeakChecked <NamedPipe::Pimpl>, public Uncopyable
 {
 public:
     Pimpl (const String& pipeName, const bool createPipe)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_win32_Registry.cpp b/Subtrees/beast/modules/beast_core/native/beast_win32_Registry.cpp
index af37aaa93a..467323852a 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_win32_Registry.cpp
+++ b/Subtrees/beast/modules/beast_core/native/beast_win32_Registry.cpp
@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-struct RegistryKeyWrapper : Uncopyable
+struct RegistryKeyWrapper : public Uncopyable
 {
     RegistryKeyWrapper (String name, const bool createForWriting, const DWORD wow64Flags)
         : key (0), wideCharValueName (nullptr)
diff --git a/Subtrees/beast/modules/beast_core/native/beast_win32_Threads.cpp b/Subtrees/beast/modules/beast_core/native/beast_win32_Threads.cpp
index 52438b5e83..6e850d59a7 100644
--- a/Subtrees/beast/modules/beast_core/native/beast_win32_Threads.cpp
+++ b/Subtrees/beast/modules/beast_core/native/beast_win32_Threads.cpp
@@ -461,7 +461,7 @@ void InterProcessLock::exit()
 }
 
 //==============================================================================
-class ChildProcess::ActiveProcess : LeakChecked <ChildProcess::ActiveProcess>, Uncopyable
+class ChildProcess::ActiveProcess : LeakChecked <ChildProcess::ActiveProcess>, public Uncopyable
 {
 public:
     ActiveProcess (const String& command)
@@ -584,7 +584,7 @@ bool ChildProcess::kill()
 }
 
 //==============================================================================
-struct HighResolutionTimer::Pimpl : Uncopyable
+struct HighResolutionTimer::Pimpl : public Uncopyable
 {
     Pimpl (HighResolutionTimer& t) noexcept  : owner (t), periodMs (0)
     {
diff --git a/Subtrees/beast/modules/beast_core/network/beast_NamedPipe.h b/Subtrees/beast/modules/beast_core/network/beast_NamedPipe.h
index 3e73e09ecc..d1e04f1dc5 100644
--- a/Subtrees/beast/modules/beast_core/network/beast_NamedPipe.h
+++ b/Subtrees/beast/modules/beast_core/network/beast_NamedPipe.h
@@ -34,7 +34,7 @@
 
     @see InterprocessConnection
 */
-class BEAST_API NamedPipe : LeakChecked <NamedPipe>, Uncopyable
+class BEAST_API NamedPipe : LeakChecked <NamedPipe>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/network/beast_Socket.h b/Subtrees/beast/modules/beast_core/network/beast_Socket.h
index 3b526f6f4e..36e5e70f1e 100644
--- a/Subtrees/beast/modules/beast_core/network/beast_Socket.h
+++ b/Subtrees/beast/modules/beast_core/network/beast_Socket.h
@@ -36,7 +36,7 @@
 
     @see DatagramSocket, InterprocessConnection, InterprocessConnectionServer
 */
-class BEAST_API StreamingSocket : LeakChecked <StreamingSocket>, Uncopyable
+class BEAST_API StreamingSocket : LeakChecked <StreamingSocket>, public Uncopyable
 {
 public:
     //==============================================================================
@@ -175,7 +175,7 @@ private:
 
     @see StreamingSocket, InterprocessConnection, InterprocessConnectionServer
 */
-class BEAST_API DatagramSocket : LeakChecked <DatagramSocket>, Uncopyable
+class BEAST_API DatagramSocket : LeakChecked <DatagramSocket>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/streams/beast_FileInputSource.h b/Subtrees/beast/modules/beast_core/streams/beast_FileInputSource.h
index ff217974cc..9aa93275c3 100644
--- a/Subtrees/beast/modules/beast_core/streams/beast_FileInputSource.h
+++ b/Subtrees/beast/modules/beast_core/streams/beast_FileInputSource.h
@@ -37,7 +37,7 @@
 class BEAST_API FileInputSource
     : public InputSource
     , LeakChecked <FileInputSource>
-    , Uncopyable
+    , public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/system/beast_SystemStats.h b/Subtrees/beast/modules/beast_core/system/beast_SystemStats.h
index 1575611976..a8f7920f56 100644
--- a/Subtrees/beast/modules/beast_core/system/beast_SystemStats.h
+++ b/Subtrees/beast/modules/beast_core/system/beast_SystemStats.h
@@ -28,7 +28,7 @@
 /**
     Contains methods for finding out about the current hardware and OS configuration.
 */
-class BEAST_API SystemStats : Uncopyable
+class BEAST_API SystemStats : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.h b/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.h
index 9efead13b1..ae6a380679 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.h
@@ -32,7 +32,7 @@
     This class lets you launch an executable, and read its output. You can also
     use it to check whether the child process has finished.
 */
-class BEAST_API ChildProcess : LeakChecked <ChildProcess>, Uncopyable
+class BEAST_API ChildProcess : LeakChecked <ChildProcess>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_CriticalSection.h b/Subtrees/beast/modules/beast_core/threads/beast_CriticalSection.h
index 28e053c791..45e8055cb4 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_CriticalSection.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_CriticalSection.h
@@ -37,7 +37,7 @@
 
     @see ScopedLock, ScopedTryLock, ScopedUnlock, SpinLock, ReadWriteLock, Thread, InterProcessLock
 */
-class BEAST_API CriticalSection : Uncopyable
+class BEAST_API CriticalSection : public Uncopyable
 {
 public:
     //==============================================================================
@@ -124,7 +124,7 @@ private:
 
     @see CriticalSection, Array, OwnedArray, SharedObjectArray
 */
-class BEAST_API DummyCriticalSection : Uncopyable
+class BEAST_API DummyCriticalSection : public Uncopyable
 {
 public:
     inline DummyCriticalSection() noexcept      {}
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_DynamicLibrary.h b/Subtrees/beast/modules/beast_core/threads/beast_DynamicLibrary.h
index 0330163a96..2c29219e83 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_DynamicLibrary.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_DynamicLibrary.h
@@ -31,7 +31,7 @@
     Since the DLL is freed when this object is deleted, it's handy for managing
     library lifetimes using RAII.
 */
-class BEAST_API DynamicLibrary : LeakChecked <DynamicLibrary>, Uncopyable
+class BEAST_API DynamicLibrary : LeakChecked <DynamicLibrary>, public Uncopyable
 {
 public:
     /** Creates an unopened DynamicLibrary object.
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_HighResolutionTimer.h b/Subtrees/beast/modules/beast_core/threads/beast_HighResolutionTimer.h
index 01f38fdc29..cba759abf2 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_HighResolutionTimer.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_HighResolutionTimer.h
@@ -38,7 +38,7 @@
 
     @see Timer
 */
-class BEAST_API HighResolutionTimer : LeakChecked <HighResolutionTimer>, Uncopyable
+class BEAST_API HighResolutionTimer : LeakChecked <HighResolutionTimer>, public Uncopyable
 {
 protected:
     /** Creates a HighResolutionTimer.
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_InterProcessLock.h b/Subtrees/beast/modules/beast_core/threads/beast_InterProcessLock.h
index 7e4469f8c6..43a83580f4 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_InterProcessLock.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_InterProcessLock.h
@@ -34,7 +34,7 @@
 
     @see CriticalSection
 */
-class BEAST_API InterProcessLock : Uncopyable
+class BEAST_API InterProcessLock : public Uncopyable
 {
 public:
     //==============================================================================
@@ -71,7 +71,7 @@ public:
 
         @see ScopedLock
     */
-    class ScopedLockType : Uncopyable
+    class ScopedLockType : public Uncopyable
     {
     public:
         //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_Process.h b/Subtrees/beast/modules/beast_core/threads/beast_Process.h
index 87b8262d80..d9a56804c5 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_Process.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_Process.h
@@ -35,7 +35,7 @@
 
     @see Thread, BEASTApplication
 */
-class BEAST_API Process : Uncopyable
+class BEAST_API Process : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ReadWriteLock.h b/Subtrees/beast/modules/beast_core/threads/beast_ReadWriteLock.h
index 880cae41b1..b5eb6ab9ee 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ReadWriteLock.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ReadWriteLock.h
@@ -50,7 +50,7 @@
 
     @see ScopedReadLock, ScopedWriteLock, CriticalSection
 */
-class BEAST_API ReadWriteLock : Uncopyable
+class BEAST_API ReadWriteLock : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ScopedLock.h b/Subtrees/beast/modules/beast_core/threads/beast_ScopedLock.h
index 91cc5473de..5ba0960b1d 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ScopedLock.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ScopedLock.h
@@ -51,7 +51,7 @@
     @see GenericScopedUnlock, CriticalSection, SpinLock, ScopedLock, ScopedUnlock
 */
 template <class LockType>
-class GenericScopedLock : Uncopyable
+class GenericScopedLock : public Uncopyable
 {
 public:
     //==============================================================================
@@ -118,7 +118,7 @@ private:
     @see GenericScopedLock, CriticalSection, ScopedLock, ScopedUnlock
 */
 template <class LockType>
-class GenericScopedUnlock : Uncopyable
+class GenericScopedUnlock : public Uncopyable
 {
 public:
     //==============================================================================
@@ -186,7 +186,7 @@ private:
     @see CriticalSection::tryEnter, GenericScopedLock, GenericScopedUnlock
 */
 template <class LockType>
-class GenericScopedTryLock : Uncopyable
+class GenericScopedTryLock : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ScopedReadLock.h b/Subtrees/beast/modules/beast_core/threads/beast_ScopedReadLock.h
index 9ec3c1ff55..1f5620c58f 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ScopedReadLock.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ScopedReadLock.h
@@ -50,7 +50,7 @@
 
     @see ReadWriteLock, ScopedWriteLock
 */
-class BEAST_API ScopedReadLock : Uncopyable
+class BEAST_API ScopedReadLock : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ScopedWriteLock.h b/Subtrees/beast/modules/beast_core/threads/beast_ScopedWriteLock.h
index 8bc88ccbdd..798d22522a 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ScopedWriteLock.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ScopedWriteLock.h
@@ -50,7 +50,7 @@
 
     @see ReadWriteLock, ScopedReadLock
 */
-class BEAST_API ScopedWriteLock : Uncopyable
+class BEAST_API ScopedWriteLock : public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_SpinLock.h b/Subtrees/beast/modules/beast_core/threads/beast_SpinLock.h
index f8eec63a7b..97b9857409 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_SpinLock.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_SpinLock.h
@@ -40,7 +40,7 @@
 
     @see CriticalSection
 */
-class BEAST_API SpinLock : Uncopyable
+class BEAST_API SpinLock : public Uncopyable
 {
 public:
     inline SpinLock() noexcept {}
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_Thread.h b/Subtrees/beast/modules/beast_core/threads/beast_Thread.h
index 90cb3f7f0a..716a79c67d 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_Thread.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_Thread.h
@@ -42,7 +42,7 @@
     @see CriticalSection, WaitableEvent, Process, ThreadWithProgressWindow,
          MessageManagerLock
 */
-class BEAST_API Thread : LeakChecked <Thread>, Uncopyable
+class BEAST_API Thread : LeakChecked <Thread>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ThreadLocalValue.h b/Subtrees/beast/modules/beast_core/threads/beast_ThreadLocalValue.h
index e3aede01fb..acd4ca64e0 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ThreadLocalValue.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ThreadLocalValue.h
@@ -51,7 +51,7 @@
     is deleted.
 */
 template <typename Type>
-class ThreadLocalValue : Uncopyable
+class ThreadLocalValue : public Uncopyable
 {
 public:
     /** */
@@ -170,7 +170,7 @@ public:
 private:
     //==============================================================================
    #if BEAST_NO_COMPILER_THREAD_LOCAL
-    struct ObjectHolder : Uncopyable
+    struct ObjectHolder : public Uncopyable
     {
         ObjectHolder (const Thread::ThreadID& tid)
             : threadId (tid), object()
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ThreadPool.h b/Subtrees/beast/modules/beast_core/threads/beast_ThreadPool.h
index 81bc7a73b5..79cc74f49b 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ThreadPool.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ThreadPool.h
@@ -46,7 +46,7 @@ class ThreadPoolThread;
 
     @see ThreadPool, Thread
 */
-class BEAST_API ThreadPoolJob : LeakChecked <ThreadPoolJob>, Uncopyable
+class BEAST_API ThreadPoolJob : LeakChecked <ThreadPoolJob>, public Uncopyable
 {
 public:
     //==============================================================================
@@ -137,7 +137,7 @@ private:
 
     @see ThreadPoolJob, Thread
 */
-class BEAST_API ThreadPool : LeakChecked <ThreadPool>, Uncopyable
+class BEAST_API ThreadPool : LeakChecked <ThreadPool>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_WaitableEvent.h b/Subtrees/beast/modules/beast_core/threads/beast_WaitableEvent.h
index 22e6104810..ee71c2dc3b 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_WaitableEvent.h
+++ b/Subtrees/beast/modules/beast_core/threads/beast_WaitableEvent.h
@@ -35,7 +35,7 @@
     calling thread until another thread wakes it up by calling the signal()
     method.
 */
-class BEAST_API WaitableEvent : LeakChecked <WaitableEvent>, Uncopyable
+class BEAST_API WaitableEvent : LeakChecked <WaitableEvent>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/xml/beast_XmlDocument.h b/Subtrees/beast/modules/beast_core/xml/beast_XmlDocument.h
index 3e51feecad..3f9a48d03d 100644
--- a/Subtrees/beast/modules/beast_core/xml/beast_XmlDocument.h
+++ b/Subtrees/beast/modules/beast_core/xml/beast_XmlDocument.h
@@ -67,7 +67,7 @@ class InputSource;
 
     @see XmlElement
 */
-class BEAST_API XmlDocument : LeakChecked <XmlDocument>, Uncopyable
+class BEAST_API XmlDocument : LeakChecked <XmlDocument>, public Uncopyable
 {
 public:
     //==============================================================================
diff --git a/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp b/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp
index 6cb71be235..98cba6701d 100644
--- a/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp
+++ b/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp
@@ -26,7 +26,7 @@
   ==============================================================================
 */
 
-class GZIPCompressorOutputStream::GZIPCompressorHelper : Uncopyable
+class GZIPCompressorOutputStream::GZIPCompressorHelper : public Uncopyable
 {
 public:
     GZIPCompressorHelper (const int compressionLevel, const int windowBits)
diff --git a/Subtrees/beast/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp b/Subtrees/beast/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
index 5f69fa68aa..bc70e9b43c 100644
--- a/Subtrees/beast/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
+++ b/Subtrees/beast/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
@@ -82,7 +82,7 @@ namespace zlibNamespace
 //==============================================================================
 // internal helper object that holds the zlib structures so they don't have to be
 // included publicly.
-class GZIPDecompressorInputStream::GZIPDecompressHelper : Uncopyable
+class GZIPDecompressorInputStream::GZIPDecompressHelper : public Uncopyable
 {
 public:
     GZIPDecompressHelper (const bool dontWrap)
diff --git a/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.cpp b/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.cpp
index 7ace22e120..bc3c6f0b4f 100644
--- a/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.cpp
+++ b/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.cpp
@@ -442,7 +442,7 @@ Result ZipFile::uncompressEntry (const int index,
 //=============================================================================
 extern unsigned long beast_crc32 (unsigned long crc, const unsigned char*, unsigned len);
 
-class ZipFile::Builder::Item : LeakChecked <ZipFile::Builder::Item>, Uncopyable
+class ZipFile::Builder::Item : LeakChecked <ZipFile::Builder::Item>, public Uncopyable
 {
 public:
     Item (const File& f, const int compression, const String& storedPath)
diff --git a/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.h b/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.h
index d137d3fefc..c5ea0f84ee 100644
--- a/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.h
+++ b/Subtrees/beast/modules/beast_core/zip/beast_ZipFile.h
@@ -42,7 +42,7 @@
     This can enumerate the items in a ZIP file and can create suitable stream objects
     to read each one.
 */
-class BEAST_API ZipFile : LeakChecked <ZipFile>, Uncopyable
+class BEAST_API ZipFile : LeakChecked <ZipFile>, public Uncopyable
 {
 public:
     /** Creates a ZipFile based for a file. */
@@ -184,7 +184,7 @@ public:
         Currently this just stores the files with no compression.. That will be added
         soon!
     */
-    class Builder : LeakChecked <Builder>, Uncopyable
+    class Builder : LeakChecked <Builder>, public Uncopyable
     {
     public:
         Builder();
diff --git a/Subtrees/beast/modules/beast_db/keyvalue/beast_KeyvaDB.cpp b/Subtrees/beast/modules/beast_db/keyvalue/beast_KeyvaDB.cpp
index 665a82a24a..c067276a68 100644
--- a/Subtrees/beast/modules/beast_db/keyvalue/beast_KeyvaDB.cpp
+++ b/Subtrees/beast/modules/beast_db/keyvalue/beast_KeyvaDB.cpp
@@ -124,7 +124,7 @@ public:
     };
 
     // Key records are indexed starting at one.
-    struct KeyRecord : Uncopyable
+    struct KeyRecord : public Uncopyable
     {
         explicit KeyRecord (void* const keyStorage)
             : key (keyStorage)
@@ -153,7 +153,7 @@ public:
     // are identical to the format on disk. Therefore it is necessary to
     // use the serialization routines to extract or update the key records.
     //
-    class KeyBlock : Uncopyable
+    class KeyBlock : public Uncopyable
     {
     public:
         KeyBlock (int depth, int keyBytes)
@@ -475,7 +475,7 @@ public:
 
     //--------------------------------------------------------------------------
 
-    struct FindResult : Uncopyable
+    struct FindResult : public Uncopyable
     {
         FindResult (void* const keyStorage)
             : keyRecord (keyStorage)
diff --git a/Subtrees/beast/modules/beast_sqdb/api/transaction.h b/Subtrees/beast/modules/beast_sqdb/api/transaction.h
index 08775ab84b..bca0ed0488 100644
--- a/Subtrees/beast/modules/beast_sqdb/api/transaction.h
+++ b/Subtrees/beast/modules/beast_sqdb/api/transaction.h
@@ -63,7 +63,7 @@
 namespace sqdb
 {
 
-class transaction : Uncopyable
+class transaction : public Uncopyable
 {
 public:
     explicit transaction(session& s);
diff --git a/Subtrees/beast/modules/beast_sqdb/detail/ref_counted_statement.h b/Subtrees/beast/modules/beast_sqdb/detail/ref_counted_statement.h
index 77b51ed159..ef068b1463 100644
--- a/Subtrees/beast/modules/beast_sqdb/detail/ref_counted_statement.h
+++ b/Subtrees/beast/modules/beast_sqdb/detail/ref_counted_statement.h
@@ -67,7 +67,7 @@ namespace detail
 {
 
 // used for "once" and "prepare"
-class ref_counted_statement_base : Uncopyable
+class ref_counted_statement_base : public Uncopyable
 {
 public:
     ref_counted_statement_base(session& s);
diff --git a/Subtrees/beast/modules/beast_sqdb/detail/type_conversion.h b/Subtrees/beast/modules/beast_sqdb/detail/type_conversion.h
index ddf810edb3..0f1ae18d95 100644
--- a/Subtrees/beast/modules/beast_sqdb/detail/type_conversion.h
+++ b/Subtrees/beast/modules/beast_sqdb/detail/type_conversion.h
@@ -78,7 +78,7 @@ template <typename T>
 class conversion_into_type
     : private base_value_holder<T>
     , public into_type <typename type_conversion<T>::base_type>
-    , Uncopyable
+    , public Uncopyable
 {
 public:
     typedef typename type_conversion<T>::base_type BASE_TYPE;
@@ -109,7 +109,7 @@ template<typename T>
 class conversion_use_type
     : private base_value_holder<T>
     , public use_type<typename type_conversion<T>::base_type>
-    , Uncopyable
+    , public Uncopyable
 {
 public:
     typedef typename type_conversion<T>::base_type BASE_TYPE;
diff --git a/modules/ripple_app/ledger/Ledger.h b/modules/ripple_app/ledger/Ledger.h
index 7b29a373c9..bc2ac51b9a 100644
--- a/modules/ripple_app/ledger/Ledger.h
+++ b/modules/ripple_app/ledger/Ledger.h
@@ -39,7 +39,7 @@ class SqliteStatement;
 class Ledger
     : public boost::enable_shared_from_this <Ledger>
     , public CountedObject <Ledger>
-    , Uncopyable
+    , public Uncopyable
 {
 public:
     static char const* getCountedObjectName () { return "Ledger"; }
diff --git a/modules/ripple_app/main/ripple_LocalCredentials.h b/modules/ripple_app/main/ripple_LocalCredentials.h
index f1a9c2ce6d..86ebe9ac15 100644
--- a/modules/ripple_app/main/ripple_LocalCredentials.h
+++ b/modules/ripple_app/main/ripple_LocalCredentials.h
@@ -9,7 +9,7 @@
 
 /** Holds the cryptographic credentials identifying this instance of the server.
 */
-class LocalCredentials : Uncopyable
+class LocalCredentials : public Uncopyable
 {
 public:
     LocalCredentials ();
diff --git a/modules/ripple_basics/types/ripple_HashMaps.h b/modules/ripple_basics/types/ripple_HashMaps.h
index bb1d22913e..d71d06507b 100644
--- a/modules/ripple_basics/types/ripple_HashMaps.h
+++ b/modules/ripple_basics/types/ripple_HashMaps.h
@@ -14,7 +14,7 @@
     done by seeding the hashing function with a random number generated
     at program startup.
 */
-class HashMaps : Uncopyable
+class HashMaps : public Uncopyable
 {
 public:
     /** Golden ratio constant used in hashing functions.
diff --git a/modules/ripple_basics/utility/ripple_LogFile.h b/modules/ripple_basics/utility/ripple_LogFile.h
index 1d457a9ae6..ca9bc34db1 100644
--- a/modules/ripple_basics/utility/ripple_LogFile.h
+++ b/modules/ripple_basics/utility/ripple_LogFile.h
@@ -17,7 +17,7 @@
 
     @note None of the listed interfaces are thread-safe.
 */
-class LogFile : Uncopyable
+class LogFile : public Uncopyable
 {
 public:
     /** Construct with no associated system file.
diff --git a/modules/ripple_basio/ripple_basio_impl.h b/modules/ripple_basio/ripple_basio_impl.h
index 9d5be45b1b..e23ddaa9c2 100644
--- a/modules/ripple_basio/ripple_basio_impl.h
+++ b/modules/ripple_basio/ripple_basio_impl.h
@@ -11,6 +11,15 @@
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ssl.hpp>
 
+#include <boost/asio.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/bind.hpp>
+#include <boost/array.hpp>
+#include <boost/foreach.hpp>
+#include <boost/unordered_map.hpp> // for unit test
+#include <boost/mpl/at.hpp>
+#include <boost/mpl/vector.hpp>
+
 /** Implementations for boost::asio abstractions.
 
     These require boost::asio header material to be included.
diff --git a/modules/ripple_core/validator/ripple_Validators.h b/modules/ripple_core/validator/ripple_Validators.h
index 226afafa03..dc29612f0a 100644
--- a/modules/ripple_core/validator/ripple_Validators.h
+++ b/modules/ripple_core/validator/ripple_Validators.h
@@ -14,7 +14,7 @@
 
     All operations are performed asynchronously on an internal thread.
 */
-class Validators : Uncopyable
+class Validators : public Uncopyable
 {
 public:
     /** Provides a ValidatorList.