diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 222d46bf3d..2801a29a44 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -1635,6 +1635,7 @@
     <ClInclude Include="..\..\src\ripple\validators\api\Source.h" />
     <ClInclude Include="..\..\src\ripple\validators\api\Types.h" />
     <ClInclude Include="..\..\src\ripple\validators\api\Manager.h" />
+    <ClInclude Include="..\..\src\ripple\validators\impl\AgedHistory.h" />
     <ClInclude Include="..\..\src\ripple\validators\impl\CancelCallbacks.h" />
     <ClInclude Include="..\..\src\ripple\validators\impl\ChosenList.h" />
     <ClInclude Include="..\..\src\ripple\validators\impl\Logic.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index f217e80991..139a15303f 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -2115,6 +2115,9 @@
     <ClInclude Include="..\..\src\ripple_basics\containers\BlackList.h">
       <Filter>[2] Old Ripple\ripple_basics\containers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\validators\impl\AgedHistory.h">
+      <Filter>[1] Ripple\validators\impl</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto">
diff --git a/src/ripple/validators/impl/AgedHistory.h b/src/ripple/validators/impl/AgedHistory.h
new file mode 100644
index 0000000000..30950aedd9
--- /dev/null
+++ b/src/ripple/validators/impl/AgedHistory.h
@@ -0,0 +1,77 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs Inc.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+
+#ifndef RIPPLE_VALIDATORS_AGEDHISTORY_H_INCLUDED
+#define RIPPLE_VALIDATORS_AGEDHISTORY_H_INCLUDED
+
+namespace ripple {
+namespace Validators {
+
+// Simple container swapping template
+template <class Container>
+class AgedHistory
+{
+public:
+    typedef Container container_type;
+
+    AgedHistory()
+        : m_p1 (&m_c1)
+        , m_p2 (&m_c2)
+    {
+    }
+
+    AgedHistory (AgedHistory const& other)
+        : m_c1 (other.front())
+        , m_c2 (other.back())
+        , m_p1 (&m_c1)
+        , m_p2 (&m_c2)
+    {
+    }
+
+    AgedHistory& operator= (AgedHistory const& other)
+    {
+        m_c1 = other.front();
+        m_c2 = other.back();
+        m_p1 = &m_c1;
+        m_p2 = &m_c2;
+        return *this;
+    }
+
+    void swap () { std::swap (m_p1, m_p2); }
+
+    Container*       operator-> ()       { return m_p1; }
+    Container const* operator-> () const { return m_p1; }
+
+    Container&       front()       { return *m_p1; }
+    Container const& front() const { return *m_p1; }
+    Container&       back()        { return *m_p2; }
+    Container const& back()  const { return *m_p2; }
+
+private:
+    Container  m_c1;
+    Container  m_c2;
+    Container* m_p1;
+    Container* m_p2;
+};
+
+}
+}
+
+#endif
diff --git a/src/ripple/validators/impl/Logic.h b/src/ripple/validators/impl/Logic.h
index dfed43d060..d078beff0c 100644
--- a/src/ripple/validators/impl/Logic.h
+++ b/src/ripple/validators/impl/Logic.h
@@ -21,6 +21,8 @@
 #ifndef RIPPLE_VALIDATORS_LOGIC_H_INCLUDED
 #define RIPPLE_VALIDATORS_LOGIC_H_INCLUDED
 
+#include "AgedHistory.h"
+
 namespace ripple {
 namespace Validators {
 
@@ -46,53 +48,6 @@ enum
     maxSizeBeforeSwap    = 100
 };
 
-// Simple container swapping template
-template <class Container>
-class AgedHistory
-{
-public:
-    typedef Container container_type;
-
-    AgedHistory()
-        : m_p1 (&m_c1)
-        , m_p2 (&m_c2)
-    {
-    }
-
-    AgedHistory (AgedHistory const& other)
-        : m_c1 (other.front())
-        , m_c2 (other.back())
-        , m_p1 (&m_c1)
-        , m_p2 (&m_c2)
-    {
-    }
-
-    AgedHistory& operator= (AgedHistory const& other)
-    {
-        m_c1 = other.front();
-        m_c2 = other.back();
-        m_p1 = &m_c1;
-        m_p2 = &m_c2;
-        return *this;
-    }
-
-    void swap () { std::swap (m_p1, m_p2); }
-
-    Container*       operator-> ()       { return m_p1; }
-    Container const* operator-> () const { return m_p1; }
-
-    Container&       front()       { return *m_p1; }
-    Container const& front() const { return *m_p1; }
-    Container&       back()        { return *m_p2; }
-    Container const& back()  const { return *m_p2; }
-
-private:
-    Container  m_c1;
-    Container  m_c2;
-    Container* m_p1;
-    Container* m_p2;
-};
-
 //------------------------------------------------------------------------------
 
 struct Ledger