diff --git a/modules/ripple_basics/utility/ripple_PlatformMacros.h b/modules/ripple_basics/utility/ripple_PlatformMacros.h
index 8f287d4182..75beb8aa9c 100644
--- a/modules/ripple_basics/utility/ripple_PlatformMacros.h
+++ b/modules/ripple_basics/utility/ripple_PlatformMacros.h
@@ -16,17 +16,18 @@
 
 // VFALCO TODO Clean this up
 
-#ifdef BOOST_NO_AUTO_PTR
-# define UPTR_T          std::auto_ptr
-#else
-# define UPTR_T          std::unique_ptr
-#endif
-
 #if (!defined(FORCE_NO_C11X) && (__cplusplus > 201100L)) || defined(FORCE_C11X)
-//#define C11X
+
+// VFALCO TODO Get rid of the C11X macro
+#define C11X
+#define UPTR_T          std::unique_ptr
 #define MOVE_P(p)       std::move(p)
+
 #else
+
+#define UPTR_T          std::auto_ptr
 #define MOVE_P(p)       (p)
+
 #endif
 
 // VFALCO TODO Clean this stuff up. Remove as much as possible