From fca16f5c71e2fa9156b95466b132fc5cabb5d101 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sun, 23 Jun 2013 15:23:06 -0700
Subject: [PATCH] Tidy up and move more items into ripple_core

---
 Builds/VisualStudio2012/RippleD.vcxproj       | 42 +++++++++----------
 .../VisualStudio2012/RippleD.vcxproj.filters  | 36 ++++++++--------
 modules/ripple_app/ripple_app.cpp             |  7 ----
 modules/ripple_basics/ripple_basics.cpp       |  1 +
 modules/ripple_basics/ripple_basics.h         |  1 +
 .../ripple_basics/utility/ripple_IniFile.cpp  |  0
 .../ripple_basics/utility/ripple_IniFile.h    | 10 +++--
 .../ripple_core/functional}/ripple_Config.cpp |  0
 .../ripple_core/functional}/ripple_Config.h   |  9 ++++
 .../functional}/ripple_ILoadFeeTrack.h        |  0
 .../functional}/ripple_LoadFeeTrack.cpp       |  4 +-
 modules/ripple_core/ripple_core.cpp           |  7 ++++
 modules/ripple_core/ripple_core.h             |  4 ++
 src/cpp/ripple/ripple_IApplication.h          |  9 ----
 14 files changed, 70 insertions(+), 60 deletions(-)
 rename src/cpp/ripple/ParseSection.cpp => modules/ripple_basics/utility/ripple_IniFile.cpp (100%)
 rename src/cpp/ripple/ParseSection.h => modules/ripple_basics/utility/ripple_IniFile.h (73%)
 rename {src/cpp/ripple => modules/ripple_core/functional}/ripple_Config.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_core/functional}/ripple_Config.h (94%)
 rename {src/cpp/ripple => modules/ripple_core/functional}/ripple_ILoadFeeTrack.h (100%)
 rename {src/cpp/ripple => modules/ripple_core/functional}/ripple_LoadFeeTrack.cpp (99%)

diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index d1a1fbb486..1db6a5d317 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -169,6 +169,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\modules\ripple_basics\utility\ripple_IniFile.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\functional\ripple_Config.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_core\functional\ripple_Job.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -187,6 +199,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\functional\ripple_LoadFeeTrack.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_core\functional\ripple_LoadMonitor.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1124,12 +1142,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LoadMonitor.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\main.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1190,12 +1202,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ParseSection.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\ripple_Pathfinder.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1260,12 +1266,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LoadEvent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\ripple_LoadFeeTrack.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1531,6 +1531,7 @@
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_CountedObject.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_DiffieHellmanUtil.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_HashUtilities.h" />
+    <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_IniFile.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_IntegerTypes.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Log.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_PlatformMacros.h" />
@@ -1542,6 +1543,8 @@
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Time.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_UptimeTimer.h" />
     <ClInclude Include="..\..\modules\ripple_client\ripple_client.h" />
+    <ClInclude Include="..\..\modules\ripple_core\functional\ripple_Config.h" />
+    <ClInclude Include="..\..\modules\ripple_core\functional\ripple_ILoadFeeTrack.h" />
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_Job.h" />
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_JobQueue.h" />
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_LoadEvent.h" />
@@ -1781,7 +1784,6 @@
     <ClInclude Include="..\..\src\cpp\ripple\ripple_Job.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_JobQueue.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_InboundLedgers.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LoadMonitor.h" />
     <ClInclude Include="..\..\src\cpp\ripple\NetworkOPs.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_NicknameState.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_Offer.h" />
@@ -1791,7 +1793,6 @@
     <ClInclude Include="..\..\src\cpp\ripple\ripple_OrderBook.h" />
     <ClInclude Include="..\..\src\cpp\ripple\OrderBookDB.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ParameterTable.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ParseSection.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_Pathfinder.h" />
     <ClInclude Include="..\..\src\cpp\ripple\PaymentTransactor.h" />
     <ClInclude Include="..\..\src\cpp\ripple\PeerDoor.h" />
@@ -1807,7 +1808,6 @@
     <ClInclude Include="..\..\src\cpp\ripple\ripple_ILoadFeeTrack.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IUniqueNodeList.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IValidations.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LoadEvent.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_Peer.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_PeerSet.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_ProofOfWork.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index e3127c5a50..7f39f1679f 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -390,15 +390,9 @@
     <ClCompile Include="..\..\src\cpp\ripple\WSDoor.cpp">
       <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LoadMonitor.cpp">
