Rename beast sources for consistency

modules/beast_core/beast_core.cpp

@@ -26,7 +26,7 @@
 #include "BeastConfig.h"
 
 //==============================================================================
-#include "native/beast_BasicNativeHeaders.h"
+#include "native/BasicNativeHeaders.h"
 #include "beast_core.h"
 
 #include <locale>
@@ -129,167 +129,167 @@
 namespace beast
 {
 
-#include "containers/beast_AbstractFifo.cpp"
-#include "containers/beast_DynamicObject.cpp"
-#include "containers/beast_NamedValueSet.cpp"
-#include "containers/beast_PropertySet.cpp"
-#include "containers/beast_Variant.cpp"
+#include "containers/AbstractFifo.cpp"
+#include "containers/DynamicObject.cpp"
+#include "containers/NamedValueSet.cpp"
+#include "containers/PropertySet.cpp"
+#include "containers/Variant.cpp"
 #include "containers/DynamicArray.cpp"
 #include "containers/DynamicList.cpp"
 #include "containers/HashMap.cpp"
 
-#include "diagnostic/beast_Debug.cpp"
-#include "diagnostic/beast_Error.cpp"
+#include "diagnostic/Debug.cpp"
+#include "diagnostic/Error.cpp"
 #include "diagnostic/FatalError.cpp"
-#include "diagnostic/beast_FPUFlags.cpp"
-#include "diagnostic/beast_LeakChecked.cpp"
+#include "diagnostic/FPUFlags.cpp"
+#include "diagnostic/LeakChecked.cpp"
 #include "diagnostic/ProtectedCall.cpp"
-#include "diagnostic/beast_SemanticVersion.cpp"
-#include "diagnostic/beast_UnitTest.cpp"
-#include "diagnostic/beast_UnitTestUtilities.cpp"
+#include "diagnostic/SemanticVersion.cpp"
+#include "diagnostic/UnitTest.cpp"
+#include "diagnostic/UnitTestUtilities.cpp"
 #include "diagnostic/Journal.cpp"
 
-#include "files/beast_DirectoryIterator.cpp"
-#include "files/beast_File.cpp"
-#include "files/beast_FileInputStream.cpp"
-#include "files/beast_FileOutputStream.cpp"
-#include "files/beast_FileSearchPath.cpp"
-#include "files/beast_RandomAccessFile.cpp"
-#include "files/beast_TemporaryFile.cpp"
+#include "files/DirectoryIterator.cpp"
+#include "files/File.cpp"
+#include "files/FileInputStream.cpp"
+#include "files/FileOutputStream.cpp"
+#include "files/FileSearchPath.cpp"
+#include "files/RandomAccessFile.cpp"
+#include "files/TemporaryFile.cpp"
 
-#include "json/beast_JSON.cpp"
+#include "json/JSON.cpp"
 
-#include "logging/beast_FileLogger.cpp"
-#include "logging/beast_Logger.cpp"
+#include "logging/FileLogger.cpp"
+#include "logging/Logger.cpp"
 
-#include "maths/beast_BigInteger.cpp"
-#include "maths/beast_Expression.cpp"
-#include "maths/beast_MurmurHash.cpp"
-#include "maths/beast_Random.cpp"
+#include "maths/BigInteger.cpp"
+#include "maths/Expression.cpp"
+#include "maths/MurmurHash.cpp"
+#include "maths/Random.cpp"
 
-#include "memory/beast_MemoryBlock.cpp"
-#include "memory/beast_FifoFreeStoreWithTLS.cpp"
-#include "memory/beast_FifoFreeStoreWithoutTLS.cpp"
-#include "memory/beast_GlobalPagedFreeStore.cpp"
-#include "memory/beast_PagedFreeStore.cpp"
+#include "memory/MemoryBlock.cpp"
+#include "memory/FifoFreeStoreWithTLS.cpp"
+#include "memory/FifoFreeStoreWithoutTLS.cpp"
+#include "memory/GlobalPagedFreeStore.cpp"
+#include "memory/PagedFreeStore.cpp"
 #include "memory/StaticObject.cpp"
 
 #include "misc/Main.cpp"
-#include "misc/beast_Result.cpp"
-#include "misc/beast_Uuid.cpp"
+#include "misc/Result.cpp"
+#include "misc/Uuid.cpp"
 
-#include "network/beast_MACAddress.cpp"
-#include "network/beast_NamedPipe.cpp"
-#include "network/beast_Socket.cpp"
-#include "network/beast_URL.cpp"
-#include "network/beast_IPAddress.cpp"
+#include "network/MACAddress.cpp"
+#include "network/NamedPipe.cpp"
+#include "network/Socket.cpp"
+#include "network/URL.cpp"
+#include "network/IPAddress.cpp"
 
-#include "streams/beast_BufferedInputStream.cpp"
-#include "streams/beast_FileInputSource.cpp"
-#include "streams/beast_InputStream.cpp"
-#include "streams/beast_MemoryInputStream.cpp"
-#include "streams/beast_MemoryOutputStream.cpp"
-#include "streams/beast_OutputStream.cpp"
-#include "streams/beast_SubregionStream.cpp"
+#include "streams/BufferedInputStream.cpp"
+#include "streams/FileInputSource.cpp"
+#include "streams/InputStream.cpp"
+#include "streams/MemoryInputStream.cpp"
+#include "streams/MemoryOutputStream.cpp"
+#include "streams/OutputStream.cpp"
+#include "streams/SubregionStream.cpp"
 
 #include "system/SystemStats.cpp"
 
-#include "text/beast_CharacterFunctions.cpp"
-#include "text/beast_LexicalCast.cpp"
-#include "text/beast_Identifier.cpp"
-#include "text/beast_LocalisedStrings.cpp"
-#include "text/beast_String.cpp"
-#include "text/beast_StringArray.cpp"
-#include "text/beast_StringPairArray.cpp"
-#include "text/beast_StringPool.cpp"
-#include "text/beast_TextDiff.cpp"
+#include "text/CharacterFunctions.cpp"
+#include "text/LexicalCast.cpp"
+#include "text/Identifier.cpp"
+#include "text/LocalisedStrings.cpp"
+#include "text/String.cpp"
+#include "text/StringArray.cpp"
+#include "text/StringPairArray.cpp"
+#include "text/StringPool.cpp"
+#include "text/TextDiff.cpp"
 
 #include "thread/impl/TrackedMutex.cpp"
-#include "thread/beast_DeadlineTimer.cpp"
-#include "thread/beast_InterruptibleThread.cpp"
-#include "thread/beast_Semaphore.cpp"
-#include "thread/beast_CallQueue.cpp"
-#include "thread/beast_Listeners.cpp"
-#include "thread/beast_ManualCallQueue.cpp"
-#include "thread/beast_ThreadWithCallQueue.cpp"
-#include "thread/beast_Workers.cpp"
+#include "thread/DeadlineTimer.cpp"
+#include "thread/InterruptibleThread.cpp"
+#include "thread/Semaphore.cpp"
+#include "thread/CallQueue.cpp"
+#include "thread/Listeners.cpp"
+#include "thread/ManualCallQueue.cpp"
+#include "thread/ThreadWithCallQueue.cpp"
+#include "thread/Workers.cpp"
 
-#include "threads/beast_ChildProcess.cpp"
-#include "threads/beast_ReadWriteLock.cpp"
-#include "threads/beast_ReadWriteMutex.cpp"
-#include "threads/beast_SpinDelay.cpp"
-#include "threads/beast_Thread.cpp"
-#include "threads/beast_ThreadPool.cpp"
-#include "threads/beast_TimeSliceThread.cpp"
+#include "threads/ChildProcess.cpp"
+#include "threads/ReadWriteLock.cpp"
+#include "threads/ReadWriteMutex.cpp"
+#include "threads/SpinDelay.cpp"
+#include "threads/Thread.cpp"
+#include "threads/ThreadPool.cpp"
+#include "threads/TimeSliceThread.cpp"
 
-#include "time/beast_PerformanceCounter.cpp"
+#include "time/PerformanceCounter.cpp"
 #include "time/AtExitHook.cpp"
-#include "time/beast_RelativeTime.cpp"
-#include "time/beast_Time.cpp"
+#include "time/RelativeTime.cpp"
+#include "time/Time.cpp"
 
-#include "xml/beast_XmlDocument.cpp"
-#include "xml/beast_XmlElement.cpp"
+#include "xml/XmlDocument.cpp"
+#include "xml/XmlElement.cpp"
 
-#include "zip/beast_GZIPDecompressorInputStream.cpp"
-#include "zip/beast_GZIPCompressorOutputStream.cpp"
-#include "zip/beast_ZipFile.cpp"
+#include "zip/GZIPDecompressorInputStream.cpp"
+#include "zip/GZIPCompressorOutputStream.cpp"
+#include "zip/ZipFile.cpp"
 
 #if BEAST_MAC || BEAST_IOS
-#include "native/beast_osx_ObjCHelpers.h"
+#include "native/osx_ObjCHelpers.h"
 #endif
 
 #if BEAST_WINDOWS
-#include "native/beast_win32_FPUFlags.cpp"
+#include "native/win32_FPUFlags.cpp"
 #else
-#include "native/beast_posix_FPUFlags.cpp"
+#include "native/posix_FPUFlags.cpp"
 #endif
 
 #if BEAST_ANDROID
-#include "native/beast_android_JNIHelpers.h"
+#include "native/android_JNIHelpers.h"
 #endif
 
 #if ! BEAST_WINDOWS
-#include "native/beast_posix_SharedCode.h"
-#include "native/beast_posix_NamedPipe.cpp"
+#include "native/posix_SharedCode.h"
+#include "native/posix_NamedPipe.cpp"
 #endif
 
 #if BEAST_MAC || BEAST_IOS
-#include "native/beast_mac_Files.mm"
-#include "native/beast_mac_Network.mm"
-#include "native/beast_mac_Strings.mm"
-#include "native/beast_mac_SystemStats.mm"
-#include "native/beast_mac_Threads.mm"
+#include "native/mac_Files.mm"
+#include "native/mac_Network.mm"
+#include "native/mac_Strings.mm"
+#include "native/mac_SystemStats.mm"
+#include "native/mac_Threads.mm"
 
 #elif BEAST_WINDOWS
-#include "native/beast_win32_ComSmartPtr.h"
-#include "native/beast_win32_Files.cpp"
-#include "native/beast_win32_Network.cpp"
-#include "native/beast_win32_Registry.cpp"
-#include "native/beast_win32_SystemStats.cpp"
-#include "native/beast_win32_Threads.cpp"
+#include "native/win32_ComSmartPtr.h"
+#include "native/win32_Files.cpp"
+#include "native/win32_Network.cpp"
+#include "native/win32_Registry.cpp"
+#include "native/win32_SystemStats.cpp"
+#include "native/win32_Threads.cpp"
 
 #elif BEAST_LINUX
-#include "native/beast_linux_Files.cpp"
-#include "native/beast_linux_Network.cpp"
-#include "native/beast_linux_SystemStats.cpp"
-#include "native/beast_linux_Threads.cpp"
+#include "native/linux_Files.cpp"
+#include "native/linux_Network.cpp"
+#include "native/linux_SystemStats.cpp"
+#include "native/linux_Threads.cpp"
 
 #elif BEAST_BSD
-#include "native/beast_bsd_Files.cpp"
-#include "native/beast_bsd_Network.cpp"
-#include "native/beast_bsd_SystemStats.cpp"
-#include "native/beast_bsd_Threads.cpp"
+#include "native/bsd_Files.cpp"
+#include "native/bsd_Network.cpp"
+#include "native/bsd_SystemStats.cpp"
+#include "native/bsd_Threads.cpp"
 
 #elif BEAST_ANDROID
-#include "native/beast_android_Files.cpp"
-#include "native/beast_android_Misc.cpp"
-#include "native/beast_android_Network.cpp"
-#include "native/beast_android_SystemStats.cpp"
-#include "native/beast_android_Threads.cpp"
+#include "native/android_Files.cpp"
+#include "native/android_Misc.cpp"
+#include "native/android_Network.cpp"
+#include "native/android_SystemStats.cpp"
+#include "native/android_Threads.cpp"
 
 #endif
 
-#include "threads/beast_HighResolutionTimer.cpp"
+#include "threads/HighResolutionTimer.cpp"
 
 }
 

