diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index 3861c4a1ec..10a927a592 100755
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -2935,6 +2935,8 @@
     <ClCompile Include="..\..\src\ripple\resource\tests\Logic.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\rpc\Context.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\Coroutine.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\rpc\handlers\AccountCurrencies.cpp">
@@ -3122,8 +3124,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\rpc\impl\Accounts.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\rpc\impl\Context.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\rpc\impl\Coroutine.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index e1d31811a2..eccd596e5f 100755
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -4116,6 +4116,9 @@
     <ClCompile Include="..\..\src\ripple\resource\tests\Logic.test.cpp">
       <Filter>ripple\resource\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\rpc\Context.h">
+      <Filter>ripple\rpc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\Coroutine.h">
       <Filter>ripple\rpc</Filter>
     </ClInclude>
@@ -4308,9 +4311,6 @@
     <ClInclude Include="..\..\src\ripple\rpc\impl\Accounts.h">
       <Filter>ripple\rpc\impl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\rpc\impl\Context.h">
-      <Filter>ripple\rpc\impl</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\rpc\impl\Coroutine.cpp">
       <Filter>ripple\rpc\impl</Filter>
     </ClCompile>
diff --git a/src/ripple/rpc/impl/Context.h b/src/ripple/rpc/Context.h
similarity index 100%
rename from src/ripple/rpc/impl/Context.h
rename to src/ripple/rpc/Context.h
diff --git a/src/ripple/rpc/RPCHandler.h b/src/ripple/rpc/RPCHandler.h
index 2723d92e5d..059b4fe18f 100644
--- a/src/ripple/rpc/RPCHandler.h
+++ b/src/ripple/rpc/RPCHandler.h
@@ -22,8 +22,8 @@
 
 #include <ripple/core/Config.h>
 #include <ripple/net/InfoSub.h>
+#include <ripple/rpc/Context.h>
 #include <ripple/rpc/Status.h>
-#include <ripple/rpc/impl/Context.h>
 
 namespace ripple {
 namespace RPC {
diff --git a/src/ripple/rpc/impl/RPCHandler.cpp b/src/ripple/rpc/impl/RPCHandler.cpp
index f189a14190..c5cb2390d4 100644
--- a/src/ripple/rpc/impl/RPCHandler.cpp
+++ b/src/ripple/rpc/impl/RPCHandler.cpp
@@ -21,7 +21,6 @@
 #include <ripple/rpc/RPCHandler.h>
 #include <ripple/rpc/Yield.h>
 #include <ripple/rpc/impl/Tuning.h>
-#include <ripple/rpc/impl/Context.h>
 #include <ripple/rpc/impl/Handler.h>
 #include <ripple/rpc/impl/WriteJson.h>
 #include <ripple/app/ledger/LedgerMaster.h>
@@ -33,7 +32,6 @@
 #include <ripple/net/InfoSub.h>
 #include <ripple/net/RPCErr.h>
 #include <ripple/protocol/JsonFields.h>
-#include <ripple/rpc/impl/Context.h>
 #include <ripple/server/Role.h>
 
 namespace ripple {