-      <Filter>1. Modules\ripple_app\refactored</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\ripple_DatabaseCon.cpp">
       <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LoadEvent.cpp">
-      <Filter>1. Modules\ripple_app\refactored</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\ripple_LoadFeeTrack.cpp">
       <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
@@ -678,9 +672,6 @@
     <ClCompile Include="..\..\src\cpp\ripple\ParameterTable.cpp">
       <Filter>1. Modules\ripple_app\_unfactored</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ParseSection.cpp">
-      <Filter>1. Modules\ripple_app\_unfactored</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\main.cpp">
       <Filter>1. Modules\ripple_app\_unfactored</Filter>
     </ClCompile>
@@ -909,6 +900,15 @@
     <ClCompile Include="..\..\modules\ripple_core\functional\ripple_LoadMonitor.cpp">
       <Filter>1. Modules\ripple_core\functional</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_basics\utility\ripple_IniFile.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\functional\ripple_Config.cpp">
+      <Filter>1. Modules\ripple_core\functional</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\functional\ripple_LoadFeeTrack.cpp">
+      <Filter>1. Modules\ripple_core\functional</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cpp\protobuf\src\google\protobuf\service.h">
@@ -1208,9 +1208,6 @@
     <ClInclude Include="..\..\src\cpp\ripple\WSConnection.h">
       <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LoadMonitor.h">
-      <Filter>1. Modules\ripple_app\refactored</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cpp\ripple\ripple_DatabaseCon.h">
       <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
@@ -1220,9 +1217,6 @@
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IValidations.h">
       <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LoadEvent.h">
-      <Filter>1. Modules\ripple_app\refactored</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IFeatures.h">
       <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
@@ -1491,9 +1485,6 @@
     <ClInclude Include="..\..\modules\ripple_app\ripple_app.h">
       <Filter>1. Modules\ripple_app</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ParseSection.h">
-      <Filter>1. Modules\ripple_app\_unfactored</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cpp\ripple\ParameterTable.h">
       <Filter>1. Modules\ripple_app\_unfactored</Filter>
     </ClInclude>
@@ -1740,6 +1731,15 @@
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_LoadMonitor.h">
       <Filter>1. Modules\ripple_core\functional</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_IniFile.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\functional\ripple_Config.h">
+      <Filter>1. Modules\ripple_core\functional</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\functional\ripple_ILoadFeeTrack.h">
+      <Filter>1. Modules\ripple_core\functional</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.proto">
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 4892e1a221..ba89ab17bf 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -137,9 +137,7 @@
 #include "src/cpp/ripple/SerializedValidation.h"
 #include "src/cpp/ripple/ripple_LoadManager.h"
 
-
 // These have few dependencies
-#include "src/cpp/ripple/ripple_Config.h"
 #include "src/cpp/ripple/ripple_DatabaseCon.h"
 #include "src/cpp/ripple/ripple_ProofOfWork.h"
 #include "src/cpp/ripple/ripple_InfoSub.h"
@@ -152,7 +150,6 @@
 #include "src/cpp/ripple/ripple_IFeatures.h"
 #include "src/cpp/ripple/ripple_IFeeVote.h"
 #include "src/cpp/ripple/ripple_IHashRouter.h"
-#include "src/cpp/ripple/ripple_ILoadFeeTrack.h"
 #include "src/cpp/ripple/ripple_Peer.h" // VFALCO TODO Rename to IPeer
 #include "src/cpp/ripple/ripple_IPeers.h"
 #include "src/cpp/ripple/ripple_IProofOfWorkFactory.h"
@@ -227,7 +224,6 @@
 #include "src/cpp/ripple/OfferCreateTransactor.h"
 #include "src/cpp/ripple/ripple_PathRequest.h"
 #include "src/cpp/ripple/ParameterTable.h"
-#include "src/cpp/ripple/ParseSection.h"
 
  #include "src/cpp/ripple/ripple_RippleLineCache.h"
  #include "src/cpp/ripple/ripple_PathState.h"
@@ -319,11 +315,9 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/CallRPC.cpp"
 #include "src/cpp/ripple/ripple_InboundLedger.cpp"
 #include "src/cpp/ripple/ripple_PathState.cpp"
-#include "src/cpp/ripple/ripple_Config.cpp"
 #include "src/cpp/ripple/ripple_SqliteDatabase.cpp"
 
 #include "src/cpp/ripple/ParameterTable.cpp"