modules/beast_core/beast_core.h

@@ -244,186 +244,186 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
 // Add new includes to the bottom.
 
 #include "diagnostic/ContractChecks.h"
-#include "memory/beast_Uncopyable.h"
-#include "memory/beast_Memory.h"
-#include "maths/beast_MathsFunctions.h"
-#include "memory/beast_ByteOrder.h"
-#include "memory/beast_Atomic.h"
-#include "text/beast_CharacterFunctions.h"
+#include "memory/Uncopyable.h"
+#include "memory/Memory.h"
+#include "maths/MathsFunctions.h"
+#include "memory/ByteOrder.h"
+#include "memory/Atomic.h"
+#include "text/CharacterFunctions.h"
 
 #if BEAST_MSVC
 # pragma warning (push)
 # pragma warning (disable: 4514 4996)
 #endif
-#include "text/beast_CharPointer_UTF8.h"
-#include "text/beast_CharPointer_UTF16.h"
-#include "text/beast_CharPointer_UTF32.h"
-#include "text/beast_CharPointer_ASCII.h"
+#include "text/CharPointer_UTF8.h"
+#include "text/CharPointer_UTF16.h"
+#include "text/CharPointer_UTF32.h"
+#include "text/CharPointer_ASCII.h"
 #if BEAST_MSVC
 # pragma warning (pop)
 #endif
 
 # include "containers/detail/removecv.h"
 #include "containers/detail/copyconst.h"
