10 files changed, 50 insertions, 10 deletions
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 9afc9ac40..bb2febd1e 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -34,7 +34,11 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
 	-I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,odbcconfig,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,odbcconfig,\
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index ee5ae6a71..0e5b7bbe1 100644
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,adabasui,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,adabasui,\
@@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,adabasui,\
     -DCOMPMOD_NAMESPACE=adabasui \
 ))
 
+$(eval $(call gb_Library_add_api,adabasui,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,adabasui,\
     comphelper \
     cppu \
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index fdd57547a..748c209ba 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,dba,\
 	-I$(realpath $(SRCDIR)/dbaccess/source/inc) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,dba,\
@@ -48,6 +47,11 @@ $(eval $(call gb_Library_set_defs,dba,\
     -DOOO_DLLIMPLEMENTATION_DBA \
 ))
 
+$(eval $(call gb_Library_add_api,dba,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,dba,\
     comphelper \
     cppu \
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index e0a190898..477f86b53 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,dbaxml,\
     -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,dbaxml,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,dbaxml,\
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index db6b152b2..023157dda 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -38,7 +38,11 @@ $(eval $(call gb_Library_set_include,dbmm,\
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
     -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,dbmm,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,dbmm,\
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 7f8c6db47..61910cfa7 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -37,7 +37,11 @@ $(eval $(call gb_Library_set_include,dbu,\
     -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \
     -I$(WORKDIR)/inc/dbaccess \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,dbu,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_set_defs,dbu,\
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index a93bc256b..5338fcf56 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -40,7 +40,11 @@ $(eval $(call gb_Library_set_include,sdbt,\
 	-I$(realpath $(SRCDIR)/dbaccess/source/inc/) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,sdbt,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,sdbt,\
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 430f9d220..93e1adb5a 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,rpt,\
     -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
     -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,rpt,\
@@ -44,6 +43,11 @@ $(eval $(call gb_Library_set_defs,rpt,\
     -DREPORTDESIGN_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,rpt,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,rpt,\
     comphelper \
     cppu \
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index c532117ce..7aee950fa 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -36,7 +36,11 @@ $(eval $(call gb_Library_set_include,rptui,\
     -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
     -I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,rptui,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,rptui,\
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 8a0b6864c..ff9eb4436 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,rptxml,\
     -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \
     -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,rptxml,\
     $$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,rptxml,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,rptxml,\
     comphelper \
     cppu \