diff --git a/gtsam/gtsam.i b/gtsam/gtsam.i
index 007686360..714910b7b 100644
--- a/gtsam/gtsam.i
+++ b/gtsam/gtsam.i
@@ -1850,7 +1850,7 @@ class GaussianFactorGraph {
 };
 
 #include <gtsam/linear/GaussianConditional.h>
-virtual class GaussianConditional : gtsam::GaussianFactor {
+virtual class GaussianConditional : gtsam::JacobianFactor {
   //Constructors
   GaussianConditional(size_t key, Vector d, Matrix R, const gtsam::noiseModel::Diagonal* sigmas);
   GaussianConditional(size_t key, Vector d, Matrix R, size_t name1, Matrix S,
diff --git a/gtsam/linear/LossFunctions.h b/gtsam/linear/LossFunctions.h
index 4705721a0..4e6a2b609 100644
--- a/gtsam/linear/LossFunctions.h
+++ b/gtsam/linear/LossFunctions.h
@@ -28,6 +28,7 @@
 #include <boost/serialization/optional.hpp>
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/serialization/singleton.hpp>
+#include <boost/serialization/version.hpp>
 
 namespace gtsam {
 namespace noiseModel {
diff --git a/gtsam/linear/SubgraphBuilder.h b/gtsam/linear/SubgraphBuilder.h
index 5247ea2a2..88c771ba5 100644
--- a/gtsam/linear/SubgraphBuilder.h
+++ b/gtsam/linear/SubgraphBuilder.h
@@ -23,6 +23,7 @@
 
 #include <boost/serialization/nvp.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/serialization/version.hpp>
 
 #include <vector>