-#include "diagnostic/beast_Throw.h"
+#include "diagnostic/Throw.h"
 #include "system/Functional.h"
-#include "memory/beast_AtomicCounter.h"
-#include "memory/beast_AtomicFlag.h"
-#include "memory/beast_AtomicPointer.h"
-#include "memory/beast_AtomicState.h"
+#include "memory/AtomicCounter.h"
+#include "memory/AtomicFlag.h"
+#include "memory/AtomicPointer.h"
+#include "memory/AtomicState.h"
 #include "containers/List.h"
-#include "containers/beast_LockFreeStack.h"
-#include "threads/beast_SpinDelay.h"
+#include "containers/LockFreeStack.h"
+#include "threads/SpinDelay.h"
 #include "memory/StaticObject.h"
 
 #include "text/StringCharPointerType.h"
 #include "text/StringFromNumber.h"
-#include "text/beast_String.h"
+#include "text/String.h"
 #include "time/AtExitHook.h"
-#include "diagnostic/beast_LeakChecked.h"
+#include "diagnostic/LeakChecked.h"
 #include "diagnostic/Journal.h"
-#include "time/beast_RelativeTime.h"
-#include "time/beast_Time.h"
-#include "memory/beast_HeapBlock.h"
-#include "threads/beast_ScopedLock.h"
-#include "threads/beast_CriticalSection.h"
-#include "containers/beast_ElementComparator.h"
-#include "containers/beast_ArrayAllocationBase.h"
-#include "containers/beast_Array.h"
-#include "misc/beast_Result.h"
-#include "text/beast_StringArray.h"
-#include "memory/beast_MemoryBlock.h"
-#include "files/beast_File.h"
-#include "time/beast_PerformanceCounter.h"
+#include "time/RelativeTime.h"
+#include "time/Time.h"
+#include "memory/HeapBlock.h"
+#include "threads/ScopedLock.h"
+#include "threads/CriticalSection.h"
+#include "containers/ElementComparator.h"
+#include "containers/ArrayAllocationBase.h"
+#include "containers/Array.h"
+#include "misc/Result.h"
+#include "text/StringArray.h"
+#include "memory/MemoryBlock.h"
+#include "files/File.h"
+#include "time/PerformanceCounter.h"
 
