diff --git a/gtsam/linear/GaussianFactorGraph.cpp b/gtsam/linear/GaussianFactorGraph.cpp
index ca06a9115..3be157d05 100644
--- a/gtsam/linear/GaussianFactorGraph.cpp
+++ b/gtsam/linear/GaussianFactorGraph.cpp
@@ -47,7 +47,7 @@ namespace gtsam {
 
   /* ************************************************************************* */
   GaussianFactorGraph::Keys GaussianFactorGraph::keys() const {
-    std::set<Index, std::less<Index>, boost::fast_pool_allocator<Index> > keys;
+    FastSet<Index> keys;
     BOOST_FOREACH(const sharedFactor& factor, *this) {
       if(factor) keys.insert(factor->begin(), factor->end()); }
     return keys;
diff --git a/gtsam/linear/GaussianFactorGraph.h b/gtsam/linear/GaussianFactorGraph.h
index 71d1d2088..b86b58696 100644
--- a/gtsam/linear/GaussianFactorGraph.h
+++ b/gtsam/linear/GaussianFactorGraph.h
@@ -21,6 +21,7 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <gtsam/base/FastSet.h>
 #include <gtsam/inference/FactorGraph.h>
 #include <gtsam/linear/Errors.h>
 #include <gtsam/linear/GaussianFactor.h>
@@ -93,7 +94,7 @@ namespace gtsam {
      * Return the set of variables involved in the factors (computes a set
      * union).
      */
-    typedef std::set<Index, std::less<Index>, boost::fast_pool_allocator<Index> > Keys;
+    typedef FastSet<Index> Keys;
     Keys keys() const;
 
     /** Permute the variables in the factors */
diff --git a/gtsam/nonlinear/LieValues.h b/gtsam/nonlinear/LieValues.h
index 7c6be82ce..55fd60daf 100644
--- a/gtsam/nonlinear/LieValues.h
+++ b/gtsam/nonlinear/LieValues.h
@@ -27,8 +27,7 @@
 #include <map>
 #include <set>
 
-#include <boost/pool/pool_alloc.hpp>
-
+#include <gtsam/base/FastMap.h>
 #include <gtsam/base/Vector.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/nonlinear/Ordering.h>
@@ -58,7 +57,7 @@ namespace gtsam {
      */
   	typedef J Key;
   	typedef typename J::Value Value;
-    typedef std::map<J,Value, std::less<J>, boost::fast_pool_allocator<std::pair<const J,Value> > > KeyValueMap;
+    typedef FastMap<J,Value> KeyValueMap;
     typedef typename KeyValueMap::value_type KeyValuePair;
     typedef typename KeyValueMap::iterator iterator;
     typedef typename KeyValueMap::const_iterator const_iterator;
diff --git a/gtsam/nonlinear/Ordering.h b/gtsam/nonlinear/Ordering.h
index 37c9706f3..06a73e80a 100644
--- a/gtsam/nonlinear/Ordering.h
+++ b/gtsam/nonlinear/Ordering.h
@@ -18,10 +18,7 @@
 
 #pragma once
 
-#include <map>
-
-
-
+#include <gtsam/base/FastMap.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/nonlinear/Key.h>
 #include <gtsam/inference/inference.h>