diff --git a/components/livestatus/hoststable.cpp b/components/livestatus/hoststable.cpp
index 5d07490b2..c33d19dff 100644
--- a/components/livestatus/hoststable.cpp
+++ b/components/livestatus/hoststable.cpp
@@ -33,6 +33,7 @@
 #include <boost/foreach.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/servicestable.cpp b/components/livestatus/servicestable.cpp
index b163f8df6..2b13b59e9 100644
--- a/components/livestatus/servicestable.cpp
+++ b/components/livestatus/servicestable.cpp
@@ -31,6 +31,7 @@
 #include "base/utility.h"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
 using namespace livestatus;
diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp
index 014e6d718..c566f7ba2 100644
--- a/lib/icinga/compatutility.cpp
+++ b/lib/icinga/compatutility.cpp
@@ -21,8 +21,11 @@
 #include "icinga/compatutility.h"
 #include "icinga/checkcommand.h"
 #include "icinga/eventcommand.h"
+#include "base/objectlock.h"
+#include "base/utility.h"
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 
diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index ef9f2882e..cf090dd88 100644
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -31,6 +31,7 @@
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/foreach.hpp>
 #include <boost/exception/diagnostic_information.hpp>
+#include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
 
diff --git a/lib/ido/dbconnection.cpp b/lib/ido/dbconnection.cpp
index 9b4de79b0..b7c0106e3 100644
--- a/lib/ido/dbconnection.cpp
+++ b/lib/ido/dbconnection.cpp
@@ -21,6 +21,7 @@
 #include "ido/dbvalue.h"
 #include "icinga/icingaapplication.h"
 #include "base/dynamictype.h"
+#include "base/utility.h"
 #include <boost/foreach.hpp>
 
 using namespace icinga;