-#include "memory/beast_MemoryAlignment.h"
-#include "memory/beast_CacheLine.h"
-#include "threads/beast_ReadWriteMutex.h"
-#include "threads/beast_SharedData.h"
-#include "diagnostic/beast_SafeBool.h"
-#include "threads/beast_WaitableEvent.h"
-#include "threads/beast_Thread.h"
-#include "threads/beast_SpinLock.h"
-#include "threads/beast_ThreadLocalValue.h"
+#include "memory/MemoryAlignment.h"
+#include "memory/CacheLine.h"
+#include "threads/ReadWriteMutex.h"
+#include "threads/SharedData.h"
+#include "diagnostic/SafeBool.h"
+#include "threads/WaitableEvent.h"
+#include "threads/Thread.h"
+#include "threads/SpinLock.h"
+#include "threads/ThreadLocalValue.h"
 #include "thread/MutexTraits.h"
 #include "thread/TrackedMutex.h"
 #include "diagnostic/FatalError.h"
-#include "diagnostic/beast_Error.h"
-#include "diagnostic/beast_Debug.h"
-#include "text/beast_LexicalCast.h"
-#include "memory/beast_ContainerDeletePolicy.h"
-#include "memory/beast_ByteSwap.h"
-#include "maths/beast_Math.h"
-#include "maths/beast_uint24.h"
-#include "logging/beast_Logger.h"
-#include "diagnostic/beast_FPUFlags.h"
+#include "diagnostic/Error.h"
+#include "diagnostic/Debug.h"
+#include "text/LexicalCast.h"
+#include "memory/ContainerDeletePolicy.h"
+#include "memory/ByteSwap.h"
+#include "maths/Math.h"
+#include "maths/uint24.h"
+#include "logging/Logger.h"
+#include "diagnostic/FPUFlags.h"
 #include "memory/SharedObject.h"
 #include "memory/SharedPtr.h"
 #include "memory/SharedFunction.h"
 #include "diagnostic/ProtectedCall.h"
