summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-01-21 01:52:59 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-02-10 21:41:45 +0100
commit4b30ec9def591ba77d5ec9ac09ded1e6782ede8d (patch)
tree539308f4df950c0eae0ccdb28b0267a48022474f
parente8a28be0dd3eb471d1d063c68b5bc163df65e182 (diff)
fdo#39491 -I$(OUTDIR)/inc is set in SOLARINC
-rw-r--r--animations/Library_animcore.mk1
-rw-r--r--basegfx/StaticLibrary_basegfx_s.mk1
-rw-r--r--basic/CppunitTest_basic_scanner.mk1
-rw-r--r--chart2/AllLangResTarget_chartcontroller.mk1
-rw-r--r--chart2/Library_chartcontroller.mk1
-rw-r--r--chart2/Library_chartmodel.mk1
-rw-r--r--chart2/Library_charttools.mk1
-rw-r--r--chart2/Library_chartview.mk1
-rw-r--r--cui/AllLangResTarget_cui.mk1
-rw-r--r--cui/Library_cui.mk1
-rw-r--r--dbaccess/AllLangResTarget_adabasui.mk1
-rw-r--r--dbaccess/AllLangResTarget_dba.mk1
-rw-r--r--dbaccess/AllLangResTarget_dbmm.mk1
-rw-r--r--dbaccess/AllLangResTarget_dbui.mk1
-rw-r--r--dbaccess/AllLangResTarget_sdbt.mk1
-rw-r--r--dbaccess/Executable_odbcconfig.mk1
-rw-r--r--dbaccess/Library_adabasui.mk1
-rw-r--r--dbaccess/Library_dba.mk1
-rw-r--r--dbaccess/Library_dbaxml.mk1
-rw-r--r--dbaccess/Library_dbmm.mk1
-rw-r--r--dbaccess/Library_dbu.mk1
-rw-r--r--dbaccess/Library_sdbt.mk1
-rw-r--r--drawinglayer/Library_drawinglayer.mk1
-rw-r--r--editeng/CppunitTest_editeng_borderline.mk1
-rw-r--r--extensions/CppunitTest_extensions_test_update.mk1
-rw-r--r--fileaccess/Library_fileacc.mk1
-rw-r--r--forms/AllLangResTarget_frm.mk1
-rw-r--r--forms/Library_frm.mk1
-rw-r--r--formula/AllLangResTarget_for.mk1
-rw-r--r--formula/AllLangResTarget_forui.mk1
-rw-r--r--formula/Library_for.mk1
-rw-r--r--formula/Library_forui.mk1
-rw-r--r--framework/AllLangResTarget_fwe.mk2
-rw-r--r--framework/Library_fwe.mk1
-rw-r--r--framework/Library_fwi.mk1
-rw-r--r--framework/Library_fwk.mk1
-rw-r--r--framework/Library_fwl.mk1
-rw-r--r--framework/Library_fwm.mk1
-rw-r--r--hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk1
-rw-r--r--idl/Executable_svidl.mk1
-rw-r--r--lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk1
-rw-r--r--lotuswordpro/Library_lwpft.mk1
-rw-r--r--oox/Library_oox.mk1
-rw-r--r--padmin/Executable_spadmin.bin.mk1
-rw-r--r--reportdesign/AllLangResTarget_rpt.mk1
-rw-r--r--reportdesign/AllLangResTarget_rptui.mk1
-rw-r--r--reportdesign/Library_rpt.mk1
-rw-r--r--reportdesign/Library_rptui.mk1
-rw-r--r--reportdesign/Library_rptxml.mk1
-rw-r--r--sc/CppunitTest_sc_databaserangeobj.mk1
-rw-r--r--sc/CppunitTest_sc_datapilotfieldobj.mk1
-rw-r--r--sc/CppunitTest_sc_datapilottableobj.mk1
-rw-r--r--sc/CppunitTest_sc_filters_test.mk1
-rw-r--r--sc/CppunitTest_sc_macros_test.mk1
-rw-r--r--sc/CppunitTest_sc_namedrangeobj.mk1
-rw-r--r--sc/CppunitTest_sc_namedrangesobj.mk1
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk1
-rw-r--r--sc/CppunitTest_sc_tableautoformatfield.mk1
-rw-r--r--sc/CppunitTest_sc_tablesheetsobj.mk1
-rw-r--r--sc/CppunitTest_sc_ucalc.mk1
-rw-r--r--sc/Library_scfilt.mk1
-rw-r--r--sc/Library_vbaobj.mk1
-rw-r--r--sd/AllLangResTarget_sd.mk1
-rw-r--r--sd/CppunitTest_sd_filters_test.mk1
-rw-r--r--sd/CppunitTest_sd_regression_test.mk1
-rw-r--r--sd/CppunitTest_sd_uimpress.mk1
-rw-r--r--sd/Library_sd.mk1
-rw-r--r--sd/Library_sdd.mk1
-rw-r--r--sd/Library_sdfilt.mk1
-rw-r--r--sd/Library_sdui.mk1
-rw-r--r--sfx2/AllLangResTarget_sfx2.mk1
-rw-r--r--sfx2/Library_qstart.mk1
-rw-r--r--sfx2/Library_sfx.mk1
-rw-r--r--slideshow/CppunitTest_slideshow.mk1
-rw-r--r--slideshow/Executable_demoshow.mk1
-rw-r--r--slideshow/Library_OGLTrans.mk1
-rw-r--r--slideshow/Library_slideshow.mk1
-rw-r--r--sot/CppunitTest_sot_test_sot.mk1
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk1
-rw-r--r--starmath/Library_sm.mk2
-rw-r--r--svl/CppunitTest_svl_lngmisc.mk1
-rw-r--r--svl/Library_fsstorage.mk1
-rw-r--r--svl/Library_passwordcontainer.mk1
-rw-r--r--svtools/CppunitTest_svtools_filters_test.mk1
-rw-r--r--svtools/Executable_bmp.mk1
-rw-r--r--svtools/Executable_bmpsum.mk1
-rw-r--r--svtools/Executable_g2g.mk1
-rw-r--r--svtools/Library_hatchwindowfactory.mk2
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svx/AllLangResTarget_gal.mk1
-rw-r--r--svx/AllLangResTarget_ofa.mk1
-rw-r--r--svx/AllLangResTarget_svx.mk1
-rw-r--r--svx/AllLangResTarget_textconversiondlgs.mk1
-rw-r--r--sw/AllLangResTarget_sw.mk1
-rw-r--r--sw/CppunitTest_sw_filters_test.mk1
-rw-r--r--sw/CppunitTest_sw_macros_test.mk1
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk1
-rw-r--r--sw/Library_msword.mk1
-rw-r--r--sw/Library_sw.mk1
-rw-r--r--sw/Library_vbaswobj.mk1
-rw-r--r--tools/Executable_bestreversemap.mk1
-rw-r--r--unotools/Library_utl.mk1
-rw-r--r--vcl/Library_desktop_detector.mk1
-rw-r--r--vcl/Library_vcl.mk1
-rw-r--r--vcl/Library_vclplug_gen.mk1
-rw-r--r--vcl/Library_vclplug_gtk.mk1
-rw-r--r--vcl/Library_vclplug_gtk3.mk1
-rw-r--r--vcl/Library_vclplug_kde.mk1
-rw-r--r--vcl/Library_vclplug_kde4.mk1
-rw-r--r--vcl/Library_vclplug_svp.mk1
-rw-r--r--vcl/StaticLibrary_vclmain.mk1
-rw-r--r--writerfilter/CppunitTest_writerfilter_doctok.mk1
-rw-r--r--writerfilter/Library_doctok.mk1
-rw-r--r--writerfilter/Library_ooxml.mk1
-rw-r--r--writerfilter/Library_resourcemodel.mk1
-rw-r--r--writerfilter/Library_rtftok.mk1
-rw-r--r--writerfilter/Library_writerfilter_uno.mk1
117 files changed, 0 insertions, 120 deletions
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 2dc3abf5a0ad..7f5220b27ed7 100644
--- 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,\
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index e72a3286a1e7..364bc42a9f4d 100644
--- 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
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index 0c9e657f7043..8b80946f73d7 100644
--- 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 \
))
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index c1ca22025ef3..eb737ea81e00 100644
--- 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,\
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index fbfbcb7a8b96..243e589d983c 100644
--- 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,\
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index 9781e9b7ac8e..ef388460e718 100644
--- 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,\
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index b67f90832797..e1fd16126b60 100644
--- 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,\
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index de52de2ff885..3535a2028202 100644
--- 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,\
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 9d40d826f62f..437824b2e5eb 100644
--- 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,\
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6a5e6838b1f1..516c68c2c8f0 100644
--- 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,\
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
index d3203e2edfa6..f0a8dde3e14f 100644
--- 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,\
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
index 8dc4bebde605..35929da077ac 100644
--- 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,\
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
index dcb6aa17d270..94f1811be8bb 100644
--- 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,\
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index f17c96c506d6..bb67ab05c8b0 100644
--- 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 \
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
index dd38e994756e..15fe6dcee9ab 100644
--- 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,\
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 4def9b330620..bb5e244fc04b 100644
--- 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,\
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index 2f5546610cde..de00e7754413 100644
--- 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,\
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 4a93a973d7b0..e8342ea1d69a 100644
--- 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,\
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 68bf39910ac0..92d819ce2d3b 100644
--- 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,\
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index f635bbc4a445..b16bcf73818c 100644
--- 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,\
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index b0deeea3ecbd..9097874879d5 100644
--- 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,\
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 23d5f5b820f4..7961b1c86237 100644
--- 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,\
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index d2934d767443..de99829209d1 100644
--- 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,\
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 9af0e51e19cb..e42cae544d06 100644
--- 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,\
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 22c30bbc633b..8137721db724 100644
--- 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,\
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index 1ea8b340ddfc..6689f0f439e0 100644
--- 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,\
diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
index 12849a3d9903..793410f6b925 100644
--- 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 \
))
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 226d00203343..f6558ef2f9a0 100644
--- 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,\
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index 08306236645b..2d509fecb257 100644
--- 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,\
diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk
index 71d3e130e902..acf371118aec 100644
--- 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,\
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 4a70c4301905..8c2813a87797 100644
--- 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,\
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index c46bd927196c..a07961a61d9d 100644
--- 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,\
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 6b9474ec2421..fd27382427a1 100644
--- 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,\
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 8f3df324c520..bc55447603cd 100644
--- 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,\
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 91b1621372f1..017116a99304 100644
--- 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,\
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 7d8d064c90bb..3d29ed1eed8f 100644
--- 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,\
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 8f1e72ffce47..eea9ef18460b 100644
--- 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,\
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index cd88fb413a93..520302e06d1b 100644
--- 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,\
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 540db598d38d..841e199a6dd0 100644
--- 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,\
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 0fe2ee2e9fd5..b91f2099dbbd 100644
--- 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) \
))
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 72f87d6adf53..b84066fa9af9 100644
--- 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,\
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index af1e4b1b99e3..7e06d1230184 100644
--- 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,\
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 0171b4e4620f..47fdf90d1fc2 100644
--- 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) \
))
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index b4081c3eb73b..7dfb7d99a65a 100644
--- 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,\
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 71e2116fc24b..cc687bd1231b 100644
--- 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,\
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index 18674e0825bd..877d4d82250e 100644
--- 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 \
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 96f82fae8228..e052d0af9b49 100644
--- 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,\
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 418e1c9d6d02..df1149f38549 100644
--- 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,\
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 56ba2fd0aac7..929311b2d6e3 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index d201ca81d4b1..bdacb0bd48c8 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 01f8c418cd79..b1e54b02427c 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 05bca552c35e..5e14b91a76d4 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 259d308cd97c..26bcc7a3b5a9 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index b8205ac5b9b0..e9837156dfc7 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 948e84de2fb5..c9f49e6aaf82 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 6a4e968d8b58..cc24060e6ada 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index a72b09fbc7d7..77d47bd5d146 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index a002d67e907f..5cb9762aa38f 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 53f33376780e..e1f92c65f44a 100644
--- 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,\
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index f3d5c025c5f3..2e24f4c7f52b 100644
--- 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,\
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 97fb999e87af..bd5bf4c17518 100644
--- 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,\
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 235cabd9b85c..30b77a122078 100644
--- 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))
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 01486fa33aa8..f8711ab143e3 100644
--- 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,\
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 54d83105a4c8..12f3048ce63b 100644
--- 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,\
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 8e563362a623..ee42c721a023 100644
--- 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,\
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index d7233a2d212e..bf01d0cbbc52 100644
--- 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,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4f9fdc03ac9a..1b030bb3ff46 100644
--- 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,\
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 84f9b098e58e..94bdfecae942 100644
--- 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,\
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 3316acc8ba43..957a9e9200b3 100644
--- 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/ \
))
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index e57f4628e39f..da6212bcd902 100644
--- 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,\
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index f849ce81a741..d197ef23943c 100644
--- 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) \
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 9b3b1bee40cf..f4b67831428c 100644
--- 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,\
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index b8f5d3724a19..f6597b583aae 100644
--- 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,\
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index 327d4d93e647..f23d763d6df2 100644
--- 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,\
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index be96512e302a..dbbe4465ae6f 100644
--- 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)
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index fd1557ff3245..96eef6979e4a 100644
--- 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)
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 187aae4f9520..e00686bf1f3e 100644
--- 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,\
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index 05365287c3ee..7403b5b0a3cf 100644
--- 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,\
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index c174a35fe743..3c73abb56c62 100644
--- 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,\
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 3ccf55210adb..fb35e9127d71 100644
--- 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:
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index 5c38e4175a12..ae2c57fe0ba9 100644
--- 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:
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 2247c9a0093d..478b4b6dcf12 100644
--- 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) \
))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 6b577b62cc06..b7e6b7e2aed4 100644
--- 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) \
))
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 8ca769ebde02..56f351098457 100644
--- 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,\
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 0d80e92c0775..fe0cd55c9344 100644
--- 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) \
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 49ef1e6819e1..d9e003b8becb 100644
--- 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) \
))
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 48c2ca9e5661..4a89156a4abb 100644
--- 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) \
))
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 1c35a08cc16d..ce19c28fd766 100644
--- 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,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 120e07766324..19253fa0ff2c 100644
--- 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) \
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
index c2d109fa57d1..1da1a0139811 100644
--- 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/) \
))
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
index 63e03ffd9a5f..c8f0e1056fca 100644
--- 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/ \
))
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 50675cf87243..7d1370a5f371 100644
--- 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) \
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk
index 238745ffd055..65cf7ad1cc36 100644
--- 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/ \
))
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 5bb50abdcfd7..8380556481b2 100644
--- 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) \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index ce85a4c25a8f..a06c8a8461ac 100644
--- 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,\
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 0a2a81d0dc54..a2f4c4e29d54 100644
--- 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,\
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index d5056ed3ac02..101bf6581988 100644
--- 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,\
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index f626351d66aa..8e61cabb507a 100644
--- 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,\
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 40e70f3be74d..a33bb5f38719 100644
--- 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,\
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index fd35e42586a5..d3703623ebf4 100644
--- 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,\
diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk
index 97112cdf86df..0468c4906c40 100644
--- a/tools/Executable_bestreversemap.mk
+++ b/tools/Executable_bestreversemap.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Executable_Executable,bestreversemap))
$(eval $(call gb_Executable_set_include,bestreversemap,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/ \
))
$(eval $(call gb_Executable_add_linked_libs,bestreversemap,\
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 5454edf46af0..98fad08b46f7 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,utl,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
# add any additional definitions to be set for compilation here
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 074f9cc5557f..bae926505bef 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,desktop_detector,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 424197a1977d..e6da489417f3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
$(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \
-I$(WORKDIR)/CustomTarget/vcl/generic/fontmanager \
))
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index e29266d1d3d5..4be0bfca52d6 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,vclplug_gen,\
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 657844d50250..b5a6eb0dadd2 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
-I$(SRCDIR)/vcl/unx \
-I$(SRCDIR)/vcl/unx/gtk/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,vclplug_gtk,\
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index ca50535412d3..0be8ef9064b0 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
-I$(SRCDIR)/vcl/unx \
-I$(SRCDIR)/vcl/unx/gtk3/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 260dce26adf4..d1c6f6d7f543 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_set_include,vclplug_kde,\
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 6828936b1113..34d289206cb3 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \
))
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 4f87c79ee9e2..f96109dc461a 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_cxxflags,vclplug_svp,\
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 1de8e9e830b1..780396262701 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_StaticLibrary_set_include,vclmain,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_StaticLibrary_add_api,vclmain,\
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index f04202cf0fb8..f694d45b26ce 100644
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \
$(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(SRCDIR)/writerfilter/inc \
))
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 43f36b0284af..beff35f636e4 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,doctok,\
-I$(WORKDIR)/CustomTarget/writerfilter/source \
-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
- -I$(OUTDIR)/inc \
))
include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index f4a1fe2763ff..5cea5492a8c5 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,ooxml,\
-I$(WORKDIR)/CustomTarget/writerfilter/source \
-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,ooxml,\
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 8f999d6a305e..fc29368e0354 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,resourcemodel,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
-I$(WORKDIR)/CustomTarget/writerfilter/source \
- -I$(OUTDIR)/inc \
))
include $(SRCDIR)/writerfilter/debug_setup.mk
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 1afdd27d3c4a..9962632442ed 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,rtftok,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
-I$(WORKDIR)/CustomTarget/writerfilter/source \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,rtftok,\
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 3f4c3bde2f0c..c6e06346e21f 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,writerfilter_uno))
$(eval $(call gb_Library_set_include,writerfilter_uno,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,writerfilter_uno,\