diff --git a/gtsam_unstable/nonlinear/ExpressionFactor.h b/gtsam_unstable/nonlinear/ExpressionFactor.h
index f763915e0..95c4d71a8 100644
--- a/gtsam_unstable/nonlinear/ExpressionFactor.h
+++ b/gtsam_unstable/nonlinear/ExpressionFactor.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <gtsam_unstable/nonlinear/Expression.h>
+#include <gtsam/nonlinear/Expression.h>
 #include <gtsam/nonlinear/NonlinearFactor.h>
 #include <gtsam/base/Testable.h>
 #include <numeric>
diff --git a/gtsam_unstable/nonlinear/expressionTesting.h b/gtsam_unstable/nonlinear/expressionTesting.h
index 92c8f71e8..4fd47eb76 100644
--- a/gtsam_unstable/nonlinear/expressionTesting.h
+++ b/gtsam_unstable/nonlinear/expressionTesting.h
@@ -19,14 +19,16 @@
 
 #pragma once
 
-#include "Expression.h"
-#include "ExpressionFactor.h"
+#include <gtsam_unstable/nonlinear/ExpressionFactor.h>
+#include <gtsam/nonlinear/Expression.h>
 #include <gtsam/base/Matrix.h>
 #include <gtsam/base/Testable.h>
+#include <gtsam/base/numericalDerivative.h>
+#include <gtsam/linear/VectorValues.h>
+
 #include <CppUnitLite/TestResult.h>
 #include <CppUnitLite/Test.h>
 #include <CppUnitLite/Failure.h>
-#include <gtsam/base/numericalDerivative.h>
 
 namespace gtsam {
 
diff --git a/gtsam_unstable/nonlinear/expressions.h b/gtsam_unstable/nonlinear/expressions.h
index eba85c33c..2490100d6 100644
--- a/gtsam_unstable/nonlinear/expressions.h
+++ b/gtsam_unstable/nonlinear/expressions.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <gtsam_unstable/nonlinear/Expression.h>
+#include <gtsam/nonlinear/Expression.h>
 #include <boost/bind.hpp>
 
 namespace gtsam {
diff --git a/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp b/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp
index cd281f4d8..a8151ec11 100644
--- a/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp
+++ b/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp
@@ -17,8 +17,9 @@
  * @brief unit tests for Block Automatic Differentiation
  */
 
+#include <gtsam_unstable/nonlinear/ceres_example.h>
 #include <gtsam_unstable/nonlinear/AdaptAutoDiff.h>
-#include <gtsam_unstable/nonlinear/Expression.h>
+#include <gtsam/nonlinear/Expression.h>
 #include <gtsam/geometry/PinholeCamera.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/geometry/Cal3_S2.h>
@@ -27,8 +28,6 @@
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/LieScalar.h>
 
-#include <gtsam_unstable/nonlinear/ceres_example.h>
-
 #include <CppUnitLite/TestHarness.h>
 
 #include <boost/assign/list_of.hpp>
diff --git a/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp b/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp
index bc2055c55..440400fb4 100644
--- a/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp
+++ b/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp
@@ -17,12 +17,7 @@
  * @brief unit tests for Block Automatic Differentiation
  */
 
-#include <gtsam_unstable/nonlinear/Expression.h>
-#include <gtsam_unstable/nonlinear/ExpressionFactor.h>
 #include <gtsam_unstable/nonlinear/expressionTesting.h>
-#include <gtsam/base/Testable.h>
-#include <gtsam/linear/VectorValues.h>
-
 #include <CppUnitLite/TestHarness.h>
 
 using namespace gtsam;
diff --git a/tests/testManifold.cpp b/tests/testManifold.cpp
index 32f04225f..1927ba5c6 100644
--- a/tests/testManifold.cpp
+++ b/tests/testManifold.cpp
@@ -22,9 +22,8 @@
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Cal3Bundler.h>
-#include <gtsam_unstable/nonlinear/Expression.h>
+#include <gtsam/base/Manifold.h>
 #include <gtsam/base/Testable.h>
-#include <gtsam/base/LieScalar.h>
 
 #undef CHECK
 #include <CppUnitLite/TestHarness.h>