diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index cd4add8e8e..6bda41cf58 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -3220,8 +3220,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\rpc\impl\ParseAccountIds.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\rpc\impl\RipplePathFind.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\rpc\impl\RPCHandler.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3252,6 +3250,8 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\Request.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\rpc\RipplePathFind.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\RPCHandler.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\RPCVersion.h">
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 8687f56463..d014f89426 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -3933,9 +3933,6 @@
     <ClInclude Include="..\..\src\ripple\rpc\impl\ParseAccountIds.h">
       <Filter>ripple\rpc\impl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\rpc\impl\RipplePathFind.h">
-      <Filter>ripple\rpc\impl</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\rpc\impl\RPCHandler.cpp">
       <Filter>ripple\rpc\impl</Filter>
     </ClCompile>
@@ -3972,6 +3969,9 @@
     <ClInclude Include="..\..\src\ripple\rpc\Request.h">
       <Filter>ripple\rpc</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\rpc\RipplePathFind.h">
+      <Filter>ripple\rpc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\RPCHandler.h">
       <Filter>ripple\rpc</Filter>
     </ClInclude>
diff --git a/src/ripple/app/ledger/tests/common_ledger.cpp b/src/ripple/app/ledger/tests/common_ledger.cpp
index dd999b184e..bac91d0bf6 100644
--- a/src/ripple/app/ledger/tests/common_ledger.cpp
+++ b/src/ripple/app/ledger/tests/common_ledger.cpp
@@ -23,7 +23,7 @@
 #include <ripple/protocol/RippleAddress.h>
 #include <ripple/protocol/Indexes.h>
 #include <ripple/protocol/types.h>
-#include <ripple/rpc/impl/RipplePathFind.h>
+#include <ripple/rpc/RipplePathFind.h>
 #include <ripple/json/json_writer.h>
 
 namespace ripple {
diff --git a/src/ripple/app/paths/tests/Path_test.cpp b/src/ripple/app/paths/tests/Path_test.cpp
index a9b65e5e89..d694fecfa1 100644
--- a/src/ripple/app/paths/tests/Path_test.cpp
+++ b/src/ripple/app/paths/tests/Path_test.cpp
@@ -22,7 +22,7 @@
 #include <ripple/json/json_reader.h>
 #include <ripple/json/to_string.h>
 #include <ripple/protocol/TxFlags.h>
-#include <ripple/rpc/impl/RipplePathFind.h>
+#include <ripple/rpc/RipplePathFind.h>
 #include <ripple/basics/Log.h>
 #include <beast/unit_test/suite.h>
 
diff --git a/src/ripple/rpc/impl/RipplePathFind.h b/src/ripple/rpc/RipplePathFind.h
similarity index 92%
rename from src/ripple/rpc/impl/RipplePathFind.h
rename to src/ripple/rpc/RipplePathFind.h
index c1676729cb..eeceb44b54 100644
--- a/src/ripple/rpc/impl/RipplePathFind.h
+++ b/src/ripple/rpc/RipplePathFind.h
@@ -25,11 +25,6 @@
 
 namespace ripple {
 
-class RippleAddress;
-
-Json::Value
-buildSrcCurrencies(AccountID const& raSrc, RippleLineCache::pointer const& cache);
-
 std::pair<bool, Json::Value>
 ripplePathFind (RippleLineCache::pointer const& cache,
     AccountID const& raSrc, AccountID const& raDst,
diff --git a/src/ripple/rpc/handlers/RipplePathFind.cpp b/src/ripple/rpc/handlers/RipplePathFind.cpp
index de37486e1e..07d6ed389d 100644
--- a/src/ripple/rpc/handlers/RipplePathFind.cpp
+++ b/src/ripple/rpc/handlers/RipplePathFind.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/rpc/impl/RipplePathFind.h>
+#include <ripple/rpc/RipplePathFind.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/paths/AccountCurrencies.h>
 #include <ripple/app/paths/FindPaths.h>
@@ -32,6 +32,24 @@
 
 namespace ripple {
 
+static
+Json::Value
+buildSrcCurrencies(AccountID const& account,
+    RippleLineCache::pointer const& cache)
+{
+    auto currencies = accountSourceCurrencies(account, cache, true);
+    auto jvSrcCurrencies = Json::Value(Json::arrayValue);
+
+    for (auto const& uCurrency : currencies)
+    {
+        Json::Value jvCurrency(Json::objectValue);
+        jvCurrency[jss::currency] = to_string(uCurrency);
+        jvSrcCurrencies.append(jvCurrency);
+    }
+
+    return jvSrcCurrencies;
+}
+
 // This interface is deprecated.
 Json::Value doRipplePathFind (RPC::Context& context)
 {
@@ -196,22 +214,6 @@ Json::Value doRipplePathFind (RPC::Context& context)
     return jvResult;
 }
 
-Json::Value
-buildSrcCurrencies(AccountID const& account, RippleLineCache::pointer const& cache)
-{
-    auto currencies = accountSourceCurrencies(account, cache, true);
-    auto jvSrcCurrencies = Json::Value(Json::arrayValue);
-
-    for (auto const& uCurrency : currencies)
-    {
-        Json::Value jvCurrency(Json::objectValue);
-        jvCurrency[jss::currency] = to_string(uCurrency);
-        jvSrcCurrencies.append(jvCurrency);
-    }
-
-    return jvSrcCurrencies;
-}
-
 std::pair<bool, Json::Value>
 ripplePathFind (RippleLineCache::pointer const& cache, 
   AccountID const& raSrc, AccountID const& raDst,