diff --git a/gtsam/inference/GenericMultifrontalSolver-inl.h b/gtsam/inference/GenericMultifrontalSolver-inl.h
index 6fb135009..652db02ca 100644
--- a/gtsam/inference/GenericMultifrontalSolver-inl.h
+++ b/gtsam/inference/GenericMultifrontalSolver-inl.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <gtsam/inference/GenericMultifrontalSolver.h>
 #include <gtsam/inference/Factor-inl.h>
 #include <gtsam/inference/JunctionTree.h>
 #include <gtsam/inference/BayesNet-inl.h>
diff --git a/gtsam/inference/GenericMultifrontalSolver.h b/gtsam/inference/GenericMultifrontalSolver.h
index 4900a5a16..5d6cc74ef 100644
--- a/gtsam/inference/GenericMultifrontalSolver.h
+++ b/gtsam/inference/GenericMultifrontalSolver.h
@@ -111,3 +111,4 @@ namespace gtsam {
 
 } // gtsam
 
+#include <gtsam/inference/GenericMultifrontalSolver-inl.h>
diff --git a/gtsam/inference/ISAM-inl.h b/gtsam/inference/ISAM-inl.h
index 1daab686f..5d72f396c 100644
--- a/gtsam/inference/ISAM-inl.h
+++ b/gtsam/inference/ISAM-inl.h
@@ -22,9 +22,8 @@
 using namespace boost::assign;
 
 #include <gtsam/inference/Conditional.h>
-#include <gtsam/inference/ISAM.h>
-#include <gtsam/inference/BayesTree-inl.h>
-#include <gtsam/inference/GenericMultifrontalSolver-inl.h>
+#include <gtsam/inference/BayesTree.h>
+#include <gtsam/inference/GenericMultifrontalSolver.h>
 
 namespace gtsam {
 
diff --git a/gtsam/inference/ISAM.h b/gtsam/inference/ISAM.h
index a4ef047e5..11d653186 100644
--- a/gtsam/inference/ISAM.h
+++ b/gtsam/inference/ISAM.h
@@ -72,3 +72,5 @@ namespace gtsam {
 	};
 
 }/// namespace gtsam
+
+#include <gtsam/inference/ISAM-inl.h>
diff --git a/gtsam/inference/tests/testISAM.cpp b/gtsam/inference/tests/testISAM.cpp
index acb849b8b..8fdc78fc0 100644
--- a/gtsam/inference/tests/testISAM.cpp
+++ b/gtsam/inference/tests/testISAM.cpp
@@ -24,7 +24,7 @@ using namespace boost::assign;
 #include <gtsam/inference/BayesNet.h>
 #include <gtsam/inference/IndexConditional.h>
 #include <gtsam/inference/SymbolicFactorGraph.h>
-#include <gtsam/inference/ISAM-inl.h>
+#include <gtsam/inference/ISAM.h>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/linear/GaussianISAM.cpp b/gtsam/linear/GaussianISAM.cpp
index 4402d8b05..6207d6ac7 100644
--- a/gtsam/linear/GaussianISAM.cpp
+++ b/gtsam/linear/GaussianISAM.cpp
@@ -19,7 +19,7 @@
 #include <gtsam/linear/GaussianISAM.h>
 #include <gtsam/linear/GaussianBayesTree.h>
 
-#include <gtsam/inference/ISAM-inl.h>
+#include <gtsam/inference/ISAM.h>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/linear/GaussianMultifrontalSolver.cpp b/gtsam/linear/GaussianMultifrontalSolver.cpp
index 9e80b7c29..dd0589965 100644
--- a/gtsam/linear/GaussianMultifrontalSolver.cpp
+++ b/gtsam/linear/GaussianMultifrontalSolver.cpp
@@ -18,8 +18,6 @@
 #include <gtsam/3rdparty/Eigen/Eigen/Dense>
 #include <gtsam/linear/GaussianMultifrontalSolver.h>
 
-#include <gtsam/inference/GenericMultifrontalSolver-inl.h>
-
 namespace gtsam {
 
 /* ************************************************************************* */
diff --git a/gtsam/linear/GaussianSequentialSolver.cpp b/gtsam/linear/GaussianSequentialSolver.cpp
index 42bce03ce..08b2461e8 100644
--- a/gtsam/linear/GaussianSequentialSolver.cpp
+++ b/gtsam/linear/GaussianSequentialSolver.cpp
@@ -19,8 +19,6 @@
 #include <gtsam/base/timing.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
 
-#include <gtsam/inference/GenericSequentialSolver-inl.h>
-
 namespace gtsam {
 
 /* ************************************************************************* */