diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp
index ce93dcc13..625a49e4f 100644
--- a/modules/ripple_ledger/ripple_ledger.cpp
+++ b/modules/ripple_ledger/ripple_ledger.cpp
@@ -22,8 +22,6 @@
     @ingroup ripple_ledger
 */
 
-#include "ripple_ledger.h"
-
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -31,6 +29,93 @@
 #pragma warning (disable: 4244) // conversion, possible loss of data
 #endif
 
+#include "ripple_ledger.h"
+
+#include <algorithm>
+#include <cassert>
+#include <fstream>
+#include <iostream>
+#include <openssl/ripemd.h>
+#include <openssl/sha.h>
+#include <string>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/pointer_cast.hpp>
+#include <boost/ref.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/test/unit_test.hpp>
+#include <boost/thread.hpp>
+#include <boost/tuple/tuple_comparison.hpp>
+#include <boost/unordered_set.hpp>
+
+#include "src/cpp/database/SqliteDatabase.h"
+#include "src/cpp/json/writer.h"
+
+#include "src/cpp/ripple/AcceptedLedger.h"
+#include "src/cpp/ripple/AccountItems.h"
+#include "src/cpp/ripple/AccountSetTransactor.h"
+#include "src/cpp/ripple/AccountState.h"
+#include "src/cpp/ripple/Application.h"
+#include "src/cpp/ripple/BitcoinUtil.h"
+#include "src/cpp/ripple/ChangeTransactor.h"
+#include "src/cpp/ripple/Config.h"
+#include "src/cpp/ripple/Contract.h"
+#include "src/cpp/ripple/FeatureTable.h"
+#include "src/cpp/ripple/FieldNames.h"
+#include "src/cpp/ripple/HashPrefixes.h"
+#include "src/cpp/ripple/Interpreter.h"
+#include "src/cpp/ripple/key.h"
+#include "src/cpp/ripple/Ledger.h"
+#include "src/cpp/ripple/LedgerAcquire.h"
+#include "src/cpp/ripple/LedgerConsensus.h"
+#include "src/cpp/ripple/LedgerEntrySet.h"
+#include "src/cpp/ripple/LedgerFormats.h"
+#include "src/cpp/ripple/LedgerHistory.h"
+#include "src/cpp/ripple/LedgerMaster.h"
+#include "src/cpp/ripple/LedgerProposal.h"
+#include "src/cpp/ripple/LedgerTiming.h"
+#include "src/cpp/ripple/Log.h"
+#include "src/cpp/ripple/NetworkOPs.h"
+#include "src/cpp/ripple/Offer.h"
+#include "src/cpp/ripple/OfferCancelTransactor.h"
+#include "src/cpp/ripple/OfferCreateTransactor.h"
+#include "src/cpp/ripple/Operation.h"
+#include "src/cpp/ripple/OrderBook.h"
+#include "src/cpp/ripple/OrderBookDB.h"
+#include "src/cpp/ripple/PackedMessage.h"
+#include "src/cpp/ripple/PaymentTransactor.h"
+#include "src/cpp/ripple/PFRequest.h"
+#include "src/cpp/ripple/RegularKeySetTransactor.h"
+#include "src/cpp/ripple/ripple.pb.h"
+#include "src/cpp/ripple/RippleAddress.h"
+#include "src/cpp/ripple/RippleCalc.h"
+#include "src/cpp/ripple/RippleState.h"
+#include "src/cpp/ripple/SerializedLedger.h"
+#include "src/cpp/ripple/SerializedObject.h"
+#include "src/cpp/ripple/SerializedTransaction.h"
+#include "src/cpp/ripple/SerializedTypes.h"
+#include "src/cpp/ripple/SerializedValidation.h"
+#include "src/cpp/ripple/Serializer.h"
+#include "src/cpp/ripple/SHAMapSync.h"
+#include "src/cpp/ripple/Transaction.h"
+#include "src/cpp/ripple/TransactionEngine.h"
+#include "src/cpp/ripple/TransactionErr.h"
+#include "src/cpp/ripple/TransactionFormats.h"
+#include "src/cpp/ripple/TransactionMaster.h"
+#include "src/cpp/ripple/TransactionMeta.h"
+#include "src/cpp/ripple/TransactionQueue.h"
+#include "src/cpp/ripple/Transactor.h"
+#include "src/cpp/ripple/TrustSetTransactor.h"
+#include "src/cpp/ripple/utils.h"
+#include "src/cpp/ripple/ValidationCollection.h"
+#include "src/cpp/ripple/Wallet.h"
+#include "src/cpp/ripple/WalletAddTransactor.h"
+
 // contracts
 #include "src/cpp/ripple/Contract.cpp" // no log
 #include "src/cpp/ripple/Operation.cpp" // no log
