12 files changed, 28 insertions, 0 deletions
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 2fb57a29cca9..fea943cd77c3 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_Library_set_include,jdbc,\
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
+$(eval $(call gb_Library_use_common_precompiled_header,jdbc))
+
 $(eval $(call gb_Library_use_libraries,jdbc,\
 	cppu \
 	cppuhelper \
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 58d9319c18e7..dfb6b1b38e02 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -20,6 +20,8 @@ $(eval $(call gb_Library_set_include,pcr,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_common_precompiled_header,pcr))
+
 $(eval $(call gb_Library_use_external,pcr,boost_headers))
 
 $(eval $(call gb_Library_use_libraries,pcr,\
diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk
index 679114e67f68..2dcab32717b6 100644
--- a/filter/Library_gie.mk
+++ b/filter/Library_gie.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_use_custom_headers,gie,\
 	officecfg/registry \
 ))
 
+$(eval $(call gb_Library_use_common_precompiled_header,gie))
+
 $(eval $(call gb_Library_use_libraries,gie,\
     basegfx \
     comphelper \
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index ad4991920a88..9fff80622074 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Library_use_libraries,localedata_euro,\
 	localedata_en \
 ))
 
+$(eval $(call gb_Library_use_common_precompiled_header,localedata_euro))
+
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
 	CustomTarget/i18npool/localedata/localedata_an_ES \
 	CustomTarget/i18npool/localedata/localedata_ast_ES \
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index 6b395b231a5f..ef546297653f 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Library_use_libraries,localedata_others,\
 	localedata_en \
 ))
 
+$(eval $(call gb_Library_use_common_precompiled_header,localedata_others))
+
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
 	CustomTarget/i18npool/localedata/localedata_af_NA \
 	CustomTarget/i18npool/localedata/localedata_af_ZA \
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 0da579ef95e5..1da101b31a4b 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -129,11 +129,17 @@ gb_PrecompiledHeader_ignore_flags_system := \
 -DFASTSAX_DLLIMPLEMENTATION \
 -DSAX_DLLIMPLEMENTATION \
 -DSCQAHELPER_DLLIMPLEMENTATION \
+-DVCLPLUG_WIN_IMPLEMENTATION \
+-DVCLPLUG_GEN_IMPLEMENTATION \
 -DSYSTEM_EXPAT \
 -DSYSTEM_LIBXML \
 -DSYSTEM_ZLIB \
+-DHAVE_VALGRIND_HEADERS \
+-DUSE_RANDR \
+-DUSE_XINERAMA_XORG \
 -DDISABLE_CVE_TESTS \
 -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' \
+-DOOO_DLLIMPLEMENTATION_TEST \
 -include $(SRCDIR)/pch/inc/clangfix.hxx \
 
 # Probably also update pch/inc/clangfix.hxx if you extend the list.
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index aaa357ef63b8..0715cc47af63 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_Library_add_defs,subsequenttest,\
 	-DOOO_DLLIMPLEMENTATION_TEST \
 ))
 
+$(eval $(call gb_Library_use_common_precompiled_header,subsequenttest))
+
 $(eval $(call gb_Library_use_sdk_api,subsequenttest))
 
 $(eval $(call gb_Library_use_libraries,subsequenttest,\
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 01189a158d34..e19323a20388 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_Library_use_custom_headers,vclplug_gen,\
 
 $(eval $(call gb_Library_use_sdk_api,vclplug_gen))
 
+$(eval $(call gb_Library_use_common_precompiled_header,vclplug_gen))
+
 $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     vcl \
     tl \
diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk
index f64cc0392d13..2b05aae476b3 100644
--- a/vcl/Library_vclplug_win.mk
+++ b/vcl/Library_vclplug_win.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_use_custom_headers,vclplug_win,\
 
 $(eval $(call gb_Library_use_sdk_api,vclplug_win))
 
+$(eval $(call gb_Library_use_common_precompiled_header,vclplugin_win))
+
 $(eval $(call gb_Library_use_libraries,vclplug_win,\
     $(call gb_Helper_optional,BREAKPAD, \
         crashreport) \
diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk
index 9466fa47925b..611dad981acf 100644
--- a/winaccessibility/Library_winaccessibility.mk
+++ b/winaccessibility/Library_winaccessibility.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_sdk_api,winaccessibility))
 
 $(eval $(call gb_Library_set_componentfile,winaccessibility,winaccessibility/source/service/winaccessibility))
 
+$(eval $(call gb_Library_use_common_precompiled_header,winaccessibility))
+
 $(eval $(call gb_Library_add_exception_objects,winaccessibility,\
 	winaccessibility/source/service/AccObject \
 	winaccessibility/source/service/ResIDGenerator \
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
index 163396a528d3..54ad1beb8e27 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/source/draw/wp
 
 $(eval $(call gb_Library_use_sdk_api,wpftdraw))
 
+$(eval $(call gb_Library_use_common_precompiled_header,wpftdraw))
+
 $(eval $(call gb_Library_use_libraries,wpftdraw,\
 	comphelper \
 	cppu \
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index 0ea6756e15a4..8993cca31490 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/source/write
 
 $(eval $(call gb_Library_use_sdk_api,wpftwriter))
 
+$(eval $(call gb_Library_use_common_precompiled_header,wpftwriter))
+
 $(eval $(call gb_Library_use_libraries,wpftwriter,\
 	comphelper \
 	cppu \