Make all include paths relative to a root directory:

* Better include path support in the VSProject scons tool.
* Various manual fixes to include paths.

Builds/VisualStudio2013/RippleD.vcxproj

@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>_WIN32_WINNT=0x6000;DEBUG;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeTypeInfo>True</RuntimeTypeInfo>
       <BufferSecurityCheck>True</BufferSecurityCheck>
@@ -88,7 +88,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>_WIN32_WINNT=0x6000;NDEBUG;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeTypeInfo>True</RuntimeTypeInfo>
       <CallingConvention>Cdecl</CallingConvention>
@@ -128,8 +128,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\BeastConfig.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\BeastConfig.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\Arithmetic.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\Atomic.h">
@@ -1801,12 +1799,8 @@
     <ClInclude Include="..\..\src\ripple\algorithm\api\DecayingSample.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\beast\ripple_beast.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\beast\ripple_beastc.unity.c">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\common\KeyCache.h">
     </ClInclude>
@@ -1844,8 +1838,6 @@
     <ClInclude Include="..\..\src\ripple\common\jsonrpc_fields.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\common\ripple_common.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\common\seconds_clock.h">
     </ClInclude>
@@ -1885,8 +1877,6 @@
     <ClInclude Include="..\..\src\ripple\http\ripple_http.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\http\ripple_http.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\json\api\JsonPropertyStream.h">
     </ClInclude>
@@ -1928,8 +1918,6 @@
     <ClInclude Include="..\..\src\ripple\json\ripple_json.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\json\ripple_json.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\peerfinder\api\Callback.h">
     </ClInclude>
@@ -2019,8 +2007,6 @@
     <ClInclude Include="..\..\src\ripple\peerfinder\ripple_peerfinder.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\peerfinder\ripple_peerfinder.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\peerfinder\sim\FunctionQueue.h">
     </ClInclude>
@@ -2040,8 +2026,6 @@
     <ClInclude Include="..\..\src\ripple\peerfinder\sim\WrappedSink.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\proto\protobuf.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <CustomBuild Include="..\..\src\ripple\proto\ripple.proto">
       <FileType>Document</FileType>
@@ -2056,8 +2040,6 @@
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</LinkObjects>
     </CustomBuild>
     <ClCompile Include="..\..\src\ripple\proto\ripple_proto.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\radmap\api\BasicFullBelowCache.h">
     </ClInclude>
@@ -2069,8 +2051,6 @@
     <ClInclude Include="..\..\src\ripple\radmap\ripple_radmap.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\radmap\ripple_radmap.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\resource\api\Charge.h">
     </ClInclude>
@@ -2121,14 +2101,10 @@
     <ClInclude Include="..\..\src\ripple\resource\ripple_resource.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\resource\ripple_resource.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\rocksdb\ripple_rocksdb.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\rocksdb\ripple_rocksdb.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\rocksdb\rocksdb\db\builder.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -2481,8 +2457,6 @@
     <ClInclude Include="..\..\src\ripple\sitefiles\ripple_sitefiles.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\sitefiles\ripple_sitefiles.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\sslutil\api\CAutoBN_CTX.h">
     </ClInclude>
@@ -2511,8 +2485,6 @@
     <ClInclude Include="..\..\src\ripple\sslutil\ripple_sslutil.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\sslutil\ripple_sslutil.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\testoverlay\api\ConfigType.h">
     </ClInclude>
@@ -2540,8 +2512,6 @@
     <ClInclude Include="..\..\src\ripple\testoverlay\ripple_testoverlay.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\testoverlay\ripple_testoverlay.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\types\api\AgedHistory.h">
     </ClInclude>
@@ -2612,8 +2582,6 @@
     <ClInclude Include="..\..\src\ripple\types\ripple_types.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\types\ripple_types.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\validators\api\Manager.h">
     </ClInclude>
@@ -2674,8 +2642,6 @@
     <ClInclude Include="..\..\src\ripple\validators\ripple_validators.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\validators\ripple_validators.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple_app\book\Amount.h">
     </ClInclude>
@@ -3060,44 +3026,24 @@
     <ClInclude Include="..\..\src\ripple_app\ripple_app.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_app\ripple_app.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt1.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt2.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt3.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt4.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt5.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt6.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt7.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt8.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\ripple_app_pt9.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\rpc\RPCHandler.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -3309,8 +3255,6 @@
     <ClInclude Include="..\..\src\ripple_basics\ripple_basics.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_basics\ripple_basics.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple_basics\system\BoostIncludes.h">
     </ClInclude>
@@ -3508,8 +3452,6 @@
     <ClInclude Include="..\..\src\ripple_core\ripple_core.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_core\ripple_core.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_data\crypto\Base58Data.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -3611,22 +3553,16 @@
     <ClInclude Include="..\..\src\ripple_data\ripple_data.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_data\ripple_data.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple_data\utility\UptimeTimerAdapter.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple_hyperleveldb\ripple_hyperleveldb.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_hyperleveldb\ripple_hyperleveldb.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple_leveldb\ripple_leveldb.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_leveldb\ripple_leveldb.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_net\basics\HTTPClient.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -3655,8 +3591,6 @@
     <ClInclude Include="..\..\src\ripple_net\ripple_net.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_net\ripple_net.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_net\rpc\InfoSub.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -3709,8 +3643,6 @@
     <ClInclude Include="..\..\src\ripple_overlay\impl\PeerImp.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_overlay\ripple_overlay.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple_rpc\api\ErrorCodes.h">
     </ClInclude>
@@ -3951,8 +3883,6 @@
     <ClInclude Include="..\..\src\ripple_rpc\ripple_rpc.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_rpc\ripple_rpc.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple_websocket\autosocket\AutoSocket.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -3965,14 +3895,10 @@
     <ClInclude Include="..\..\src\ripple_websocket\ripple_websocket.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple_websocket\ripple_websocket.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\snappy\config\snappy-stubs-public.h">
     </ClInclude>
     <ClCompile Include="..\..\src\snappy\snappy.unity.cpp">
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\snappy\snappy\snappy-internal.h">
     </ClInclude>

