diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index b1c230107..4c7085fc3 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -485,12 +485,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
@@ -990,7 +984,7 @@
true
true
-
+
true
true
true
@@ -1448,7 +1442,6 @@
-
@@ -1562,7 +1555,7 @@
-
+
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index ffe82bbf8..e61dc217d 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -720,9 +720,6 @@
[1] Ripple\ripple_app\rpc
-
- [1] Ripple\ripple_app\rpc
-
[1] Ripple\ripple_app\rpc
@@ -825,9 +822,6 @@
[1] Ripple\ripple_app\boost
-
- [1] Ripple\ripple_asio\sockets
-
[1] Ripple\ripple_app\websocket
@@ -876,15 +870,15 @@
[1] Ripple\ripple_net\basics
-
- [1] Ripple\ripple_net\basics
-
[1] Ripple\ripple_app\rpc
[1] Ripple\ripple_app\rpc
+
+ [1] Ripple\ripple_net\basics
+
@@ -1493,9 +1487,6 @@
[1] Ripple\ripple_app\rpc
-
- [1] Ripple\ripple_app\rpc
-
[1] Ripple\ripple_app\rpc
@@ -1679,15 +1670,15 @@
[1] Ripple\ripple_net\basics\impl
-
- [1] Ripple\ripple_net\basics
-
[1] Ripple\ripple_app\rpc
[1] Ripple\ripple_app\rpc
+
+ [1] Ripple\ripple_net\basics
+
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 91c5cc053..c9872bfc8 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -195,8 +195,6 @@ namespace ripple
#include "basics/ripple_RPCServerHandler.h"
-#include "rpc/RPCDoor.h" // needs RPCServer
-
}
//------------------------------------------------------------------------------
@@ -354,7 +352,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "misc/ripple_FeeVote.cpp"
#include "misc/ripple_Validations.cpp"
#include "peers/ripple_Peer.cpp"
-#include "rpc/RPCDoor.cpp"
#include "tx/OfferCreateTransactor.cpp"
#include "tx/WalletAddTransactor.cpp"
diff --git a/modules/ripple_app/rpc/RPCDoor.cpp b/modules/ripple_net/basics/RPCDoor.cpp
similarity index 100%
rename from modules/ripple_app/rpc/RPCDoor.cpp
rename to modules/ripple_net/basics/RPCDoor.cpp
diff --git a/modules/ripple_app/rpc/RPCDoor.h b/modules/ripple_net/basics/RPCDoor.h
similarity index 82%
rename from modules/ripple_app/rpc/RPCDoor.h
rename to modules/ripple_net/basics/RPCDoor.h
index 4990da43b..6635d6f89 100644
--- a/modules/ripple_app/rpc/RPCDoor.h
+++ b/modules/ripple_net/basics/RPCDoor.h
@@ -4,8 +4,8 @@
*/
//==============================================================================
-#ifndef RIPPLE_RPCDOOR_H
-#define RIPPLE_RPCDOOR_H
+#ifndef RIPPLE_NET_BASICS_RPCDOOR_H_INCLUDED
+#define RIPPLE_NET_BASICS_RPCDOOR_H_INCLUDED
/** Listening socket for RPC requests.
*/
diff --git a/modules/ripple_net/ripple_net.cpp b/modules/ripple_net/ripple_net.cpp
index 41c9dd540..1ed0a1a44 100644
--- a/modules/ripple_net/ripple_net.cpp
+++ b/modules/ripple_net/ripple_net.cpp
@@ -43,6 +43,7 @@ namespace ripple
#include "basics/MultiSocket.cpp"
#include "basics/HTTPRequest.cpp"
#include "basics/HTTPClient.cpp"
+#include "basics/RPCDoor.cpp"
#include "basics/RPCServer.cpp"
#include "basics/SNTPClient.cpp"
diff --git a/modules/ripple_net/ripple_net.h b/modules/ripple_net/ripple_net.h
index 6c3d8ea2c..46c0b8d6a 100644
--- a/modules/ripple_net/ripple_net.h
+++ b/modules/ripple_net/ripple_net.h
@@ -21,6 +21,7 @@ namespace ripple
#include "basics/HTTPRequest.h"
#include "basics/HTTPClient.h"
#include "basics/RPCServer.h"
+#include "basics/RPCDoor.h"
#include "basics/SNTPClient.h"
}