17 files changed, 31 insertions, 1 deletions
diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index 784aa7864533..e8e5a01f6531 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_ado,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_CppunitTest_use_external,connectivity_ado,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_api,connectivity_ado,\
     udkapi \
     offapi \
diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk
index 987dd5773fa6..68420d9249ac 100644
--- a/connectivity/CppunitTest_connectivity_mork.mk
+++ b/connectivity/CppunitTest_connectivity_mork.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_mork,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_CppunitTest_use_external,connectivity_mork,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_api,connectivity_mork,\
     udkapi \
     offapi \
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index aedd21bb3347..3f5ce099b668 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,calc))
 
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
+$(eval $(call gb_Library_use_external,calc,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,calc))
 
 $(eval $(call gb_Library_set_include,calc,\
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 0dbb517bd6ae..35c7f797d4f3 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,dbase))
 
 $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
 
+$(eval $(call gb_Library_use_external,dbase,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,dbase))
 
 $(eval $(call gb_Library_set_include,dbase,\
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 964f9f372950..1e063eacd2a9 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_Library_set_include,dbtools,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,dbtools,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,dbtools))
 
 $(eval $(call gb_Library_use_libraries,dbtools,\
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 687245571f13..fe6ee4703d7c 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_set_include,evoab,\
 ))
 
 $(eval $(call gb_Library_use_externals,evoab,\
+	boost_headers \
 	gtk \
 	gobject \
 ))
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index 551b6cdbcc6a..47a3f072e95a 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -39,6 +39,8 @@ $(eval $(call gb_Library_set_include,file,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,file,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,file))
 
 $(eval $(call gb_Library_use_libraries,file,\
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 2eba9652567f..a5bc6e78e71e 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,flat))
 
 $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
 
+$(eval $(call gb_Library_use_external,flat,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,flat))
 
 $(eval $(call gb_Library_set_precompiled_header,flat,$(SRCDIR)/connectivity/inc/pch/precompiled_flat))
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index 8521ae3107d9..37655e7b8d31 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_set_include,hsqldb,\
 ))
 
 $(eval $(call gb_Library_use_externals,hsqldb,\
+	boost_headers \
 	hsqldb \
 ))
 
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 23b755374e55..248470483c80 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,jdbc))
 
 $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
 
+$(eval $(call gb_Library_use_external,jdbc,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,jdbc))
 
 $(eval $(call gb_Library_set_include,jdbc,\
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 1e565e81e281..be18decf5af8 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -20,6 +20,8 @@ $(eval $(call gb_Library_set_include,mork,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,mork,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,mork, \
     comphelper \
     cppu \
diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk
index 4b4b78927229..74ed37a9f95b 100644
--- a/connectivity/Library_mozab.mk
+++ b/connectivity/Library_mozab.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,mozab2,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,mozab2,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,mozab2))
 
 $(eval $(call gb_Library_use_libraries,mozab2,\
diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index 99944b372162..b5b2f3ae5995 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\
 ))
 
 $(eval $(call gb_Library_use_externals,mozabdrv,\
+	boost_headers \
 	mozilla \
 	nss3 \
 ))
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 4e05e402e1e1..9d2d09589b9e 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,mysql))
 
 $(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
 
+$(eval $(call gb_Library_use_external,mysql,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,mysql))
 
 $(eval $(call gb_Library_set_include,mysql,\
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index 8335f7e0b1b5..3e4066ce0ec0 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -41,7 +41,10 @@ $(eval $(call gb_Library_add_defs,odbcbase,\
 	-DOOO_DLLIMPLEMENTATION_ODBCBASE \
 ))
 
-$(eval $(call gb_Library_use_external,odbcbase,odbc_headers))
+$(eval $(call gb_Library_use_externals,odbcbase,\
+	boost_headers \
+	odbc_headers \
+))
 
 $(eval $(call gb_Library_use_libraries,odbcbase,\
 	cppu \
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index a69e3d86256a..37c40746c7cf 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -58,6 +58,7 @@ endif
 endif
 
 $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
+	boost_headers \
 	postgresql \
 ))
 
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index 7f030f1d53cd..c79c2ad1431c 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,sdbc2))
 
 $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
 
+$(eval $(call gb_Library_use_external,sdbc2,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,sdbc2))