diff --git a/Repository.mk b/Repository.mk
index 82f3033a4446..f77022a5ffc7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -444,6 +444,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 	$(if $(filter WNT,$(OS)),jpipx) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \
+	fileacc \
+	i18nutil \
+	package2 \
+	sofficeapp \
+	ucb1 \
+	ucpfile1 \
+	xstor \
+))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     avmediagst \
     avmediagst_0_10 \
@@ -458,7 +467,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     dict_zh \
     embobj \
     emboleobj \
-    fileacc \
     hsqldb \
     index_data \
     java_uno_accessbridge \
@@ -472,22 +480,18 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     mcnttype \
     mozbootstrap \
     officebean \
-    package2 \
     pyuno \
     pyuno_wrapper \
     recentfile \
     scriptframe \
     sdbc2 \
     smoketest \
-    sofficeapp \
     srtrs1 \
     subsequenttest \
     test \
     textconv_dict \
     tvhlp1 \
-    ucb1 \
     ucpdav1 \
-    ucpfile1 \
     ucpftp1 \
     ucpchelp1 \
     ucphier1 \
@@ -500,7 +504,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     xmlsecurity \
     xsec_fw \
     xsec_xmlsec \
-    xstor \
     $(if $(filter $(OS),ANDROID), \
         lo-bootstrap \
     ) \
@@ -546,7 +549,6 @@ endif
 $(eval $(call gb_Helper_register_libraries,RTLIBS, \
     comphelper \
     i18nlangtag \
-    i18nutil \
     ucbhelper \
 ))
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9214f171b28f..bb4c0f2b0ccd 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -430,8 +430,6 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
 STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
 
-SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
-
 STD_LIB_FILE(gid_File_Lib_Filterconfig1, filterconfig)
 
 STD_LIB_FILE( gid_File_Lib_Flat, flat)
@@ -601,17 +599,6 @@ File gid_File_Lib_I18nisolang
     PACKED_LIB_FILE_BODY;
 End
 
-File gid_File_Lib_I18nutil
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libi18nutil,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(i18nutil,COMID,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 #ifndef SYSTEM_ICU
 
 File gid_File_Lib_Icudata
@@ -807,8 +794,6 @@ End
 
 #endif
 
-SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2)
-
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
 
 STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
@@ -1123,17 +1108,6 @@ File gid_File_Lib_Tvhlp1
   #endif
 End
 
-File gid_File_Lib_Ucb1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
-  #else
-    Name = "ucb1.dll";
-  #endif
-End
-
 File gid_File_Lib_Ucbhelper
     LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
@@ -1195,8 +1169,6 @@ End
 
 #endif
 
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
-
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
@@ -1248,8 +1220,6 @@ File gid_File_Lib_Xo
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor)
-
 STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
 STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
 STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
@@ -1416,13 +1386,6 @@ File gid_File_Lib_Crypto
 End
 #endif
 
-File gid_File_Lib_Soffice
-    LIB_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("sofficeapp");
-    Styles = (PACKED);
-End
-
 File gid_File_Lib_Unopkgapp
     LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 1d8daac6d4f9..2db76d5ef826 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -101,7 +101,6 @@ Module gid_Module_Root_Files_2
 	gid_File_Bin_Uri_Encode,
 	gid_File_Bin_UIPreviewer,
 	gid_File_Exe_Nsplugin,
-        gid_File_Lib_Soffice,
         gid_File_Lib_Unopkgapp,
 	gid_File_Txt_Pagein_Common,
 	gid_File_Txt_Pagein_Calc,
@@ -275,11 +274,9 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
 	gid_File_Lib_Evtatt,
-	gid_File_Lib_Fileacc,
 	gid_File_Lib_Filterconfig1,
 	gid_File_Lib_I18nsearch,
     gid_File_Lib_I18nisolang,
-	gid_File_Lib_I18nutil,
 	gid_File_Lib_Icudata,
 	gid_File_Lib_Icui18n,
 	gid_File_Lib_Icule,
@@ -298,7 +295,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Odbc,
 	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
-	gid_File_Lib_Package2,
 	gid_File_Lib_Deployment,
 	gid_File_Lib_DeploymentGui,
 	gid_File_Lib_Expwrap_Uno,
@@ -335,12 +331,10 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ssl3,
 	gid_File_Lib_Sndfile,
 	gid_File_Lib_Tvhlp1,
-	gid_File_Lib_Ucb1,
 	gid_File_Lib_Ucbhelper,
 	gid_File_Lib_Ucpchelp1,
 	gid_File_Lib_Ucpdav1,
 	gid_File_Lib_Neon,
-	gid_File_Lib_Ucpfile1,
 	gid_File_Lib_Ucpftp1,
 	gid_File_Lib_Ucphier1,
 	gid_File_Lib_Ucppkg1,
@@ -353,7 +347,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_XSec_XMLSecurity,
 	gid_File_Lib_XSec_Framework,
 	gid_File_Lib_XSec_XmlSec,
-	gid_File_Lib_Xstor,
 	gid_File_CanvasFactory,
 	gid_File_SimpleCanvas,
 	gid_File_Lib_Cmdmail,