diff --git a/RippleD.props b/RippleD.props
index 4d5516806..79a713980 100644
--- a/RippleD.props
+++ b/RippleD.props
@@ -17,6 +17,7 @@
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees\beast;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <ExceptionHandling>Async</ExceptionHandling>
     </ClCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/modules/ripple_data/protocol/ripple_RippleAddress.cpp b/modules/ripple_data/protocol/ripple_RippleAddress.cpp
index 924be45a4..a935734c1 100644
--- a/modules/ripple_data/protocol/ripple_RippleAddress.cpp
+++ b/modules/ripple_data/protocol/ripple_RippleAddress.cpp
@@ -1,13 +1,8 @@
 
-
-// VFALCO TODO remove this when it's safe to do so.
-#ifdef __APPLICATION__
-#error Including Application.h is disallowed!
-#endif
-
 SETUP_LOG (RippleAddress)
 
-RippleAddress::RippleAddress() : mIsValid(false)
+RippleAddress::RippleAddress ()
+    : mIsValid (false)
 {
     nVersion = VER_NONE;
 }
diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_main/ripple_main.cpp
index e5f7836b9..1687d36a9 100644
--- a/modules/ripple_main/ripple_main.cpp
+++ b/modules/ripple_main/ripple_main.cpp
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <queue>
 #include <set>
 #include <stack>
 #include <string>
@@ -55,11 +56,14 @@
 #include <boost/function.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
+#include <boost/mem_fn.hpp>
 #include <boost/pointer_cast.hpp>
+#include <boost/program_options.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/ref.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/test/included/unit_test.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition_variable.hpp>
diff --git a/src/cpp/ripple/Application.h b/src/cpp/ripple/Application.h
index 1ae29dd66..0e8080ad8 100644
--- a/src/cpp/ripple/Application.h
+++ b/src/cpp/ripple/Application.h
@@ -1,5 +1,5 @@
-#ifndef __APPLICATION__
-#define __APPLICATION__
+#ifndef RIPPLE_APPLICATION_H
+#define RIPPLE_APPLICATION_H
 
 // VFALCO TODO Fix forward declares required for header dependency loops
 class IFeatures;
diff --git a/src/cpp/ripple/CallRPC.cpp b/src/cpp/ripple/CallRPC.cpp
index 13c29361e..958933fbd 100644
--- a/src/cpp/ripple/CallRPC.cpp
+++ b/src/cpp/ripple/CallRPC.cpp
@@ -20,7 +20,6 @@
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 
-#include "Application.h"
 #include "RPC.h"
 #include "RPCErr.h"
 
diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
index bdf5cc3cf..19fb28ef4 100644
--- a/src/cpp/ripple/NetworkOPs.cpp
+++ b/src/cpp/ripple/NetworkOPs.cpp
@@ -1,10 +1,4 @@
 
-#include "Application.h"
-#include "Transaction.h"
-#include "HashPrefixes.h"
-#include "LedgerConsensus.h"
-#include "LedgerTiming.h"
-
 SETUP_LOG (NetworkOPs)
 
 // This is the primary interface into the "client" portion of the program.
diff --git a/src/cpp/ripple/Pathfinder.cpp b/src/cpp/ripple/Pathfinder.cpp
index 8db36b228..a6d7a539b 100644
--- a/src/cpp/ripple/Pathfinder.cpp
+++ b/src/cpp/ripple/Pathfinder.cpp
@@ -1,12 +1,4 @@
 
