diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 91d4adc778..5c126d4e1b 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -1514,7 +1514,6 @@
     <ClInclude Include="..\..\modules\ripple_data\utility\ripple_JSONCache.h" />
     <ClInclude Include="..\..\modules\ripple_data\utility\ripple_UptimeTimerAdapter.h" />
     <ClInclude Include="..\..\modules\ripple_db\ripple_db.h" />
-    <ClInclude Include="..\..\modules\ripple_json\json\json.h" />
     <ClInclude Include="..\..\modules\ripple_json\json\json_autolink.h" />
     <ClInclude Include="..\..\modules\ripple_json\json\json_batchallocator.h" />
     <ClInclude Include="..\..\modules\ripple_json\json\json_config.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 6a8c877ed8..3114eb595f 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -1136,9 +1136,6 @@
     <ClInclude Include="..\..\modules\ripple_json\json\json_writer.h">
       <Filter>1. Modules\ripple_json\json</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_json\json\json.h">
-      <Filter>1. Modules\ripple_json\json\DEPRECATED</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_json\json\json_autolink.h">
       <Filter>1. Modules\ripple_json\json\DEPRECATED</Filter>
     </ClInclude>
diff --git a/TODO.txt b/TODO.txt
index cab925ee90..9641de588b 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,8 +2,12 @@
 TODO
 --------------------------------------------------------------------------------
 
+- Put all the Ripple code in the ripple namespace
+
 - Remove "using namespace" statements
 
+- lift bind, function, and placeholders into ripple namespace
+
 - Make LevelDB and Ripple code work with both Unicode and non-Unicode Windows APIs
 
 - Raise the warning level and fix everything
diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index 26b37be970..81b307bc11 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -32,6 +32,7 @@
 #include <climits>
 #include <cstdio>
 #include <cstring>
+#include <functional>
 #include <string>
 #include <vector>
 
diff --git a/modules/ripple_basics/utility/ripple_ByteOrder.cpp b/modules/ripple_basics/utility/ripple_ByteOrder.cpp
index 2b6851e2bf..72e0300287 100644
--- a/modules/ripple_basics/utility/ripple_ByteOrder.cpp
+++ b/modules/ripple_basics/utility/ripple_ByteOrder.cpp
@@ -6,7 +6,6 @@
 
 #ifdef WIN32
 
-//#include <windows.h>
 // from: http://stackoverflow.com/questions/3022552/is-there-any-standard-htonl-like-function-for-64-bits-integers-in-c
 // but we don't need to check the endianness
 uint64_t htobe64 (uint64_t value)
@@ -43,5 +42,3 @@ uint32_t be32toh (uint32_t value)
 }
 
 #endif
-
-// vim:ts=4
diff --git a/modules/ripple_basics/utility/ripple_ByteOrder.h b/modules/ripple_basics/utility/ripple_ByteOrder.h
index 02b709a7ab..9a60b8b37a 100644
--- a/modules/ripple_basics/utility/ripple_ByteOrder.h
+++ b/modules/ripple_basics/utility/ripple_ByteOrder.h
@@ -19,8 +19,6 @@ extern uint32_t htobe32 (uint32_t value);
 extern uint32_t be32toh (uint32_t value);
 
 #elif __APPLE__
-#include <libkern/OSByteOrder.h>
-
 #define htobe16(x) OSSwapHostToBigInt16(x)
 #define htole16(x) OSSwapHostToLittleInt16(x)
 #define be16toh(x) OSSwapBigToHostInt16(x)
@@ -37,10 +35,8 @@ extern uint32_t be32toh (uint32_t value);
 #define le64toh(x) OSSwapLittleToHostInt64(x)
 
 #elif defined(__FreeBSD__) || defined(__NetBSD__)
-#include <sys/endian.h>
 
 #elif defined(__OpenBSD__)
-#include <sys/types.h>
 #define be16toh(x) betoh16(x)
 #define be32toh(x) betoh32(x)
 #define be64toh(x) betoh64(x)
@@ -48,5 +44,3 @@ extern uint32_t be32toh (uint32_t value);
 #endif
 
 #endif
-
-// vim:ts=4
diff --git a/modules/ripple_basics/utility/ripple_PlatformMacros.h b/modules/ripple_basics/utility/ripple_PlatformMacros.h
index d6be4a2f44..86e081918e 100644
--- a/modules/ripple_basics/utility/ripple_PlatformMacros.h
+++ b/modules/ripple_basics/utility/ripple_PlatformMacros.h
@@ -14,7 +14,6 @@
 // VFALCO TODO replace BIND_TYPE with a namespace lift
 
 #define C11X
-#include                <functional>
 #define UPTR_T          std::unique_ptr
 #define MOVE_P(p)       std::move(p)
 #define BIND_TYPE       std::bind
diff --git a/modules/ripple_data/crypto/ripple_RFC1751.cpp b/modules/ripple_data/crypto/ripple_RFC1751.cpp
index 9c1e9ef393..2bab8f2a70 100644
--- a/modules/ripple_data/crypto/ripple_RFC1751.cpp
+++ b/modules/ripple_data/crypto/ripple_RFC1751.cpp
@@ -8,16 +8,6 @@
 // RFC 1751 code converted to C++/Boost.
 //
 
-// VFALCO TODO move these
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/trim.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/foreach.hpp>
-#include <boost/range/adaptor/copied.hpp>
-#include <string>
-#include <vector>
-
 char const* RFC1751::s_dictionary [2048] =
 {
     "A", "ABE", "ACE", "ACT", "AD", "ADA", "ADD",
diff --git a/modules/ripple_data/ripple_data.cpp b/modules/ripple_data/ripple_data.cpp
index d8a9981b94..49fc0392b9 100644
--- a/modules/ripple_data/ripple_data.cpp
+++ b/modules/ripple_data/ripple_data.cpp
@@ -18,14 +18,18 @@
 #include <iomanip>
 #include <iostream>
 #include <map>
+#include <string>
 #include <vector>
 
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/range/adaptor/copied.hpp>
 #include <boost/regex.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/modules/ripple_json/json/json.h b/modules/ripple_json/json/json.h
deleted file mode 100644
index 69d2c99729..0000000000
--- a/modules/ripple_json/json/json.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#ifndef JSON_JSON_H_INCLUDED
-#define JSON_JSON_H_INCLUDED
-
-#include "autolink.h"
-#include "value.h"
-#include "reader.h"
-#include "writer.h"
-#include "features.h"
-
-#endif
-