-#include "containers/beast_AbstractFifo.h"
-#include "text/beast_Identifier.h"
-#include "containers/beast_Variant.h"
-#include "containers/beast_LinkedListPointer.h"
-#include "containers/beast_NamedValueSet.h"
-#include "containers/beast_DynamicObject.h"
-#include "maths/beast_BigInteger.h"
-#include "maths/beast_Random.h"
-#include "containers/beast_LockFreeQueue.h"
-#include "containers/beast_OwnedArray.h"
-#include "text/beast_StringPairArray.h"
-#include "containers/beast_PropertySet.h"
-#include "containers/beast_SharedObjectArray.h"
-#include "containers/beast_ScopedValueSetter.h"
-#include "containers/beast_SharedTable.h"
-#include "containers/beast_SortedLookupTable.h"
-#include "containers/beast_SortedSet.h"
-#include "maths/beast_Range.h"
-#include "containers/beast_SparseSet.h"
+#include "containers/AbstractFifo.h"
+#include "text/Identifier.h"
+#include "containers/Variant.h"
+#include "containers/LinkedListPointer.h"
+#include "containers/NamedValueSet.h"
+#include "containers/DynamicObject.h"
+#include "maths/BigInteger.h"
+#include "maths/Random.h"
+#include "containers/LockFreeQueue.h"
+#include "containers/OwnedArray.h"
+#include "text/StringPairArray.h"
+#include "containers/PropertySet.h"
+#include "containers/SharedObjectArray.h"
+#include "containers/ScopedValueSetter.h"
+#include "containers/SharedTable.h"
+#include "containers/SortedLookupTable.h"
+#include "containers/SortedSet.h"
+#include "maths/Range.h"
+#include "containers/SparseSet.h"
 # include "containers/DynamicList.h"
 # include "containers/DynamicArray.h"
 #include "containers/HashMap.h"
