diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index 186f5a178c..7525a8cbe7 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -32,6 +32,6 @@
 #ifndef RIPPLE_BASICS_H
 #define RIPPLE_BASICS_H
 
-
+#include "src/cpp/ripple/IntegerTypes.h"
 
 #endif
diff --git a/modules/ripple_client/ripple_client.h b/modules/ripple_client/ripple_client.h
index 3be7ebbbe0..4c069d433e 100644
--- a/modules/ripple_client/ripple_client.h
+++ b/modules/ripple_client/ripple_client.h
@@ -32,6 +32,6 @@
 #ifndef RIPPLE_CLIENT_H
 #define RIPPLE_CLIENT_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif
diff --git a/modules/ripple_db/ripple_db.h b/modules/ripple_db/ripple_db.h
index 983743e5ff..fbecb4ab53 100644
--- a/modules/ripple_db/ripple_db.h
+++ b/modules/ripple_db/ripple_db.h
@@ -32,6 +32,6 @@
 #ifndef RIPPLE_DB_H
 #define RIPPLE_DB_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif
diff --git a/modules/ripple_ledger/ripple_ledger.h b/modules/ripple_ledger/ripple_ledger.h
index eef111df99..947a88c46e 100644
--- a/modules/ripple_ledger/ripple_ledger.h
+++ b/modules/ripple_ledger/ripple_ledger.h
@@ -32,6 +32,6 @@
 #ifndef RIPPLE_LEDGER_H
 #define RIPPLE_LEDGER_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif
diff --git a/modules/ripple_main/ripple_main.h b/modules/ripple_main/ripple_main.h
index f71619637a..9dd9f49537 100644
--- a/modules/ripple_main/ripple_main.h
+++ b/modules/ripple_main/ripple_main.h
@@ -32,6 +32,6 @@
 #ifndef RIPPLE_MAIN_H
 #define RIPPLE_MAIN_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif
diff --git a/modules/ripple_net/ripple_net.h b/modules/ripple_net/ripple_net.h
index 291c0f4fb8..53afff84b2 100644
--- a/modules/ripple_net/ripple_net.h
+++ b/modules/ripple_net/ripple_net.h
@@ -32,6 +32,6 @@
 #ifndef RIPPLE_NET_H
 #define RIPPLE_NET_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index cc169f7a04..16516805aa 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -1625,7 +1625,7 @@
     <ClInclude Include="src\cpp\ripple\TransactionQueue.h" />
     <ClInclude Include="src\cpp\ripple\Transactor.h" />
     <ClInclude Include="src\cpp\ripple\TrustSetTransactor.h" />
-    <ClInclude Include="src\cpp\ripple\types.h" />
+    <ClInclude Include="src\cpp\ripple\IntegerTypes.h" />
     <ClInclude Include="src\cpp\ripple\uint256.h" />
     <ClInclude Include="src\cpp\ripple\UniqueNodeList.h" />
     <ClInclude Include="src\cpp\ripple\utils.h" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 650edbd40b..3cfe405a77 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -1133,9 +1133,6 @@
     <ClInclude Include="src\cpp\ripple\rfc1751.h">
       <Filter>1. Modules\ripple_basics\types</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\types.h">
-      <Filter>1. Modules\ripple_basics\types</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\utils.h">
       <Filter>1. Modules\ripple_basics\types</Filter>
     </ClInclude>
@@ -1364,6 +1361,9 @@
     <ClInclude Include="build\proto\ripple.pb.h">
       <Filter>1. Modules\ripple_basics\protobuf</Filter>
     </ClInclude>
+    <ClInclude Include="src\cpp\ripple\IntegerTypes.h">
+      <Filter>1. Modules\ripple_basics\types</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="wallet.xml" />
diff --git a/src/cpp/database/database.h b/src/cpp/database/database.h
index 5b69056fca..e37c8458c7 100644
--- a/src/cpp/database/database.h
+++ b/src/cpp/database/database.h
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
-#include "../ripple/types.h"
 #include "../ripple/utils.h"
 
 #define SQL_FOREACH(_db, _strQuery)		\
diff --git a/src/cpp/ripple/AccountState.h b/src/cpp/ripple/AccountState.h
index 2b02c79205..0a2a750e50 100644
--- a/src/cpp/ripple/AccountState.h
+++ b/src/cpp/ripple/AccountState.h
@@ -11,7 +11,6 @@
 
 #include "../json/value.h"
 
-#include "types.h"
 #include "RippleAddress.h"
 #include "SerializedLedger.h"
 
diff --git a/src/cpp/ripple/BitcoinUtil.h b/src/cpp/ripple/BitcoinUtil.h
index e9b5fb21a3..32dc63f0a8 100644
--- a/src/cpp/ripple/BitcoinUtil.h
+++ b/src/cpp/ripple/BitcoinUtil.h
@@ -4,7 +4,6 @@
 // TODO: these things should all go somewhere
 
 #include <string>
