diff --git a/gtsam.h b/gtsam.h
index 8e558b554..47f659a25 100644
--- a/gtsam.h
+++ b/gtsam.h
@@ -1548,15 +1548,6 @@ class KalmanFilter {
       Vector z, Matrix Q);
 };
 
-#include <gtsam/linear/QPSolver.h>
-class QPSolver {
-  QPSolver(const gtsam::GaussianFactorGraph &graph);
-  pair<gtsam::VectorValues, gtsam::VectorValues> optimize(const gtsam::VectorValues& initials) const;
-  pair<gtsam::VectorValues, gtsam::VectorValues> optimize() const;
-  pair<bool, gtsam::VectorValues> findFeasibleInitialValues() const;
-};
-
-
 //*************************************************************************
 // nonlinear
 //*************************************************************************
diff --git a/gtsam_unstable/gtsam_unstable.h b/gtsam_unstable/gtsam_unstable.h
index f2223c2f4..eea83c276 100644
--- a/gtsam_unstable/gtsam_unstable.h
+++ b/gtsam_unstable/gtsam_unstable.h
@@ -47,6 +47,15 @@ class Dummy {
   unsigned char dummyTwoVar(unsigned char a) const;
 };
 
+#include <gtsam_unstable/linear/QPSolver.h>
+class QPSolver {
+  QPSolver(const gtsam::GaussianFactorGraph &graph);
+  pair<gtsam::VectorValues, gtsam::VectorValues> optimize(const gtsam::VectorValues& initials) const;
+  pair<gtsam::VectorValues, gtsam::VectorValues> optimize() const;
+  pair<bool, gtsam::VectorValues> findFeasibleInitialValues() const;
+};
+
+
 #include <gtsam_unstable/dynamics/PoseRTV.h>
 virtual class PoseRTV : gtsam::Value {
   PoseRTV();