use INCLUDE instead of SOLARINC, and after local includes

dbaccess/Library_dbui.mk

@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbui,\
 	-I$(SRCDIR)/dbaccess/source/ui/inc \
 	-I$(SRCDIR)/dbaccess/source/ui/dlg \
 	-I$(SRCDIR)/dbaccess/source/inc \
-	$$(SOLARINC) \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,dbui,\

svl/Library_fsstorage.mk

@@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,fsstorage))
 $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
 
 $(eval $(call gb_Library_set_include,fsstorage,\
-    $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(OUTDIR)/inc \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,fsstorage,\

svl/Library_passwordcontainer.mk

@@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,passwordcontainer))
 $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
 
 $(eval $(call gb_Library_set_include,passwordcontainer,\
-    $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(OUTDIR)/inc \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,passwordcontainer,\

svl/Library_svl.mk

@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_package_headers,svl,svl_inc))
 $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
 
 $(eval $(call gb_Library_set_include,svl,\
-    $$(SOLARINC) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,svl,\

svx/Library_svx.mk

@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
 $(eval $(call gb_Library_set_include,svx,\
     -I$(realpath $(SRCDIR)/svx/inc) \
     -I$(realpath $(SRCDIR)/svx/source/inc) \
-    $$(SOLARINC) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,svx,\

xmloff/Library_xo.mk

@@ -33,8 +33,8 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
 $(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
 
 $(eval $(call gb_Library_set_include,xo,\
-    $$(SOLARINC) \
     -I$(realpath $(SRCDIR)/xmloff/inc) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,xo,\