-#include "types.h"
 #include "uint256.h"
 #include <openssl/ripemd.h>
 #include <openssl/sha.h>
diff --git a/src/cpp/ripple/Config.h b/src/cpp/ripple/Config.h
index c6f28d8ba2..3f9897c5d3 100644
--- a/src/cpp/ripple/Config.h
+++ b/src/cpp/ripple/Config.h
@@ -6,7 +6,6 @@
 #include <boost/asio/ssl.hpp>
 #include <boost/filesystem.hpp>
 
-#include "types.h"
 #include "RippleAddress.h"
 #include "ParseSection.h"
 #include "SerializedTypes.h"
diff --git a/src/cpp/ripple/ConnectionPool.h b/src/cpp/ripple/ConnectionPool.h
index 45ba2b6e95..70e627f489 100644
--- a/src/cpp/ripple/ConnectionPool.h
+++ b/src/cpp/ripple/ConnectionPool.h
@@ -8,7 +8,6 @@
 
 #include "Peer.h"
 #include "PackedMessage.h"
-#include "types.h"
 
 //
 // Access to the Ripple network.
diff --git a/src/cpp/ripple/HashPrefixes.h b/src/cpp/ripple/HashPrefixes.h
index 799b66e625..1e7d3c74f5 100644
--- a/src/cpp/ripple/HashPrefixes.h
+++ b/src/cpp/ripple/HashPrefixes.h
@@ -1,7 +1,6 @@
 #ifndef __HASHPREFIXES__
 #define __HASHPREFIXES__
 
-#include "types.h"
 
 // TXN - Hash of transaction plus signature to give transaction ID
 const uint32 sHP_TransactionID =	0x54584E00;
diff --git a/src/cpp/ripple/HashedObject.h b/src/cpp/ripple/HashedObject.h
index c1df75b2c1..f865df0743 100644
--- a/src/cpp/ripple/HashedObject.h
+++ b/src/cpp/ripple/HashedObject.h
@@ -6,7 +6,6 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
 
-#include "types.h"
 #include "uint256.h"
 #include "ScopedLock.h"
 #include "TaggedCache.h"
diff --git a/src/cpp/ripple/types.h b/src/cpp/ripple/IntegerTypes.h
similarity index 58%
rename from src/cpp/ripple/types.h
rename to src/cpp/ripple/IntegerTypes.h
index b47b71479a..96495790e2 100644
--- a/src/cpp/ripple/types.h
+++ b/src/cpp/ripple/IntegerTypes.h
@@ -1,8 +1,8 @@
-#ifndef __TYPES_HH__
-#define __TYPES_HH__
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#ifndef INTEGERTYPES_H
+#define INTEGERTYPES_H
 
+// VFALCO: TODO, determine if Borland C is supported
+#if defined (_MSC_VER) /*|| defined(__BORLANDC__)*/
 typedef __int64  int64;
 typedef unsigned __int64  uint64;
 typedef unsigned int uint32;
@@ -10,7 +10,6 @@ typedef unsigned short int uint16;
 typedef int int32;
 
 #else
-
 typedef long long  int64;
 typedef unsigned long long  uint64;
 typedef unsigned int uint32;
@@ -18,8 +17,13 @@ typedef unsigned short int uint16;
 typedef int int32;
 
 #endif
+
+// VFALCO: TODO, make sure minimum VS version is 9, 10, or 11
+// If commenting this out creates a problem, contact me!
+/*
 #if defined(_MSC_VER) && _MSC_VER < 1300
 #define for  if (false) ; else for
 #endif
+*/
 
 #endif
diff --git a/src/cpp/ripple/JobQueue.h b/src/cpp/ripple/JobQueue.h
index 76d444b92c..4bc4064631 100644
--- a/src/cpp/ripple/JobQueue.h
+++ b/src/cpp/ripple/JobQueue.h
@@ -13,7 +13,6 @@
 
 #include "../json/value.h"
 
-#include "types.h"
 #include "LoadMonitor.h"
 
 // Note that this queue should only be used for CPU-bound jobs
diff --git a/src/cpp/ripple/Ledger.h b/src/cpp/ripple/Ledger.h
index 381bd658cf..b8ee4ced8f 100644
--- a/src/cpp/ripple/Ledger.h
+++ b/src/cpp/ripple/Ledger.h
@@ -14,7 +14,6 @@
 #include "TransactionMeta.h"
 #include "AccountState.h"
 #include "NicknameState.h"
-#include "types.h"
 #include "BitcoinUtil.h"
 #include "SHAMap.h"
 #include "InstanceCounter.h"
