use the packaged header

Change-Id: I3a447ab2b7798922e1805d8ed379359fd9a8f216

fpicker/AllLangResTarget_fps_office.mk

@@ -36,15 +36,11 @@ $(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
 $(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
 
 $(eval $(call gb_SrsTarget_use_packages,fps_office/res,\
+	fpicker_inc \
     svl_inc \
 	svtools_inc \
 ))
 
-$(eval $(call gb_SrsTarget_set_include,fps_office/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/fpicker/inc \
-))
-
 $(eval $(call gb_SrsTarget_add_files,fps_office/res,\
 	fpicker/source/office/OfficeFilePicker.src \
 	fpicker/source/office/iodlg.src \

fpicker/Library_fps.mk

@@ -31,9 +31,8 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/src))
 
 $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
 
-$(eval $(call gb_Library_set_include,fps,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/fpicker/inc \
+$(eval $(call gb_Library_use_packages,fps,\
+	fpicker_inc \
 ))
 
 $(eval $(call gb_Library_use_api,fps,\

fpicker/Library_fps_aqua.mk

@@ -29,16 +29,15 @@ $(eval $(call gb_Library_Library,fps_aqua))
 
 $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
 
+$(eval $(call gb_Library_use_packages,fps_aqua,\
+	fpicker_inc \
+))
+
 $(eval $(call gb_Library_use_api,fps_aqua,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_set_include,fps_aqua,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/fpicker/inc \
-))
-
 $(eval $(call gb_Library_add_libs,fps_aqua,\
     -framework Cocoa \
     -framework CoreFoundation \