diff --git a/src/libqof/qof/kvp-value.cpp b/src/libqof/qof/kvp-value.cpp
index 771f0bee71..bbf6ccd634 100644
--- a/src/libqof/qof/kvp-value.cpp
+++ b/src/libqof/qof/kvp-value.cpp
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <sstream>
 #include <iomanip>
+#include <stdexcept>
 #include "kvp_frame-p.hpp"
 
 KvpValueImpl::KvpValueImpl(KvpValueImpl const & other) noexcept
diff --git a/src/libqof/qof/kvp-value.hpp b/src/libqof/qof/kvp-value.hpp
index e56a369da2..4c1b1ae73f 100644
--- a/src/libqof/qof/kvp-value.hpp
+++ b/src/libqof/qof/kvp-value.hpp
@@ -27,8 +27,10 @@ extern "C"
 #include "config.h"
 #include "qof.h"
 }
-
+#include <boost/version.hpp>
+#if BOOST_VERSION == 105600
 #include <boost/type_traits/is_nothrow_move_assignable.hpp>
+#endif
 #include <boost/variant.hpp>
 
 struct KvpValueImpl