diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp
index 6b14b8123..c834b4f42 100644
--- a/src/cpp/ripple/LedgerMaster.cpp
+++ b/src/cpp/ripple/LedgerMaster.cpp
@@ -23,7 +23,7 @@ void LedgerMaster::addHeldTransaction(Transaction::ref transaction)
 	mHeldTransactions.push_back(transaction->getSTransaction());
 }
 
-void LedgerMaster::pushLedger(Ledger::ref newLedger)
+void LedgerMaster::pushLedger(Ledger::pointer newLedger)
 {
 	// Caller should already have properly assembled this ledger into "ready-to-close" form --
 	// all candidate transactions must already be applied
@@ -41,7 +41,7 @@ void LedgerMaster::pushLedger(Ledger::ref newLedger)
 	mEngine.setLedger(newLedger);
 }
 
-void LedgerMaster::pushLedger(Ledger::ref newLCL, Ledger::ref newOL, bool fromConsensus)
+void LedgerMaster::pushLedger(Ledger::pointer newLCL, Ledger::pointer newOL, bool fromConsensus)
 {
 	assert(newLCL->isClosed() && newLCL->isAccepted());
 	assert(!newOL->isClosed() && !newOL->isAccepted());
@@ -63,7 +63,7 @@ void LedgerMaster::pushLedger(Ledger::ref newLCL, Ledger::ref newOL, bool fromCo
 	checkAccept(newLCL->getHash(), newLCL->getLedgerSeq());
 }
 
-void LedgerMaster::switchLedgers(Ledger::ref lastClosed, Ledger::ref current)
+void LedgerMaster::switchLedgers(Ledger::pointer lastClosed, Ledger::pointer current)
 {
 	assert(lastClosed && current);
 
@@ -80,7 +80,7 @@ void LedgerMaster::switchLedgers(Ledger::ref lastClosed, Ledger::ref current)
 	checkAccept(lastClosed->getHash(), lastClosed->getLedgerSeq());
 }
 
-void LedgerMaster::storeLedger(Ledger::ref ledger)
+void LedgerMaster::storeLedger(Ledger::pointer ledger)
 {
 	mLedgerHistory.addLedger(ledger);
 	if (ledger->isAccepted())
diff --git a/src/cpp/ripple/LedgerMaster.h b/src/cpp/ripple/LedgerMaster.h
index b6665ff89..496d7962e 100644
--- a/src/cpp/ripple/LedgerMaster.h
+++ b/src/cpp/ripple/LedgerMaster.h
@@ -80,13 +80,13 @@ public:
 	int getMinValidations()				{ return mMinValidations; }
 	void setMinValidations(int v)		{ mMinValidations = v; }
 
-	void pushLedger(Ledger::ref newLedger);
-	void pushLedger(Ledger::ref newLCL, Ledger::ref newOL, bool fromConsensus);
-	void storeLedger(Ledger::ref);
+	void pushLedger(Ledger::pointer newLedger);
+	void pushLedger(Ledger::pointer newLCL, Ledger::pointer newOL, bool fromConsensus);
+	void storeLedger(Ledger::pointer);
 
 	void setFullLedger(Ledger::ref ledger);
 
-	void switchLedgers(Ledger::ref lastClosed, Ledger::ref newCurrent);
+	void switchLedgers(Ledger::pointer lastClosed, Ledger::pointer newCurrent);
 
 	std::string getCompleteLedgers()
 	{
diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
index f50377b62..da49c25e1 100644
--- a/src/cpp/ripple/NetworkOPs.cpp
+++ b/src/cpp/ripple/NetworkOPs.cpp
@@ -102,7 +102,7 @@ void NetworkOPs::closeTimeOffset(int offset)
 
 uint32 NetworkOPs::getLedgerID(const uint256& hash)
 {
-	Ledger::ref  lrLedger	= mLedgerMaster->getLedgerByHash(hash);
+	Ledger::pointer  lrLedger	= mLedgerMaster->getLedgerByHash(hash);
 
 	return lrLedger ? lrLedger->getLedgerSeq() : 0;
 }
@@ -839,7 +839,7 @@ void NetworkOPs::switchLastClosedLedger(Ledger::pointer newLedger, bool duringCo
 	theApp->getConnectionPool().relayMessage(NULL, packet);
 }
 
-int NetworkOPs::beginConsensus(const uint256& networkClosed, Ledger::ref closingLedger)
+int NetworkOPs::beginConsensus(const uint256& networkClosed, Ledger::pointer closingLedger)
 {
 	cLog(lsINFO) << "Consensus time for ledger " << closingLedger->getLedgerSeq();
 	cLog(lsINFO) << " LCL is " << closingLedger->getParentHash();
diff --git a/src/cpp/ripple/NetworkOPs.h b/src/cpp/ripple/NetworkOPs.h
index 50519a582..af7a30218 100644
--- a/src/cpp/ripple/NetworkOPs.h
+++ b/src/cpp/ripple/NetworkOPs.h
@@ -263,7 +263,7 @@ public:
 	void checkState(const boost::system::error_code& result);
 	void switchLastClosedLedger(Ledger::pointer newLedger, bool duringConsensus); // Used for the "jump" case
 	bool checkLastClosedLedger(const std::vector<Peer::pointer>&, uint256& networkClosed);
-	int beginConsensus(const uint256& networkClosed, Ledger::ref closingLedger);
+	int beginConsensus(const uint256& networkClosed, Ledger::pointer closingLedger);
 	void tryStartConsensus();
 	void endConsensus(bool correctLCL);
 	void setStandAlone()				{ setMode(omFULL); }
diff --git a/src/cpp/ripple/RippleCalc.h b/src/cpp/ripple/RippleCalc.h
index eacf62a42..8df0eebba 100644
--- a/src/cpp/ripple/RippleCalc.h
+++ b/src/cpp/ripple/RippleCalc.h
@@ -69,7 +69,7 @@ extern std::size_t hash_value(const aciSource& asValue);
 class PathState
 {
 protected:
-	Ledger::ref					mLedger;
+	Ledger::pointer				mLedger;
 
 	TER		pushNode(const int iType, const uint160& uAccountID, const uint160& uCurrencyID, const uint160& uIssuerID);
 	TER		pushImply(const uint160& uAccountID, const uint160& uCurrencyID, const uint160& uIssuerID);
@@ -115,7 +115,7 @@ public:
 	PathState(
 		const STAmount&			saSend,
 		const STAmount&			saSendMax,
-		const Ledger::ref		lrLedger = Ledger::pointer()
+		Ledger::pointer			lrLedger = Ledger::pointer()
 	) : mLedger(lrLedger), saInReq(saSendMax), saOutReq(saSend) { ; }
 
 	PathState(const PathState& psSrc, bool bUnused)