-#include "src/cpp/ripple/ParseSection.cpp"
 #include "src/cpp/ripple/PaymentTransactor.cpp"
 #include "src/cpp/ripple/PeerDoor.cpp"
 #include "src/cpp/ripple/RegularKeySetTransactor.cpp"
@@ -389,7 +383,6 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/ripple_InboundLedgers.cpp"
 #include "src/cpp/ripple/ripple_InfoSub.cpp"
 #include "src/cpp/ripple/ripple_LedgerHistory.cpp"
-#include "src/cpp/ripple/ripple_LoadFeeTrack.cpp"
 #include "src/cpp/ripple/ripple_OrderBook.cpp"
 #include "src/cpp/ripple/ripple_PathRequest.cpp"
 #include "src/cpp/ripple/ripple_PeerSet.cpp"
diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp
index 2ccf2cbfb3..d94bb2ce2c 100644
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/modules/ripple_basics/ripple_basics.cpp
@@ -63,6 +63,7 @@ namespace ripple
 #include "utility/ripple_ByteOrder.cpp"
 #include "utility/ripple_CountedObject.cpp"
 #include "utility/ripple_DiffieHellmanUtil.cpp"
+#include "utility/ripple_IniFile.cpp"
 #include "utility/ripple_StringUtilities.cpp"
 #include "utility/ripple_Sustain.cpp"
 #include "utility/ripple_ThreadName.cpp"
diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index e0a6f64bb5..39a11237a4 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -89,6 +89,7 @@ namespace ripple
 #include "utility/ripple_ByteOrder.h"
 #include "utility/ripple_CountedObject.h"
 #include "utility/ripple_DiffieHellmanUtil.h"
+#include "utility/ripple_IniFile.h"
 #include "utility/ripple_PlatformMacros.h"
 #include "utility/ripple_RandomNumbers.h"
 #include "utility/ripple_ScopedLock.h"
diff --git a/src/cpp/ripple/ParseSection.cpp b/modules/ripple_basics/utility/ripple_IniFile.cpp
similarity index 100%
rename from src/cpp/ripple/ParseSection.cpp
rename to modules/ripple_basics/utility/ripple_IniFile.cpp
diff --git a/src/cpp/ripple/ParseSection.h b/modules/ripple_basics/utility/ripple_IniFile.h
similarity index 73%
rename from src/cpp/ripple/ParseSection.h
rename to modules/ripple_basics/utility/ripple_IniFile.h
index a3c158ef6e..fe5327ec89 100644
--- a/src/cpp/ripple/ParseSection.h
+++ b/modules/ripple_basics/utility/ripple_IniFile.h
@@ -4,10 +4,14 @@
 */
 //==============================================================================
 
-#ifndef _PARSE_SECTION_
-#define _PARSE_SECTION_
+#ifndef RIPPLE_INIFILE_RIPPLEHEADER
+#define RIPPLE_INIFILE_RIPPLEHEADER
 
-typedef std::map<const std::string, std::vector<std::string> > Section;
+// VFALCO TODO Rename to IniFile and clean up
+typedef std::map <const std::string, std::vector<std::string> > Section;
+
+// VFALCO TODO Wrap this up in a class interface
+//
 
 Section ParseSection (const std::string& strInput, const bool bTrim);
 void SectionPrint (Section secInput);
diff --git a/src/cpp/ripple/ripple_Config.cpp b/modules/ripple_core/functional/ripple_Config.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Config.cpp
rename to modules/ripple_core/functional/ripple_Config.cpp
diff --git a/src/cpp/ripple/ripple_Config.h b/modules/ripple_core/functional/ripple_Config.h
similarity index 94%
rename from src/cpp/ripple/ripple_Config.h
rename to modules/ripple_core/functional/ripple_Config.h
index 8487695094..865cc32c32 100644
--- a/src/cpp/ripple/ripple_Config.h
+++ b/modules/ripple_core/functional/ripple_Config.h
@@ -7,6 +7,15 @@
 #ifndef RIPPLE_CONFIG_H
 #define RIPPLE_CONFIG_H
 
+// VFALCO TODO Replace these with beast "unsigned long long" generators
+// VFALCO NOTE Apparently these are used elsewhere. Make them constants in the config
+//             or in the IApplication
+//
+#define SYSTEM_CURRENCY_GIFT        1000ull
+#define SYSTEM_CURRENCY_USERS       100000000ull
+#define SYSTEM_CURRENCY_PARTS       1000000ull      // 10^SYSTEM_CURRENCY_PRECISION
+#define SYSTEM_CURRENCY_START       (SYSTEM_CURRENCY_GIFT*SYSTEM_CURRENCY_USERS*SYSTEM_CURRENCY_PARTS)
+
 // VFALCO NOTE Set this to 1 to enable code which is unnecessary
 #define ENABLE_INSECURE             0
 