-#include "memory/beast_ScopedPointer.h"
-#include "files/beast_DirectoryIterator.h"
-#include "streams/beast_InputStream.h"
-#include "files/beast_FileInputStream.h"
-#include "streams/beast_InputSource.h"
-#include "streams/beast_FileInputSource.h"
-#include "text/beast_NewLine.h"
-#include "streams/beast_OutputStream.h"
-#include "files/beast_FileOutputStream.h"
-#include "files/beast_FileSearchPath.h"
-#include "files/beast_MemoryMappedFile.h"
-#include "files/beast_RandomAccessFile.h"
-#include "files/beast_TemporaryFile.h"
-#include "json/beast_JSON.h"
-#include "logging/beast_FileLogger.h"
-#include "logging/beast_Logger.h"
-#include "maths/beast_Expression.h"
-#include "maths/beast_Interval.h"
-#include "maths/beast_MathsFunctions.h"
-#include "maths/beast_MurmurHash.h"
-#include "memory/beast_ByteOrder.h"
-#include "memory/beast_Memory.h"
-#include "memory/beast_OptionalScopedPointer.h"
+#include "memory/ScopedPointer.h"
+#include "files/DirectoryIterator.h"
+#include "streams/InputStream.h"
+#include "files/FileInputStream.h"
+#include "streams/InputSource.h"
+#include "streams/FileInputSource.h"
+#include "text/NewLine.h"
+#include "streams/OutputStream.h"
+#include "files/FileOutputStream.h"
+#include "files/FileSearchPath.h"
+#include "files/MemoryMappedFile.h"
+#include "files/RandomAccessFile.h"
+#include "files/TemporaryFile.h"
+#include "json/JSON.h"
+#include "logging/FileLogger.h"
+#include "logging/Logger.h"
+#include "maths/Expression.h"
+#include "maths/Interval.h"
+#include "maths/MathsFunctions.h"
+#include "maths/MurmurHash.h"
+#include "memory/ByteOrder.h"
+#include "memory/Memory.h"
+#include "memory/OptionalScopedPointer.h"
 #include "memory/SharedSingleton.h"
-#include "memory/beast_WeakReference.h"
-#include "memory/beast_RecycledObjectPool.h"
+#include "memory/WeakReference.h"
+#include "memory/RecycledObjectPool.h"
 #include "misc/Main.h"
-#include "misc/beast_Uuid.h"
-#include "misc/beast_WindowsRegistry.h"
-#include "network/beast_IPAddress.h"
-#include "network/beast_MACAddress.h"
-#include "threads/beast_ReadWriteLock.h"
-#include "network/beast_NamedPipe.h"
-#include "network/beast_Socket.h"
-#include "network/beast_URL.h"
-#include "streams/beast_BufferedInputStream.h"
-#include "streams/beast_MemoryInputStream.h"
-#include "streams/beast_MemoryOutputStream.h"
-#include "streams/beast_SubregionStream.h"
+#include "misc/Uuid.h"
+#include "misc/WindowsRegistry.h"
+#include "network/IPAddress.h"
+#include "network/MACAddress.h"
+#include "threads/ReadWriteLock.h"
+#include "network/NamedPipe.h"
+#include "network/Socket.h"
+#include "network/URL.h"
+#include "streams/BufferedInputStream.h"
+#include "streams/MemoryInputStream.h"
+#include "streams/MemoryOutputStream.h"
+#include "streams/SubregionStream.h"
 
 #include "system/SystemStats.h"
-#include "text/beast_LocalisedStrings.h"
-#include "diagnostic/beast_SemanticVersion.h"
-#include "text/beast_StringPool.h"
-#include "text/beast_TextDiff.h"
-#include "threads/beast_ChildProcess.h"
-#include "threads/beast_DynamicLibrary.h"
-#include "threads/beast_HighResolutionTimer.h"
-#include "threads/beast_InterProcessLock.h"
-#include "threads/beast_Process.h"
-#include "threads/beast_ScopedReadLock.h"
-#include "threads/beast_ScopedWriteLock.h"
-#include "threads/beast_ThreadPool.h"
-#include "threads/beast_TimeSliceThread.h"
-#include "diagnostic/beast_UnitTest.h"
-#include "xml/beast_XmlDocument.h"
-#include "xml/beast_XmlElement.h"
-#include "diagnostic/beast_UnitTestUtilities.h"
-#include "zip/beast_GZIPCompressorOutputStream.h"
-#include "zip/beast_GZIPDecompressorInputStream.h"
-#include "zip/beast_ZipFile.h"
+#include "text/LocalisedStrings.h"
+#include "diagnostic/SemanticVersion.h"
+#include "text/StringPool.h"
+#include "text/TextDiff.h"
+#include "threads/ChildProcess.h"
+#include "threads/DynamicLibrary.h"
+#include "threads/HighResolutionTimer.h"
+#include "threads/InterProcessLock.h"
+#include "threads/Process.h"
+#include "threads/ScopedReadLock.h"
+#include "threads/ScopedWriteLock.h"
+#include "threads/ThreadPool.h"
+#include "threads/TimeSliceThread.h"
+#include "diagnostic/UnitTest.h"
+#include "xml/XmlDocument.h"
+#include "xml/XmlElement.h"
+#include "diagnostic/UnitTestUtilities.h"
+#include "zip/GZIPCompressorOutputStream.h"
+#include "zip/GZIPDecompressorInputStream.h"
+#include "zip/ZipFile.h"
 
 #include "diagnostic/MeasureFunctionCallTime.h"
 
-#include "thread/beast_DeadlineTimer.h"
+#include "thread/DeadlineTimer.h"
 
-#include "memory/beast_AllocatedBy.h"
-#include "memory/beast_PagedFreeStore.h"
-#include "memory/beast_GlobalPagedFreeStore.h"
-#include "memory/beast_FifoFreeStoreWithTLS.h"
-#include "memory/beast_FifoFreeStoreWithoutTLS.h"
-#include "memory/beast_FifoFreeStore.h"
-#include "memory/beast_GlobalFifoFreeStore.h"
+#include "memory/AllocatedBy.h"
+#include "memory/PagedFreeStore.h"
+#include "memory/GlobalPagedFreeStore.h"
+#include "memory/FifoFreeStoreWithTLS.h"
+#include "memory/FifoFreeStoreWithoutTLS.h"
+#include "memory/FifoFreeStore.h"
+#include "memory/GlobalFifoFreeStore.h"
 
-#include "thread/beast_Semaphore.h"
-#include "thread/beast_InterruptibleThread.h"
-#include "thread/beast_CallQueue.h"
-#include "thread/beast_Listeners.h"
-#include "thread/beast_ManualCallQueue.h"
-#include "thread/beast_ThreadWithCallQueue.h"
-#include "thread/beast_Workers.h"
+#include "thread/Semaphore.h"
+#include "thread/InterruptibleThread.h"
+#include "thread/CallQueue.h"
+#include "thread/Listeners.h"
+#include "thread/ManualCallQueue.h"
+#include "thread/ThreadWithCallQueue.h"
+#include "thread/Workers.h"
 
 }