4 files changed, 5 insertions, 20 deletions
diff --git a/Repository.mk b/Repository.mk
index fc6e7375f48c..3cbed038991e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,6 +222,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 endif
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
+    svgfilter \
+    flash \
+    wpftdraw \
+    graphicfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
@@ -388,8 +392,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     dbu \
     evoab \
 	filtertracer \
-	flash \
-    graphicfilter \
     log \
 	MacOSXSpell \
     mork \
@@ -413,7 +415,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     spa \
     spell \
     sts \
-    svgfilter \
     textfd \
     updatecheckui \
     $(if $(DISABLE_SCRIPTING),,vbahelper) \
@@ -423,7 +424,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     vclplug_kde \
     vclplug_kde4 \
     vclplug_svp \
-    wpftdraw \
 ))
 
 ifneq (,$(filter ANDROID IOS,$(OS)))
diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk
index 1858d9394b81..f166e2569928 100644
--- a/scp2/InstallModule_graphicfilter.mk
+++ b/scp2/InstallModule_graphicfilter.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter))
 
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\
-    scp2/source/graphicfilter/file_graphicfilter \
-))
-
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\
     scp2/source/graphicfilter/module_graphicfilter \
 ))
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index 535688ded532..2fdffb4506c8 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -34,11 +34,4 @@ File gid_File_Share_Registry_Graphicfilter_Xcd
     Name = "graphicfilter.xcd";
 End
 
-STD_LIB_FILE( gid_File_Lib_Flash, flash )
 STD_RES_FILE( gid_File_Res_Flash, flash )
-
-STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
-
-STD_LIB_FILE( gid_File_Lib_Graphic, graphicfilter )
-
-STD_LIB_FILE( gid_File_Lib_WpftDraw, wpftdraw )
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index e86e6a5c8538..9ebfcc2dde4b 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -35,10 +35,6 @@ Module gid_Module_Optional_Grfflt
     Sortkey = "600";
     ParentID = gid_Module_Optional;
     Default = YES;
-    Files = (
-        gid_File_Lib_Svg,
-        gid_File_Lib_Flash,
-        gid_File_Lib_WpftDraw,
-        gid_File_Lib_Graphic,
+    Files = (auto_Graphicfilter_Lib_ALL
         gid_File_Share_Registry_Graphicfilter_Xcd);
 End