diff --git a/examples/vSLAMexample/vISAMexample.cpp b/examples/vSLAMexample/vISAMexample.cpp
index 300124c4e..ed3a68ba8 100644
--- a/examples/vSLAMexample/vISAMexample.cpp
+++ b/examples/vSLAMexample/vISAMexample.cpp
@@ -27,9 +27,7 @@ using namespace boost;
 #include <gtsam/inference/graph-inl.h>
 #include <gtsam/slam/visualSLAM.h>
 #include <gtsam/slam/PriorFactor.h>
-#include <gtsam/inference/ISAM-inl.h>
-#include <gtsam/linear/GaussianISAM.h>
-#include <gtsam/nonlinear/NonlinearISAM-inl.h>
+#include <gtsam/nonlinear/NonlinearISAM.h>
 
 #include "vSLAMutils.h"
 #include "Feature2D.h"
diff --git a/gtsam/nonlinear/GaussianISAM2.cpp b/gtsam/nonlinear/GaussianISAM2.cpp
index 6c75f96a3..7df21bf2c 100644
--- a/gtsam/nonlinear/GaussianISAM2.cpp
+++ b/gtsam/nonlinear/GaussianISAM2.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <gtsam/nonlinear/GaussianISAM2.h>
-#include <gtsam/nonlinear/ISAM2-inl.h>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/nonlinear/ISAM2-inl.h b/gtsam/nonlinear/ISAM2-inl.h
index 3f68d2db4..0519af50c 100644
--- a/gtsam/nonlinear/ISAM2-inl.h
+++ b/gtsam/nonlinear/ISAM2-inl.h
@@ -27,7 +27,6 @@ using namespace boost::assign;
 #include <gtsam/inference/BayesTree-inl.h>
 #include <gtsam/linear/HessianFactor.h>
 
-#include <gtsam/nonlinear/ISAM2.h>
 #include <gtsam/nonlinear/ISAM2-impl-inl.h>
 
 
diff --git a/gtsam/nonlinear/ISAM2.h b/gtsam/nonlinear/ISAM2.h
index a2ee6f8e4..1fd077c3c 100644
--- a/gtsam/nonlinear/ISAM2.h
+++ b/gtsam/nonlinear/ISAM2.h
@@ -250,3 +250,5 @@ private:
 }; // ISAM2
 
 } /// namespace gtsam
+
+#include <gtsam/nonlinear/ISAM2-inl.h>
diff --git a/gtsam/nonlinear/NonlinearISAM-inl.h b/gtsam/nonlinear/NonlinearISAM-inl.h
index 478a351a3..16ec47247 100644
--- a/gtsam/nonlinear/NonlinearISAM-inl.h
+++ b/gtsam/nonlinear/NonlinearISAM-inl.h
@@ -24,7 +24,6 @@
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/inference/ISAM-inl.h>
 #include <gtsam/nonlinear/Ordering.h>
-#include <gtsam/nonlinear/NonlinearISAM.h>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/nonlinear/NonlinearISAM.h b/gtsam/nonlinear/NonlinearISAM.h
index 1eb6e66e2..8c6d2499d 100644
--- a/gtsam/nonlinear/NonlinearISAM.h
+++ b/gtsam/nonlinear/NonlinearISAM.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <gtsam/linear/GaussianConditional.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/linear/GaussianISAM.h>
 
@@ -102,3 +101,5 @@ public:
 };
 
 } // \namespace gtsam
+
+#include <gtsam/nonlinear/NonlinearISAM-inl.h>
diff --git a/tests/testGaussianISAM2.cpp b/tests/testGaussianISAM2.cpp
index 6c96c7134..ad9855fa5 100644
--- a/tests/testGaussianISAM2.cpp
+++ b/tests/testGaussianISAM2.cpp
@@ -18,7 +18,6 @@ using namespace boost::assign;
 #include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
 #include <gtsam/nonlinear/GaussianISAM2.h>
-#include <gtsam/nonlinear/ISAM2-inl.h>
 #include <gtsam/slam/smallExample.h>
 #include <gtsam/slam/planarSLAM.h>
 
diff --git a/tests/testNonlinearISAM.cpp b/tests/testNonlinearISAM.cpp
index a7f3bb285..b90e98625 100644
--- a/tests/testNonlinearISAM.cpp
+++ b/tests/testNonlinearISAM.cpp
@@ -6,7 +6,7 @@
 #include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/linear/Sampler.h>
-#include <gtsam/nonlinear/NonlinearISAM-inl.h>
+#include <gtsam/nonlinear/NonlinearISAM.h>
 #include <gtsam/slam/planarSLAM.h>
 
 using namespace gtsam;