fdo#39491 -I$(OUTDIR)/inc is set in SOLARINC

2012-01-21 01:52:59 +01:00
parent e8a28be0dd
commit 4b30ec9def
117 changed files with 0 additions and 120 deletions
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/a
 $(eval $(call gb_Library_set_include,animcore,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/animcore/source/animcore) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,animcore,\
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
 	-I$(realpath $(SRCDIR)/basegfx/inc) \
 	-I$(realpath $(SRCDIR)/basegfx/source/inc) \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
 ))

 # Work around gcc bug 41847 present at least in
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -34,5 +34,4 @@ $(eval $(call gb_CppunitTest_set_include,basic_scanner,\
 -I$(realpath $(SRCDIR)/basic/source/inc) \
 -I$(realpath $(SRCDIR)/basic/inc) \
 $$(INCLUDE) \
-I$(OUTDIR)/inc \
 ))
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
    -I$(realpath $(SRCDIR)/chart2/source/controller/main) \
    -I$(realpath $(SRCDIR)/chart2/source/inc) \
    -I$(WORKDIR)/inc/chart2 \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,chart2/res,\
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/chart2/source/controller/inc) \
    -I$(realpath $(SRCDIR)/chart2/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,chartcontroller,\
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,chartmodel,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/chart2/source/model/inc) \
    -I$(realpath $(SRCDIR)/chart2/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,chartmodel,\
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,charttools))
 $(eval $(call gb_Library_set_include,charttools,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/chart2/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,charttools,\
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,chartview,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/chart2/source/view/inc) \
    -I$(realpath $(SRCDIR)/chart2/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,chartview,\
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,cui/res))
 $(eval $(call gb_SrsTarget_set_include,cui/res,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/cui/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,cui/res,\
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,cui,cui/util/cui))
 $(eval $(call gb_Library_set_include,cui,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/cui/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,cui,\
--- a/dbaccess/AllLangResTarget_adabasui.mk
+++ b/dbaccess/AllLangResTarget_adabasui.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui))
 $(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/dbaccess/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\
--- a/dbaccess/AllLangResTarget_dba.mk
+++ b/dbaccess/AllLangResTarget_dba.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba))
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\
    $$(INCLUDE) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\
--- a/dbaccess/AllLangResTarget_dbmm.mk
+++ b/dbaccess/AllLangResTarget_dbmm.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm))

 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbmm,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbui))

 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
 	-I$(WORKDIR)/inc/dbaccess \
 	-I$(SRCDIR)/dbaccess/source/ui/inc \
 	-I$(SRCDIR)/dbaccess/source/ui/dlg \
--- a/dbaccess/AllLangResTarget_sdbt.mk
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
    -I$(WORKDIR)/inc/dbaccess \
    -I$(realpath $(SRCDIR)/dbaccess/inc) \
    -I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_set_targettype_gui,odbcconfig,YES))
 $(eval $(call gb_Executable_set_include,odbcconfig,\
    $$(INCLUDE) \
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,odbcconfig,\
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,adabasui))

 $(eval $(call gb_Library_set_include,adabasui,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,adabasui,\
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,dba,\
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/inc) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,dba,\
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,dbaxml))
 $(eval $(call gb_Library_set_include,dbaxml,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,dbaxml,\
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_add_package_headers,dbmm,\
 $(eval $(call gb_Library_set_include,dbmm,\
    $$(INCLUDE) \
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,dbmm,\
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,dbu,\
    -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
    -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \
    -I$(WORKDIR)/inc/dbaccess \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,dbu,\
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,sdbt,\
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/inc/) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,sdbt,\
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc))

 $(eval $(call gb_Library_set_include,drawinglayer,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,drawinglayer,\
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\

 $(eval $(call gb_CppunitTest_set_include,editeng_borderline,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,editeng_borderline,\
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_external,extensions_test_update,curl))
 $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/extensions/inc \
-	-I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,extensions_test_update,\
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,fileacc))

 $(eval $(call gb_Library_set_include,fileacc,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,fileacc,\
--- a/forms/AllLangResTarget_frm.mk
+++ b/forms/AllLangResTarget_frm.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,frm/res))
 $(eval $(call gb_SrsTarget_set_include,frm/res,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/forms/source/inc) \
-    -I$(OUTDIR)/inc \
    -I$(WORKDIR)/inc \
 ))

--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,frm,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/forms/source/inc) \
    -I$(realpath $(SRCDIR)/forms/source/solar/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,frm,\
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res))
 $(eval $(call gb_SrsTarget_set_include,formula/res,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/formula/source/core/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,formula/res,\
--- a/formula/AllLangResTarget_forui.mk
+++ b/formula/AllLangResTarget_forui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_SrsTarget_set_include,formula/ui,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/formula/inc) \
    -I$(realpath $(SRCDIR)/formula/source/ui/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,formula/ui,\
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_add_package_headers,for,\
 $(eval $(call gb_Library_set_include,for,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/formula/source/core/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,for,\
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,forui,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/formula/inc) \
    -I$(realpath $(SRCDIR)/formula/source/ui/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,forui,\
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/framework/inc) \
    -I$(realpath $(SRCDIR)/framework/inc/classes) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
@@ -55,7 +54,6 @@ $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/framework/inc) \
    -I$(realpath $(SRCDIR)/framework/inc/services) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,fwe,\
    -I$(realpath $(SRCDIR)/framework/inc) \
    -I$(WORKDIR)/inc/framework/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))

 $(eval $(call gb_Library_add_defs,fwe,\
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_set_include,fwi,\
    -I$(realpath $(SRCDIR)/framework/inc) \
    -I$(WORKDIR)/inc/framework/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))

 $(eval $(call gb_Library_add_linked_libs,fwi,\
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwk,\
    -I$(realpath $(SRCDIR)/framework/inc) \
    -I$(WORKDIR)/inc/framework/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))

 $(eval $(call gb_Library_add_api,fwk,\
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwl,\
    -I$(realpath $(SRCDIR)/framework/source/inc) \
    -I$(WORKDIR)/inc/framework/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))

 $(eval $(call gb_Library_add_api,fwl,\
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwm,\
    -I$(realpath $(SRCDIR)/framework/source/inc) \
    -I$(WORKDIR)/inc/framework/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))

 $(eval $(call gb_Library_add_api,fwm,\
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,hwpfilter_test_hwpfilter, \

 $(eval $(call gb_CppunitTest_set_include,hwpfilter_test_hwpfilter,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,hwpfilter_test_hwpfilter,\
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,svidl))

 $(eval $(call gb_Executable_set_include,svidl,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/ \
 	-I$(realpath $(SRCDIR)/idl/inc) \
 ))

--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \

 $(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,lotuswordpro_test_lotuswordpro,\
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,lwpft))

 $(eval $(call gb_Library_set_include,lwpft,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,lwpft,\
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_package_headers,oox,\

 $(eval $(call gb_Library_set_include,oox,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
    -I$(realpath $(SRCDIR)/oox/inc) \
 ))

--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,spadmin.bin))

 $(eval $(call gb_Executable_set_include,spadmin.bin,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res))
 $(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))

 $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
 	-I$(WORKDIR)/inc/reportdesign \
 	-I$(SRCDIR)/reportdesign/source/ui/inc \
 	-I$(SRCDIR)/reportdesign/inc \
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,rpt,\
    -I$(realpath $(SRCDIR)/reportdesign/inc) \
    -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
    -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,rpt,\
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,rptui,\
    -I$(realpath $(SRCDIR)/reportdesign/inc) \
    -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
    -I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,rptui,\
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,rptxml,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/reportdesign/inc) \
    -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,rptxml,\
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_databaserangeobj,\
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_datapilotfieldobj,\
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_datapilottableobj,\
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_macros_test,\
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_namedrangeobj,\
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_namedrangesobj,\
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_subsequent_filters_test,\
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_tableautoformatfield,\
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_spreadsheetsobj,\
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sc/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sc_ucalc,\
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
        -I$(WORKDIR)/Misc/sc/ \
        $$(INCLUDE) \
        -I$(WORKDIR)/oox/inc/ \
