diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index ba9ba1223..8dfd810cd 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -25,6 +25,54 @@
true
true
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
true
true
@@ -454,48 +502,6 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
true
true
@@ -514,18 +520,6 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
true
true
@@ -550,18 +544,6 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
true
true
@@ -592,24 +574,6 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
true
true
@@ -634,18 +598,6 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
true
true
@@ -658,18 +610,6 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
true
true
@@ -856,12 +796,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
@@ -910,18 +844,6 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
true
true
@@ -1350,6 +1272,14 @@
+
+
+
+
+
+
+
+
@@ -1442,47 +1372,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1507,15 +1420,12 @@
-
-
-
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 1487bad87..cd054df14 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -97,15 +97,6 @@
{223ac5ce-c9a0-4196-9b75-4f5fbe8bfa00}
-
- {46bda3c0-166b-4188-8f6b-da6f6ff638fc}
-
-
- {01ac5649-14bd-4c61-ac6b-169742a86036}
-
-
- {85ea08c2-f8a6-477b-8d59-9a7339761d20}
-
{cf19fa31-c40b-4203-b497-63a8c3dcb282}
@@ -148,6 +139,15 @@
{bd48a825-192f-4d5e-9230-661fdd65f9b6}
+
+ {3ac448dc-9f2e-472b-9f3c-cf9140dddf3a}
+
+
+ {28809512-5c30-469f-a094-90839fbfa210}
+
+
+ {85ea08c2-f8a6-477b-8d59-9a7339761d20}
+
{6a769530-8edf-4836-afc8-8836fe315603}
@@ -531,75 +531,12 @@
[1] Ripple\ripple_client
-
- [1] Ripple\ripple_app\_contracts
-
-
- [1] Ripple\ripple_app\_contracts
-
-
- [1] Ripple\ripple_app\_contracts
-
-
- [1] Ripple\ripple_app\_contracts
-
[1] Ripple\ripple_app\_misc\_consensus
[1] Ripple\ripple_app\_misc\_consensus
-
- [1] Ripple\ripple_app\_data
-
-
- [1] Ripple\ripple_app\_data
-
-
- [1] Ripple\ripple_app\_data
-
-
- [1] Ripple\ripple_app\_data
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
[1] Ripple\ripple_app\_main
@@ -876,6 +813,30 @@
[1] Ripple\ripple_hyperleveldb
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\data
+
+
+ [1] Ripple\ripple_app\data
+
+
+ [1] Ripple\ripple_app\data
+
+
+ [1] Ripple\ripple_app\data
+
@@ -1299,69 +1260,12 @@
[1] Ripple\ripple_client
-
- [1] Ripple\ripple_app\_contracts
-
-
- [1] Ripple\ripple_app\_contracts
-
-
- [1] Ripple\ripple_app\_contracts
-
-
- [1] Ripple\ripple_app\_contracts
-
[1] Ripple\ripple_app\_misc\_consensus
[1] Ripple\ripple_app\_misc\_consensus
-
- [1] Ripple\ripple_app\_data
-
-
- [1] Ripple\ripple_app\_data
-
-
- [1] Ripple\ripple_app\_data
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
-
- [1] Ripple\ripple_app\_ledger
-
[1] Ripple\ripple_app\_main
@@ -1608,9 +1512,6 @@
[1] Ripple\ripple_basio\boost
-
- [1] Ripple\ripple_app\_data
-
[1] Ripple\ripple_app\node
@@ -1632,6 +1533,30 @@
[1] Ripple\ripple_hyperleveldb
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\contracts
+
+
+ [1] Ripple\ripple_app\data
+
+
+ [1] Ripple\ripple_app\data
+
+
+ [1] Ripple\ripple_app\data
+
+
+ [1] Ripple\ripple_app\data
+
diff --git a/TODO.txt b/TODO.txt
index 2f4756596..6cac78f23 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,6 +2,10 @@
RIPPLE TODO
--------------------------------------------------------------------------------
+- Move everything in src/cpp/ripple into ripple_app and sort them into
+ subdirectories within the module as per the project filters.
+ * Make sure there are no pending commits from David
+
- See if UniqueNodeList is really used, and if its not used remove it. If
only some small part of it is used, then delete the rest. David says
that it is broken anyway.
@@ -30,10 +34,6 @@ RIPPLE TODO
by providing an observer (beast::ListenerList or Listeners). This way
LoadManager does not need stopThread() function.
-- Move everything in src/cpp/ripple into ripple_app and sort them into
- subdirectories within the module as per the project filters.
- * Make sure there are no pending commits from David
-
- Rewrite Sustain to use Beast and work on Windows as well
* Do not enable watchdog process if a debugger is attached
diff --git a/src/cpp/ripple/Contract.cpp b/modules/ripple_app/contracts/ripple_Contract.cpp
similarity index 100%
rename from src/cpp/ripple/Contract.cpp
rename to modules/ripple_app/contracts/ripple_Contract.cpp
diff --git a/src/cpp/ripple/Contract.h b/modules/ripple_app/contracts/ripple_Contract.h
similarity index 100%
rename from src/cpp/ripple/Contract.h
rename to modules/ripple_app/contracts/ripple_Contract.h
diff --git a/src/cpp/ripple/Interpreter.cpp b/modules/ripple_app/contracts/ripple_Interpreter.cpp
similarity index 100%
rename from src/cpp/ripple/Interpreter.cpp
rename to modules/ripple_app/contracts/ripple_Interpreter.cpp
diff --git a/src/cpp/ripple/Interpreter.h b/modules/ripple_app/contracts/ripple_Interpreter.h
similarity index 100%
rename from src/cpp/ripple/Interpreter.h
rename to modules/ripple_app/contracts/ripple_Interpreter.h
diff --git a/src/cpp/ripple/Operation.cpp b/modules/ripple_app/contracts/ripple_Operation.cpp
similarity index 100%
rename from src/cpp/ripple/Operation.cpp
rename to modules/ripple_app/contracts/ripple_Operation.cpp
diff --git a/src/cpp/ripple/Operation.h b/modules/ripple_app/contracts/ripple_Operation.h
similarity index 100%
rename from src/cpp/ripple/Operation.h
rename to modules/ripple_app/contracts/ripple_Operation.h
diff --git a/src/cpp/ripple/ScriptData.cpp b/modules/ripple_app/contracts/ripple_ScriptData.cpp
similarity index 100%
rename from src/cpp/ripple/ScriptData.cpp
rename to modules/ripple_app/contracts/ripple_ScriptData.cpp
diff --git a/src/cpp/ripple/ScriptData.h b/modules/ripple_app/contracts/ripple_ScriptData.h
similarity index 100%
rename from src/cpp/ripple/ScriptData.h
rename to modules/ripple_app/contracts/ripple_ScriptData.h
diff --git a/src/cpp/ripple/ripple_DBInit.cpp b/modules/ripple_app/data/ripple_DBInit.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_DBInit.cpp
rename to modules/ripple_app/data/ripple_DBInit.cpp
diff --git a/src/cpp/ripple/ripple_DBInit.h b/modules/ripple_app/data/ripple_DBInit.h
similarity index 100%
rename from src/cpp/ripple/ripple_DBInit.h
rename to modules/ripple_app/data/ripple_DBInit.h
diff --git a/src/cpp/ripple/ripple_Database.cpp b/modules/ripple_app/data/ripple_Database.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Database.cpp
rename to modules/ripple_app/data/ripple_Database.cpp
diff --git a/src/cpp/ripple/ripple_Database.h b/modules/ripple_app/data/ripple_Database.h
similarity index 100%
rename from src/cpp/ripple/ripple_Database.h
rename to modules/ripple_app/data/ripple_Database.h
diff --git a/src/cpp/ripple/ripple_DatabaseCon.cpp b/modules/ripple_app/data/ripple_DatabaseCon.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_DatabaseCon.cpp
rename to modules/ripple_app/data/ripple_DatabaseCon.cpp
diff --git a/src/cpp/ripple/ripple_DatabaseCon.h b/modules/ripple_app/data/ripple_DatabaseCon.h
similarity index 100%
rename from src/cpp/ripple/ripple_DatabaseCon.h
rename to modules/ripple_app/data/ripple_DatabaseCon.h
diff --git a/src/cpp/ripple/ripple_SqliteDatabase.cpp b/modules/ripple_app/data/ripple_SqliteDatabase.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SqliteDatabase.cpp
rename to modules/ripple_app/data/ripple_SqliteDatabase.cpp
diff --git a/src/cpp/ripple/ripple_SqliteDatabase.h b/modules/ripple_app/data/ripple_SqliteDatabase.h
similarity index 100%
rename from src/cpp/ripple/ripple_SqliteDatabase.h
rename to modules/ripple_app/data/ripple_SqliteDatabase.h
diff --git a/src/cpp/ripple/Ledger.cpp b/modules/ripple_app/ledger/Ledger.cpp
similarity index 100%
rename from src/cpp/ripple/Ledger.cpp
rename to modules/ripple_app/ledger/Ledger.cpp
diff --git a/src/cpp/ripple/Ledger.h b/modules/ripple_app/ledger/Ledger.h
similarity index 100%
rename from src/cpp/ripple/Ledger.h
rename to modules/ripple_app/ledger/Ledger.h
diff --git a/src/cpp/ripple/LedgerMaster.cpp b/modules/ripple_app/ledger/LedgerMaster.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerMaster.cpp
rename to modules/ripple_app/ledger/LedgerMaster.cpp
diff --git a/src/cpp/ripple/LedgerMaster.h b/modules/ripple_app/ledger/LedgerMaster.h
similarity index 100%
rename from src/cpp/ripple/LedgerMaster.h
rename to modules/ripple_app/ledger/LedgerMaster.h
diff --git a/src/cpp/ripple/LedgerProposal.cpp b/modules/ripple_app/ledger/LedgerProposal.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerProposal.cpp
rename to modules/ripple_app/ledger/LedgerProposal.cpp
diff --git a/src/cpp/ripple/LedgerProposal.h b/modules/ripple_app/ledger/LedgerProposal.h
similarity index 100%
rename from src/cpp/ripple/LedgerProposal.h
rename to modules/ripple_app/ledger/LedgerProposal.h
diff --git a/src/cpp/ripple/LedgerTiming.cpp b/modules/ripple_app/ledger/LedgerTiming.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerTiming.cpp
rename to modules/ripple_app/ledger/LedgerTiming.cpp
diff --git a/src/cpp/ripple/LedgerTiming.h b/modules/ripple_app/ledger/LedgerTiming.h
similarity index 100%
rename from src/cpp/ripple/LedgerTiming.h
rename to modules/ripple_app/ledger/LedgerTiming.h
diff --git a/src/cpp/ripple/LedgerUnitTests.cpp b/modules/ripple_app/ledger/LedgerUnitTests.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerUnitTests.cpp
rename to modules/ripple_app/ledger/LedgerUnitTests.cpp
diff --git a/src/cpp/ripple/OrderBookDB.cpp b/modules/ripple_app/ledger/OrderBookDB.cpp
similarity index 100%
rename from src/cpp/ripple/OrderBookDB.cpp
rename to modules/ripple_app/ledger/OrderBookDB.cpp
diff --git a/src/cpp/ripple/OrderBookDB.h b/modules/ripple_app/ledger/OrderBookDB.h
similarity index 100%
rename from src/cpp/ripple/OrderBookDB.h
rename to modules/ripple_app/ledger/OrderBookDB.h
diff --git a/src/cpp/ripple/SerializedValidation.cpp b/modules/ripple_app/ledger/SerializedValidation.cpp
similarity index 100%
rename from src/cpp/ripple/SerializedValidation.cpp
rename to modules/ripple_app/ledger/SerializedValidation.cpp
diff --git a/src/cpp/ripple/SerializedValidation.h b/modules/ripple_app/ledger/SerializedValidation.h
similarity index 100%
rename from src/cpp/ripple/SerializedValidation.h
rename to modules/ripple_app/ledger/SerializedValidation.h
diff --git a/src/cpp/ripple/ripple_AcceptedLedger.cpp b/modules/ripple_app/ledger/ripple_AcceptedLedger.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedger.cpp
rename to modules/ripple_app/ledger/ripple_AcceptedLedger.cpp
diff --git a/src/cpp/ripple/ripple_AcceptedLedger.h b/modules/ripple_app/ledger/ripple_AcceptedLedger.h
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedger.h
rename to modules/ripple_app/ledger/ripple_AcceptedLedger.h
diff --git a/src/cpp/ripple/ripple_AcceptedLedgerTx.cpp b/modules/ripple_app/ledger/ripple_AcceptedLedgerTx.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedgerTx.cpp
rename to modules/ripple_app/ledger/ripple_AcceptedLedgerTx.cpp
diff --git a/src/cpp/ripple/ripple_AcceptedLedgerTx.h b/modules/ripple_app/ledger/ripple_AcceptedLedgerTx.h
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedgerTx.h
rename to modules/ripple_app/ledger/ripple_AcceptedLedgerTx.h
diff --git a/src/cpp/ripple/ripple_InboundLedger.cpp b/modules/ripple_app/ledger/ripple_InboundLedger.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedger.cpp
rename to modules/ripple_app/ledger/ripple_InboundLedger.cpp
diff --git a/src/cpp/ripple/ripple_InboundLedger.h b/modules/ripple_app/ledger/ripple_InboundLedger.h
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedger.h
rename to modules/ripple_app/ledger/ripple_InboundLedger.h
diff --git a/src/cpp/ripple/ripple_InboundLedgers.cpp b/modules/ripple_app/ledger/ripple_InboundLedgers.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedgers.cpp
rename to modules/ripple_app/ledger/ripple_InboundLedgers.cpp
diff --git a/src/cpp/ripple/ripple_InboundLedgers.h b/modules/ripple_app/ledger/ripple_InboundLedgers.h
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedgers.h
rename to modules/ripple_app/ledger/ripple_InboundLedgers.h
diff --git a/src/cpp/ripple/ripple_LedgerEntrySet.cpp b/modules/ripple_app/ledger/ripple_LedgerEntrySet.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerEntrySet.cpp
rename to modules/ripple_app/ledger/ripple_LedgerEntrySet.cpp
diff --git a/src/cpp/ripple/ripple_LedgerEntrySet.h b/modules/ripple_app/ledger/ripple_LedgerEntrySet.h
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerEntrySet.h
rename to modules/ripple_app/ledger/ripple_LedgerEntrySet.h
diff --git a/src/cpp/ripple/ripple_LedgerHistory.cpp b/modules/ripple_app/ledger/ripple_LedgerHistory.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerHistory.cpp
rename to modules/ripple_app/ledger/ripple_LedgerHistory.cpp
diff --git a/src/cpp/ripple/ripple_LedgerHistory.h b/modules/ripple_app/ledger/ripple_LedgerHistory.h
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerHistory.h
rename to modules/ripple_app/ledger/ripple_LedgerHistory.h
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 5762a6b59..0c32a6181 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -91,10 +91,10 @@ namespace ripple
// linearize the include sequence and view it in one place.
//
-#include "src/cpp/ripple/ripple_Database.h"
-#include "src/cpp/ripple/ripple_DatabaseCon.h"
-#include "src/cpp/ripple/ripple_SqliteDatabase.h"
-#include "src/cpp/ripple/ripple_DBInit.h"
+#include "data/ripple_Database.h"
+#include "data/ripple_DatabaseCon.h"
+#include "data/ripple_SqliteDatabase.h"
+#include "data/ripple_DBInit.h"
#include "node/ripple_NodeObject.h"
#include "node/ripple_NodeStore.h"
@@ -136,10 +136,6 @@ namespace ripple
#include "src/cpp/ripple/ripple_PeerSet.h"
#include "src/cpp/ripple/ripple_InboundLedger.h"
#include "src/cpp/ripple/ripple_InboundLedgers.h"
-#include "src/cpp/ripple/ScriptData.h"
-#include "src/cpp/ripple/Contract.h"
-#include "src/cpp/ripple/Interpreter.h"
-#include "src/cpp/ripple/Operation.h"
#include "src/cpp/ripple/ripple_AccountItem.h"
#include "src/cpp/ripple/ripple_AccountItems.h"
#include "src/cpp/ripple/ripple_AcceptedLedgerTx.h"
@@ -157,7 +153,6 @@ namespace ripple
#include "src/cpp/ripple/RPCHandler.h"
#include "src/cpp/ripple/TransactionQueue.h"
#include "src/cpp/ripple/OrderBookDB.h"
-#include "src/cpp/ripple/ripple_DatabaseCon.h"
#include "src/cpp/ripple/ripple_IApplication.h"
#include "src/cpp/ripple/CallRPC.h"
#include "src/cpp/ripple/Transactor.h"
@@ -189,6 +184,11 @@ namespace ripple
#include "src/cpp/ripple/ripple_WSHandler.h"
#include "src/cpp/ripple/WalletAddTransactor.h"
+#include "contracts/ripple_ScriptData.h"
+#include "contracts/ripple_Contract.h"
+#include "contracts/ripple_Interpreter.h"
+#include "contracts/ripple_Operation.h"
+
#include "basics/ripple_Version.h" // VFALCO TODO Should this be private?
#include "basics/ripple_BuildVersion.h" // private
#include "basics/ripple_RPCServerHandler.h"
@@ -252,11 +252,15 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "src/cpp/ripple/ripple_SHAMapNode.cpp"
#include "src/cpp/ripple/ripple_SHAMapTreeNode.cpp"
-#include "src/cpp/ripple/ripple_Database.cpp"
#include "src/cpp/ripple/ripple_AccountItems.cpp"
#include "src/cpp/ripple/ripple_AccountState.cpp"
#include "src/cpp/ripple/ChangeTransactor.cpp"
+#include "contracts/ripple_Contract.cpp"
+#include "contracts/ripple_Operation.cpp"
+#include "contracts/ripple_ScriptData.cpp"
+#include "contracts/ripple_Interpreter.cpp"
+
#endif
//------------------------------------------------------------------------------
@@ -272,13 +276,17 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "src/cpp/ripple/ripple_AccountItem.cpp"
#include "src/cpp/ripple/AccountSetTransactor.cpp"
#include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
-#include "src/cpp/ripple/Contract.cpp"
#include "src/cpp/ripple/LedgerProposal.cpp"
#include "src/cpp/ripple/ripple_LoadManager.cpp"
#include "src/cpp/ripple/ripple_NicknameState.cpp"
#include "src/cpp/ripple/OfferCancelTransactor.cpp"
#include "src/cpp/ripple/OrderBookDB.cpp"
+#include "data/ripple_Database.cpp"
+#include "data/ripple_DatabaseCon.cpp"
+#include "data/ripple_SqliteDatabase.cpp"
+#include "data/ripple_DBInit.cpp"
+
#endif
//------------------------------------------------------------------------------
@@ -319,13 +327,11 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#include "src/cpp/ripple/ripple_UniqueNodeList.cpp"
#include "src/cpp/ripple/ripple_InboundLedger.cpp"
-#include "src/cpp/ripple/ripple_SqliteDatabase.cpp"
#include "src/cpp/ripple/PaymentTransactor.cpp"
#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
#include "src/cpp/ripple/ripple_RippleState.cpp"
#include "src/cpp/ripple/RPCDoor.cpp"
-#include "src/cpp/ripple/ScriptData.cpp"
#include "src/cpp/ripple/TransactionCheck.cpp"
#include "src/cpp/ripple/TransactionMaster.cpp"
#include "src/cpp/ripple/TransactionQueue.cpp"
@@ -345,10 +351,7 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#include "src/cpp/ripple/WalletAddTransactor.cpp"
#include "src/cpp/ripple/ripple_AcceptedLedgerTx.cpp"
-#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
#include "src/cpp/ripple/ripple_FeeVote.cpp"
-#include "src/cpp/ripple/ripple_DBInit.cpp"
-#include "src/cpp/ripple/Interpreter.cpp"
#include "src/cpp/ripple/LedgerTiming.cpp"
#endif
@@ -382,7 +385,6 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#include "src/cpp/ripple/ripple_PathRequest.cpp"
#include "src/cpp/ripple/ripple_SerializedLedger.cpp"
#include "src/cpp/ripple/ripple_TransactionAcquire.cpp"
-#include "src/cpp/ripple/Operation.cpp"
#endif