diff --git a/src/cpp/ripple/ripple_ILoadFeeTrack.h b/modules/ripple_core/functional/ripple_ILoadFeeTrack.h
similarity index 100%
rename from src/cpp/ripple/ripple_ILoadFeeTrack.h
rename to modules/ripple_core/functional/ripple_ILoadFeeTrack.h
diff --git a/src/cpp/ripple/ripple_LoadFeeTrack.cpp b/modules/ripple_core/functional/ripple_LoadFeeTrack.cpp
similarity index 99%
rename from src/cpp/ripple/ripple_LoadFeeTrack.cpp
rename to modules/ripple_core/functional/ripple_LoadFeeTrack.cpp
index c6ff6d8290..124c6ae775 100644
--- a/src/cpp/ripple/ripple_LoadFeeTrack.cpp
+++ b/modules/ripple_core/functional/ripple_LoadFeeTrack.cpp
@@ -4,6 +4,8 @@
 */
 //==============================================================================
 
+class LoadManager;
+
 class LoadFeeTrack : public ILoadFeeTrack
 {
 private:
@@ -205,5 +207,3 @@ BOOST_AUTO_TEST_CASE (LoadFeeTrack_test)
 }
 
 BOOST_AUTO_TEST_SUITE_END ()
-
-// vim:ts=4
diff --git a/modules/ripple_core/ripple_core.cpp b/modules/ripple_core/ripple_core.cpp
index f82f624a56..0c43bd21ca 100644
--- a/modules/ripple_core/ripple_core.cpp
+++ b/modules/ripple_core/ripple_core.cpp
@@ -12,8 +12,15 @@
 
 #include "ripple_core.h"
 
+#include <fstream>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
+#include "functional/ripple_Config.cpp"
+#include "functional/ripple_LoadFeeTrack.cpp"
 #include "functional/ripple_Job.cpp"
 #include "functional/ripple_JobQueue.cpp"
 #include "functional/ripple_LoadEvent.cpp"
diff --git a/modules/ripple_core/ripple_core.h b/modules/ripple_core/ripple_core.h
index 3162c66666..eb5c6f58df 100644
--- a/modules/ripple_core/ripple_core.h
+++ b/modules/ripple_core/ripple_core.h
@@ -22,16 +22,20 @@
 #define RIPPLE_CORE_RIPPLEHEADER
 
 #include "../ripple_basics/ripple_basics.h"
+#include "../ripple_data/ripple_data.h"
 
 #include <set>
 #include <string>
 
 #include <boost/asio.hpp>
+#include <boost/asio/ssl.hpp>
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 
 // VFALCO NOTE Indentation shows dependency hierarchy
 //
+/**/#include "functional/ripple_Config.h"
+/**/#include "functional/ripple_ILoadFeeTrack.h"
 /*..*/#include "functional/ripple_LoadEvent.h"
 /*..*/#include "functional/ripple_LoadMonitor.h"
 /*.*/#include "functional/ripple_Job.h"
diff --git a/src/cpp/ripple/ripple_IApplication.h b/src/cpp/ripple/ripple_IApplication.h
index 32d9eff7d2..af77f8841b 100644
--- a/src/cpp/ripple/ripple_IApplication.h
+++ b/src/cpp/ripple/ripple_IApplication.h
@@ -7,15 +7,6 @@
 #ifndef RIPPLE_IAPPLICATION_H
 #define RIPPLE_IAPPLICATION_H
 
-// VFALCO TODO Replace these with beast "unsigned long long" generators
-// VFALCO NOTE Apparently these are used elsewhere. Make them constants in the config
-//             or in the IApplication
-//
-#define SYSTEM_CURRENCY_GIFT        1000ull
-#define SYSTEM_CURRENCY_USERS       100000000ull
-#define SYSTEM_CURRENCY_PARTS       1000000ull      // 10^SYSTEM_CURRENCY_PRECISION
-#define SYSTEM_CURRENCY_START       (SYSTEM_CURRENCY_GIFT*SYSTEM_CURRENCY_USERS*SYSTEM_CURRENCY_PARTS)
-
 // VFALCO TODO Fix forward declares required for header dependency loops
 class IFeatures;
 class IFeeVote;