-#include "Pathfinder.h"
-
-#include <queue>
-
-#include <boost/foreach.hpp>
-
-#include "Application.h"
-
 SETUP_LOG (Pathfinder)
 
 /*
diff --git a/src/cpp/ripple/PeerDoor.cpp b/src/cpp/ripple/PeerDoor.cpp
index 352a5c828..5472c06fc 100644
--- a/src/cpp/ripple/PeerDoor.cpp
+++ b/src/cpp/ripple/PeerDoor.cpp
@@ -1,13 +1,4 @@
 
-#include "PeerDoor.h"
-
-#include <iostream>
-
-#include <boost/bind.hpp>
-#include <boost/mem_fn.hpp>
-
-#include "Application.h"
-
 SETUP_LOG (PeerDoor)
 
 using namespace std;
diff --git a/src/cpp/ripple/RPCDoor.cpp b/src/cpp/ripple/RPCDoor.cpp
index b2df802f6..9033681e5 100644
--- a/src/cpp/ripple/RPCDoor.cpp
+++ b/src/cpp/ripple/RPCDoor.cpp
@@ -1,5 +1,4 @@
 #include "RPCDoor.h"
-#include "Application.h"
 #include <boost/bind.hpp>
 #include <iostream>
 
diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
index 16f2db088..d502e800a 100644
--- a/src/cpp/ripple/RPCHandler.cpp
+++ b/src/cpp/ripple/RPCHandler.cpp
@@ -11,7 +11,6 @@
 #include "Pathfinder.h"
 #include "RPCHandler.h"
 #include "RPCSub.h"
-#include "Application.h"
 #include "AccountItems.h"
 #include "Wallet.h"
 #include "RippleCalc.h"
diff --git a/src/cpp/ripple/RPCSub.cpp b/src/cpp/ripple/RPCSub.cpp
index 6028eda30..a6c9e2007 100644
--- a/src/cpp/ripple/RPCSub.cpp
+++ b/src/cpp/ripple/RPCSub.cpp
@@ -1,6 +1,5 @@
 #include <boost/thread.hpp>
 
-#include "Application.h"
 #include "RPCSub.h"
 
 #include "CallRPC.h"
diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h
index d19cc95bf..45251bfc8 100644
--- a/src/cpp/ripple/WSConnection.h
+++ b/src/cpp/ripple/WSConnection.h
@@ -11,7 +11,6 @@
 #include <boost/pointer_cast.hpp>
 
 #include "WSDoor.h"
-#include "Application.h"
 #include "CallRPC.h"
 #include "LoadManager.h"
 #include "RPCErr.h"
diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp
index fac356c15..85a3f3fde 100644
--- a/src/cpp/ripple/WSDoor.cpp
+++ b/src/cpp/ripple/WSDoor.cpp
@@ -4,7 +4,6 @@
 //#include "../websocketpp/src/sockets/autotls.hpp"
 //#include "../websocketpp/src/websocketpp.hpp"
 
-#include "Application.h"
 #include "WSConnection.h"
 #include "WSHandler.h"
 
diff --git a/src/cpp/ripple/WSHandler.h b/src/cpp/ripple/WSHandler.h
index 4e0de4cfb..17fdad72b 100644
--- a/src/cpp/ripple/WSHandler.h
+++ b/src/cpp/ripple/WSHandler.h
@@ -1,8 +1,6 @@
 #ifndef __WSHANDLER__
 #define __WSHANDLER__
 
-#include "Application.h"
-
 extern void initSSLContext(boost::asio::ssl::context& context,
 	std::string key_file, std::string cert_file, std::string chain_file);
 
diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp
index db76538db..fd6d19786 100644
--- a/src/cpp/ripple/main.cpp
+++ b/src/cpp/ripple/main.cpp
@@ -1,15 +1,4 @@
 
-#include <iostream>
-
-#include <boost/asio.hpp>
-#include <boost/foreach.hpp>
-#include <boost/program_options.hpp>
-#include <boost/test/included/unit_test.hpp>
-
-#include "Application.h"
-#include "CallRPC.h"
-#include "RPCHandler.h"
-
 namespace po = boost::program_options;
 
 // VFALCO TODO make these singletons that initialize statically
diff --git a/src/cpp/ripple/ripple_LoadFeeTrack.cpp b/src/cpp/ripple/ripple_LoadFeeTrack.cpp
index 374ce5214..fecf9f409 100644
--- a/src/cpp/ripple/ripple_LoadFeeTrack.cpp
+++ b/src/cpp/ripple/ripple_LoadFeeTrack.cpp
@@ -1,7 +1,3 @@
-//#include <boost/test/unit_test.hpp>
-//#include <boost/thread.hpp>
-//#include <boost/date_time/posix_time/posix_time.hpp>
-//#include "Application.h"
 
 class LoadFeeTrack : public ILoadFeeTrack
 { 
diff --git a/src/cpp/ripple/ripple_Validations.cpp b/src/cpp/ripple/ripple_Validations.cpp
index 1784847e3..4b2924d78 100644
--- a/src/cpp/ripple/ripple_Validations.cpp
+++ b/src/cpp/ripple/ripple_Validations.cpp
@@ -1,9 +1,4 @@
 
-#include <boost/foreach.hpp>
-
-#include "Application.h"
-#include "LedgerTiming.h"
-
 class Validations;
 
 SETUP_LOG (Validations)