diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 113926731..b1c230107 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -479,7 +479,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\rpc.cpp">
+    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCUtil.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -990,6 +990,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\basics\RPCErr.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_net\basics\RPCServer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1441,7 +1447,7 @@
     <ClInclude Include="..\..\modules\ripple_app\peers\ripple_UniqueNodeList.h" />
     <ClInclude Include="..\..\modules\ripple_app\ripple_app.h" />
     <ClInclude Include="..\..\modules\ripple_app\rpc\CallRPC.h" />
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPC.h" />
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCUtil.h" />
     <ClInclude Include="..\..\modules\ripple_app\rpc\RPCDoor.h" />
     <ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h" />
     <ClInclude Include="..\..\modules\ripple_app\rpc\RPCHandler.h" />
@@ -1556,6 +1562,7 @@
     <ClInclude Include="..\..\modules\ripple_net\basics\HTTPRequest.h" />
     <ClInclude Include="..\..\modules\ripple_net\basics\HTTPClient.h" />
     <ClInclude Include="..\..\modules\ripple_net\basics\MultiSocket.h" />
+    <ClInclude Include="..\..\modules\ripple_net\basics\RPCErr.h" />
     <ClInclude Include="..\..\modules\ripple_net\basics\RPCServer.h" />
     <ClInclude Include="..\..\modules\ripple_net\basics\SNTPClient.h" />
     <ClInclude Include="..\..\modules\ripple_net\ripple_net.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 7203685c2..ffe82bbf8 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -720,15 +720,9 @@
     <ClCompile Include="..\..\modules\ripple_app\rpc\CallRPC.cpp">
       <Filter>[1] Ripple\ripple_app\rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\rpc.cpp">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_app\rpc\RPCDoor.cpp">
       <Filter>[1] Ripple\ripple_app\rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCErr.cpp">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_app\rpc\RPCHandler.cpp">
       <Filter>[1] Ripple\ripple_app\rpc</Filter>
     </ClCompile>
@@ -882,6 +876,15 @@
     <ClCompile Include="..\..\modules\ripple_net\basics\SNTPClient.cpp">
       <Filter>[1] Ripple\ripple_net\basics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\basics\RPCErr.cpp">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCErr.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCUtil.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\modules\ripple_app\ripple_app.h">
@@ -1490,15 +1493,9 @@
     <ClInclude Include="..\..\modules\ripple_app\rpc\CallRPC.h">
       <Filter>[1] Ripple\ripple_app\rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPC.h">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_app\rpc\RPCDoor.h">
       <Filter>[1] Ripple\ripple_app\rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_app\rpc\RPCHandler.h">
       <Filter>[1] Ripple\ripple_app\rpc</Filter>
     </ClInclude>
@@ -1682,6 +1679,15 @@
     <ClInclude Include="..\..\modules\ripple_net\basics\impl\MultiSocketType.h">
       <Filter>[1] Ripple\ripple_net\basics\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\RPCErr.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCUtil.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 4d2283ab3..91c5cc053 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -61,7 +61,6 @@
 
 #include "../ripple_core/ripple_core.h"
 
-#include "beast/modules/beast_asio/beast_asio.h"
 #include "beast/modules/beast_db/beast_db.h"
 #include "beast/modules/beast_sqdb/beast_sqdb.h"
 #include "beast/modules/beast_sqlite/beast_sqlite.h"
@@ -180,8 +179,6 @@ namespace ripple
 #include  "paths/ripple_Pathfinder.h"
 #include "tx/PaymentTransactor.h"
 #include "peers/PeerDoor.h"
-#include "rpc/RPC.h"
-#include "rpc/RPCErr.h"
 #include "rpc/RPCSub.h"
 #include "tx/RegularKeySetTransactor.h"
 #include "paths/ripple_RippleState.h"
@@ -243,7 +240,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 1
 
-#include "basics/ripple_RPCServerHandler.cpp"
 #include "node/ripple_NodeObject.cpp"
 #include "node/ripple_NodeStore.cpp"
 #include "node/ripple_HyperLevelDBBackendFactory.cpp"
@@ -274,7 +270,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 2
 
-#include "rpc/RPCHandler.cpp"
 #include "shamap/ripple_SHAMap.cpp" // Uses theApp
 #include "shamap/ripple_SHAMapItem.cpp"
 #include "shamap/ripple_SHAMapSync.cpp"
@@ -302,16 +297,24 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 3
 
+#include "rpc/RPCErr.h" // private
+#include "rpc/RPCUtil.h" // private
+
+#include "rpc/RPCErr.cpp"
+#include "rpc/RPCUtil.cpp"
+
+#include "rpc/CallRPC.cpp"
+#include "rpc/RPCHandler.cpp"
+#include "rpc/RPCSub.cpp"
+
+#include "basics/ripple_RPCServerHandler.cpp" // needs RPCUtil
+#include "paths/ripple_PathRequest.cpp" // needs RPCErr.h
 #include "paths/ripple_RippleCalc.cpp"
 #include "paths/ripple_PathState.cpp"
-#include "rpc/CallRPC.cpp"
 
 #include "main/ParameterTable.cpp"
 #include "peers/PeerDoor.cpp"
 #include "paths/ripple_RippleLineCache.cpp"
-#include "rpc/rpc.cpp"
-#include "rpc/RPCErr.cpp"
-#include "rpc/RPCSub.cpp"
 #include "ledger/SerializedValidation.cpp"
 #include "tx/Transaction.cpp"
 #include "tx/TransactionEngine.cpp"
@@ -381,7 +384,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 
 #include "ledger/ripple_InboundLedgers.cpp"
 #include "ledger/ripple_LedgerHistory.cpp"
-#include "paths/ripple_PathRequest.cpp"
 #include "misc/ripple_SerializedLedger.cpp"
 #include "tx/ripple_TransactionAcquire.cpp"
 
diff --git a/modules/ripple_app/rpc/rpc.cpp b/modules/ripple_app/rpc/RPCUtil.cpp
similarity index 100%
rename from modules/ripple_app/rpc/rpc.cpp
rename to modules/ripple_app/rpc/RPCUtil.cpp
diff --git a/modules/ripple_app/rpc/RPC.h b/modules/ripple_app/rpc/RPCUtil.h
similarity index 93%
rename from modules/ripple_app/rpc/RPC.h
rename to modules/ripple_app/rpc/RPCUtil.h
index 1b7cedad1..470e3e65f 100644
--- a/modules/ripple_app/rpc/RPC.h
+++ b/modules/ripple_app/rpc/RPCUtil.h
@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_RPC_H_INCLUDED
-#define RIPPLE_RPC_H_INCLUDED
+#ifndef RIPPLE_RPC_RPCUTIL_H_INCLUDED
+#define RIPPLE_RPC_RPCUTIL_H_INCLUDEDRIPPLE_RPC_H_INCLUDED
 
 // VFALCO TODO Wrap these up into a class. It looks like they just do some
 //             convenience packaging of JSON data from the pieces. It looks