diff --git a/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk b/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk
new file mode 100644
index 000000000000..aa9bf8b03708
--- /dev/null
+++ b/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk
@@ -0,0 +1,11 @@
+--- canvas/source/cairo/makefile.mk.orig	2021-04-02 12:58:20 UTC
++++ canvas/source/cairo/makefile.mk
+@@ -49,7 +49,7 @@ DLLPRE =
+ 
+ 
+ .IF "$(SYSTEM_CAIRO)" == "YES"
+-CFLAGS+=$(CAIRO_CFLAGS)
++INCSYSTEM+=$(CAIRO_CFLAGS)
+ .ELSE
+ CFLAGS+=-I$(SOLARINCDIR)/cairo
+ .ENDIF
diff --git a/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk b/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk
new file mode 100644
index 000000000000..c82be1905eaa
--- /dev/null
+++ b/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk
@@ -0,0 +1,11 @@
+--- connectivity/source/drivers/evoab2/makefile.mk.orig	2020-10-06 14:16:17 UTC
++++ connectivity/source/drivers/evoab2/makefile.mk
+@@ -41,7 +41,7 @@ PKGCONFIG_MODULES=gtk+-2.0
+ PKGCONFIG_MODULES=gtk+-2.0
+ .INCLUDE : pkg_config.mk
+ 
+-CFLAGS+=$(GOBJECT_CFLAGS)
++INCSYSTEM+=$(GOBJECT_CFLAGS)
+ 
+ # --- Files -------------------------------------
+ 
diff --git a/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk b/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk
new file mode 100644
index 000000000000..e53a78202a13
--- /dev/null
+++ b/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk
@@ -0,0 +1,11 @@
+--- connectivity/source/drivers/kab/makefile.mk.orig	2021-04-02 12:58:20 UTC
++++ connectivity/source/drivers/kab/makefile.mk
+@@ -38,7 +38,7 @@ VISIBILITY_HIDDEN=TRUE
+ .IF "$(GUI)" == "UNX"
+ .IF "$(ENABLE_KAB)" == "TRUE"
+ 
+-CFLAGS+=$(KDE_CFLAGS)
++INCSYSTEM+=$(KDE_CFLAGS)
+ 
+ .IF "$(KDE_ROOT)"!=""
+ EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
diff --git a/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk b/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk
new file mode 100644
index 000000000000..29d5e45ec891
--- /dev/null
+++ b/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk
@@ -0,0 +1,12 @@
+--- forms/source/xforms/submission/makefile.mk.orig	2020-10-06 14:16:22 UTC
++++ forms/source/xforms/submission/makefile.mk
+@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS=TRUE
+ .INCLUDE: $(PRJ)$/makefile.pmk
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk b/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk
new file mode 100644
index 000000000000..89c9ff106212
--- /dev/null
+++ b/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk
@@ -0,0 +1,12 @@
+--- forms/source/xforms/xpathlib/makefile.mk.orig	2020-10-06 14:16:22 UTC
++++ forms/source/xforms/xpathlib/makefile.mk
+@@ -36,7 +36,8 @@ INCPRE+=$(PRJ)$/source$/inc
+ INCPRE+=$(PRJ)$/source$/inc
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk b/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk
new file mode 100644
index 000000000000..6f79e6eb7be9
--- /dev/null
+++ b/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk
@@ -0,0 +1,11 @@
+--- fpicker/source/unx/gnome/makefile.mk.orig	2021-04-02 12:58:21 UTC
++++ fpicker/source/unx/gnome/makefile.mk
+@@ -56,7 +56,7 @@ CFLAGS+= $(WIDGETSET_CFLAGS)
+ .ELSE
+ 
+ CFLAGS+= $(WIDGETSET_CFLAGS)
+-CFLAGS+= $(PKGCONFIG_CFLAGS)
++INCSYSTEM+= $(PKGCONFIG_CFLAGS)
+ 
+ # --- Files --------------------------------------------------------
+ 
diff --git a/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk b/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk
new file mode 100644
index 000000000000..669e096bb2a3
--- /dev/null
+++ b/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk
@@ -0,0 +1,11 @@
+--- fpicker/source/unx/kde4/makefile.mk.orig	2021-04-02 12:58:21 UTC
++++ fpicker/source/unx/kde4/makefile.mk
+@@ -43,7 +43,7 @@ dummy:
+ 
+ .ELSE # we build for KDE
+ 
+-CFLAGS+= $(KDE4_CFLAGS)
++INCSYSTEM+= $(KDE4_CFLAGS)
+ 
+ # --- Files --------------------------------------------------------
+ 
diff --git a/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk b/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk
new file mode 100644
index 000000000000..8a06fc9f2166
--- /dev/null
+++ b/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk
@@ -0,0 +1,12 @@
+--- jvmfwk/source/makefile.mk.orig	2021-04-02 12:58:21 UTC
++++ jvmfwk/source/makefile.mk
+@@ -34,7 +34,8 @@ UNIXVERSIONNAMES = UDK
+ .INCLUDE: settings.mk
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ UNOUCROUT = $(OUT)$/inc
diff --git a/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk b/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk
new file mode 100644
index 000000000000..b56a1e8dc100
--- /dev/null
+++ b/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk
@@ -0,0 +1,11 @@
+--- l10ntools/source/help/makefile.mk.orig	2020-10-06 14:16:24 UTC
++++ l10ntools/source/help/makefile.mk
+@@ -34,7 +34,7 @@ TARGETTYPE=CUI
+ .INCLUDE : helplinker.pmk
+  
+ .IF "$(SYSTEM_LIBXSLT)" == "YES"
+-CFLAGS+= $(LIBXSLT_CFLAGS)
++INCSYSTEM+= $(LIBXSLT_CFLAGS)
+ .ELSE
+ LIBXSLTINCDIR=external$/libxslt
+ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
diff --git a/editors/openoffice-4/files/patch-oox_source_core_makefile.mk b/editors/openoffice-4/files/patch-oox_source_core_makefile.mk
new file mode 100644
index 000000000000..732f8945a87d
--- /dev/null
+++ b/editors/openoffice-4/files/patch-oox_source_core_makefile.mk
@@ -0,0 +1,11 @@
+--- oox/source/core/makefile.mk.orig	2021-04-02 12:58:21 UTC
++++ oox/source/core/makefile.mk
+@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
+ .INCLUDE: $(PRJ)$/util$/makefile.pmk
+ 
+ .IF "$(SYSTEM_OPENSSL)" == "YES"
+-CFLAGS+= $(OPENSSL_CFLAGS)
++INCSYSTEM+= $(OPENSSL_CFLAGS)
+ .ENDIF
+ 
+ # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk b/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk
new file mode 100644
index 000000000000..ac2cfb0180c7
--- /dev/null
+++ b/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk
@@ -0,0 +1,11 @@
+--- pyuno/source/loader/makefile.mk.orig	2020-10-06 14:16:27 UTC
++++ pyuno/source/loader/makefile.mk
+@@ -41,7 +41,7 @@ PYTHONLIB=$(PYTHON_LIBS)
+ 
+ .IF "$(SYSTEM_PYTHON)" == "YES"
+ PYTHONLIB=$(PYTHON_LIBS)
+-CFLAGS+=$(PYTHON_CFLAGS)
++INCSYSTEM+=$(PYTHON_CFLAGS)
+ .IF "$(EXTRA_CFLAGS)"!=""
+ PYTHONLIB+=-framework Python
+ .ENDIF # "$(EXTRA_CFLAGS)"!=""
diff --git a/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk b/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk
new file mode 100644
index 000000000000..a2ffb4a5af1b
--- /dev/null
+++ b/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk
@@ -0,0 +1,11 @@
+--- pyuno/source/module/makefile.mk.orig	2020-10-06 14:16:27 UTC
++++ pyuno/source/module/makefile.mk
+@@ -60,7 +60,7 @@ PYTHONLIB=$(PYTHON_LIBS)
+ 
+ .IF "$(SYSTEM_PYTHON)" == "YES"
+ PYTHONLIB=$(PYTHON_LIBS)
+-CFLAGS+=$(PYTHON_CFLAGS)
++INCSYSTEM+=$(PYTHON_CFLAGS)
+ .ELSE # "$(SYSTEM_PYTHON)" == "YES"
+ .INCLUDE :  pyversion.mk
+ CFLAGS+=-I$(SOLARINCDIR)$/python
diff --git a/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk b/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk
new file mode 100644
index 000000000000..5160a24da180
--- /dev/null
+++ b/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk
@@ -0,0 +1,12 @@
+--- sccomp/source/solver/makefile.mk.orig	2021-04-02 12:58:22 UTC
++++ sccomp/source/solver/makefile.mk
+@@ -66,7 +66,8 @@ DEF1NAME=       $(SHL1TARGET)
+ DEF1NAME=       $(SHL1TARGET)
+ 
+ .IF "$(SYSTEM_COINMP)" == "YES"
+-CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP
++INCSYSTEM+= $(COINMP_CFLAGS)
++CFLAGS+= -DSYSTEM_COINMP
+ # Use the library flags from configure
+ SHL1STDLIBS+=$(COINMP_LIBS)
+ .ELSE
diff --git a/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk b/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk
new file mode 100644
index 000000000000..4ddcef72e029
--- /dev/null
+++ b/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk
@@ -0,0 +1,11 @@
+--- shell/source/backends/kde4be/makefile.mk.orig	2020-10-06 14:16:31 UTC
++++ shell/source/backends/kde4be/makefile.mk
+@@ -45,7 +45,7 @@ DLLPRE =
+ 
+ .IF "$(ENABLE_KDE4)" == "TRUE"
+ 
+-CFLAGS+=$(KDE4_CFLAGS)
++INCSYSTEM+=$(KDE4_CFLAGS)
+ 
+ # --- Files ---
+ 
diff --git a/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk b/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk
new file mode 100644
index 000000000000..057fc4e09b35
--- /dev/null
+++ b/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk
@@ -0,0 +1,11 @@
+--- shell/source/backends/kdebe/makefile.mk.orig	2020-10-06 14:16:31 UTC
++++ shell/source/backends/kdebe/makefile.mk
+@@ -45,7 +45,7 @@ DLLPRE =
+ 
+ .IF "$(ENABLE_KDE)" == "TRUE"
+ 
+-CFLAGS+=$(KDE_CFLAGS)
++INCSYSTEM+=$(KDE_CFLAGS)
+ 
+ # --- Files ---
+ 
diff --git a/editors/openoffice-4/files/patch-solenv_inc_target.mk b/editors/openoffice-4/files/patch-solenv_inc_target.mk
new file mode 100644
index 000000000000..959c7d0c0950
--- /dev/null
+++ b/editors/openoffice-4/files/patch-solenv_inc_target.mk
@@ -0,0 +1,14 @@
+--- solenv/inc/target.mk.orig	2021-04-02 12:58:22 UTC
++++ solenv/inc/target.mk
+@@ -57,9 +57,9 @@ INCLUDE:=
+ INCLUDE:=
+ .EXPORT : INCLUDE
+ .IF "$(PRJINC)"!=""
+-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM)
+ .ELSE		# "$(PRJINC)"!=""
+-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM)
+ .ENDIF		# "$(PRJINC)"!=""
+ INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
+ .EXPORT : LIB
diff --git a/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk b/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk
new file mode 100644
index 000000000000..5c5310cd36e1
--- /dev/null
+++ b/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk
@@ -0,0 +1,46 @@
+--- ucb/source/ucp/webdav/makefile.mk.orig	2021-04-02 12:58:23 UTC
++++ ucb/source/ucp/webdav/makefile.mk
+@@ -56,7 +56,7 @@ SERFINCDIR=serf
+ #
+ 
+ .IF "$(SYSTEM_APR)" == "YES"
+-CFLAGS+= $(APR_CFLAGS)
++INCSYSTEM+= $(APR_CFLAGS)
+ SHL1STDLIBS+=$(APR_LIBS)
+ .ELSE
+ CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
+@@ -67,7 +67,7 @@ CFLAGS+=\
+ .ENDIF
+ 
+ .IF "$(SYSTEM_APR_UTIL)" == "YES"
+-CFLAGS+= $(APR_UTIL_CFLAGS)
++INCSYSTEM+= $(APR_UTIL_CFLAGS)
+ SHL1STDLIBS+=$(APR_UTIL_LIBS)
+ .ELSE
+ CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
+@@ -78,7 +78,7 @@ CFLAGS+=\
+ .ENDIF
+ 
+ .IF "$(SYSTEM_SERF)" == "YES"
+-CFLAGS+= $(SERF_CFLAGS)
++INCSYSTEM+= $(SERF_CFLAGS)
+ SHL1STDLIBS+=$(SERF_LIBS)
+ .ELSE
+ CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
+@@ -89,14 +89,14 @@ CFLAGS+=\
+ .ENDIF
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+= $(LIBXML_CFLAGS)
++INCSYSTEM+= $(LIBXML_CFLAGS)
+ .ELSE
+ LIBXMLINCDIR=external$/libxml
+ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
+ .ENDIF
+ 
+ .IF "$(SYSTEM_OPENSSL)" == "YES"
+-CFLAGS+= -I$(OPENSSL_CFLAGS)
++INCSYSTEM+= -I$(OPENSSL_CFLAGS)
+ SHL1STDLIBS+= $(OPENSSLLIB)
+ .ELSE
+ SHL1STDLIBS+= $(OPENSSLLIBST)
diff --git a/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk b/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk
new file mode 100644
index 000000000000..946e39cd7cae
--- /dev/null
+++ b/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk
@@ -0,0 +1,19 @@
+--- xmlhelp/source/cxxhelp/provider/makefile.mk.orig	2021-04-02 12:58:23 UTC
++++ xmlhelp/source/cxxhelp/provider/makefile.mk
+@@ -49,14 +49,14 @@ CFLAGS +=  -DHAVE_EXPAT_H
+ CFLAGS +=  -DHAVE_EXPAT_H
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+= $(LIBXML_CFLAGS)
++INCSYSTEM+= $(LIBXML_CFLAGS)
+ .ELSE
+ LIBXMLINCDIR=external$/libxml
+ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
+ .ENDIF
+ 
+ .IF "$(SYSTEM_LIBXSLT)" == "YES"
+-CFLAGS+= $(LIBXSLT_CFLAGS)
++INCSYSTEM+= $(LIBXSLT_CFLAGS)
+ .ELSE
+ LIBXSLTINCDIR=external$/libxslt
+ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
diff --git a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk
new file mode 100644
index 000000000000..bb8fb3f26f79
--- /dev/null
+++ b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk
@@ -0,0 +1,12 @@
+--- xmlsecurity/source/xmlsec/makefile.mk.orig	2020-10-06 14:16:36 UTC
++++ xmlsecurity/source/xmlsec/makefile.mk
+@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE
+ .INCLUDE :	$(PRJ)$/util$/target.pmk
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ .IF "$(ENABLE_NSS_MODULE)"!="YES"
diff --git a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk
new file mode 100644
index 000000000000..b366deb73a49
--- /dev/null
+++ b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk
@@ -0,0 +1,12 @@
+--- xmlsecurity/source/xmlsec/nss/makefile.mk.orig	2021-04-02 12:58:23 UTC
++++ xmlsecurity/source/xmlsec/nss/makefile.mk
+@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE
+ .INCLUDE :	$(PRJ)$/util$/target.pmk
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ .IF "$(ENABLE_NSS_MODULE)"!="YES"
diff --git a/editors/openoffice-devel/files/patch-connectivity_source_drivers_evoab2_makefile.mk b/editors/openoffice-devel/files/patch-connectivity_source_drivers_evoab2_makefile.mk
new file mode 100644
index 000000000000..bf10327c14b1
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-connectivity_source_drivers_evoab2_makefile.mk
@@ -0,0 +1,11 @@
+--- connectivity/source/drivers/evoab2/makefile.mk.orig	2019-09-17 22:55:11 UTC
++++ connectivity/source/drivers/evoab2/makefile.mk
+@@ -41,7 +41,7 @@ PKGCONFIG_MODULES=gtk+-2.0
+ PKGCONFIG_MODULES=gtk+-2.0
+ .INCLUDE : pkg_config.mk
+ 
+-CFLAGS+=$(GOBJECT_CFLAGS)
++INCSYSTEM+=$(GOBJECT_CFLAGS)
+ 
+ # --- Files -------------------------------------
+ 
diff --git a/editors/openoffice-devel/files/patch-forms_source_xforms_submission_makefile.mk b/editors/openoffice-devel/files/patch-forms_source_xforms_submission_makefile.mk
new file mode 100644
index 000000000000..e54331272a11
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-forms_source_xforms_submission_makefile.mk
@@ -0,0 +1,12 @@
+--- forms/source/xforms/submission/makefile.mk.orig	2019-09-17 22:55:15 UTC
++++ forms/source/xforms/submission/makefile.mk
+@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS=TRUE
+ .INCLUDE: $(PRJ)$/makefile.pmk
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-devel/files/patch-forms_source_xforms_xpathlib_makefile.mk b/editors/openoffice-devel/files/patch-forms_source_xforms_xpathlib_makefile.mk
new file mode 100644
index 000000000000..993c6c35d4c9
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-forms_source_xforms_xpathlib_makefile.mk
@@ -0,0 +1,12 @@
+--- forms/source/xforms/xpathlib/makefile.mk.orig	2019-09-17 22:55:15 UTC
++++ forms/source/xforms/xpathlib/makefile.mk
+@@ -36,7 +36,8 @@ INCPRE+=$(PRJ)$/source$/inc
+ INCPRE+=$(PRJ)$/source$/inc
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-devel/files/patch-l10ntools_source_help_makefile.mk b/editors/openoffice-devel/files/patch-l10ntools_source_help_makefile.mk
new file mode 100644
index 000000000000..ac561aac276f
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-l10ntools_source_help_makefile.mk
@@ -0,0 +1,11 @@
+--- l10ntools/source/help/makefile.mk.orig	2019-09-17 22:55:16 UTC
++++ l10ntools/source/help/makefile.mk
+@@ -34,7 +34,7 @@ TARGETTYPE=CUI
+ .INCLUDE : helplinker.pmk
+  
+ .IF "$(SYSTEM_LIBXSLT)" == "YES"
+-CFLAGS+= $(LIBXSLT_CFLAGS)
++INCSYSTEM+= $(LIBXSLT_CFLAGS)
+ .ELSE
+ LIBXSLTINCDIR=external$/libxslt
+ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
diff --git a/editors/openoffice-devel/files/patch-pyuno_source_loader_makefile.mk b/editors/openoffice-devel/files/patch-pyuno_source_loader_makefile.mk
new file mode 100644
index 000000000000..b85f1ee77696
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-pyuno_source_loader_makefile.mk
@@ -0,0 +1,11 @@
+--- pyuno/source/loader/makefile.mk.orig	2019-09-17 22:55:18 UTC
++++ pyuno/source/loader/makefile.mk
+@@ -41,7 +41,7 @@ PYTHONLIB=$(PYTHON_LIBS)
+ 
+ .IF "$(SYSTEM_PYTHON)" == "YES"
+ PYTHONLIB=$(PYTHON_LIBS)
+-CFLAGS+=$(PYTHON_CFLAGS)
++INCSYSTEM+=$(PYTHON_CFLAGS)
+ .IF "$(EXTRA_CFLAGS)"!=""
+ PYTHONLIB+=-framework Python
+ .ENDIF # "$(EXTRA_CFLAGS)"!=""
diff --git a/editors/openoffice-devel/files/patch-pyuno_source_module_makefile.mk b/editors/openoffice-devel/files/patch-pyuno_source_module_makefile.mk
new file mode 100644
index 000000000000..f77301eab7f2
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-pyuno_source_module_makefile.mk
@@ -0,0 +1,11 @@
+--- pyuno/source/module/makefile.mk.orig	2019-09-17 22:55:18 UTC
++++ pyuno/source/module/makefile.mk
+@@ -60,7 +60,7 @@ PYTHONLIB=$(PYTHON_LIBS)
+ 
+ .IF "$(SYSTEM_PYTHON)" == "YES"
+ PYTHONLIB=$(PYTHON_LIBS)
+-CFLAGS+=$(PYTHON_CFLAGS)
++INCSYSTEM+=$(PYTHON_CFLAGS)
+ .ELSE # "$(SYSTEM_PYTHON)" == "YES"
+ .INCLUDE :  pyversion.mk
+ CFLAGS+=-I$(SOLARINCDIR)$/python
diff --git a/editors/openoffice-devel/files/patch-shell_source_backends_kde4be_makefile.mk b/editors/openoffice-devel/files/patch-shell_source_backends_kde4be_makefile.mk
new file mode 100644
index 000000000000..fc09363afe6d
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-shell_source_backends_kde4be_makefile.mk
@@ -0,0 +1,11 @@
+--- shell/source/backends/kde4be/makefile.mk.orig	2019-09-17 22:55:21 UTC
++++ shell/source/backends/kde4be/makefile.mk
+@@ -45,7 +45,7 @@ DLLPRE =
+ 
+ .IF "$(ENABLE_KDE4)" == "TRUE"
+ 
+-CFLAGS+=$(KDE4_CFLAGS)
++INCSYSTEM+=$(KDE4_CFLAGS)
+ 
+ # --- Files ---
+ 
diff --git a/editors/openoffice-devel/files/patch-shell_source_backends_kdebe_makefile.mk b/editors/openoffice-devel/files/patch-shell_source_backends_kdebe_makefile.mk
new file mode 100644
index 000000000000..32ad77f1fd52
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-shell_source_backends_kdebe_makefile.mk
@@ -0,0 +1,11 @@
+--- shell/source/backends/kdebe/makefile.mk.orig	2019-09-17 22:55:21 UTC
++++ shell/source/backends/kdebe/makefile.mk
+@@ -45,7 +45,7 @@ DLLPRE =
+ 
+ .IF "$(ENABLE_KDE)" == "TRUE"
+ 
+-CFLAGS+=$(KDE_CFLAGS)
++INCSYSTEM+=$(KDE_CFLAGS)
+ 
+ # --- Files ---
+ 
diff --git a/editors/openoffice-devel/files/patch-solenv_inc_target.mk b/editors/openoffice-devel/files/patch-solenv_inc_target.mk
new file mode 100644
index 000000000000..71d2e59fe834
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-solenv_inc_target.mk
@@ -0,0 +1,14 @@
+--- solenv/inc/target.mk.orig	2021-04-17 18:43:53 UTC
++++ solenv/inc/target.mk
+@@ -57,9 +57,9 @@ INCLUDE:=
+ INCLUDE:=
+ .EXPORT : INCLUDE
+ .IF "$(PRJINC)"!=""
+-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM)
+ .ELSE		# "$(PRJINC)"!=""
+-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM)
+ .ENDIF		# "$(PRJINC)"!=""
+ INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
+ .EXPORT : LIB
diff --git a/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_makefile.mk b/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_makefile.mk
new file mode 100644
index 000000000000..8af1f874ab0f
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_makefile.mk
@@ -0,0 +1,12 @@
+--- xmlsecurity/source/xmlsec/makefile.mk.orig	2019-09-17 22:55:25 UTC
++++ xmlsecurity/source/xmlsec/makefile.mk
+@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE
+ .INCLUDE :	$(PRJ)$/util$/target.pmk
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ .IF "$(ENABLE_NSS_MODULE)"!="YES"
diff --git a/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk b/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk
new file mode 100644
index 000000000000..caa928d2eaa9
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk
@@ -0,0 +1,12 @@
+--- xmlsecurity/source/xmlsec/nss/makefile.mk.orig	2019-09-17 22:55:25 UTC
++++ xmlsecurity/source/xmlsec/nss/makefile.mk
+@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE
+ .INCLUDE :	$(PRJ)$/util$/target.pmk
+ 
+ .IF "$(SYSTEM_LIBXML)" == "YES"
+-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++INCSYSTEM+=$(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML
+ .ENDIF
+ 
+ .IF "$(ENABLE_NSS_MODULE)"!="YES"