5 files changed, 12 insertions, 12 deletions
diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk
index 229b003e5a28..ba14d33261d0 100644
--- a/fpicker/Library_fpicker.mk
+++ b/fpicker/Library_fpicker.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,fpicker))
 
 $(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker))
 
-$(eval $(call gb_Library_add_api,fpicker,\
+$(eval $(call gb_Library_use_api,fpicker,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fpicker,\
+$(eval $(call gb_Library_use_libraries,fpicker,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,fpicker,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_static_libs,fpicker,\
+$(eval $(call gb_Library_use_static_libraries,fpicker,\
 	odma_lib \
 ))
 endif
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 986b16789849..aa6251771494 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/src))
 
 $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
 
-$(eval $(call gb_Library_add_api,fps,\
+$(eval $(call gb_Library_use_api,fps,\
 	offapi \
 	udkapi \
 ))
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,fps,\
 	-D_WIN32_WINNT=0x0600 \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fps,\
+$(eval $(call gb_Library_use_libraries,fps,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index a2575d08dc7f..18bad445f52d 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,fps_aqua))
 
 $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
 
-$(eval $(call gb_Library_add_api,fps_aqua,\
+$(eval $(call gb_Library_use_api,fps_aqua,\
 	offapi \
 	udkapi \
 ))
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_libs,fps_aqua,\
     -framework CoreFoundation \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fps_aqua,\
+$(eval $(call gb_Library_use_libraries,fps_aqua,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk
index 754487601293..d55c1d1a2a48 100644
--- a/fpicker/Library_fps_odma.mk
+++ b/fpicker/Library_fps_odma.mk
@@ -27,12 +27,12 @@
 
 $(eval $(call gb_Library_Library,fps_odma))
 
-$(eval $(call gb_Library_add_api,fps_odma,\
+$(eval $(call gb_Library_use_api,fps_odma,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fps_odma,\
+$(eval $(call gb_Library_use_libraries,fps_odma,\
 	comphelper \
 	cppu \
 	cppuhelper \
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,fps_odma,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_static_libs,fps_odma,\
+$(eval $(call gb_Library_use_static_libraries,fps_odma,\
 	odma_lib \
 ))
 endif
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index 1f0e9983b726..af5bc1b1265a 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,fps_office))
 
 $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office))
 
-$(eval $(call gb_Library_add_api,fps_office,\
+$(eval $(call gb_Library_use_api,fps_office,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fps_office,\
+$(eval $(call gb_Library_use_libraries,fps_office,\
 	comphelper \
 	cppu \
 	cppuhelper \