diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp
index 8946f2e39..14c0e5720 100644
--- a/modules/ripple_ledger/ripple_ledger.cpp
+++ b/modules/ripple_ledger/ripple_ledger.cpp
@@ -29,6 +29,8 @@
 #pragma warning (disable: 4244) // conversion, possible loss of data
 #endif
 
+
+
 #include "ripple_ledger.h"
 
 #include <algorithm>
@@ -38,6 +40,9 @@
 #include <openssl/ripemd.h>
 #include <openssl/sha.h>
 #include <string>
+#include <vector>
+
+//#include "uint256.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
@@ -47,6 +52,7 @@
 #include <boost/make_shared.hpp>
 #include <boost/pointer_cast.hpp>
 #include <boost/ref.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
@@ -54,6 +60,7 @@
 #include <boost/unordered_set.hpp>
 
 #include "src/cpp/database/SqliteDatabase.h"
+
 #include "src/cpp/json/writer.h"
 
 #include "src/cpp/ripple/AcceptedLedger.h"
@@ -65,11 +72,9 @@
 #include "src/cpp/ripple/CanonicalTXSet.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"
@@ -85,7 +90,6 @@
 #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"
@@ -117,8 +121,18 @@
 #include "src/cpp/ripple/Wallet.h"
 #include "src/cpp/ripple/WalletAddTransactor.h"
 
+// contract stuff, order matters
+#include "src/cpp/ripple/ScriptData.h"
+#include "src/cpp/ripple/Contract.h"
+#include "src/cpp/ripple/Interpreter.h"
+#include "src/cpp/ripple/Operation.h"
+
+//------------------------------------------------------------------------------
+
 // contracts
 #include "src/cpp/ripple/Contract.cpp" // no log
+#include "src/cpp/ripple/Interpreter.cpp" // no log
+#include "src/cpp/ripple/ScriptData.cpp" // no log
 #include "src/cpp/ripple/Operation.cpp" // no log
 
 // processing
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 083a8c3e8..aeb0ad3a4 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -660,7 +660,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Interpreter.cpp" />
+    <ClCompile Include="src\cpp\ripple\Interpreter.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\JobQueue.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -906,7 +911,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ScriptData.cpp" />
+    <ClCompile Include="src\cpp\ripple\ScriptData.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\SerializedLedger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 452e2b9a4..a9140ac96 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -397,9 +397,6 @@
     <ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
       <Filter>Unsorted Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Interpreter.cpp">
-      <Filter>Unsorted Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
       <Filter>Unsorted Sources</Filter>
     </ClCompile>
@@ -427,9 +424,6 @@
     <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
       <Filter>Unsorted Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ScriptData.cpp">
-      <Filter>Unsorted Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\websocket_core.cpp">
       <Filter>0. Third Party Code\websocket</Filter>
     </ClCompile>
@@ -721,6 +715,12 @@
     <ClCompile Include="modules\ripple_net\ripple_net.cpp">
       <Filter>1. Modules\ripple_net</Filter>
     </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Interpreter.cpp">
+      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ScriptData.cpp">
+      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="database\sqlite3ext.h">
@@ -1023,9 +1023,6 @@
     <ClInclude Include="src\cpp\ripple\RippleAddress.h">
       <Filter>Unsorted Sources</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Interpreter.h">
-      <Filter>Unsorted Sources</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\KeyCache.h">
       <Filter>Unsorted Sources</Filter>
     </ClInclude>
@@ -1065,9 +1062,6 @@
     <ClInclude Include="src\cpp\ripple\ScopedLock.h">
       <Filter>Unsorted Sources</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ScriptData.h">
-      <Filter>Unsorted Sources</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\SecureAllocator.h">
       <Filter>Unsorted Sources</Filter>
     </ClInclude>
@@ -1359,6 +1353,12 @@
     <ClInclude Include="modules\ripple_net\ripple_net.h">
       <Filter>1. Modules\ripple_net</Filter>
     </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Interpreter.h">
+      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ScriptData.h">
+      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="wallet.xml" />
diff --git a/src/cpp/ripple/Contract.h b/src/cpp/ripple/Contract.h
index 9a708a75c..7d14a1541 100644
--- a/src/cpp/ripple/Contract.h
+++ b/src/cpp/ripple/Contract.h
@@ -1,9 +1,6 @@
-#ifndef __CONTRACT__
-#define __CONTRACT__
+#ifndef CONTRACT_H
+#define CONTRACT_H
 
-#include "SerializedLedger.h"
-#include <boost/shared_ptr.hpp>
-#include "ScriptData.h"
 /*
 	Encapsulates the SLE for a Contract
 */
diff --git a/src/cpp/ripple/Interpreter.h b/src/cpp/ripple/Interpreter.h
index f544ab845..f23660986 100644
--- a/src/cpp/ripple/Interpreter.h
+++ b/src/cpp/ripple/Interpreter.h
@@ -1,12 +1,5 @@
-#ifndef __INTERPRETER__
-#define __INTERPRETER__
-
-#include "uint256.h"
-#include "Contract.h"
-#include <boost/shared_ptr.hpp>
-#include <vector>
-#include "ScriptData.h"
-#include "TransactionEngine.h"
+#ifndef INTERPRETER_H
+#define INTERPRETER_H
 
 namespace Script {
 
diff --git a/src/cpp/ripple/Operation.h b/src/cpp/ripple/Operation.h
index 6e0c75043..da292f719 100644
--- a/src/cpp/ripple/Operation.h
+++ b/src/cpp/ripple/Operation.h
@@ -1,4 +1,5 @@
-#include "Interpreter.h"
+#ifndef OPERATION_H
+#define OPERATION_H
 
 namespace Script {
 
@@ -317,4 +318,7 @@ public:
 
 }
 
+#endif
+
 // vim:ts=4
+
diff --git a/src/cpp/ripple/ScriptData.h b/src/cpp/ripple/ScriptData.h
index 480cc9f25..719ddfd82 100644
--- a/src/cpp/ripple/ScriptData.h
+++ b/src/cpp/ripple/ScriptData.h
@@ -1,7 +1,5 @@
-#ifndef __SCRIPT_DATA__
-#define __SCRIPT_DATA__
-#include "uint256.h"
-#include <boost/shared_ptr.hpp>
+#ifndef SCRIPT_DATA_H
+#define SCRIPT_DATA_H
 
 namespace Script {
 class Data