diff --git a/src/cpp/ripple/CallRPC.cpp b/src/cpp/ripple/CallRPC.cpp
index 96d350140c..1d0f009105 100644
--- a/src/cpp/ripple/CallRPC.cpp
+++ b/src/cpp/ripple/CallRPC.cpp
@@ -785,7 +785,7 @@ int commandLineRPC(const std::vector<std::string>& vCmd)
 					: vCmd[0],
 				jvParams,								// Parsed, execute.
 				false,
-				boost::bind(callRPCHandler, &jvOutput, _1));
+				BIND_TYPE(callRPCHandler, &jvOutput, P_1));
 
 			isService.run(); // This blocks until there is no more outstanding async calls.
 
@@ -848,7 +848,7 @@ int commandLineRPC(const std::vector<std::string>& vCmd)
 #define RPC_NOTIFY_SECONDS		10
 
 bool responseRPC(
-	boost::function<void(const Json::Value& jvInput)> callbackFuncP,
+	FUNCTION_TYPE<void(const Json::Value& jvInput)> callbackFuncP,
 	const boost::system::error_code& ecResult, int iStatus, const std::string& strData)
 {
 	if (callbackFuncP)
@@ -886,7 +886,9 @@ bool responseRPC(
 }
 
 // Build the request.
-void requestRPC(const std::string& strMethod, const Json::Value& jvParams, const std::map<std::string, std::string>& mHeaders, const std::string& strPath, boost::asio::streambuf& sb, const std::string& strHost)
+void requestRPC(const std::string& strMethod, const Json::Value& jvParams,
+	const std::map<std::string, std::string>& mHeaders, const std::string& strPath,
+	boost::asio::streambuf& sb, const std::string& strHost)
 {
 	cLog(lsDEBUG) << "requestRPC: strPath='" << strPath << "'";
 
@@ -906,7 +908,7 @@ void callRPC(
 	const std::string& strUsername, const std::string& strPassword,
 	const std::string& strPath, const std::string& strMethod,
 	const Json::Value& jvParams, const bool bSSL,
-	boost::function<void(const Json::Value& jvInput)> callbackFuncP)
+	FUNCTION_TYPE<void(const Json::Value& jvInput)> callbackFuncP)
 {
 	// Connect to localhost
 	if (!theConfig.QUIET)
@@ -933,15 +935,15 @@ void callRPC(
 		io_service,
 		strIp,
 		iPort,
-		boost::bind(
+		BIND_TYPE(
 			&requestRPC,
 			strMethod,
 			jvParams,
 			mapRequestHeaders,
-			strPath, _1, _2),
+			strPath, P_1, P_2),
 		RPC_REPLY_MAX_BYTES,
 		boost::posix_time::seconds(RPC_NOTIFY_SECONDS),
-		boost::bind(&responseRPC, callbackFuncP, _1, _2, _3));
+		BIND_TYPE(&responseRPC, callbackFuncP, P_1, P_2, P_3));
 }
 
 // vim:ts=4
diff --git a/src/cpp/ripple/CallRPC.h b/src/cpp/ripple/CallRPC.h
index adde89f708..5d9a0377fc 100644
--- a/src/cpp/ripple/CallRPC.h
+++ b/src/cpp/ripple/CallRPC.h
@@ -56,7 +56,7 @@ extern void callRPC(
 	const std::string& strUsername, const std::string& strPassword,
 	const std::string& strPath, const std::string& strMethod,
 	const Json::Value& jvParams, const bool bSSL,
-	boost::function<void(const Json::Value& jvInput)> callbackFuncP = 0);
+	FUNCTION_TYPE<void(const Json::Value& jvInput)> callbackFuncP = 0);
 #endif
 
 // vim:ts=4
diff --git a/src/cpp/ripple/HttpsClient.cpp b/src/cpp/ripple/HttpsClient.cpp
index 1ae01e19f2..1144d98596 100644
--- a/src/cpp/ripple/HttpsClient.cpp
+++ b/src/cpp/ripple/HttpsClient.cpp
@@ -6,7 +6,6 @@
 #include "utils.h"
 
 #include <iostream>
-#include <boost/bind.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/regex.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
@@ -52,9 +51,9 @@ void HttpsClient::makeGet(const std::string& strPath, boost::asio::streambuf& sb
 void HttpsClient::httpsRequest(
 	bool bSSL,
 	std::deque<std::string> deqSites,
-	boost::function<void(boost::asio::streambuf& sb, const std::string& strHost)> build,
+	FUNCTION_TYPE<void(boost::asio::streambuf& sb, const std::string& strHost)> build,
 	boost::posix_time::time_duration timeout,
-	boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete)
+	FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete)
 {
 	mSSL		= bSSL;
 	mDeqSites	= deqSites;
@@ -70,7 +69,7 @@ void HttpsClient::httpsGet(
 	std::deque<std::string> deqSites,
 	const std::string& strPath,
 	boost::posix_time::time_duration timeout,
-	boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
+	FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
 
 	mComplete	= complete;
 	mTimeout	= timeout;
@@ -78,7 +77,7 @@ void HttpsClient::httpsGet(
 	httpsRequest(
 		bSSL,
 		deqSites,
-		boost::bind(&HttpsClient::makeGet, shared_from_this(), strPath, _1, _2),
+		BIND_TYPE(&HttpsClient::makeGet, shared_from_this(), strPath, P_1, P_2),
 		timeout,
 		complete);
 }
@@ -403,7 +402,7 @@ void HttpsClient::httpsGet(
 	const std::string& strPath,
 	std::size_t responseMax,
 	boost::posix_time::time_duration timeout,
-	boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
+	FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
 
     boost::shared_ptr<HttpsClient> client(new HttpsClient(io_service, port, responseMax));
 
@@ -418,7 +417,7 @@ void HttpsClient::httpsGet(
 	const std::string& strPath,
 	std::size_t responseMax,
 	boost::posix_time::time_duration timeout,
-	boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
+	FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
 
 	std::deque<std::string> deqSites(1, strSite);
 
@@ -432,10 +431,10 @@ void HttpsClient::httpsRequest(
 	boost::asio::io_service& io_service,
 	std::string strSite,
 	const unsigned short port,
-	boost::function<void(boost::asio::streambuf& sb, const std::string& strHost)> setRequest,
+	FUNCTION_TYPE<void(boost::asio::streambuf& sb, const std::string& strHost)> setRequest,
 	std::size_t responseMax,
 	boost::posix_time::time_duration timeout,
-	boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
+	FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete) {
 
 	std::deque<std::string> deqSites(1, strSite);
 
diff --git a/src/cpp/ripple/HttpsClient.h b/src/cpp/ripple/HttpsClient.h
index d4e89df6c8..909594efe1 100644
--- a/src/cpp/ripple/HttpsClient.h
+++ b/src/cpp/ripple/HttpsClient.h
@@ -8,10 +8,10 @@
 #include <boost/asio/ssl.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include "AutoSocket.h"
+#include "utils.h"
 
 //
 // Async https client.
@@ -33,8 +33,8 @@ private:
 	const unsigned short										mPort;
 	int															mResponseMax;
 	int															mStatus;
-	boost::function<void(boost::asio::streambuf& sb, const std::string& strHost)>			mBuild;
-    boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)>	mComplete;
+	FUNCTION_TYPE<void(boost::asio::streambuf& sb, const std::string& strHost)>			mBuild;
+    FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)>	mComplete;
 
 	boost::asio::deadline_timer									mDeadline;
 
@@ -76,16 +76,16 @@ public:
 	void httpsRequest(
 		bool bSSL,
 		std::deque<std::string> deqSites,
-		boost::function<void(boost::asio::streambuf& sb, const std::string& strHost)> build,
+		FUNCTION_TYPE<void(boost::asio::streambuf& sb, const std::string& strHost)> build,
 		boost::posix_time::time_duration timeout,
-		boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
+		FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
 
 	void httpsGet(
 		bool bSSL,
 		std::deque<std::string> deqSites,
 		const std::string& strPath,
 		boost::posix_time::time_duration timeout,
-		boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
+		FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
 
 	static void httpsGet(
 		bool bSSL,
@@ -95,7 +95,7 @@ public:
 		const std::string& strPath,
 		std::size_t responseMax,
 		boost::posix_time::time_duration timeout,
-		boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
+		FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
 
 	static void httpsGet(
 		bool bSSL,
@@ -105,17 +105,17 @@ public:
 		const std::string& strPath,
 		std::size_t responseMax,
 		boost::posix_time::time_duration timeout,
-		boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
+		FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
 
 	static void httpsRequest(
 		bool bSSL,
 		boost::asio::io_service& io_service,
 		std::string strSite,
 		const unsigned short port,
-		boost::function<void(boost::asio::streambuf& sb, const std::string& strHost)> build,
+		FUNCTION_TYPE<void(boost::asio::streambuf& sb, const std::string& strHost)> build,
 		std::size_t responseMax,
 		boost::posix_time::time_duration timeout,
-		boost::function<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
+		FUNCTION_TYPE<bool(const boost::system::error_code& ecResult, int iStatus, const std::string& strData)> complete);
 };
 #endif
 // vim:ts=4
diff --git a/src/cpp/ripple/NetworkOPs.h b/src/cpp/ripple/NetworkOPs.h
index 1fa99064b2..99daf9483d 100644
--- a/src/cpp/ripple/NetworkOPs.h
+++ b/src/cpp/ripple/NetworkOPs.h
@@ -185,7 +185,7 @@ public:
 	//
 	// Transaction operations
 	//
-	typedef boost::function<void (Transaction::pointer, TER)> stCallback; // must complete immediately
+	typedef FUNCTION_TYPE<void (Transaction::pointer, TER)> stCallback; // must complete immediately
 	void submitTransaction(Job&, SerializedTransaction::pointer, stCallback callback = stCallback());
 	Transaction::pointer submitTransactionSync(Transaction::ref tpTrans, bool bSubmit=true);
 
diff --git a/src/cpp/ripple/UniqueNodeList.cpp b/src/cpp/ripple/UniqueNodeList.cpp
index 5928fb5a9a..04917f2b88 100644
--- a/src/cpp/ripple/UniqueNodeList.cpp
+++ b/src/cpp/ripple/UniqueNodeList.cpp
@@ -885,7 +885,7 @@ void UniqueNodeList::getValidatorsUrl(const RippleAddress& naNodePublic, section
 			strPath,
 			NODE_FILE_BYTES_MAX,
 			boost::posix_time::seconds(NODE_FETCH_SECONDS),
-			boost::bind(&UniqueNodeList::responseValidators, this, strValidatorsUrl, naNodePublic, secSite, strDomain, _1, _2, _3));
+			BIND_TYPE(&UniqueNodeList::responseValidators, this, strValidatorsUrl, naNodePublic, secSite, strDomain, P_1, P_2, P_3));
 	}
 	else
 	{
@@ -1063,7 +1063,7 @@ void UniqueNodeList::fetchProcess(std::string strDomain)
 		NODE_FILE_PATH,
 		NODE_FILE_BYTES_MAX,
 		boost::posix_time::seconds(NODE_FETCH_SECONDS),
-		boost::bind(&UniqueNodeList::responseFetch, this, strDomain, _1, _2, _3));
+		BIND_TYPE(&UniqueNodeList::responseFetch, this, strDomain, P_1, P_2, P_3));
 }
 
 void UniqueNodeList::fetchTimerHandler(const boost::system::error_code& err)
@@ -1610,7 +1610,7 @@ void UniqueNodeList::nodeNetwork()
 			theConfig.VALIDATORS_URI,
 			VALIDATORS_FILE_BYTES_MAX,
 			boost::posix_time::seconds(VALIDATORS_FETCH_SECONDS),
-			boost::bind(&UniqueNodeList::validatorsResponse, this, _1, _2, _3));
+			BIND_TYPE(&UniqueNodeList::validatorsResponse, this, P_1, P_2, P_3));
 	}
 }