8 files changed, 18 insertions, 12 deletions
diff --git a/framework/prj/target_lib_fwe.mk b/framework/prj/target_lib_fwe.mk
index 9387cad85a..1cd47b05cb 100644
--- a/framework/prj/target_lib_fwe.mk
+++ b/framework/prj/target_lib_fwe.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,fwe))
 
-$(call gb_Library_get_headers_target,fwe) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwe,framework_inc))
 
 $(eval $(call gb_Library_set_include,fwe,\
     $$(INCLUDE) \
diff --git a/framework/prj/target_lib_fwi.mk b/framework/prj/target_lib_fwi.mk
index 0c1d9a63fe..1d53d9b1ab 100644
--- a/framework/prj/target_lib_fwi.mk
+++ b/framework/prj/target_lib_fwi.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,fwi))
 
-$(call gb_Library_get_headers_target,fwi) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
 
 $(eval $(call gb_Library_set_defs,fwi,\
     $$(DEFS) \
diff --git a/framework/prj/target_lib_fwk.mk b/framework/prj/target_lib_fwk.mk
index 272f57e7df..37b5fbcb58 100644
--- a/framework/prj/target_lib_fwk.mk
+++ b/framework/prj/target_lib_fwk.mk
@@ -27,14 +27,16 @@
 
 $(eval $(call gb_Library_Library,fwk))
 
-$(call gb_Library_get_headers_target,fwk) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwk,framework_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework))
 
 $(eval $(call gb_Library_set_include,fwk,\
-    $$(INCLUDE) \
-    -I$(WORKDIR)/inc/framework/ \
     -I$(SRCDIR)/framework/inc \
     -I$(SRCDIR)/framework/inc/pch \
     -I$(SRCDIR)/framework/source/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
     -I$(OUTDIR)/inc/offuh \
 ))
diff --git a/framework/prj/target_lib_fwl.mk b/framework/prj/target_lib_fwl.mk
index 8e549041ca..a43ab95444 100644
--- a/framework/prj/target_lib_fwl.mk
+++ b/framework/prj/target_lib_fwl.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,fwl))
 
-$(call gb_Library_get_headers_target,fwl) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwl,framework_inc))
 
 $(eval $(call gb_Library_set_include,fwl,\
     $$(INCLUDE) \
diff --git a/framework/prj/target_lib_fwm.mk b/framework/prj/target_lib_fwm.mk
index e0b4df3ef2..0c84ab2de2 100644
--- a/framework/prj/target_lib_fwm.mk
+++ b/framework/prj/target_lib_fwm.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,fwm))
 
-$(call gb_Library_get_headers_target,fwm) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwm,framework_inc))
 
 $(eval $(call gb_Library_set_include,fwm,\
     $$(INCLUDE) \
diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk
index 952fb9ce05..9c1dc852e6 100644
--- a/sfx2/prj/target_lib_sfx2.mk
+++ b/sfx2/prj/target_lib_sfx2.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_add_package_headers,sfx,\
     sfx2_sdi \
 ))
 
+#$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2))
+
 $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
 
 $(eval $(call gb_Library_set_include,sfx,\
diff --git a/xmloff/prj/target_lib_xo.mk b/xmloff/prj/target_lib_xo.mk
index d503388be3..5a13d5053f 100644
--- a/xmloff/prj/target_lib_xo.mk
+++ b/xmloff/prj/target_lib_xo.mk
@@ -27,7 +27,9 @@
 
 $(eval $(call gb_Library_Library,xo))
 
-$(call gb_Library_get_headers_target,xo) : $(call gb_Package_get_target,xo_inc)
+$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff))
 
 $(eval $(call gb_Library_set_include,xo,\
     $$(SOLARINC) \
diff --git a/xmloff/prj/target_lib_xof.mk b/xmloff/prj/target_lib_xof.mk
index a414106da3..320aafbf12 100644
--- a/xmloff/prj/target_lib_xof.mk
+++ b/xmloff/prj/target_lib_xof.mk
@@ -28,13 +28,13 @@
 $(eval $(call gb_Library_Library,xof))
 
 $(eval $(call gb_Library_set_include,xof,\
-    $$(SOLARINC) \
-    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/xmloff/inc/pch \
     -I$(SRCDIR)/xmloff/inc \
     -I$(SRCDIR)/xmloff/source/inc \
-    -I$(SRCDIR)/xmloff/inc/pch \
-    -I$(OUTDIR)/inc/offuh \
+    -I$(WORKDIR)/inc/ \
+    $$(INCLUDE) \
     -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,xof,\