diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index 09664a9b45..a22b26c16b 100644
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
@@ -69,6 +69,7 @@
     <None Include="..\..\README.md" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\beast\Config.h" />
     <ClInclude Include="..\..\beast\intrusive\ForwardList.h" />
     <ClInclude Include="..\..\beast\intrusive\PointerTraits.h" />
     <ClInclude Include="..\..\beast\mpl.h" />
@@ -244,7 +245,6 @@
     <ClInclude Include="..\..\modules\beast_core\system\PlatformDefs.h" />
     <ClInclude Include="..\..\modules\beast_core\system\StandardHeader.h" />
     <ClInclude Include="..\..\modules\beast_core\system\SystemStats.h" />
-    <ClInclude Include="..\..\modules\beast_core\system\TargetPlatform.h" />
     <ClInclude Include="..\..\modules\beast_core\system\BeforeBoost.h" />
     <ClInclude Include="..\..\modules\beast_core\system\BoostIncludes.h" />
     <ClInclude Include="..\..\modules\beast_core\system\BoostPlaceholdersFix.h" />
diff --git a/Builds/VisualStudio2012/beast.vcxproj.filters b/Builds/VisualStudio2012/beast.vcxproj.filters
index fd4484bb37..18657906b7 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -807,9 +807,6 @@
     <ClInclude Include="..\..\modules\beast_core\system\SystemStats.h">
       <Filter>beast_core\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\system\TargetPlatform.h">
-      <Filter>beast_core\system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\containers\DynamicList.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
@@ -1041,6 +1038,9 @@
     <ClInclude Include="..\..\beast\net\IPEndpoint.h">
       <Filter>beast\net</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\beast\Config.h">
+      <Filter>beast</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\containers\AbstractFifo.cpp">
diff --git a/modules/beast_core/system/TargetPlatform.h b/beast/Config.h
similarity index 98%
rename from modules/beast_core/system/TargetPlatform.h
rename to beast/Config.h
index 2cb46c333e..d67089d4cd 100644
--- a/modules/beast_core/system/TargetPlatform.h
+++ b/beast/Config.h
@@ -21,8 +21,10 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_TARGETPLATFORM_H_INCLUDED
-#define BEAST_CORE_TARGETPLATFORM_H_INCLUDED
+#ifndef BEAST_CONFIG_H_INCLUDED
+#define BEAST_CONFIG_H_INCLUDED
+
+// VFALCO NOTE this is analogous to <boost/config.hpp>
 
 //==============================================================================
 /*  This file figures out which platform is being built, and defines some macros
diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h
index c7834a0040..c6943aab03 100644
--- a/modules/beast_core/beast_core.h
+++ b/modules/beast_core/beast_core.h
@@ -173,7 +173,7 @@ Some files contain portions of these external projects, licensed separately:
 */
 
 // TargetPlatform.h should not use anything from BeastConfig.h
-#include "system/TargetPlatform.h"
+#include "../../beast/Config.h"
 #include "system/BeastConfigCheck.h"
 
 # include "system/BeforeBoost.h"
diff --git a/modules/beast_core/native/BasicNativeHeaders.h b/modules/beast_core/native/BasicNativeHeaders.h
index dae1b669a4..e20e4fd0bc 100644
--- a/modules/beast_core/native/BasicNativeHeaders.h
+++ b/modules/beast_core/native/BasicNativeHeaders.h
@@ -24,7 +24,8 @@
 #ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED
 #define BEAST_BASICNATIVEHEADERS_H_INCLUDED
 
-#include "../system/TargetPlatform.h"
+#include "../../../beast/Config.h"
+
 #undef T
 
 //==============================================================================
diff --git a/modules/beast_core/system/BeforeBoost.h b/modules/beast_core/system/BeforeBoost.h
index a314cc6677..2cf22d58af 100644
--- a/modules/beast_core/system/BeforeBoost.h
+++ b/modules/beast_core/system/BeforeBoost.h
@@ -21,7 +21,7 @@
 #define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
 
 // TargetPlatform.h should not use anything from BeastConfig.h
-#include "TargetPlatform.h"
+#include "../../../beast/Config.h"
 #include "BeastConfigCheck.h"
 
 // This file should be included before including any boost headers.
diff --git a/modules/beast_sqlite/beast_sqlite.h b/modules/beast_sqlite/beast_sqlite.h
index 4dff289446..1c1b5c6152 100644
--- a/modules/beast_sqlite/beast_sqlite.h
+++ b/modules/beast_sqlite/beast_sqlite.h
@@ -30,7 +30,7 @@
           see BeastConfig.h.
 */
 
-#include "../beast_core/system/TargetPlatform.h"
+#include "../../../beast/beast/Config.h"
 
 #if BEAST_IOS || BEAST_MAC
 # define BEAST_HAVE_NATIVE_SQLITE 1