diff --git a/daemon/contrib/src/boost-headers/rules.mak b/daemon/contrib/src/boost-headers/rules.mak
index 1dfc64485a93d9cc490499f0271f28536cc61022..ca835b18267f248683ae119553f8327d296a9392 100644
--- a/daemon/contrib/src/boost-headers/rules.mak
+++ b/daemon/contrib/src/boost-headers/rules.mak
@@ -8,7 +8,10 @@ $(TARBALLS)/boost-headers.tar.gz:
 
 boost-headers: boost-headers.tar.gz .sum-boost-headers
 	$(UNPACK)
-	mv boost-headers.git boost
+	mv boost-headers.git $@
+	touch $@
 
 .boost-headers: boost-headers
+	mkdir -p ../$(HOST)/include
+	cp -rf $< ../$(HOST)/include/boost
 	touch $@
diff --git a/daemon/contrib/src/yaml-cpp/rules.mak b/daemon/contrib/src/yaml-cpp/rules.mak
index 371004efbbd01435f29a09b108046bedd972bc64..1087f61725d9d6b44c92b1386c15959e27aaea3a 100644
--- a/daemon/contrib/src/yaml-cpp/rules.mak
+++ b/daemon/contrib/src/yaml-cpp/rules.mak
@@ -12,7 +12,7 @@ DEPS_yaml-cpp = boost-headers $(DEPS_boost-headers)
 
 YAML_CPP_CMAKECONF := -DBUILD_STATIC:BOOL=ON \
                       -DBUILD_SHARED:BOOL=OFF \
-                      -DBoost_INCLUDE_DIR=../ \
+                      -DBoost_INCLUDE_DIR=../../$(HOST)/include \
                       -DBUILD_SHARED_LIBS:BOOL=OFF
 
 $(TARBALLS)/yaml-cpp-$(YAML_CPP_VERSION).tar.gz: