14 files changed, 33 insertions, 3 deletions
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index bbfb56fe1eea..9e833e99bc5c 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Executable_use_packages,nsplugin,\
     tools_inc \
 ))
 
+$(eval $(call gb_Executable_use_external,nsplugin,boost_headers))
+
 $(eval $(call gb_Executable_use_sdk_api,nsplugin))
 
 $(eval $(call gb_Executable_add_exception_objects,nsplugin,\
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 49195c09de58..8aa4569ba401 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -53,6 +53,8 @@ $(eval $(call gb_Library_add_defs,abp,\
 	-DCOMPMOD_RESPREFIX=abp \
 ))
 
+$(eval $(call gb_Library_use_external,abp,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,abp))
 
 $(eval $(call gb_Library_add_exception_objects,abp,\
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index cd0cc2fcc6de..320dbd9b0460 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_Library_set_include,bib,\
 	-I$(SRCDIR)/extensions/inc \
 ))
 
+$(eval $(call gb_Library_use_external,bib,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,bib))
 
 $(eval $(call gb_Library_add_exception_objects,bib,\
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 47b64e5ed832..0c3ca370cf6f 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_defs,dbp,\
 	-DCOMPMOD_NAMESPACE=dbp \
 ))
 
+$(eval $(call gb_Library_use_external,dbp,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,dbp))
 
 $(eval $(call gb_Library_add_exception_objects,dbp,\
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 05a5186c03bb..8dd0a6eadd13 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Library_use_packages,log,\
 
 $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log))
 
+$(eval $(call gb_Library_use_external,log,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,log))
 
 $(eval $(call gb_Library_add_exception_objects,log,\
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index adbf359271c9..7aec0c2231f9 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_ldflags,oleautobridge,\
 	-LIBPATH:$(ATL_LIB) \
 ))
 
+$(eval $(call gb_Library_use_external,oleautobridge,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,oleautobridge,\
 	comphelper \
 	cppuhelper \
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
index b6fee4918d9c..7a609f876832 100644
--- a/extensions/Library_oleautobridge2.mk
+++ b/extensions/Library_oleautobridge2.mk
@@ -46,6 +46,8 @@ $(eval $(call gb_Library_add_ldflags,oleautobridge2,\
 	-LIBPATH:$(ATL_LIB) \
 ))
 
+$(eval $(call gb_Library_use_external,oleautobridge2,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,oleautobridge2,\
 	comphelper \
 	cppuhelper \
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 690a3cd28256..1502ce1e6c95 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -37,6 +37,8 @@ $(eval $(call gb_Library_set_include,pcr,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,pcr,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,pcr,\
 	svx \
 	svxcore \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 92e707faf2d5..9d885469af39 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -34,7 +34,10 @@ $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
 
 $(eval $(call gb_Library_use_package,pl,np_sdk_inc))
 
-$(eval $(call gb_Library_use_external,pl,npapi_headers))
+$(eval $(call gb_Library_use_externals,pl,\
+	boost_headers \
+	npapi_headers \
+))
 
 $(eval $(call gb_Library_set_include,pl,\
 	$$(INCLUDE) \
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index 3297b14200dd..8dd2064cb483 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_Library,res))
 
 $(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res))
 
+$(eval $(call gb_Library_use_external,res,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,res))
 
 $(eval $(call gb_Library_use_libraries,res,\
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index d64c16d60ff6..aec8e251b767 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -29,6 +29,7 @@
 $(eval $(call gb_Library_Library,scn))
 
 $(eval $(call gb_Library_use_externals,scn,\
+	boost_headers \
     sane_headers \
 ))
 
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 4ddad271c8a6..623239204980 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_use_packages,updatecheckui,\
     sfx2_inc \
 ))
 
+$(eval $(call gb_Library_use_external,updatecheckui,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,updatecheckui))
 
 $(eval $(call gb_Library_use_libraries,updatecheckui,\
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index 602d43474109..182f7f5a8d66 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -60,7 +60,10 @@ $(eval $(call gb_Library_add_exception_objects,updchk,\
 ))
 endif # OS WNT
 
-$(eval $(call gb_Library_use_external,updchk,curl))
+$(eval $(call gb_Library_use_external,updchk,\
+	boost_headers \
+    curl \
+))
 
 $(eval $(call gb_Library_add_exception_objects,updchk,\
 	extensions/source/update/check/download \
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index bb073e7d2f7d..4779f419be83 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -42,7 +42,10 @@ $(eval $(call gb_StaticLibrary_use_packages,plugcon,\
     vcl_inc \
 ))
 
-$(eval $(call gb_StaticLibrary_use_external,plugcon,npapi_headers))
+$(eval $(call gb_StaticLibrary_use_externals,plugcon,\
+    boost_headers \
+    npapi_headers \
+))
 
 $(eval $(call gb_StaticLibrary_set_include,plugcon,\
 	$$(INCLUDE) \