Builds/VisualStudio2013/RippleD.vcxproj.filters

@@ -648,9 +648,6 @@
     <ClInclude Include="..\..\src\BeastConfig.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\BeastConfig.h">
-      <Filter>src\beast</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\Arithmetic.h">
       <Filter>src\beast\beast</Filter>
     </ClInclude>

SConstruct

@@ -424,9 +424,10 @@ import_environ(base)
 config_base(base)
 base.Append(CPPPATH=[
     'src',
-    os.path.join(build_dir, 'proto'),
+    os.path.join('src', 'beast'),
     os.path.join('src', 'snappy', 'snappy'),
     os.path.join('src', 'snappy', 'config'),
+    os.path.join(build_dir, 'proto'),
     ])
 base.Append(CPPPATH=[
     os.path.join('src', 'leveldb'),

src/beast/Builds/VisualStudio2013/Beast.props

@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <RepoDir>..\..</RepoDir>
+    <RepoDir>$(ProjectDir)\..\..\</RepoDir>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>BEAST_INCLUDE_BEASTCONFIG=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BEAST_INCLUDE_BEASTCONFIG=0;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>

src/beast/beast/Arithmetic.h

@@ -24,9 +24,9 @@
 #ifndef BEAST_ARITHMETIC_H_INCLUDED
 #define BEAST_ARITHMETIC_H_INCLUDED
 
-#include "Config.h"
+#include <beast/Config.h>
 
-#include "utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 
 #include <cmath>
 #include <cstdint>

src/beast/beast/Atomic.h

@@ -24,10 +24,10 @@
 #ifndef BEAST_ATOMIC_H_INCLUDED
 #define BEAST_ATOMIC_H_INCLUDED
 
-#include "Config.h"
-#include "StaticAssert.h"
+#include <beast/Config.h>
+#include <beast/StaticAssert.h>
 
-#include "utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 
 #include <cstdint>
 

src/beast/beast/Boost.h

@@ -22,6 +22,6 @@
 
 // These classes require boost in order to be used.
 
-#include "boost/ErrorCode.h"
+#include <beast/boost/ErrorCode.h>
 
 #endif

src/beast/beast/ByteOrder.h

@@ -24,8 +24,8 @@
 #ifndef BEAST_BYTEORDER_H_INCLUDED
 #define BEAST_BYTEORDER_H_INCLUDED
 
-#include "Config.h"
-#include "Uncopyable.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
 
 #include <cstdint>
 

src/beast/beast/Chrono.h

@@ -20,13 +20,13 @@
 #ifndef BEAST_CHRONO_H_INCLUDED
 #define BEAST_CHRONO_H_INCLUDED
 
-#include "chrono/abstract_clock.h"
-#include "chrono/basic_seconds_clock.h"
-#include "chrono/chrono_io.h"
-#include "chrono/chrono_util.h"
-#include "chrono/manual_clock.h"
-#include "chrono/ratio_io.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/chrono/basic_seconds_clock.h>
+#include <beast/chrono/chrono_io.h>
+#include <beast/chrono/chrono_util.h>
+#include <beast/chrono/manual_clock.h>
+#include <beast/chrono/ratio_io.h>
 
-#include "chrono/RelativeTime.h"
+#include <beast/chrono/RelativeTime.h>
 
 #endif

src/beast/beast/Config.h

@@ -30,34 +30,34 @@
 #define BOOST_ASIO_HAS_STD_ARRAY 1
 
 #if !defined(BEAST_COMPILER_CONFIG) && !defined(BEAST_NO_COMPILER_CONFIG) && !defined(BEAST_NO_CONFIG)
-#include "config/SelectCompilerConfig.h"
+#include <beast/config/SelectCompilerConfig.h>
 #endif
 #ifdef   BEAST_COMPILER_CONFIG
 #include BEAST_COMPILER_CONFIG
 #endif
 
 #if !defined(BEAST_STDLIB_CONFIG) && !defined(BEAST_NO_STDLIB_CONFIG) && !defined(BEAST_NO_CONFIG) && defined(__cplusplus)
-#include "config/SelectStdlibConfig.h"
+#include <beast/config/SelectStdlibConfig.h>
 #endif
 #ifdef   BEAST_STDLIB_CONFIG
 #include BEAST_STDLIB_CONFIG
 #endif
 
 #if !defined(BEAST_PLATFORM_CONFIG) && !defined(BEAST_NO_PLATFORM_CONFIG) && !defined(BEAST_NO_CONFIG)
-#include "config/SelectCompilerConfig.h"
+#include <beast/config/SelectCompilerConfig.h>
 #endif
 #ifdef   BEAST_PLATFORM_CONFIG
 #include BEAST_PLATFORM_CONFIG
 #endif
 
 // Legacy
-#include "Version.h"
-#include "config/PlatformConfig.h"
-#include "config/CompilerConfig.h"
-#include "config/StandardConfig.h"
-#include "config/ConfigCheck.h"
+#include <beast/Version.h>
+#include <beast/config/PlatformConfig.h>
+#include <beast/config/CompilerConfig.h>
+#include <beast/config/StandardConfig.h>
+#include <beast/config/ConfigCheck.h>
 
 // Suffix
-#include "config/Suffix.h"
+#include <beast/config/Suffix.h>
     
 #endif

src/beast/beast/Crypto.h

@@ -20,11 +20,11 @@
 #ifndef BEAST_CRYPTO_H_INCLUDED
 #define BEAST_CRYPTO_H_INCLUDED
 
-#include "crypto/BinaryEncoding.h"
-#include "crypto/MurmurHash.h"
-#include "crypto/Sha256.h"
-#include "crypto/UnsignedInteger.h"
-#include "crypto/UnsignedIntegerCalc.h"
+#include <beast/crypto/BinaryEncoding.h>
+#include <beast/crypto/MurmurHash.h>
+#include <beast/crypto/Sha256.h>
+#include <beast/crypto/UnsignedInteger.h>
+#include <beast/crypto/UnsignedIntegerCalc.h>
 
 #endif
 

src/beast/beast/HeapBlock.h

@@ -28,8 +28,8 @@
 #include <cstdlib>
 #include <stdexcept>
 
-#include "Memory.h"
-#include "Uncopyable.h"
+#include <beast/Memory.h>
+#include <beast/Uncopyable.h>
 
 // If the MSVC debug heap headers were included, disable
 // the macros during the juce include since they conflict.

src/beast/beast/Insight.h

@@ -20,18 +20,18 @@
 #ifndef BEAST_INSIGHT_H_INCLUDED
 #define BEAST_INSIGHT_H_INCLUDED
 
-#include "insight/Counter.h"
-#include "insight/CounterImpl.h"
-#include "insight/Event.h"
-#include "insight/EventImpl.h"
-#include "insight/Gauge.h"
-#include "insight/GaugeImpl.h"
-#include "insight/Group.h"
-#include "insight/Groups.h"
-#include "insight/Hook.h"
-#include "insight/HookImpl.h"
-#include "insight/Collector.h"
-#include "insight/NullCollector.h"
-#include "insight/StatsDCollector.h"
+#include <beast/insight/Counter.h>
+#include <beast/insight/CounterImpl.h>
+#include <beast/insight/Event.h>
+#include <beast/insight/EventImpl.h>
+#include <beast/insight/Gauge.h>
+#include <beast/insight/GaugeImpl.h>
+#include <beast/insight/Group.h>
+#include <beast/insight/Groups.h>
+#include <beast/insight/Hook.h>
+#include <beast/insight/HookImpl.h>
+#include <beast/insight/Collector.h>
+#include <beast/insight/NullCollector.h>
+#include <beast/insight/StatsDCollector.h>
 
 #endif

src/beast/beast/Intrusive.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_INTRUSIVE_H_INCLUDED
 #define BEAST_INTRUSIVE_H_INCLUDED
 
-#include "intrusive/List.h"
-#include "intrusive/LockFreeStack.h"
+#include <beast/intrusive/List.h>
+#include <beast/intrusive/LockFreeStack.h>
 
 #endif

src/beast/beast/Memory.h

@@ -26,8 +26,8 @@
 
 #include <cstring>
     
-#include "Config.h"
-#include "Uncopyable.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
 
 namespace beast {
 

src/beast/beast/SmartPtr.h

@@ -20,11 +20,11 @@
 #ifndef BEAST_SMARTPTR_H_INCLUDED
 #define BEAST_SMARTPTR_H_INCLUDED
 
-#include "Config.h"
+#include <beast/Config.h>
 
-#include "smart_ptr/ContainerDeletePolicy.h"
-#include "smart_ptr/SharedObject.h"
-#include "smart_ptr/SharedPtr.h"
-#include "smart_ptr/ScopedPointer.h"
+#include <beast/smart_ptr/ContainerDeletePolicy.h>
+#include <beast/smart_ptr/SharedObject.h>
+#include <beast/smart_ptr/SharedPtr.h>
+#include <beast/smart_ptr/ScopedPointer.h>
 
 #endif

src/beast/beast/Strings.h

@@ -20,8 +20,8 @@
 #ifndef BEAST_STRINGS_H_INCLUDED
 #define BEAST_STRINGS_H_INCLUDED
 
-#include "strings/String.h"
-#include "strings/NewLine.h"
+#include <beast/strings/String.h>
+#include <beast/strings/NewLine.h>
 
 #endif
 

src/beast/beast/Threads.h

@@ -20,19 +20,19 @@
 #ifndef BEAST_THREADS_H_INCLUDED
 #define BEAST_THREADS_H_INCLUDED
 
-#include "threads/UnlockGuard.h"
-#include "threads/TryLockGuard.h"
-#include "threads/SharedLockGuard.h"
-#include "threads/SharedMutexAdapter.h"
-#include "threads/SharedData.h"
-#include "threads/ServiceQueue.h"
-#include "threads/SpinLock.h"
-#include "threads/Stoppable.h"
-#include "threads/Thread.h"
-#include "threads/ThreadLocalValue.h"
-#include "threads/WaitableEvent.h"
-#include "threads/ScopedWrapperContext.h"
+#include <beast/threads/UnlockGuard.h>
+#include <beast/threads/TryLockGuard.h>
+#include <beast/threads/SharedLockGuard.h>
+#include <beast/threads/SharedMutexAdapter.h>
+#include <beast/threads/SharedData.h>
+#include <beast/threads/ServiceQueue.h>
+#include <beast/threads/SpinLock.h>
+#include <beast/threads/Stoppable.h>
+#include <beast/threads/Thread.h>
+#include <beast/threads/ThreadLocalValue.h>
+#include <beast/threads/WaitableEvent.h>
+#include <beast/threads/ScopedWrapperContext.h>
 
-#include "threads/semaphore.h"
+#include <beast/threads/semaphore.h>
 
 #endif

src/beast/beast/asio/Asio.unity.cpp

@@ -18,15 +18,15 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/IPAddressConversion.cpp"
+#include <beast/asio/impl/IPAddressConversion.cpp>
 
-#include "tests/wrap_handler.test.cpp"
-#include "tests/bind_handler.test.cpp"
-#include "tests/enable_wait_for_async.test.cpp"
-#include "tests/shared_handler.test.cpp"
+#include <beast/asio/tests/wrap_handler.test.cpp>
+#include <beast/asio/tests/bind_handler.test.cpp>
+#include <beast/asio/tests/enable_wait_for_async.test.cpp>
+#include <beast/asio/tests/shared_handler.test.cpp>
 
-#include "abstract_socket.cpp" // TEMPORARY!
+#include <beast/asio/abstract_socket.cpp> // TEMPORARY!
 

src/beast/beast/asio/IPAddressConversion.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED
 #define BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED
 
-#include "../net/IPEndpoint.h"
+#include <beast/net/IPEndpoint.h>
 
 #include <sstream>
 

src/beast/beast/asio/abstract_socket.cpp

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "abstract_socket.h"
-#include "bind_handler.h"
+#include <beast/asio/abstract_socket.h>
+#include <beast/asio/bind_handler.h>
 
 namespace beast {
 namespace asio {

src/beast/beast/asio/abstract_socket.h

@@ -20,8 +20,8 @@
 #ifndef BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED
 #define BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED
 
-#include "buffer_sequence.h"
-#include "shared_handler.h"
+#include <beast/asio/buffer_sequence.h>
+#include <beast/asio/shared_handler.h>
 
 #include <boost/asio/socket_base.hpp>
 #include <boost/asio/ssl/stream_base.hpp>

src/beast/beast/asio/bind_handler.h

@@ -25,8 +25,8 @@
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 
 #include <functional>
-#include "../cxx14/type_traits.h" // <type_traits>
-#include "../cxx14/utility.h" // <utility>
+#include <beast/cxx14/type_traits.h> // <type_traits>
+#include <beast/cxx14/utility.h> // <utility>
 
 namespace beast {
 namespace asio {

src/beast/beast/asio/buffer_sequence.h

@@ -22,10 +22,10 @@
 
 #include <boost/asio/buffer.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <algorithm>
 #include <iterator>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <vector>
 
 namespace beast {

src/beast/beast/asio/enable_wait_for_async.h

@@ -20,9 +20,9 @@
 #ifndef BEAST_ASIO_ENABLE_WAIT_FOR_ASYNC_H_INCLUDED
 #define BEAST_ASIO_ENABLE_WAIT_FOR_ASYNC_H_INCLUDED
 
-#include "wrap_handler.h"
+#include <beast/asio/wrap_handler.h>
 
-#include "../utility/is_call_possible.h"
+#include <beast/utility/is_call_possible.h>
 
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
@@ -31,7 +31,7 @@
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 namespace beast {
 namespace asio {

src/beast/beast/asio/impl/IPAddressConversion.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../IPAddressConversion.h"
+#include <beast/asio/IPAddressConversion.h>
 
 namespace beast {
 namespace IP {

src/beast/beast/asio/memory_buffer.h

@@ -20,11 +20,11 @@
 #ifndef BEAST_ASIO_MEMORY_BUFFER_H_INCLUDED
 #define BEAST_ASIO_MEMORY_BUFFER_H_INCLUDED
 
-#include "../utility/empty_base_optimization.h"
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/asio/buffer.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <cstddef>
 #include <memory>
 #include <type_traits>

src/beast/beast/asio/shared_handler.h

@@ -20,19 +20,19 @@
 #ifndef BEAST_ASIO_SHARED_HANDLER_H_INCLUDED
 #define BEAST_ASIO_SHARED_HANDLER_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "../utility/is_call_possible.h"
+#include <beast/utility/is_call_possible.h>
 
 #include <boost/utility/base_from_member.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <functional>
 #include <memory>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 #ifndef BEAST_ASIO_NO_ALLOCATE_SHARED
 #define BEAST_ASIO_NO_ALLOCATE_SHARED 0

src/beast/beast/asio/socket_wrapper.h

@@ -20,10 +20,10 @@
 #ifndef BEAST_ASIO_SOCKET_WRAPPER_H_INCLUDED
 #define BEAST_ASIO_SOCKET_WRAPPER_H_INCLUDED
 
-#include "abstract_socket.h"
-#include "bind_handler.h"
+#include <beast/asio/abstract_socket.h>
+#include <beast/asio/bind_handler.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 
 namespace beast {
 namespace asio {

src/beast/beast/asio/tests/bind_handler.test.cpp

@@ -20,12 +20,12 @@
 // LIBS: boost_system
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../bind_handler.h"
+#include <beast/asio/bind_handler.h>
 
 #include <functional>
 

src/beast/beast/asio/tests/enable_wait_for_async.test.cpp

@@ -18,13 +18,13 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../bind_handler.h"
-#include "../enable_wait_for_async.h"
+#include <beast/asio/bind_handler.h>
+#include <beast/asio/enable_wait_for_async.h>
 
 #include <boost/asio/io_service.hpp>
 

src/beast/beast/asio/tests/shared_handler.test.cpp

@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../shared_handler.h"
+#include <beast/asio/shared_handler.h>
 
 // Disables is_constructible tests for std::function
 // Visual Studio std::function fails the is_constructible tests

src/beast/beast/asio/tests/wrap_handler.test.cpp

@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../wrap_handler.h"
+#include <beast/asio/wrap_handler.h>
 
 #include <boost/version.hpp>
 

src/beast/beast/asio/wrap_handler.h

@@ -24,7 +24,7 @@
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <utility>
 
 namespace beast {

src/beast/beast/boost/Boost.unity.cpp

@@ -18,10 +18,10 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "ErrorCode.h"
+#include <beast/boost/ErrorCode.h>
 
 namespace detail {
 

src/beast/beast/chrono/Chrono.unity.cpp

@@ -18,13 +18,13 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "impl/chrono_io.cpp"
-#include "impl/RelativeTime.cpp"
+#include <beast/chrono/impl/chrono_io.cpp>
+#include <beast/chrono/impl/RelativeTime.cpp>
 
-#include "tests/abstract_clock.test.cpp"
-#include "tests/basic_seconds_clock.test.cpp"
+#include <beast/chrono/tests/abstract_clock.test.cpp>
+#include <beast/chrono/tests/basic_seconds_clock.test.cpp>

src/beast/beast/chrono/RelativeTime.h

@@ -24,10 +24,10 @@
 #ifndef BEAST_CHRONO_RELATIVETIME_H_INCLUDED
 #define BEAST_CHRONO_RELATIVETIME_H_INCLUDED
 
-#include "../Config.h"
-#include "../strings/String.h"
+#include <beast/Config.h>
+#include <beast/strings/String.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <string>
 #include <sstream>
 

src/beast/beast/chrono/abstract_clock_io.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CHRONO_ABSTRACT_CLOCK_IO_H_INCLUDED
 #define BEAST_CHRONO_ABSTRACT_CLOCK_IO_H_INCLUDED
 
-#include "chrono_io.h"
+#include <beast/chrono/chrono_io.h>
 
 namespace beast {
 

src/beast/beast/chrono/basic_seconds_clock.h

@@ -39,22 +39,22 @@
 #endif
 
 #if BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND
-# include <boost/version.hpp>
+#include <boost/version.hpp>
 # if BOOST_VERSION >= 105500
-#  include <boost/thread/thread.hpp>
-#  include <boost/thread/mutex.hpp>
-#  include <boost/thread/condition_variable.hpp>
-#  include <boost/chrono.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <boost/chrono.hpp>
 # else
 #  error "Boost version 1.55.0 or later is required"
 # endif
 #else
-# include <condition_variable>
-# include <mutex>
-# include <thread>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
 #endif
 
-#include "../chrono/chrono_util.h"
+#include <beast/chrono/chrono_util.h>
 
 namespace beast {
 

src/beast/beast/chrono/chrono_io.h

@@ -27,9 +27,9 @@
 #ifndef BEAST_CHRONO_CHRONO_IO_H_INCLUDED
 #define BEAST_CHRONO_CHRONO_IO_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <ctime>
 #include <locale>
 
@@ -156,7 +156,7 @@ template <class charT, class Traits, class Duration>
 */
 
 #include <chrono>
-#include "ratio_io.h"
+#include <beast/chrono/ratio_io.h>
 
 //_LIBCPP_BEGIN_NAMESPACE_STD
 namespace std {

src/beast/beast/chrono/impl/RelativeTime.cpp

@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-#include "../RelativeTime.h"
+#include <beast/chrono/RelativeTime.h>
 
 // VFALCO TODO Migrate the localizable strings interfaces for this file
 

src/beast/beast/chrono/impl/chrono_io.cpp

@@ -24,7 +24,7 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 
-#include "../chrono_io.h"
+#include <beast/chrono/chrono_io.h>
 
 //_LIBCPP_BEGIN_NAMESPACE_STD
 namespace std {

src/beast/beast/chrono/manual_clock.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 #define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 
-#include "abstract_clock.h"
+#include <beast/chrono/abstract_clock.h>
 
 namespace beast {
 

src/beast/beast/chrono/tests/abstract_clock.test.cpp

@@ -19,11 +19,11 @@
 
 // MODULES: ../impl/chrono_io.cpp
 
-#include "../abstract_clock.h"
-#include "../abstract_clock_io.h"
-#include "../manual_clock.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/chrono/abstract_clock_io.h>
+#include <beast/chrono/manual_clock.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 #include <sstream>
 #include <string>

src/beast/beast/chrono/tests/basic_seconds_clock.test.cpp

@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../basic_seconds_clock.h"
+#include <beast/chrono/basic_seconds_clock.h>
 
 namespace beast {
 

src/beast/beast/config/CompilerConfig.h

@@ -25,7 +25,7 @@
 #define BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
 
 #include <assert.h>
-#include "PlatformConfig.h"
+#include <beast/config/PlatformConfig.h>
 
 // This file defines miscellaneous macros for debugging, assertions, etc.
 

src/beast/beast/config/StandardConfig.h

@@ -35,28 +35,28 @@
 #endif
 
 #if BEAST_USE_INTRINSICS
-# include <intrin.h>
+#include <intrin.h>
 #endif
 
 #if BEAST_MAC || BEAST_IOS
-# include <libkern/OSAtomic.h>
+#include <libkern/OSAtomic.h>
 #endif
 
 #if BEAST_LINUX
-# include <signal.h>
+#include <signal.h>
 # if __INTEL_COMPILER
 #  if __ia64__
-#   include <ia64intrin.h>
+#include <ia64intrin.h>
 #  else
-#   include <ia32intrin.h>
+#include <ia32intrin.h>
 #  endif
 # endif
 #endif
 
 #if BEAST_MSVC && BEAST_DEBUG
-# include <crtdbg.h>
-# include <stdlib.h>
-# include <malloc.h>
+#include <crtdbg.h>
+#include <stdlib.h>
+#include <malloc.h>
 #endif
 
 #if BEAST_MSVC

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

@@ -19,4 +19,4 @@
 
 // Microsoft Visual C++ compiler configuration
 
-#include "../../utility/noexcept.h"
+#include <beast/utility/noexcept.h>

src/beast/beast/container/Container.unity.cpp

@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/spookyv2.cpp"
+#include <beast/container/impl/spookyv2.cpp>
 
-#include "tests/aged_associative_container.test.cpp"
-#include "tests/buffer_view.test.cpp"
-#include "tests/hardened_hash.test.cpp"
-#include "tests/hash_append.test.cpp"
+#include <beast/container/tests/aged_associative_container.test.cpp>
+#include <beast/container/tests/buffer_view.test.cpp>
+#include <beast/container/tests/hardened_hash.test.cpp>
+#include <beast/container/tests/hash_append.test.cpp>

src/beast/beast/container/aged_container_utility.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 #define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 
-#include "aged_container.h"
+#include <beast/container/aged_container.h>
 
 #include <type_traits>
 

src/beast/beast/container/aged_map.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/aged_multimap.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/aged_multiset.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/aged_set.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_SET_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/aged_unordered_map.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/aged_unordered_multimap.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/aged_unordered_multiset.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/aged_unordered_set.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

src/beast/beast/container/buffer_view.h

@@ -20,16 +20,16 @@
 #ifndef BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
 #define BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
 #include <array>
-#include "../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 #include <cstddef>
 #include <iterator>
 #include <memory>
 #include <string>
 #include <vector>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 namespace beast {
 

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

@@ -20,23 +20,23 @@
 #ifndef BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED
 
-#include "aged_container_iterator.h"
-#include "aged_associative_container.h"
+#include <beast/container/detail/aged_container_iterator.h>
+#include <beast/container/detail/aged_associative_container.h>
 
-#include "../aged_container.h"
+#include <beast/container/aged_container.h>
 
-#include "../../chrono/abstract_clock.h"
-#include "../../utility/empty_base_optimization.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 
-#include "../../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <memory>
-#include "../../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <utility>
 
 namespace beast {

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

@@ -20,23 +20,23 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED
 
-#include "aged_container_iterator.h"
-#include "aged_associative_container.h"
+#include <beast/container/detail/aged_container_iterator.h>
+#include <beast/container/detail/aged_associative_container.h>
 
-#include "../aged_container.h"
+#include <beast/container/aged_container.h>
 
-#include "../../chrono/abstract_clock.h"
-#include "../../utility/empty_base_optimization.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 
-#include "../../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <memory>
-#include "../../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <utility>
 
 /*

src/beast/beast/container/hardened_hash.h

@@ -20,17 +20,17 @@
 #ifndef BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
 #define BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
 
-#include "hash_append.h"
+#include <beast/container/hash_append.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <cstdint>
 #include <functional>
 #include <mutex>
 #include <random>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <unordered_map>
 #include <unordered_set>
-#include "../cxx14/utility.h" // <utility>
+#include <beast/cxx14/utility.h> // <utility>
 
 // When set to 1, makes the seed per-process instead
 // of per default-constructed instance of hardened_hash

src/beast/beast/container/hash_append.h

@@ -21,23 +21,23 @@
 #ifndef BEAST_CONTAINER_HASH_APPEND_H_INCLUDED
 #define BEAST_CONTAINER_HASH_APPEND_H_INCLUDED
 
-#include "../utility/meta.h"
+#include <beast/utility/meta.h>
 
-#include "impl/spookyv2.h"
+#include <beast/container/impl/spookyv2.h>
 
 #if BEAST_USE_BOOST_FEATURES
 #include <boost/shared_ptr.hpp>
 #endif
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <array>
 #include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>
 #include <tuple>
-#include "../cxx14/type_traits.h" // <type_traits>
-#include "../cxx14/utility.h" // <utility>
+#include <beast/cxx14/type_traits.h> // <type_traits>
+#include <beast/cxx14/utility.h> // <utility>
 #include <vector>
 
 // Set to 1 to disable variadic hash_append for tuple. When set, overloads

src/beast/beast/container/impl/spookyv2.cpp

@@ -10,7 +10,7 @@
 //   August 5 2012: SpookyV2: d = should be d += in short hash, and remove extra mix from long hash
 
 #include <memory.h>
-#include "spookyv2.h"
+#include <beast/container/impl/spookyv2.h>
 
 #ifdef _MSC_VER
 #pragma warning (push)

src/beast/beast/container/impl/spookyv2.h

@@ -38,7 +38,7 @@
   typedef  unsigned __int16 uint16;
   typedef  unsigned __int8  uint8;
 #else
-# include <stdint.h>
+#include <stdint.h>
 # define INLINE inline
   typedef  uint64_t  uint64;
   typedef  uint32_t  uint32;

src/beast/beast/container/tests/aged_associative_container.test.cpp

@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include "../../chrono/manual_clock.h"
-#include "../../unit_test/suite.h"
+#include <beast/chrono/manual_clock.h>
+#include <beast/unit_test/suite.h>
 
-#include "../aged_set.h"
-#include "../aged_map.h"
-#include "../aged_multiset.h"
-#include "../aged_multimap.h"
-#include "../aged_unordered_set.h"
-#include "../aged_unordered_map.h"
-#include "../aged_unordered_multiset.h"
-#include "../aged_unordered_multimap.h"
+#include <beast/container/aged_set.h>
+#include <beast/container/aged_map.h>
+#include <beast/container/aged_multiset.h>
+#include <beast/container/aged_multimap.h>
+#include <beast/container/aged_unordered_set.h>
+#include <beast/container/aged_unordered_map.h>
+#include <beast/container/aged_unordered_multiset.h>
+#include <beast/container/aged_unordered_multimap.h>
 
 #include <vector>
 #include <list>

src/beast/beast/container/tests/buffer_view.test.cpp

@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../buffer_view.h"
+#include <beast/container/buffer_view.h>
 
-#include "../../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 
 namespace beast {
 

src/beast/beast/container/tests/hardened_hash.test.cpp

@@ -20,13 +20,13 @@
 // MODULES: ../../crypto/impl/Sha256.cpp ../../container/impl/spookyv2.cpp
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../hardened_hash.h"
-#include "../../unit_test/suite.h"
+#include <beast/container/hardened_hash.h>
+#include <beast/unit_test/suite.h>
 
-#include "../../crypto/Sha256.h"
+#include <beast/crypto/Sha256.h>
 #include <boost/functional/hash.hpp>
 
 #include <array>

src/beast/beast/container/tests/hash_append.test.cpp

@@ -20,17 +20,17 @@
 // MODULES: ../impl/spookyv2.cpp
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "hash_metrics.h"
+#include <beast/container/tests/hash_metrics.h>
 
-#include "../hash_append.h"
-#include "../impl/spookyv2.h"
+#include <beast/container/hash_append.h>
+#include <beast/container/impl/spookyv2.h>
 
-#include "../../chrono/chrono_io.h"
-#include "../../unit_test/suite.h"
-#include "../../utility/type_name.h"
+#include <beast/chrono/chrono_io.h>
+#include <beast/unit_test/suite.h>
+#include <beast/utility/type_name.h>
 
 #include <array>
 #include <algorithm>

src/beast/beast/crypto/Crypto.unity.cpp

@@ -18,13 +18,13 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/MurmurHash.cpp"
-#include "impl/Sha256.cpp"
-#include "impl/UnsignedInteger.cpp"
+#include <beast/crypto/impl/MurmurHash.cpp>
+#include <beast/crypto/impl/Sha256.cpp>
+#include <beast/crypto/impl/UnsignedInteger.cpp>
 
-#include "tests/BinaryEncoding.cpp"
+#include <beast/crypto/tests/BinaryEncoding.cpp>
 
-#include "tests/UnsignedInteger.test.cpp"
+#include <beast/crypto/tests/UnsignedInteger.test.cpp>

src/beast/beast/crypto/Sha256.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CRYPTO_SHA256_H_INCLUDED
 #define BEAST_CRYPTO_SHA256_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
 #include <array>
 #include <cstdint>

src/beast/beast/crypto/UnsignedInteger.h

@@ -20,13 +20,13 @@
 #ifndef BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED
 #define BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED
 
-#include "UnsignedIntegerCalc.h"
-#include "MurmurHash.h"
+#include <beast/crypto/UnsignedIntegerCalc.h>
+#include <beast/crypto/MurmurHash.h>
 
-#include "../ByteOrder.h"
-#include "../container/hardened_hash.h"
+#include <beast/ByteOrder.h>
+#include <beast/container/hardened_hash.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <algorithm>
 #include <cassert>
 #include <cstdint>

src/beast/beast/crypto/UnsignedIntegerCalc.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED
 #define BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED
 
-#include "../ByteOrder.h"
+#include <beast/ByteOrder.h>
 
 #include <algorithm>
 #include <cassert>

src/beast/beast/crypto/impl/MurmurHash.cpp

@@ -19,7 +19,7 @@
 
 // http://code.google.com/p/smhasher/
 
-#include "../MurmurHash.h"
+#include <beast/crypto/MurmurHash.h>
 
 #include <cstdint>
 

src/beast/beast/crypto/impl/Sha256.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../Sha256.h"
+#include <beast/crypto/Sha256.h>
 
 namespace beast {
 namespace Sha256 {
@@ -39,7 +39,7 @@ namespace Sha256 {
 //#define SHA2_USE_INTTYPES_H
 
 namespace detail {
-#include "sha2/sha2.c"
+#include <beast/crypto/impl/sha2/sha2.c>
 }
 
 Context::Context ()

src/beast/beast/crypto/impl/UnsignedInteger.cpp

@@ -20,9 +20,9 @@
 */
 //==============================================================================
 
-#include "../UnsignedInteger.h"
+#include <beast/crypto/UnsignedInteger.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 

src/beast/beast/crypto/tests/BinaryEncoding.cpp

@@ -18,11 +18,11 @@
 //==============================================================================
 
 // MODULES: ../../../modules/beast_core/beast_core.beast_core.unity.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp
-#include "../BinaryEncoding.h"
-#include "../UnsignedInteger.h"
+#include <beast/crypto/BinaryEncoding.h>
+#include <beast/crypto/UnsignedInteger.h>
 
-#include "../../unit_test/suite.h"
-#include "../../../modules/beast_core/maths/Random.h"
+#include <beast/unit_test/suite.h>
+#include <modules/beast_core/maths/Random.h>
 
 #include <cstddef>
 #include <string>

src/beast/beast/crypto/tests/UnsignedInteger.test.cpp

@@ -20,9 +20,9 @@
 */
 //==============================================================================
 
-#include "../UnsignedInteger.h"
+#include <beast/crypto/UnsignedInteger.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 

src/beast/beast/cxx14/algorithm.h

@@ -20,8 +20,8 @@
 #ifndef BEAST_CXX14_ALGORITHM_H_INCLUDED
 #define BEAST_CXX14_ALGORITHM_H_INCLUDED
 
-#include "config.h"
-#include "functional.h"
+#include <beast/cxx14/config.h>
+#include <beast/cxx14/functional.h>
 
 #include <algorithm>
 

src/beast/beast/cxx14/cxx14.unity.cpp

@@ -17,4 +17,4 @@
 */
 //==============================================================================
 
-#include "tests/integer_sequence.test.cpp"
+#include <beast/cxx14/tests/integer_sequence.test.cpp>

src/beast/beast/cxx14/functional.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_FUNCTIONAL_H_INCLUDED
 #define BEAST_CXX14_FUNCTIONAL_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <functional>
 #include <type_traits>

src/beast/beast/cxx14/iterator.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_ITERATOR_H_INCLUDED
 #define BEAST_CXX14_ITERATOR_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <iterator>
 

src/beast/beast/cxx14/memory.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_MEMORY_H_INCLUDED
 #define BEAST_CXX14_MEMORY_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <memory>
 

src/beast/beast/cxx14/tests/integer_sequence.test.cpp

@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../utility.h"
+#include <beast/cxx14/utility.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 namespace asio {

src/beast/beast/cxx14/type_traits.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_TYPE_TRAITS_H_INCLUDED
 #define BEAST_CXX14_TYPE_TRAITS_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <tuple>
 #include <type_traits>

src/beast/beast/cxx14/utility.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_UTILITY_H_INCLUDED
 #define BEAST_CXX14_UTILITY_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <cstddef>
 #include <type_traits>

src/beast/beast/http/HTTP.unity.cpp

@@ -18,17 +18,17 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/basic_url.cpp"
-#include "impl/get.cpp"
-#include "impl/joyent_parser.cpp"
-#include "impl/ParsedURL.cpp"
-#include "impl/raw_parser.cpp"
-#include "impl/URL.cpp"
+#include <beast/http/impl/basic_url.cpp>
+#include <beast/http/impl/get.cpp>
+#include <beast/http/impl/joyent_parser.cpp>
+#include <beast/http/impl/ParsedURL.cpp>
+#include <beast/http/impl/raw_parser.cpp>
+#include <beast/http/impl/URL.cpp>
 
-#include "tests/basic_url.test.cpp"
-#include "tests/client_session.test.cpp"
-#include "tests/ParsedURL.cpp"
-#include "tests/urls_large_data.cpp"
+#include <beast/http/tests/basic_url.test.cpp>
+#include <beast/http/tests/client_session.test.cpp>
+#include <beast/http/tests/ParsedURL.cpp>
+#include <beast/http/tests/urls_large_data.cpp>

src/beast/beast/http/ParsedURL.h

@@ -20,8 +20,8 @@
 #ifndef BEAST_HTTP_PARSEDURL_H_INCLUDED
 #define BEAST_HTTP_PARSEDURL_H_INCLUDED
 
-#include "../Strings.h"
-#include "URL.h"
+#include <beast/Strings.h>
+#include <beast/http/URL.h>
 
 namespace beast {
 

src/beast/beast/http/URL.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_URL_H_INCLUDED
 #define BEAST_HTTP_URL_H_INCLUDED
 
-#include "../strings/String.h"
+#include <beast/strings/String.h>
 
 #include <ios>
 

src/beast/beast/http/basic_url.h

@@ -23,7 +23,7 @@
 #include <boost/system/error_code.hpp>
 #include <boost/utility/string_ref.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <cstdint>
 #include <functional>
 #include <memory>

src/beast/beast/http/client_session.h

@@ -20,16 +20,16 @@
 #ifndef BEAST_ASIO_HTTP_BASIC_SESSION_H_INCLUDED
 #define BEAST_ASIO_HTTP_BASIC_SESSION_H_INCLUDED
 
-#include "basic_url.h"
-#include "raw_parser.h"
-#include "detail/header_traits.h"
+#include <beast/http/basic_url.h>
+#include <beast/http/raw_parser.h>
+#include <beast/http/detail/header_traits.h>
 
-#include "../asio/bind_handler.h"
-#include "../asio/enable_wait_for_async.h"
-#include "../asio/placeholders.h"
-#include "../asio/shared_handler.h"
-#include "../utility/is_call_possible.h"
-#include "../utility/ci_char_traits.h"
+#include <beast/asio/bind_handler.h>
+#include <beast/asio/enable_wait_for_async.h>
+#include <beast/asio/placeholders.h>
+#include <beast/asio/shared_handler.h>
+#include <beast/utility/is_call_possible.h>
+#include <beast/utility/ci_char_traits.h>
 
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/deadline_timer.hpp>
@@ -42,8 +42,8 @@
 #include <boost/utility/string_ref.hpp>
 #include <boost/logic/tribool.hpp>
 
-#include "../cxx14/memory.h" // <memory>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/memory.h> // <memory>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 #include <sstream> // REMOVE ASAP!
 

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

@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_HEADER_TRAITS_H_INCLUDED
 #define BEAST_HTTP_HEADER_TRAITS_H_INCLUDED
 
-#include "../../utility/ci_char_traits.h"
+#include <beast/utility/ci_char_traits.h>
 
 #include <boost/utility/string_ref.hpp>
 

src/beast/beast/http/impl/ParsedURL.cpp

@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include "../ParsedURL.h"
-#include "../../strings/String.h"
+#include <beast/http/ParsedURL.h>
+#include <beast/strings/String.h>
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
 #include <cstdint>
 

src/beast/beast/http/impl/URL.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../URL.h"
+#include <beast/http/URL.h>
 
 namespace beast {
 

src/beast/beast/http/impl/basic_url.cpp

@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../basic_url.h"
+#include <beast/http/basic_url.h>
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
 namespace beast {
 namespace http {

src/beast/beast/http/impl/get.cpp

@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../get.h"
+#include <beast/http/get.h>
 
-#include "../basic_url.h"
+#include <beast/http/basic_url.h>
 
 namespace beast {
 namespace http {

src/beast/beast/http/impl/joyent_parser.cpp

@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
-#include "../basic_message.h"
+#include <beast/http/basic_message.h>
 
 #include <boost/system/error_code.hpp>
 
@@ -31,7 +31,7 @@ namespace joyent {
 # pragma warning (disable: 4127) // conditional expression is constant
 # pragma warning (disable: 4244) // integer conversion, possible loss of data
 #endif
-#include "http-parser/http_parser.c"
+#include <beast/http/impl/http-parser/http_parser.c>
 #ifdef _MSC_VER
 # pragma warning (pop)
 #endif

src/beast/beast/http/impl/joyent_parser.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_JOYENT_PARSER_H_INCLUDED
 #define BEAST_HTTP_JOYENT_PARSER_H_INCLUDED
 
-#include "../basic_message.h"
+#include <beast/http/basic_message.h>
 
 // TODO Use <system_error>
 #include <boost/system/error_code.hpp>
@@ -30,7 +30,7 @@
 namespace beast {
 namespace joyent {
 
-#include "http-parser/http_parser.h"
+#include <beast/http/impl/http-parser/http_parser.h>
 
 http::method::methodc_t
 convert_http_method (joyent::http_method m);

src/beast/beast/http/impl/raw_parser.cpp

@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../raw_parser.h"
+#include <beast/http/raw_parser.h>
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
 #include <utility>
 

src/beast/beast/http/raw_parser.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_RAW_PARSER_H_INCLUDED
 #define BEAST_HTTP_RAW_PARSER_H_INCLUDED
 
-#include "../utility/empty_base_optimization.h"
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/system/error_code.hpp> // change to <system_error> soon