6 files changed, 55 insertions, 7 deletions
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index da39f4d7d249..728563e42c06 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -30,11 +30,15 @@ $(eval $(call gb_Executable_Executable,svidl))
 $(eval $(call gb_Executable_set_include,svidl,\
 	$$(INCLUDE) \
 	-I$(OUTDIR)/inc/ \
-	-I$(OUTDIR)/inc/offuh/ \
 	-I$(SRCDIR)/idl/inc/pch \
 	-I$(SRCDIR)/idl/inc \
 ))
 
+$(eval $(call gb_Executable_add_api,svidl,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Executable_add_defs,svidl,\
 	-DIDL_COMPILER \
 ))
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 00fcc94143b0..7c38b66b5a50 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -37,7 +37,11 @@ $(eval $(call gb_Library_set_include,lng,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/linguistic/inc \
 	-I$(SRCDIR)/linguistic/inc/pch \
-	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,lng,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_defs,lng,\
diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile
new file mode 100644
index 000000000000..c898975e5277
--- /dev/null
+++ b/oovbaapi/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 3e63dc9959c6..1c33b5279bc0 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -48,8 +48,7 @@ $(eval $(call gb_Library_add_defs,qstart_gtk,\
 ))
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
     -DENABLE_SYSTRAY_GTK \
 ))
 endif
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index d3d294158532..5b7999e873a4 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -59,8 +59,7 @@ $(eval $(call gb_Library_add_defs,sfx,\
 ))
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,sfx,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
     -DENABLE_QUICKSTART_APPLET \
     -DENABLE_SYSTRAY_GTK \
     -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index d23347509227..54b05d7bd40d 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,xcr,\
 	-I$(SRCDIR)/xmlscript/source/inc \
 	-I$(SRCDIR)/xmlscript/inc/pch \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,xcr,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_defs,xcr,\