-        -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,scfilt,\
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\
 	-I$(realpath $(SRCDIR)/sc/inc) \
 	-I$(WORKDIR)/Misc/sc/ \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/ \
 ))

 $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj))
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_set_include,sd/res,\
    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
    -I$(WORKDIR)/inc/sd \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_SrsTarget_add_files,sd/res,\
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\
    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sd/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sd_filters_test,\
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\
    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sd/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sd_regression_test,\
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_uimpress))
 $(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/sd/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Library_set_include,sd,\
    -I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
    -I$(WORKDIR)/inc/sd \
    -I$(WORKDIR)/SdiTarget/sd/sdi \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,sd,\
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,sdd))
 $(eval $(call gb_Library_set_include,sdd,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/sd/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,sdd,\
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,sdfilt))
 $(eval $(call gb_Library_set_include,sdfilt,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/sd/inc) \
-    -I$(OUTDIR)/inc \
    -I$(WORKDIR)/oox/inc/ \
 ))

--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,sdui,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/sd/inc) \
    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,sdui,\
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sfx/res))

 $(eval $(call gb_SrsTarget_set_include,sfx/res,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
    -I$(WORKDIR)/inc \
    -I$(realpath $(SRCDIR)/sfx2/source/dialog) \
    -I$(realpath $(SRCDIR)/sfx2/source/inc) \
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\
    $$(INCLUDE) \
    -I$(SRCDIR)/sfx2/inc \
    -I$(SRCDIR)/sfx2/inc/sfx2 \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,qstart_gtk,\
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_set_include,sfx,\
    -I$(WORKDIR)/SdiTarget/sfx2/sdi \
    -I$(WORKDIR)/inc/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,sfx,\
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_add_package_headers,slideshow,sd_qa_unit))
 $(eval $(call gb_CppunitTest_set_include,slideshow,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/slideshow/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_set_defs,slideshow,\
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_add_package_headers,demoshow,sd_qa_unit))
 $(eval $(call gb_Executable_set_include,demoshow,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/slideshow/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 ifeq ($(strip $(VERBOSE)),TRUE)
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,OGLTrans))

 $(eval $(call gb_Library_set_include,OGLTrans,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 ifeq ($(strip $(VERBOSE)),TRUE)
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,slideshow))
 $(eval $(call gb_Library_set_include,slideshow,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/slideshow/source/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_defs,slideshow,\
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sot_test_sot, \

 $(eval $(call gb_CppunitTest_set_include,sot_test_sot,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sot_test_sot,\
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,starmath_qa_cppunit))
 $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\
    $$(INCLUDE) \
    -I$(realpath $(SRCDIR)/starmath/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,sm,\
        -I$(realpath $(SRCDIR)/starmath/inc) \
        -I$(WORKDIR)/SdiTarget/starmath/sdi \
        $$(INCLUDE) \
-        -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,sm,\
@@ -102,7 +101,6 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
        -I$(realpath $(SRCDIR)/starmath/inc) \
        -I$(realpath $(SRCDIR)/starmath/sdi) \
        $$(INCLUDE) \
-        -I$(OUTDIR)/inc \
 ))

 # vim: set noet sw=4 ts=4:
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -52,6 +52,5 @@ $(eval $(call gb_CppunitTest_set_include,svl_lngmisc,\
 	-I$(realpath $(SRCDIR)/svl/source/inc) \
 	-I$(realpath $(SRCDIR)/svl/inc) \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
 ))
 # vim: set noet sw=4 ts=4:
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,fsstorage,\
    -I$(realpath $(SRCDIR)/svl/inc) \
    -I$(realpath $(SRCDIR)/svl/inc/svl) \
    -I$(realpath $(SRCDIR)/svl/source/inc) \
-    -I$(OUTDIR)/inc \
    $$(INCLUDE) \
 ))

--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
    -I$(realpath $(SRCDIR)/svl/inc) \
    -I$(realpath $(SRCDIR)/svl/inc/svl) \
    -I$(realpath $(SRCDIR)/svl/source/inc) \
