diff --git a/gtsam/linear/GaussianBayesNet.cpp b/gtsam/linear/GaussianBayesNet.cpp index 9d261a003..c41846217 100644 --- a/gtsam/linear/GaussianBayesNet.cpp +++ b/gtsam/linear/GaussianBayesNet.cpp @@ -22,12 +22,11 @@ #include #include +#include + using namespace std; using namespace gtsam; -// Explicitly instantiate so we don't have to include everywhere -#include -template class BayesNet; // trick from some reading group #define FOREACH_PAIR( KEY, VAL, COL) BOOST_FOREACH (boost::tie(KEY,VAL),COL) @@ -35,6 +34,9 @@ template class BayesNet; namespace gtsam { +// Explicitly instantiate so we don't have to include everywhere +template class BayesNet; + /* ************************************************************************* */ GaussianBayesNet scalarGaussian(Index key, double mu, double sigma) { GaussianBayesNet bn; diff --git a/gtsam/linear/GaussianISAM.cpp b/gtsam/linear/GaussianISAM.cpp index d44c2f025..703f97c2d 100644 --- a/gtsam/linear/GaussianISAM.cpp +++ b/gtsam/linear/GaussianISAM.cpp @@ -18,15 +18,16 @@ #include #include +#include + using namespace std; using namespace gtsam; -// Explicitly instantiate so we don't have to include everywhere -#include -template class ISAM; - namespace gtsam { +// Explicitly instantiate so we don't have to include everywhere +template class ISAM; + /* ************************************************************************* */ GaussianFactor::shared_ptr GaussianISAM::marginalFactor(Index j) const { return Super::marginalFactor(j, &EliminateQR);