diff --git a/src/cpp/ripple/Pathfinder.cpp b/src/cpp/ripple/Pathfinder.cpp
index 82b55202f..0f772bf62 100644
--- a/src/cpp/ripple/Pathfinder.cpp
+++ b/src/cpp/ripple/Pathfinder.cpp
@@ -1,8 +1,13 @@
+
 #include "Pathfinder.h"
+
+#include <queue>
+
+#include <boost/foreach.hpp>
+
 #include "Application.h"
 #include "AccountItems.h"
 #include "Log.h"
-#include <boost/foreach.hpp>
 
 SETUP_LOG();
 
diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
index e1dc3c178..e7d34198d 100644
--- a/src/cpp/ripple/RPCHandler.cpp
+++ b/src/cpp/ripple/RPCHandler.cpp
@@ -2,6 +2,12 @@
 // carries out the RPC
 //
 
+#include <openssl/md5.h>
+
+#include <boost/foreach.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+#include "Pathfinder.h"
 #include "Log.h"
 #include "NetworkOPs.h"
 #include "RPCHandler.h"
@@ -16,9 +22,6 @@
 #include "InstanceCounter.h"
 #include "Offer.h"
 
-#include "Pathfinder.h"
-#include <boost/foreach.hpp>
-#include <openssl/md5.h>
 
 SETUP_LOG();
 
diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp
index 4213487cd..cd523c0de 100644
--- a/src/cpp/ripple/WSDoor.cpp
+++ b/src/cpp/ripple/WSDoor.cpp
@@ -1,6 +1,10 @@
 
 #include "Log.h"
 
+#define WSDOOR_CPP
+#include "../websocketpp/src/sockets/tls.hpp"
+#include "../websocketpp/src/websocketpp.hpp"
+
 SETUP_LOG();
 
 #include "Application.h"
diff --git a/src/cpp/ripple/WSDoor.h b/src/cpp/ripple/WSDoor.h
index 40c37815d..24ba138a8 100644
--- a/src/cpp/ripple/WSDoor.h
+++ b/src/cpp/ripple/WSDoor.h
@@ -1,15 +1,22 @@
 #ifndef __WSDOOR__
 #define __WSDOOR__
 
-#include "../websocketpp/src/sockets/tls.hpp"
-#include "../websocketpp/src/websocketpp.hpp"
-
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#ifndef WSDOOR_CPP
+
+namespace websocketpp
+{
+	class server;
+	class server_tls;
+}
+
+#endif
+
 class WSDoor
 {
 private: