diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index 8ed328df440..42bf6d66c9d 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -602,7 +602,7 @@ class ApplicationImp : public Application, public BasicApp
         return *m_networkOPs;
     }
 
-    virtual ServerHandlerImp&
+    virtual ServerHandler&
     getServerHandler() override
     {
         assert(serverHandler_);
diff --git a/src/ripple/app/main/Application.h b/src/ripple/app/main/Application.h
index d2ba8f7cc75..67343852b66 100644
--- a/src/ripple/app/main/Application.h
+++ b/src/ripple/app/main/Application.h
@@ -89,7 +89,7 @@ class Overlay;
 class PathRequests;
 class PendingSaves;
 class PublicKey;
-class ServerHandlerImp;
+class ServerHandler;
 class SecretKey;
 class STLedgerEntry;
 class TimeKeeper;
@@ -232,7 +232,7 @@ class Application : public beast::PropertyStream::Source
     getOPs() = 0;
     virtual OrderBookDB&
     getOrderBookDB() = 0;
-    virtual ServerHandlerImp&
+    virtual ServerHandler&
     getServerHandler() = 0;
     virtual TransactionMaster&
     getMasterTransaction() = 0;
diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
index 6f51f811055..79cd857b785 100644
--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -64,8 +64,8 @@
 #include <ripple/resource/ResourceManager.h>
 #include <ripple/rpc/BookChanges.h>
 #include <ripple/rpc/DeliveredAmount.h>
+#include <ripple/rpc/ServerHandler.h>
 #include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/ServerHandlerImp.h>
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>