15 files changed, 15 insertions, 60 deletions
diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk
index 2ef218a4f4b9..e548fa710099 100644
--- a/ucb/Library_cached1.mk
+++ b/ucb/Library_cached1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,cached1))
 
 $(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1))
 
-$(eval $(call gb_Library_use_api,cached1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,cached1))
 
 $(eval $(call gb_Library_use_libraries,cached1,\
 	cppu \
diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk
index 09f3302088c5..7beb741e7465 100644
--- a/ucb/Library_srtrs1.mk
+++ b/ucb/Library_srtrs1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,srtrs1))
 
 $(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1))
 
-$(eval $(call gb_Library_use_api,srtrs1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,srtrs1))
 
 $(eval $(call gb_Library_use_libraries,srtrs1,\
 	cppu \
diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk
index 32ca8baee823..a501f877a184 100644
--- a/ucb/Library_ucb1.mk
+++ b/ucb/Library_ucb1.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ucb1,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,ucb1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucb1))
 
 $(eval $(call gb_Library_use_libraries,ucb1,\
 	comphelper \
diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk
index 8237f6c85951..635aaa2cac87 100644
--- a/ucb/Library_ucpcmis1.mk
+++ b/ucb/Library_ucpcmis1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpcmis1))
 
 $(eval $(call gb_Library_set_componentfile,ucpcmis1,ucb/source/ucp/cmis/ucpcmis1))
 
-$(eval $(call gb_Library_use_api,ucpcmis1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpcmis1))
 
 $(eval $(call gb_Library_use_libraries,ucpcmis1,\
 	cppu \
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 3d7d8d306bd9..91b3a975c1ce 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpdav1))
 
 $(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1))
 
-$(eval $(call gb_Library_use_api,ucpdav1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpdav1))
 
 $(eval $(call gb_Library_use_libraries,ucpdav1,\
 	comphelper \
diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
index 962cf2d90324..51c79e703c5c 100644
--- a/ucb/Library_ucpexpand1.mk
+++ b/ucb/Library_ucpexpand1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpexpand1))
 
 $(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1))
 
-$(eval $(call gb_Library_use_api,ucpexpand1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpexpand1))
 
 $(eval $(call gb_Library_use_libraries,ucpexpand1,\
 	cppu \
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
index 9d648fbd8cc8..9e730003d3e9 100644
--- a/ucb/Library_ucpext.mk
+++ b/ucb/Library_ucpext.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpext))
 
 $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext))
 
-$(eval $(call gb_Library_use_api,ucpext,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpext))
 
 $(eval $(call gb_Library_use_libraries,ucpext,\
 	comphelper \
diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk
index db3e2739f72a..d0b301e12d6a 100644
--- a/ucb/Library_ucpfile1.mk
+++ b/ucb/Library_ucpfile1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpfile1))
 
 $(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1))
 
-$(eval $(call gb_Library_use_api,ucpfile1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpfile1))
 
 $(eval $(call gb_Library_use_libraries,ucpfile1,\
 	cppu \
diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk
index f0c6fc2b5d25..69e938ce9d8d 100644
--- a/ucb/Library_ucpftp1.mk
+++ b/ucb/Library_ucpftp1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpftp1))
 
 $(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1))
 
-$(eval $(call gb_Library_use_api,ucpftp1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpftp1))
 
 $(eval $(call gb_Library_use_libraries,ucpftp1,\
 	cppu \
diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk
index c01b1255b93a..d986f2c3737c 100644
--- a/ucb/Library_ucpgio1.mk
+++ b/ucb/Library_ucpgio1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpgio1))
 
 $(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio))
 
-$(eval $(call gb_Library_use_api,ucpgio1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpgio1))
 
 $(eval $(call gb_Library_use_libraries,ucpgio1,\
 	cppu \
diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk
index 321359c20d04..213c7fc789de 100644
--- a/ucb/Library_ucpgvfs1.mk
+++ b/ucb/Library_ucpgvfs1.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ucpgvfs1,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,ucpgvfs1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpgvfs1))
 
 $(eval $(call gb_Library_add_libs,ucpgvfs1,\
 	$(GNOMEVFS_LIBS) \
diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk
index d3c7030be320..ac33d001c686 100644
--- a/ucb/Library_ucphier1.mk
+++ b/ucb/Library_ucphier1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucphier1))
 
 $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1))
 
-$(eval $(call gb_Library_use_api,ucphier1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucphier1))
 
 $(eval $(call gb_Library_use_libraries,ucphier1,\
 	cppu \
diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk
index 8536de71324b..84300e59ae63 100644
--- a/ucb/Library_ucpodma1.mk
+++ b/ucb/Library_ucpodma1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpodma1))
 
 $(eval $(call gb_Library_set_componentfile,ucpodma1,ucb/source/ucp/odma/ucpodma1))
 
-$(eval $(call gb_Library_use_api,ucpodma1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucpodma1))
 
 $(eval $(call gb_Library_use_libraries,ucpodma1,\
 	cppu \
diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk
index 5f0aa247173a..8b0e8ec0fe12 100644
--- a/ucb/Library_ucppkg1.mk
+++ b/ucb/Library_ucppkg1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucppkg1))
 
 $(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1))
 
-$(eval $(call gb_Library_use_api,ucppkg1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucppkg1))
 
 $(eval $(call gb_Library_use_libraries,ucppkg1,\
 	comphelper \
diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk
index d79f42e9b056..82b8aba0fc37 100644
--- a/ucb/Library_ucptdoc1.mk
+++ b/ucb/Library_ucptdoc1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucptdoc1))
 
 $(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1))
 
-$(eval $(call gb_Library_use_api,ucptdoc1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ucptdoc1))
 
 $(eval $(call gb_Library_use_libraries,ucptdoc1,\
 	comphelper \