diff --git a/src/cpp/ripple/LedgerMaster.h b/src/cpp/ripple/LedgerMaster.h
index 37c3a9630c..c903764b7b 100644
--- a/src/cpp/ripple/LedgerMaster.h
+++ b/src/cpp/ripple/LedgerMaster.h
@@ -4,7 +4,6 @@
 #include "Ledger.h"
 #include "LedgerHistory.h"
 #include "Peer.h"
-#include "types.h"
 #include "LedgerAcquire.h"
 #include "Transaction.h"
 #include "TransactionEngine.h"
diff --git a/src/cpp/ripple/LoadManager.h b/src/cpp/ripple/LoadManager.h
index 70944f8f2e..f2dea3963a 100644
--- a/src/cpp/ripple/LoadManager.h
+++ b/src/cpp/ripple/LoadManager.h
@@ -7,7 +7,6 @@
 
 #include "../json/value.h"
 
-#include "types.h"
 
 extern int upTime();
 
diff --git a/src/cpp/ripple/LoadMonitor.h b/src/cpp/ripple/LoadMonitor.h
index f97c2fb3c7..0915aad88e 100644
--- a/src/cpp/ripple/LoadMonitor.h
+++ b/src/cpp/ripple/LoadMonitor.h
@@ -7,7 +7,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "utils.h"
-#include "types.h"
 
 extern int upTime();
 
diff --git a/src/cpp/ripple/Log.h b/src/cpp/ripple/Log.h
index 739c33be7d..fa8c833f33 100644
--- a/src/cpp/ripple/Log.h
+++ b/src/cpp/ripple/Log.h
@@ -21,8 +21,6 @@ namespace boost {
 // Ensure that we don't get value.h without writer.h
 #include "../json/json.h"
 
-#include "types.h"
-
 enum LogSeverity
 {
 	lsINVALID	= -1,	// used to indicate an invalid severity
diff --git a/src/cpp/ripple/RangeSet.h b/src/cpp/ripple/RangeSet.h
index 12623ff020..4da32eaf83 100644
--- a/src/cpp/ripple/RangeSet.h
+++ b/src/cpp/ripple/RangeSet.h
@@ -7,7 +7,6 @@
 #include <boost/foreach.hpp>
 #include <boost/icl/interval_set.hpp>
 
-#include "types.h"
 
 class RangeSet
 {
diff --git a/src/cpp/ripple/SHAMap.h b/src/cpp/ripple/SHAMap.h
index da58b1c2a9..9d38d780e9 100644
--- a/src/cpp/ripple/SHAMap.h
+++ b/src/cpp/ripple/SHAMap.h
@@ -9,7 +9,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "types.h"
 #include "uint256.h"
 #include "ScopedLock.h"
 #include "Serializer.h"
diff --git a/src/cpp/ripple/SNTPClient.h b/src/cpp/ripple/SNTPClient.h
index ea01bcf7aa..00d76eb667 100644
--- a/src/cpp/ripple/SNTPClient.h
+++ b/src/cpp/ripple/SNTPClient.h
@@ -9,8 +9,6 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/asio.hpp>
 
-#include "types.h"
-
 class SNTPQuery
 {
 public:
diff --git a/src/cpp/ripple/Suppression.h b/src/cpp/ripple/Suppression.h
index 876cb833a4..1de7892781 100644
--- a/src/cpp/ripple/Suppression.h
+++ b/src/cpp/ripple/Suppression.h
@@ -9,7 +9,6 @@
 #include <boost/thread/mutex.hpp>
 
 #include "uint256.h"
-#include "types.h"
 #include "InstanceCounter.h"
 
 DEFINE_INSTANCE(Suppression);
diff --git a/src/cpp/ripple/ValidationCollection.h b/src/cpp/ripple/ValidationCollection.h
index f6dc705095..72015ea7b7 100644
--- a/src/cpp/ripple/ValidationCollection.h
+++ b/src/cpp/ripple/ValidationCollection.h
@@ -7,7 +7,6 @@
 #include <boost/thread/mutex.hpp>
 
 #include "uint256.h"
-#include "types.h"
 #include "SerializedValidation.h"
 #include "TaggedCache.h"
 #include "JobQueue.h"
diff --git a/src/cpp/ripple/uint256.h b/src/cpp/ripple/uint256.h
index f24e7dd059..50bdf3a1d3 100644
--- a/src/cpp/ripple/uint256.h
+++ b/src/cpp/ripple/uint256.h
@@ -15,7 +15,6 @@
 
 #include <boost/functional/hash.hpp>
 
-#include "types.h"
 #include "utils.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
diff --git a/src/cpp/ripple/utils.h b/src/cpp/ripple/utils.h
index d277b0da08..ab767e6566 100644
--- a/src/cpp/ripple/utils.h
+++ b/src/cpp/ripple/utils.h
@@ -10,7 +10,6 @@
 #endif
 
 #include <openssl/dh.h>
-#include "types.h"
 
 #define QUALITY_ONE			1000000000	// 10e9