diff --git a/src/cpp/ripple/AcceptedLedger.cpp b/src/cpp/ripple/AcceptedLedger.cpp
index 770d0e874..7cd311181 100644
--- a/src/cpp/ripple/AcceptedLedger.cpp
+++ b/src/cpp/ripple/AcceptedLedger.cpp
@@ -1,6 +1,3 @@
-#include "AcceptedLedger.h"
-
-#include <boost/foreach.hpp>
 
 TaggedCache<uint256, AcceptedLedger> AcceptedLedger::ALCache("AcceptedLedger", 4, 60);
 
diff --git a/src/cpp/ripple/AccountItems.cpp b/src/cpp/ripple/AccountItems.cpp
index 7bb67977d..173391731 100644
--- a/src/cpp/ripple/AccountItems.cpp
+++ b/src/cpp/ripple/AccountItems.cpp
@@ -1,11 +1,3 @@
-#include "AccountItems.h"
-
-#include <boost/foreach.hpp>
-
-#include "Application.h"
-#include "Log.h"
-
-SETUP_LOG();
 
 AccountItem::AccountItem(SerializedLedgerEntry::ref ledger) : mLedgerEntry(ledger)
 {
diff --git a/src/cpp/ripple/AccountSetTransactor.cpp b/src/cpp/ripple/AccountSetTransactor.cpp
index 8720fee34..f1cc4b44a 100644
--- a/src/cpp/ripple/AccountSetTransactor.cpp
+++ b/src/cpp/ripple/AccountSetTransactor.cpp
@@ -1,5 +1,3 @@
-#include "AccountSetTransactor.h"
-#include "Config.h"
 
 TER AccountSetTransactor::doApply()
 {
diff --git a/src/cpp/ripple/AccountState.cpp b/src/cpp/ripple/AccountState.cpp
index b00acbea7..e10b30b01 100644
--- a/src/cpp/ripple/AccountState.cpp
+++ b/src/cpp/ripple/AccountState.cpp
@@ -1,16 +1,4 @@
 
-#include "AccountState.h"
-
-#include <boost/lexical_cast.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include "../json/writer.h"
-
-#include "Ledger.h"
-#include "Serializer.h"
-#include "Log.h"
-
 AccountState::AccountState(const RippleAddress& naAccountID) : mAccountID(naAccountID), mValid(false)
 {
 	if (!naAccountID.isValid()) return;
diff --git a/src/cpp/ripple/Contract.cpp b/src/cpp/ripple/Contract.cpp
index b6db42831..0fe6b9cd7 100644
--- a/src/cpp/ripple/Contract.cpp
+++ b/src/cpp/ripple/Contract.cpp
@@ -1,5 +1,3 @@
-#include "Contract.h"
-#include "Interpreter.h"
 
 using namespace Script;
 /*
diff --git a/src/cpp/ripple/FeatureTable.cpp b/src/cpp/ripple/FeatureTable.cpp
index d5c94b2ec..886c4bdbb 100644
--- a/src/cpp/ripple/FeatureTable.cpp
+++ b/src/cpp/ripple/FeatureTable.cpp
@@ -1,11 +1,3 @@
-#include "FeatureTable.h"
-
-#include <boost/foreach.hpp>
-
-#include "Log.h"
-#include "Application.h"
-#include "ValidationCollection.h"
-#include "HashPrefixes.h"
 
 void FeatureTable::addInitialFeatures()
 {
diff --git a/src/cpp/ripple/Ledger.cpp b/src/cpp/ripple/Ledger.cpp
index a0eebfe8c..712f529d0 100644
--- a/src/cpp/ripple/Ledger.cpp
+++ b/src/cpp/ripple/Ledger.cpp
@@ -1,27 +1,4 @@
 
-#include <iostream>
-#include <fstream>
-
-#include <boost/lexical_cast.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "../json/writer.h"
-
-#include "../database/SqliteDatabase.h"
-
-#include "Application.h"
-#include "Ledger.h"
-#include "utils.h"
-#include "ripple.pb.h"
-#include "PackedMessage.h"
-#include "Config.h"
-#include "BitcoinUtil.h"
-#include "Wallet.h"
-#include "LedgerTiming.h"
-#include "HashPrefixes.h"
-#include "Log.h"
-
 DECLARE_INSTANCE(Ledger);
 
 Ledger::Ledger(const RippleAddress& masterID, uint64 startAmount) : mTotCoins(startAmount), mLedgerSeq(1),
diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp
index 900a52240..ac7068e7c 100644
--- a/src/cpp/ripple/LedgerAcquire.cpp
+++ b/src/cpp/ripple/LedgerAcquire.cpp
@@ -1,15 +1,4 @@
 
-#include "LedgerAcquire.h"
-
-#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/pointer_cast.hpp>
-
-#include "Application.h"
-#include "Log.h"
-#include "SHAMapSync.h"
-#include "HashPrefixes.h"
-
 DECLARE_INSTANCE(LedgerAcquire);
 
 #define LA_DEBUG
diff --git a/src/cpp/ripple/LedgerConsensus.cpp b/src/cpp/ripple/LedgerConsensus.cpp
index d798adb85..9a1daf7f4 100644
--- a/src/cpp/ripple/LedgerConsensus.cpp
+++ b/src/cpp/ripple/LedgerConsensus.cpp
@@ -1,18 +1,3 @@
-#include "LedgerConsensus.h"
-
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/unordered_set.hpp>
-#include <boost/foreach.hpp>
-
-#include "../json/writer.h"
-
-#include "Application.h"
-#include "NetworkOPs.h"
-#include "LedgerTiming.h"
-#include "SerializedValidation.h"
-#include "Log.h"
-#include "SHAMapSync.h"
 
 #define LEDGER_TOTAL_PASSES 8
 #define LEDGER_RETRY_PASSES 5
diff --git a/src/cpp/ripple/LedgerEntrySet.cpp b/src/cpp/ripple/LedgerEntrySet.cpp
index b6db002e1..a2ada51d2 100644
--- a/src/cpp/ripple/LedgerEntrySet.cpp
+++ b/src/cpp/ripple/LedgerEntrySet.cpp
@@ -1,11 +1,4 @@
 
-#include "LedgerEntrySet.h"
-
-#include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
-
-#include "Log.h"
 
 DECLARE_INSTANCE(LedgerEntrySetEntry);
 DECLARE_INSTANCE(LedgerEntrySet)
diff --git a/src/cpp/ripple/LedgerFormats.cpp b/src/cpp/ripple/LedgerFormats.cpp
index fc6c70da3..872b3cb90 100644
--- a/src/cpp/ripple/LedgerFormats.cpp
+++ b/src/cpp/ripple/LedgerFormats.cpp
@@ -1,6 +1,4 @@
 
-#include "LedgerFormats.h"
-
 std::map<int, LedgerEntryFormat*> LedgerEntryFormat::byType;
 std::map<std::string, LedgerEntryFormat*> LedgerEntryFormat::byName;
 
diff --git a/src/cpp/ripple/LedgerHistory.cpp b/src/cpp/ripple/LedgerHistory.cpp
index 0fe513bd6..9b3f4419f 100644
--- a/src/cpp/ripple/LedgerHistory.cpp
+++ b/src/cpp/ripple/LedgerHistory.cpp
@@ -1,14 +1,4 @@
 
-#include "LedgerHistory.h"
-
-#include <string>
-
-#include <boost/bind.hpp>
-#include <boost/thread.hpp>
-
-#include "Config.h"
-#include "Application.h"
-
 #ifndef CACHED_LEDGER_NUM
 #define CACHED_LEDGER_NUM 96
 #endif
diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp
index eeba5c7f8..97b21ae24 100644
--- a/src/cpp/ripple/LedgerMaster.cpp
+++ b/src/cpp/ripple/LedgerMaster.cpp
@@ -1,13 +1,4 @@
 
-#include "LedgerMaster.h"
-
-#include <boost/foreach.hpp>
-
-#include "Application.h"
-#include "RippleAddress.h"
-#include "Log.h"
-#include "PFRequest.h"
-
 #define MIN_VALIDATION_RATIO	150		// 150/256ths of validations of previous ledger
 #define MAX_LEDGER_GAP			100		// Don't catch up more than 100 ledgers  (cannot exceed 256)
 
diff --git a/src/cpp/ripple/LedgerProposal.cpp b/src/cpp/ripple/LedgerProposal.cpp
index 7d4d193ca..c3fc7dbed 100644
--- a/src/cpp/ripple/LedgerProposal.cpp
+++ b/src/cpp/ripple/LedgerProposal.cpp
@@ -1,12 +1,4 @@
 
-#include "LedgerProposal.h"
-
-#include <boost/make_shared.hpp>
-
-#include "key.h"
-#include "Application.h"
-#include "HashPrefixes.h"
-
 DECLARE_INSTANCE(LedgerProposal);
 
 LedgerProposal::LedgerProposal(const uint256& pLgr, uint32 seq, const uint256& tx, uint32 closeTime,
diff --git a/src/cpp/ripple/LedgerTiming.cpp b/src/cpp/ripple/LedgerTiming.cpp
index d4c0378d7..b9faa47ef 100644
--- a/src/cpp/ripple/LedgerTiming.cpp
+++ b/src/cpp/ripple/LedgerTiming.cpp
@@ -1,12 +1,4 @@
 
-#include "LedgerTiming.h"
-
-#include <cassert>
-
-#include <boost/format.hpp>
-
-#include "Log.h"
-
 // VFALCO: Should rename ContinuousLedgerTiming to LedgerTiming
 struct LedgerTiming;
 
diff --git a/src/cpp/ripple/Offer.cpp b/src/cpp/ripple/Offer.cpp
index 79e2b2f8a..109d77852 100644
--- a/src/cpp/ripple/Offer.cpp
+++ b/src/cpp/ripple/Offer.cpp
@@ -1,4 +1,3 @@
-#include "Offer.h"
 
 AccountItem::pointer Offer::makeItem(const uint160& ,SerializedLedgerEntry::ref ledgerEntry)
 {
diff --git a/src/cpp/ripple/OfferCancelTransactor.cpp b/src/cpp/ripple/OfferCancelTransactor.cpp
index 56fffaf6e..59f169d20 100644
--- a/src/cpp/ripple/OfferCancelTransactor.cpp
+++ b/src/cpp/ripple/OfferCancelTransactor.cpp
@@ -1,5 +1,3 @@
-#include "OfferCancelTransactor.h"
-#include "Log.h"
 
 TER OfferCancelTransactor::doApply()
 {
diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/src/cpp/ripple/OfferCreateTransactor.cpp
index def76f191..66fa615a0 100644
--- a/src/cpp/ripple/OfferCreateTransactor.cpp
+++ b/src/cpp/ripple/OfferCreateTransactor.cpp
@@ -1,9 +1,3 @@
-#include "Application.h"
-
-#include "OfferCreateTransactor.h"
-
-#include <boost/foreach.hpp>
-#include <boost/bind.hpp>
 
 // Make sure an offer is still valid. If not, mark it unfunded.
 bool OfferCreateTransactor::bValidOffer(
diff --git a/src/cpp/ripple/Operation.cpp b/src/cpp/ripple/Operation.cpp
index b0661f57a..e84801fe5 100644
--- a/src/cpp/ripple/Operation.cpp
+++ b/src/cpp/ripple/Operation.cpp
@@ -1,5 +1,3 @@
-#include "Operation.h"
-#include "Config.h"
 
 /*
 We also need to charge for each op
diff --git a/src/cpp/ripple/OrderBook.cpp b/src/cpp/ripple/OrderBook.cpp
index d71da9861..f46c85362 100644
--- a/src/cpp/ripple/OrderBook.cpp
+++ b/src/cpp/ripple/OrderBook.cpp
@@ -1,5 +1,3 @@
-#include "OrderBook.h"
-#include "Ledger.h"
 
 OrderBook::OrderBook(SerializedLedgerEntry::ref ledgerEntry)
 {
diff --git a/src/cpp/ripple/OrderBookDB.cpp b/src/cpp/ripple/OrderBookDB.cpp
index 7a8ce468a..7d204ac8d 100644
--- a/src/cpp/ripple/OrderBookDB.cpp
+++ b/src/cpp/ripple/OrderBookDB.cpp
@@ -1,10 +1,3 @@
-#include "OrderBookDB.h"
-
-#include <boost/foreach.hpp>
-#include <boost/ref.hpp>
-
-#include "Application.h"
-#include "Log.h"
 
 OrderBookDB::OrderBookDB() : mSeq(0)
 {
diff --git a/src/cpp/ripple/PaymentTransactor.cpp b/src/cpp/ripple/PaymentTransactor.cpp
index edc9dea8e..80aa15bd4 100644
--- a/src/cpp/ripple/PaymentTransactor.cpp
+++ b/src/cpp/ripple/PaymentTransactor.cpp
@@ -1,7 +1,3 @@
-#include "PaymentTransactor.h"
-#include "Config.h"
-#include "RippleCalc.h"
-#include "Application.h"
 
 #define RIPPLE_PATHS_MAX	6
 
diff --git a/src/cpp/ripple/RegularKeySetTransactor.cpp b/src/cpp/ripple/RegularKeySetTransactor.cpp
index b421d0618..bc8e850e4 100644
--- a/src/cpp/ripple/RegularKeySetTransactor.cpp
+++ b/src/cpp/ripple/RegularKeySetTransactor.cpp
@@ -1,5 +1,3 @@
-#include "RegularKeySetTransactor.h"
-#include "Log.h"
 
 uint64 RegularKeySetTransactor::calculateBaseFee()
 {
diff --git a/src/cpp/ripple/RippleCalc.cpp b/src/cpp/ripple/RippleCalc.cpp
index 84dada969..624baeab5 100644
--- a/src/cpp/ripple/RippleCalc.cpp
+++ b/src/cpp/ripple/RippleCalc.cpp
@@ -5,14 +5,6 @@
 // all liquidity is used.
 //
 
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/tuple/tuple_comparison.hpp>
-
-#include "RippleCalc.h"
-#include "Log.h"
-
-#include "../json/writer.h"
 
 std::size_t hash_value(const aciSource& asValue)
 {
diff --git a/src/cpp/ripple/RippleState.cpp b/src/cpp/ripple/RippleState.cpp
index bebaee450..23ef1604c 100644
--- a/src/cpp/ripple/RippleState.cpp
+++ b/src/cpp/ripple/RippleState.cpp
@@ -1,4 +1,3 @@
-#include "RippleState.h"
 
 
 AccountItem::pointer RippleState::makeItem(const uint160& accountID, SerializedLedgerEntry::ref ledgerEntry)
diff --git a/src/cpp/ripple/SerializedLedger.cpp b/src/cpp/ripple/SerializedLedger.cpp
index 6238b0115..7f616e229 100644
--- a/src/cpp/ripple/SerializedLedger.cpp
+++ b/src/cpp/ripple/SerializedLedger.cpp
@@ -1,9 +1,3 @@
-#include "SerializedLedger.h"
-
-#include <boost/format.hpp>
-
-#include "Ledger.h"
-#include "Log.h"
 
 DECLARE_INSTANCE(SerializedLedgerEntry)
 
diff --git a/src/cpp/ripple/SerializedObject.cpp b/src/cpp/ripple/SerializedObject.cpp
index fb9e67ddc..6e65fca2f 100644
--- a/src/cpp/ripple/SerializedObject.cpp
+++ b/src/cpp/ripple/SerializedObject.cpp
@@ -1,18 +1,4 @@
 
-#include "SerializedObject.h"
-
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/bind.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "../json/writer.h"
-
-#include "Log.h"
-#include "LedgerFormats.h"
-#include "TransactionFormats.h"
-#include "SerializedTransaction.h"
-
 DECLARE_INSTANCE(SerializedObject);
 DECLARE_INSTANCE(SerializedArray);
 
diff --git a/src/cpp/ripple/SerializedTransaction.cpp b/src/cpp/ripple/SerializedTransaction.cpp
index 62bd30aa8..f6a923910 100644
--- a/src/cpp/ripple/SerializedTransaction.cpp
+++ b/src/cpp/ripple/SerializedTransaction.cpp
@@ -1,13 +1,4 @@
 
-#include "SerializedTransaction.h"
-
-#include <boost/foreach.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "Application.h"
-#include "Log.h"
-#include "HashPrefixes.h"
-
 DECLARE_INSTANCE(SerializedTransaction);
 
 SerializedTransaction::SerializedTransaction(TransactionType type) : STObject(sfTransaction), mType(type),
diff --git a/src/cpp/ripple/SerializedTypes.cpp b/src/cpp/ripple/SerializedTypes.cpp
index 425cfef5a..379b4001d 100644
--- a/src/cpp/ripple/SerializedTypes.cpp
+++ b/src/cpp/ripple/SerializedTypes.cpp
@@ -1,18 +1,4 @@
 
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include "SerializedTypes.h"
-#include "SerializedObject.h"
-#include "TransactionFormats.h"
-#include "LedgerFormats.h"
-#include "FieldNames.h"
-#include "Log.h"
-#include "RippleAddress.h"
-#include "utils.h"
-#include "RippleAddress.h"
-#include "TransactionErr.h"
-
 const STAmount saZero(CURRENCY_ONE, ACCOUNT_ONE, 0);
 const STAmount saOne(CURRENCY_ONE, ACCOUNT_ONE, 1);
 
diff --git a/src/cpp/ripple/SerializedValidation.cpp b/src/cpp/ripple/SerializedValidation.cpp
index 633943f52..43b48ada9 100644
--- a/src/cpp/ripple/SerializedValidation.cpp
+++ b/src/cpp/ripple/SerializedValidation.cpp
@@ -1,9 +1,4 @@
 
-#include "SerializedValidation.h"
-
-#include "Config.h"
-#include "Log.h"
-
 DECLARE_INSTANCE(SerializedValidation);
 
 SOTemplate sValidationFormat;
diff --git a/src/cpp/ripple/Serializer.cpp b/src/cpp/ripple/Serializer.cpp
index 9602c5684..99ebed9be 100644
--- a/src/cpp/ripple/Serializer.cpp
+++ b/src/cpp/ripple/Serializer.cpp
@@ -1,17 +1,4 @@
 
-#include "Serializer.h"
-
-#include <cassert>
-
-#include <openssl/ripemd.h>
-#include <openssl/sha.h>
-
-#include <boost/test/unit_test.hpp>
-#include <boost/foreach.hpp>
-
-#include "key.h"
-#include "Log.h"
-
 int Serializer::addZeros(size_t uBytes)
 {
 	int ret = mData.size();
diff --git a/src/cpp/ripple/Transaction.cpp b/src/cpp/ripple/Transaction.cpp
index 5d5dc2770..797c9b229 100644
--- a/src/cpp/ripple/Transaction.cpp
+++ b/src/cpp/ripple/Transaction.cpp
@@ -1,17 +1,3 @@
-#include <cassert>
-
-#include <boost/format.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/ref.hpp>
-
-#include "Application.h"
-#include "Transaction.h"
-#include "Wallet.h"
-#include "BitcoinUtil.h"
-#include "Serializer.h"
-#include "SerializedTransaction.h"
-#include "Log.h"
 
 DECLARE_INSTANCE(Transaction);
 
diff --git a/src/cpp/ripple/TransactionAcquire.cpp b/src/cpp/ripple/TransactionAcquire.cpp
index 589fd7a2c..7dddbd2f0 100644
--- a/src/cpp/ripple/TransactionAcquire.cpp
+++ b/src/cpp/ripple/TransactionAcquire.cpp
@@ -1,19 +1,3 @@
-#include "LedgerConsensus.h"
-
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/unordered_set.hpp>
-#include <boost/foreach.hpp>
-#include <boost/pointer_cast.hpp>
-
-#include "../json/writer.h"
-
-#include "Application.h"
-#include "NetworkOPs.h"
-#include "SerializedValidation.h"
-#include "Log.h"
-#include "SHAMapSync.h"
-#include "HashPrefixes.h"
 
 #define TX_ACQUIRE_TIMEOUT	250
 
diff --git a/src/cpp/ripple/TransactionCheck.cpp b/src/cpp/ripple/TransactionCheck.cpp
index 7ea2e7904..5ad584632 100644
--- a/src/cpp/ripple/TransactionCheck.cpp
+++ b/src/cpp/ripple/TransactionCheck.cpp
@@ -1,7 +1,4 @@
 
-#include "TransactionErr.h"
-#include "TransactionEngine.h"
-
 // VFALCO: TODO, move this into TransactionEngine.cpp
 
 // Double check a transaction's metadata to make sure no system invariants were broken
diff --git a/src/cpp/ripple/TransactionEngine.cpp b/src/cpp/ripple/TransactionEngine.cpp
index 3e5f770d4..584ea9f8b 100644
--- a/src/cpp/ripple/TransactionEngine.cpp
+++ b/src/cpp/ripple/TransactionEngine.cpp
@@ -2,19 +2,6 @@
 // XXX Make sure all fields are recognized in transactions.
 //
 
-#include <boost/format.hpp>
-#include <boost/foreach.hpp>
-#include <boost/smart_ptr/shared_ptr.hpp>
-
-#include "TransactionEngine.h"
-#include "Transactor.h"
-
-#include "../json/writer.h"
-
-#include "Config.h"
-#include "Log.h"
-#include "TransactionFormats.h"
-#include "utils.h"
 
 DECLARE_INSTANCE(TransactionEngine);
 
diff --git a/src/cpp/ripple/TransactionErr.cpp b/src/cpp/ripple/TransactionErr.cpp
index cf1390f2f..2c06b0ae5 100644
--- a/src/cpp/ripple/TransactionErr.cpp
+++ b/src/cpp/ripple/TransactionErr.cpp
@@ -1,5 +1,3 @@
-#include "TransactionErr.h"
-#include "utils.h"
 
 bool transResultInfo(TER terCode, std::string& strToken, std::string& strHuman)
 {
diff --git a/src/cpp/ripple/TransactionFormats.cpp b/src/cpp/ripple/TransactionFormats.cpp
index ea92335fb..d84293698 100644
--- a/src/cpp/ripple/TransactionFormats.cpp
+++ b/src/cpp/ripple/TransactionFormats.cpp
@@ -1,4 +1,3 @@
-#include "TransactionFormats.h"
 
 std::map<int, TransactionFormat*> TransactionFormat::byType;
 std::map<std::string, TransactionFormat*> TransactionFormat::byName;
diff --git a/src/cpp/ripple/TransactionMaster.cpp b/src/cpp/ripple/TransactionMaster.cpp
index 3c7991350..585c9b6ee 100644
--- a/src/cpp/ripple/TransactionMaster.cpp
+++ b/src/cpp/ripple/TransactionMaster.cpp
@@ -1,10 +1,4 @@
 
-#include "TransactionMaster.h"
-
-#include <boost/bind.hpp>
-
-#include "Application.h"
-
 #ifndef CACHED_TRANSACTION_NUM
 #define CACHED_TRANSACTION_NUM 65536
 #endif
diff --git a/src/cpp/ripple/TransactionMeta.cpp b/src/cpp/ripple/TransactionMeta.cpp
index cdf119cd6..2cb4c1cff 100644
--- a/src/cpp/ripple/TransactionMeta.cpp
+++ b/src/cpp/ripple/TransactionMeta.cpp
@@ -1,13 +1,3 @@
-#include "TransactionMeta.h"
-
-#include <algorithm>
-
-#include <boost/make_shared.hpp>
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-
-#include "Log.h"
-#include "SerializedObject.h"
 
 // VFALCO: TODO, rename class to TransactionMeta
 
diff --git a/src/cpp/ripple/TransactionQueue.cpp b/src/cpp/ripple/TransactionQueue.cpp
index 7bc6f2d32..54a6c05e6 100644
--- a/src/cpp/ripple/TransactionQueue.cpp
+++ b/src/cpp/ripple/TransactionQueue.cpp
@@ -1,6 +1,3 @@
-#include "TransactionQueue.h"
-
-#include <boost/foreach.hpp>
 
 void TXQEntry::addCallbacks(const TXQEntry& otherEntry)
 {
diff --git a/src/cpp/ripple/Transactor.cpp b/src/cpp/ripple/Transactor.cpp
index 79b4915ca..afc161f21 100644
--- a/src/cpp/ripple/Transactor.cpp
+++ b/src/cpp/ripple/Transactor.cpp
@@ -1,14 +1,3 @@
-#include "Transactor.h"
-#include "Log.h"
-#include "Config.h"
-#include "PaymentTransactor.h"
-#include "RegularKeySetTransactor.h"
-#include "AccountSetTransactor.h"
-#include "WalletAddTransactor.h"
-#include "OfferCancelTransactor.h"
-#include "OfferCreateTransactor.h"
-#include "TrustSetTransactor.h"
-#include "ChangeTransactor.h"
 
 UPTR_T<Transactor> Transactor::makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine)
 {
diff --git a/src/cpp/ripple/TrustSetTransactor.cpp b/src/cpp/ripple/TrustSetTransactor.cpp
index b573b8174..8db30a668 100644
--- a/src/cpp/ripple/TrustSetTransactor.cpp
+++ b/src/cpp/ripple/TrustSetTransactor.cpp
@@ -1,6 +1,3 @@
-#include "Application.h"
-
-#include "TrustSetTransactor.h"
 
 TER TrustSetTransactor::doApply()
 {