-    -I$(OUTDIR)/inc \
    $$(INCLUDE) \
 ))

--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,svtools_filters_test, \

 $(eval $(call gb_CppunitTest_set_include,svtools_filters_test,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,svtools_filters_test,\
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_set_include,bmp,\
    $$(INCLUDE) \
    -I$(WORKDIR)/inc/svtools \
    -I$(WORKDIR)/inc/ \
-    -I$(OUTDIR)/inc/ \
    -I$(realpath $(SRCDIR)/svtools/inc) \
    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
    -I$(realpath $(SRCDIR)/svtools/source/inc) \
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,bmpsum))

 $(eval $(call gb_Executable_set_include,bmpsum,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/ \
    -I$(realpath $(SRCDIR)/svtools/inc) \
    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
 ))
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,g2g))

 $(eval $(call gb_Executable_set_include,g2g,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/ \
    -I$(realpath $(SRCDIR)/svtools/inc) \
    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
 ))
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -34,9 +34,7 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
    $$(INCLUDE) \
    -I$(WORKDIR)/inc/svtools \
    -I$(WORKDIR)/inc/ \
-    -I$(OUTDIR)/inc/ \
    -I$(realpath $(SRCDIR)/svtools/inc) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,hatchwindowfactory,\
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_set_include,svt,\
    $$(INCLUDE) \
    -I$(WORKDIR)/inc/svtools \
    -I$(WORKDIR)/inc/ \
-    -I$(OUTDIR)/inc/ \
    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
    -I$(realpath $(SRCDIR)/svtools/source/inc) \
    -I$(realpath $(SRCDIR)/svtools/inc) \
--- a/svx/AllLangResTarget_gal.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/gal))

 $(eval $(call gb_SrsTarget_set_include,svx/gal,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
    -I$(realpath $(SRCDIR)/svx/source/gallery2) \
    -I$(realpath $(SRCDIR)/svx/inc/) \
 ))
--- a/svx/AllLangResTarget_ofa.mk
+++ b/svx/AllLangResTarget_ofa.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/ofa))

 $(eval $(call gb_SrsTarget_set_include,svx/ofa,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
    -I$(SRCDIR)/svx/inc/ \
 ))

--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res))

 $(eval $(call gb_SrsTarget_set_include,svx/res,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
    -I$(WORKDIR)/inc/svx \
    -I$(realpath $(SRCDIR)/svx/source/inc) \
    -I$(realpath $(SRCDIR)/svx/source/dialog) \
--- a/svx/AllLangResTarget_textconversiondlgs.mk
+++ b/svx/AllLangResTarget_textconversiondlgs.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs))

 $(eval $(call gb_SrsTarget_set_include,svx/textconversiondlgs,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
    -I$(SRCDIR)/svx/inc/ \
 ))

--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sw/res))

 $(eval $(call gb_SrsTarget_set_include,sw/res,\
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
    -I$(WORKDIR)/inc/sw \
    -I$(realpath $(SRCDIR)/sw/inc) \
    -I$(realpath $(SRCDIR)/sw/source/core/inc) \
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sw/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sw_filters_test,\
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\
    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sw/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sw_macros_test,\
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -79,7 +79,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_swdoc_test,\
    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
    -I$(realpath $(SRCDIR)/sw/inc) \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_CppunitTest_add_api,sw_swdoc_test,\
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_set_include,msword,\
    -I$(WORKDIR)/Misc/sw/ \
    $$(INCLUDE) \
    -I$(WORKDIR)/oox/inc/ \
-    -I$(OUTDIR)/inc/sw \
 ))

 $(eval $(call gb_Library_add_api,msword,\
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,sw,\
    -I$(WORKDIR)/SdiTarget/sw/sdi \
    -I$(WORKDIR)/Misc/sw/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))

 $(eval $(call gb_Library_add_api,sw,\
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,vbaswobj,\
    -I$(realpath $(SRCDIR)/sw/inc) \
    -I$(WORKDIR)/Misc/sw/ \
    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/ \
 ))

 $(eval $(call gb_Library_add_api,vbaswobj,\
--- a/Show More
+++ b/Show More