diff --git a/cpp/BayesTree-inl.h b/cpp/BayesTree-inl.h
index 88a0b8069..56bbbd368 100644
--- a/cpp/BayesTree-inl.h
+++ b/cpp/BayesTree-inl.h
@@ -10,6 +10,7 @@
 #include <boost/assign/std/list.hpp> // for operator +=
 using namespace boost::assign;
 
+#include "Conditional.h"
 #include "BayesTree.h"
 #include "inference-inl.h"
 
diff --git a/cpp/BayesTree.h b/cpp/BayesTree.h
index fc3a52648..618026cef 100644
--- a/cpp/BayesTree.h
+++ b/cpp/BayesTree.h
@@ -13,6 +13,7 @@
 #include <vector>
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/list.hpp>
+#include <stdexcept>
 
 #include "Testable.h"
 #include "FactorGraph.h"
diff --git a/cpp/Conditional.h b/cpp/Conditional.h
index 914809603..4c955080b 100644
--- a/cpp/Conditional.h
+++ b/cpp/Conditional.h
@@ -10,6 +10,7 @@
 
 #include <boost/utility.hpp> // for noncopyable
 #include <boost/serialization/string.hpp>
+#include <boost/serialization/access.hpp>
 #include "Testable.h"
 
 namespace gtsam {