diff --git a/gtsam_unstable/base/DSFMap.h b/gtsam/base/DSFMap.h
similarity index 100%
rename from gtsam_unstable/base/DSFMap.h
rename to gtsam/base/DSFMap.h
diff --git a/gtsam_unstable/base/tests/testDSFMap.cpp b/gtsam/base/tests/testDSFMap.cpp
similarity index 97%
rename from gtsam_unstable/base/tests/testDSFMap.cpp
rename to gtsam/base/tests/testDSFMap.cpp
index 9c9143a15..5ffa0d12a 100644
--- a/gtsam_unstable/base/tests/testDSFMap.cpp
+++ b/gtsam/base/tests/testDSFMap.cpp
@@ -16,7 +16,7 @@
  * @brief unit tests for DSFMap
  */
 
-#include <gtsam_unstable/base/DSFMap.h>
+#include <gtsam/base/DSFMap.h>
 
 #include <boost/assign/std/list.hpp>
 #include <boost/assign/std/set.hpp>
@@ -115,7 +115,6 @@ TEST(DSFMap, mergePairwiseMatches2) {
 TEST(DSFMap, sets){
   // Create some "matches"
   typedef pair<size_t,size_t> Match;
-  typedef pair<size_t, set<size_t> > key_pair;
   list<Match> matches;
   matches += Match(1,2), Match(2,3), Match(4,5), Match(4,6);
 
diff --git a/gtsam/linear/SubgraphSolver.cpp b/gtsam/linear/SubgraphSolver.cpp
index 406109758..e7ff38ca5 100644
--- a/gtsam/linear/SubgraphSolver.cpp
+++ b/gtsam/linear/SubgraphSolver.cpp
@@ -22,7 +22,7 @@
 #include <gtsam/linear/iterative-inl.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/SubgraphPreconditioner.h>
-#include <gtsam_unstable/base/DSFMap.h>
+#include <gtsam/base/DSFMap.h>
 
 #include <iostream>
 
diff --git a/gtsam_unstable/timing/timeDSFvariants.cpp b/gtsam_unstable/timing/timeDSFvariants.cpp
index f39bdda59..378d2b572 100644
--- a/gtsam_unstable/timing/timeDSFvariants.cpp
+++ b/gtsam_unstable/timing/timeDSFvariants.cpp
@@ -18,7 +18,7 @@
 
 #include <gtsam/base/DSFVector.h>
 #include <gtsam_unstable/base/DSF.h>
-#include <gtsam_unstable/base/DSFMap.h>
+#include <gtsam/base/DSFMap.h>
 
 #include <boost/random.hpp>
 #include <boost/timer.hpp>