tdf#42949 Fix IWYU warnings in desktop/

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: If72377cb352be71050a5b0a471bbe3b02d9c0f74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87117 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-24 11:59:16 +01:00
parent 1d10db1003
commit 3381e35ec2
112 changed files with 158 additions and 474 deletions
@@ -0,0 +1,94 @@
+---
+assumeFilename: desktop/source/lib/init.cxx
+blacklist:
+    desktop/inc/lib/init.hxx:
+    # Complete type is needed
+    - boost/property_tree/ptree.hpp
+    desktop/source/offacc/acceptor.hxx:
+    # Don't propose hxx -> h change in URE libs
+    - osl/thread.hxx
+    desktop/qa/desktop_lib/test_desktop_lib.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    desktop/source/app/app.cxx:
+    # Needed on WIN32
+    - o3tl/char16_t2wchar_t.hxx
+    # Needed for HAVE_FEATURE_UPDATE_MAR
+    - com/sun/star/system/XSystemShellExecute.hpp
+    - com/sun/star/system/SystemShellExecute.hpp
+    - officecfg/Office/Update.hxx
+    desktop/source/app/appinit.cxx:
+    # Needed on IOS
+    - rtl/bootstrap.hxx
+    desktop/source/app/cmdlineargs.cxx:
+    # Don't propose hxx -> h change in URE libs
+    - osl/thread.hxx
+    desktop/source/app/cmdlinehelp.cxx:
+    # Needed on WIN32
+    - comphelper/string.hxx
+    desktop/source/app/crashreport.cxx:
+    # Needed on WIN32
+    - o3tl/char16_t2wchar_t.hxx
+    desktop/source/app/dispatchwatcher.cxx:
+    # Don't propose hxx -> h change in URE libs
+    - osl/thread.hxx
+    desktop/source/app/sofficemain.cxx:
+    # Might be needed on WIN32
+    - prewin.h
+    - postwin.h
+    # Needed on ANDROID
+    - rtl/bootstrap.hxx
+    desktop/source/lib/init.cxx:
+    # Needed for boost::trim_copy
+    - boost/algorithm/string.hpp
+    # Actually used
+    - comphelper/scopeguard.hxx
+    # Needed on IOS & ANDROID
+    - officecfg/Office/Impress.hxx
+    desktop/source/minidump/minidump.cxx:
+    # Needed for ostringstream
+    - sstream
+    desktop/source/deployment/manager/dp_properties.cxx:
+    # Actually used
+    - com/sun/star/ucb/XCommandEnvironment.hpp
+    desktop/source/deployment/manager/dp_informationprovider.cxx:
+    # Needed for extern functions
+    - dp_services.hxx
+    desktop/source/deployment/manager/dp_extensionmanager.cxx:
+    # Actually used
+    - com/sun/star/deployment/XPackage.hpp
+    - com/sun/star/deployment/XPackageManager.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    # Needed for extern functions
+    - dp_services.hxx
+    desktop/source/deployment/misc/lockfile.cxx:
+    # Needed on WIN32
+    - memory
+    desktop/source/deployment/misc/dp_descriptioninfoset.cxx:
+    # Actually used
+    - o3tl/optional.hxx
+    desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    desktop/source/deployment/registry/component/dp_compbackenddb.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    desktop/source/deployment/registry/package/dp_extbackenddb.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    desktop/source/deployment/registry/help/dp_helpbackenddb.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    desktop/source/deployment/registry/script/dp_lib_container.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    - com/sun/star/ucb/XCommandEnvironment.hpp
+    desktop/source/deployment/registry/help/dp_help.cxx:
+    # Actually used
+    - com/sun/star/util/XMacroExpander.hpp
@@ -21,12 +21,10 @@
 #define INCLUDED_DESKTOP_INC_APP_HXX

 #include <o3tl/optional.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <unotools/bootstrap.hxx>
-#include <unotools/resmgr.hxx>
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/uno/Reference.h>
@@ -20,16 +20,11 @@
 #ifndef INCLUDED_DESKTOP_INC_DP_MISC_H
 #define INCLUDED_DESKTOP_INC_DP_MISC_H

-#include <rtl/ustrbuf.hxx>
-#include <rtl/instance.hxx>
 #include <osl/mutex.hxx>
 #include <osl/process.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/deployment/XPackageRegistry.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <dp_misc_api.hxx>

 namespace dp_misc {
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX

-#include <osl/diagnose.h>
 #include <rtl/instance.hxx>
 #include <unotools/resmgr.hxx>

@@ -15,6 +15,7 @@
 #include <memory>
 #include <mutex>

+#include <boost/property_tree/ptree.hpp>
 #include <boost/variant.hpp>

 #include <osl/thread.h>
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_DESKTOP_INC_MIGRATION_HXX
 #define INCLUDED_DESKTOP_INC_MIGRATION_HXX

-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
 namespace desktop {

 class Migration
@@ -24,7 +24,6 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>

 #include "../../source/deployment/inc/dp_version.hxx"
@@ -17,14 +17,12 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <cstddef>
 #include <sal/types.h>

 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -15,13 +15,10 @@
 #include <com/sun/star/awt/XReschedule.hpp>
 #include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

-#include <com/sun/star/frame/XStorable.hpp>
-
 #include <vcl/combobox.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/svapp.hxx>
@@ -30,7 +27,6 @@
 #include <comphelper/processfactory.hxx>
 #include <rtl/uri.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <test/unoapi_test.hxx>
 #include <comphelper/lok.hxx>
@@ -49,7 +45,6 @@
 #include <comphelper/string.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <cairo.h>
-#include <ostream>
 #include <config_features.h>
 #include <config_mpl.h>

@@ -9,9 +9,6 @@

 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>

 using namespace ::com::sun::star;
@@ -7,16 +7,11 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <memory>
-#include <boost/property_tree/json_parser.hpp>
 #include <cppunit/TestFixture.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/sequence.hxx>
-#include <cstdlib>
-#include <string>
-#include <stdio.h>

 #include <tools/color.hxx>

@@ -28,21 +28,16 @@
 #include <sal/config.h>

 #include <iostream>
-#include <mutex>
-#if defined UNX
-#include <signal.h>
-#endif

 #include <app.hxx>
 #include <dp_shared.hxx>
 #include <strings.hrc>
 #include "cmdlineargs.hxx"
-#include "cmdlinehelp.hxx"
-#include "dispatchwatcher.hxx"
 #include <lockfile.hxx>
 #include "userinstall.hxx"
 #include "desktopcontext.hxx"
 #include <migration.hxx>
+#include "officeipcthread.hxx"
 #if HAVE_FEATURE_UPDATE_MAR
 #include "updater.hxx"
 #endif
@@ -61,7 +56,6 @@
 #include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/StartModule.hpp>
@@ -79,8 +73,6 @@
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XRestartManager.hpp>
 #include <com/sun/star/document/XDocumentEventListener.hpp>
-#include <com/sun/star/ui/theUIElementFactoryManager.hpp>
-#include <com/sun/star/ui/theWindowStateConfiguration.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 #include <com/sun/star/system/XSystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
@@ -93,6 +85,7 @@
 #include <comphelper/threadpool.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/backupfilehelper.hxx>
+#include <uno/current_context.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -105,7 +98,6 @@
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <rtl/byteseq.hxx>
-#include <rtl/uri.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/menuoptions.hxx>
@@ -20,28 +20,18 @@

 #include <algorithm>

-#include <config_vclplug.h>
-
 #include <app.hxx>
 #include <dp_shared.hxx>
 #include "cmdlineargs.hxx"
 #include <strings.hrc>
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/XCurrentContext.hpp>
-#include <com/sun/star/packages/zip/ZipIOException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
-#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
-#include <uno/current_context.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <officecfg/Setup.hxx>
 #include <osl/file.hxx>
-#include <osl/module.h>
-#include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
@@ -52,7 +42,6 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
-#include <sfx2/safemode.hxx>
 #include <map>

 using namespace desktop;
@@ -20,22 +20,16 @@
 #include <config_folders.h>
 #include <config_features.h>

-#include <osl/file.hxx>
-
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <cppuhelper/implbase.hxx>

-#include <vcl/timer.hxx>
-
-#include <unotools/configmgr.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>

 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
@@ -50,7 +44,6 @@
 #include <com/sun/star/deployment/LicenseException.hpp>
 #include <com/sun/star/deployment/ui/LicenseDialog.hpp>
 #include <com/sun/star/task/OfficeRestartManager.hpp>
-#include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -26,9 +26,8 @@
 #endif

 #include "cmdlineargs.hxx"
+#include <osl/thread.hxx>
 #include <tools/stream.hxx>
-#include <vcl/svapp.hxx>
-#include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/process.h>
 #include <comphelper/lok.hxx>
@@ -36,8 +35,6 @@
 #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
 #include <unotools/bootstrap.hxx>

-#include <svl/documentlockfile.hxx>
-
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 #include <sal/log.hxx>
@@ -18,10 +18,8 @@
 */


-#include <stdlib.h>
 #include <stdio.h>
 #include <comphelper/string.hxx>
-#include <sal/types.h>
 #include <app.hxx>

 #include "cmdlinehelp.hxx"
@@ -21,7 +21,6 @@

 #include "desktopcontext.hxx"

-#include <vcl/svapp.hxx>
 #include <svtools/javainteractionhandler.hxx>

 using namespace com::sun::star::uno;
@@ -21,7 +21,7 @@
 #define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX

 #include <cppuhelper/implbase.hxx>
-#include <uno/current_context.hxx>
+#include <com/sun/star/uno/XCurrentContext.hpp>

 namespace desktop
 {
@@ -23,11 +23,11 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <sfx2/app.hxx>
 #include <svl/fstathelper.hxx>

 #include <app.hxx>
 #include "dispatchwatcher.hxx"
+#include "officeipcthread.hxx"
 #include <rtl/ustring.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/synchronousdispatch.hxx>
@@ -49,8 +49,6 @@
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/script/ModuleInfo.hpp>
-#include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/XLibraryContainer2.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>

@@ -60,11 +58,8 @@
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>

-#include <vector>
 #include <osl/thread.hxx>
 #include <osl/file.hxx>
-#include <osl/file.h>
-#include <rtl/byteseq.hxx>
 #include <iostream>

 using namespace ::osl;
@@ -22,9 +22,8 @@

 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/frame/XDispatchResultListener.hpp>
+#include <o3tl/optional.hxx>

-#include "officeipcthread.hxx"
-#include <unordered_map>
 #include <vector>

 namespace desktop
@@ -34,8 +34,6 @@
 #include <officecfg/Setup.hxx>
 #include <officecfg/System.hxx>
 #include <rtl/ustring.hxx>
-#include <sal/log.hxx>
-#include <sal/types.h>
 #include <svl/languageoptions.hxx>
 #include <svtools/langhelp.hxx>
 #include <tools/diagnose_ex.h>
@@ -22,8 +22,6 @@

 #include <sal/config.h>

-#include <rtl/ustring.hxx>
-
 namespace desktop { namespace langselect {

 bool prepareLocale();
@@ -27,15 +27,13 @@
 #include "officeipcthread.hxx"
 #include "cmdlineargs.hxx"
 #include "dispatchwatcher.hxx"
-#include <stdio.h>
 #include <com/sun/star/frame/TerminationVetoException.hpp>
-#include <osl/process.h>
+#include <salhelper/thread.hxx>
 #include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/help.hxx>
 #include <unotools/configmgr.hxx>
-#include <osl/thread.hxx>
+#include <osl/pipe.hxx>
 #include <rtl/digest.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
@@ -46,7 +44,6 @@
 #include <osl/file.hxx>
 #include <rtl/process.h>

-#include <algorithm>
 #include <cassert>
 #include <cstdlib>
 #include <memory>
@@ -26,14 +26,12 @@

 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <osl/pipe.hxx>
-#include <osl/security.hxx>
 #include <osl/signal.h>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <osl/conditn.hxx>
-#include <salhelper/thread.hxx>
 #include <o3tl/optional.hxx>

 namespace desktop
@@ -19,8 +19,6 @@

 #include <sal/config.h>
 #include <config_features.h>
-#include <config_version.h>
-#include <config_folders.h>

 #include <desktop/dllapi.h>

@@ -31,8 +29,6 @@
 // needed before sal/main.h to avoid redefinition of macros
 #include <prewin.h>

-#include <desktop/exithelper.h>
-#include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
 #include <sal/main.h>
@@ -40,10 +36,6 @@
 #include <vcl/glxtestprocess.hxx>
 #include <vcl/svmain.hxx>

-#include <com/sun/star/beans/NamedValue.hpp>
-#include <cppuhelper/bootstrap.hxx>
-#include <unotools/mediadescriptor.hxx>
-
 #if HAVE_FEATURE_BREAKPAD
 #include <desktop/crashreport.hxx>
 #endif
@@ -27,9 +27,7 @@
 #include <officecfg/Setup.hxx>
 #include <osl/file.h>
 #include <osl/file.hxx>
-#include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/bootstrap.hxx>

@@ -20,23 +20,13 @@

 #include <dp_misc.h>
 #include <dp_services.hxx>
-#include <rtl/strbuf.hxx>
-#include <sal/log.hxx>
-#include <osl/time.h>
-#include <osl/thread.h>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/servicedecl.hxx>
-#include <comphelper/unwrapargs.hxx>
 #include <comphelper/logging.hxx>
-#include <com/sun/star/deployment/DeploymentException.hpp>
+#include <rtl/ustrbuf.hxx>
 #include <com/sun/star/logging/LogLevel.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <stdio.h>
-#include <o3tl/optional.hxx>

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -18,9 +18,7 @@
 */


-#include <dp_misc.h>
 #include <dp_xml.h>
-#include <rtl/ustrbuf.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/xml/sax/Parser.hpp>

@@ -20,33 +20,6 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H

-#include "dp_gui_updatedata.hxx"
-#include <dp_misc.h>
-#include <rtl/ref.hxx>
-#include <rtl/instance.hxx>
-#include <osl/thread.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-#include <com/sun/star/ucb/XContentEventListener.hpp>
-#include <osl/mutex.hxx>
-
-namespace com { namespace sun { namespace star {
-    namespace container {
-        class XNameAccess;
-    }
-    namespace frame {
-        class XDesktop;
-    }
-    namespace awt {
-        class XWindow;
-    }
-    namespace uno {
-        class XComponentContext;
-    }
-    namespace deployment {
-        class XPackageManagerFactory;
-    }
-} } }
-
 namespace dp_gui {

 enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE };
@@ -20,9 +20,6 @@

 #include <sal/config.h>

-#include <algorithm>
-#include <vector>
-
 #include <rtl/ustring.hxx>
 #include <vcl/weld.hxx>

@@ -22,7 +22,6 @@

 #include <sal/config.h>

-#include <tools/gen.hxx>
 #include <vcl/weld.hxx>

 #include <vector>
@@ -17,9 +17,10 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <config_extensions.h>
+
 #include <strings.hrc>
 #include <helpids.h>
-#include <svtools/controldims.hxx>

 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
@@ -28,10 +29,8 @@
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include <dp_misc.h>
-#include <dp_ucb.h>
 #include <dp_update.hxx>
 #include <dp_identifier.hxx>
-#include <dp_descriptioninfoset.hxx>

 #include <fpicker/strings.hrc>

@@ -48,28 +47,19 @@

 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/bootstrap.hxx>

 #include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
-#include <ucbhelper/content.hxx>
-#include <unotools/collatorwrapper.hxx>
 #include <unotools/configmgr.hxx>

-#include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/deployment/DeploymentException.hpp>
-#include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>

 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>

 #include <officecfg/Office/ExtensionManager.hxx>

@@ -20,30 +20,21 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX

-#include <config_extensions.h>
-
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>

-#include <osl/conditn.hxx>
 #include <osl/mutex.hxx>

-#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>

 #include <cppuhelper/implbase.hxx>

-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-
-#include <stack>
-#include <vector>

 namespace dp_gui {

@@ -19,8 +19,6 @@

 #include <sal/config.h>

-#include <cstddef>
-
 #include <com/sun/star/beans/NamedValue.hpp>

 #include <com/sun/star/deployment/DependencyException.hpp>
@@ -31,7 +29,6 @@

 #include <com/sun/star/deployment/ui/LicenseDialog.hpp>
 #include <com/sun/star/deployment/DeploymentException.hpp>
-#include <com/sun/star/deployment/UpdateInformationProvider.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>

 #include <com/sun/star/task/InteractionHandler.hpp>
@@ -46,15 +43,13 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>

 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/TypeClass.hpp>
 #include <o3tl/any.hxx>
+#include <osl/conditn.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <salhelper/thread.hxx>
@@ -64,9 +59,7 @@
 #include <comphelper/anytostring.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <toolkit/helper/vclunohelper.hxx>

-#include "dp_gui.h"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_gui_dependencydialog.hxx"
 #include "dp_gui_dialog2.hxx"
@@ -76,6 +69,7 @@
 #include "dp_gui_updatedialog.hxx"
 #include "dp_gui_updateinstalldialog.hxx"
 #include <dp_dependencies.hxx>
+#include <dp_misc.h>
 #include <dp_identifier.hxx>
 #include <dp_version.hxx>

@@ -17,14 +17,11 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <svtools/controldims.hxx>
-
 #include <dp_shared.hxx>
 #include <strings.hrc>
 #include "dp_gui.h"
 #include "dp_gui_extlistbox.hxx"
 #include "dp_gui_theextmgr.hxx"
-#include "dp_gui_dialog2.hxx"
 #include <dp_dependencies.hxx>
 #include <bitmaps.hlst>

@@ -38,7 +35,7 @@
 #include <com/sun/star/system/SystemShellExecute.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <vcl/commandevent.hxx>
+#include <osl/diagnose.h>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/svapp.hxx>
@@ -35,6 +35,8 @@

 #include <memory>

+#include "dp_gui.h"
+
 namespace dp_gui {

 #define SMALL_ICON_SIZE     16
@@ -19,11 +19,9 @@


 #include <memory>
-#include "dp_gui.h"
 #include "dp_gui_theextmgr.hxx"
 #include <osl/diagnose.h>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicedecl.hxx>
@@ -31,8 +29,6 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/task/XJobExecutor.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>

@@ -40,6 +36,7 @@
 #include "license_dialog.hxx"
 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
+#include <dp_misc.h>

 using namespace ::dp_misc;
 using namespace ::com::sun::star;
@@ -19,11 +19,10 @@

 #include <vcl/svapp.hxx>

-#include <toolkit/helper/vclunohelper.hxx>
-
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/deployment/DeploymentException.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/TerminationVetoException.hpp>
@@ -31,14 +30,13 @@
 #include <com/sun/star/ucb/CommandFailedException.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>

 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_gui_theextmgr.hxx"
-#include <dp_identifier.hxx>
+#include <dp_misc.h>
 #include <dp_update.hxx>

 #define USER_PACKAGE_MANAGER    "user"
@@ -24,7 +24,6 @@

 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/deployment/XExtensionManager.hpp>
-#include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -32,7 +31,6 @@

 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
-#include "dp_gui_updatedata.hxx"


 namespace dp_gui {
@@ -20,86 +20,54 @@

 #include <sal/config.h>

-#include <cstddef>
-#include <limits>
-#include <map>
 #include <utility>
 #include <vector>


 #include <o3tl/optional.hxx>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/WindowAttribute.hpp>
-#include <com/sun/star/awt/WindowClass.hpp>
-#include <com/sun/star/awt/WindowDescriptor.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/deployment/UpdateInformationProvider.hpp>
-#include <com/sun/star/deployment/XPackage.hpp>
-#include <com/sun/star/deployment/XExtensionManager.hpp>
 #include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/task/XAbortChannel.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/xml/dom/XElement.hpp>
-#include <com/sun/star/xml/dom/XNode.hpp>
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
-#include <rtl/string.h>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <salhelper/thread.hxx>
-#include <svtools/controldims.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <unotools/configmgr.hxx>
 #include <vcl/svapp.hxx>

 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/exc_hlp.hxx>

 #include <dp_dependencies.hxx>
 #include <dp_descriptioninfoset.hxx>
 #include <dp_identifier.hxx>
-#include <dp_version.hxx>
 #include <dp_misc.h>
 #include <dp_update.hxx>

-#include "dp_gui.h"
 #include <strings.hrc>
-#include <bitmaps.hlst>
 #include "dp_gui_updatedata.hxx"
 #include "dp_gui_updatedialog.hxx"
 #include <dp_shared.hxx>
@@ -22,32 +22,20 @@

 #include <sal/config.h>
 #include <osl/file.hxx>
-#include <osl/conditn.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/implbase.hxx>

-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/xml/dom/XElement.hpp>
-#include <com/sun/star/xml/dom/XNode.hpp>
-#include <com/sun/star/xml/dom/XNodeList.hpp>
+#include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <com/sun/star/deployment/DeploymentException.hpp>
-#include <com/sun/star/deployment/XExtensionManager.hpp>
 #include <com/sun/star/deployment/ExtensionManager.hpp>
-#include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
-#include <com/sun/star/deployment/DependencyException.hpp>
 #include <com/sun/star/deployment/LicenseException.hpp>
 #include <com/sun/star/deployment/VersionException.hpp>
-#include <com/sun/star/deployment/ui/LicenseDialog.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>

 #include <dp_descriptioninfoset.hxx>
@@ -56,7 +44,6 @@
 #include <dp_shared.hxx>
 #include <dp_ucb.h>
 #include <dp_misc.h>
-#include <dp_version.hxx>
 #include "dp_gui_extensioncmdqueue.hxx"
 #include <ucbhelper/content.hxx>
 #include <rtl/ref.hxx>
@@ -18,13 +18,7 @@
 */


-#include <cppuhelper/implementationentry.hxx>
-#include <unotools/configmgr.hxx>
 #include <comphelper/unwrapargs.hxx>
-#include <i18nlangtag/mslangid.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <svl/lstner.hxx>
 #include <vcl/event.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/svapp.hxx>
@@ -35,7 +29,6 @@

 #include <functional>

-using namespace ::dp_misc;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;

@@ -19,9 +19,9 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX

-#include "dp_gui.h"
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>


@@ -22,7 +22,6 @@

 #include <rtl/ref.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/task/XAbortChannel.hpp>
 #include "dp_misc_api.hxx"
@@ -21,7 +21,6 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H

 #include <i18nlangtag/languagetag.hxx>
-#include <dp_misc.h>
 #include "dp_misc_api.hxx"

 namespace dp_misc {
@@ -21,8 +21,6 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UCB_H

 #include <vector>
-#include <rtl/byteseq.hxx>
-#include <rtl/instance.hxx>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include "dp_misc_api.hxx"
@@ -27,7 +27,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/dom/XNode.hpp>

-#include <rtl/ustrbuf.hxx>
 #include "dp_misc_api.hxx"

 #include <map>
@@ -21,6 +21,8 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_VERSION_HXX

 #include <sal/config.h>
+
+#include <rtl/ustring.hxx>
 #include "dp_misc_api.hxx"


@@ -20,10 +20,7 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H

-#include <rtl/ref.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/input/XRoot.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>


@@ -35,8 +35,6 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX

-#include <sal/types.h>
-#include <rtl/string.hxx>
 #include <rtl/ustring.hxx>

 #include "dp_misc_api.hxx"
@@ -17,20 +17,15 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <config_features.h>
+#include <config_extensions.h>

 #include <sal/config.h>

-#include <cstddef>
 #include <utility>
-#include <vector>

 #include <osl/diagnose.h>
-#include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
 #include <rtl/textenc.h>
-#include <rtl/uri.h>
-#include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>

 #include <dp_identifier.hxx>
@@ -24,10 +24,8 @@
 #include <com/sun/star/deployment/DependencyException.hpp>
 #include <com/sun/star/deployment/PlatformException.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include "dp_commandenvironments.hxx"
 #include <osl/diagnose.h>

@@ -21,7 +21,11 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX

 #include <cppuhelper/implbase.hxx>
-#include <ucbhelper/content.hxx>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+

 namespace dp_manager {

@@ -24,18 +24,13 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/bootstrap.hxx>
 #include <com/sun/star/deployment/DeploymentException.hpp>
-#include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/deployment/XExtensionManager.hpp>
 #include <com/sun/star/deployment/thePackageManagerFactory.hpp>
 #include <com/sun/star/deployment/XPackageManager.hpp>
-#include <com/sun/star/deployment/XPackageManagerFactory.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
 #include <com/sun/star/deployment/InstallException.hpp>
 #include <com/sun/star/deployment/VersionException.hpp>
-#include <com/sun/star/deployment/LicenseException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/beans/Ambiguous.hpp>
@@ -47,9 +42,7 @@
 #include <comphelper/sequence.hxx>
 #include <xmlscript/xml_helper.hxx>
 #include <osl/diagnose.h>
-#include <vcl/svapp.hxx>
 #include <dp_interact.h>
-#include <dp_resource.h>
 #include <dp_services.hxx>
 #include <dp_ucb.h>
 #include <dp_identifier.hxx>
@@ -23,13 +23,10 @@
 #include <strings.hrc>
 #include <dp_misc.h>
 #include <dp_shared.hxx>
-#include <dp_interact.h>
-#include "dp_activepackages.hxx"
-#include <rtl/ref.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <ucbhelper/content.hxx>
-#include <com/sun/star/deployment/XPackageRegistry.hpp>
+#include <com/sun/star/deployment/XExtensionManager.hpp>
 #include <com/sun/star/deployment/XPackageManager.hpp>
+#include <com/sun/star/deployment/XPackageManagerFactory.hpp>
 #include <osl/mutex.hxx>
 #include <vector>
 #include <unordered_map>
@@ -26,18 +26,14 @@
 #include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/task/XAbortChannel.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/xml/dom/XElement.hpp>
-#include <com/sun/star/xml/dom/XNode.hpp>

 #include <com/sun/star/uno/Reference.hxx>
 #include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/diagnose_ex.h>
 #include <ucbhelper/content.hxx>
@@ -47,7 +43,6 @@
 #include <dp_identifier.hxx>
 #include <dp_services.hxx>
 #include <dp_version.hxx>
-#include <dp_misc.h>
 #include <dp_update.hxx>

 namespace beans      = com::sun::star::beans ;
@@ -19,11 +19,11 @@

 #include <config_features.h>

+#include <dp_interact.h>
 #include <dp_registry.hxx>
 #include <dp_shared.hxx>
 #include <strings.hrc>
 #include <dp_ucb.h>
-#include <dp_resource.h>
 #include <dp_platform.hxx>
 #include "dp_manager.h"
 #include <dp_identifier.hxx>
@@ -37,15 +37,12 @@
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <osl/security.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/logging.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <comphelper/sequence.hxx>
 #include <xmlscript/xml_helper.hxx>
 #include <svl/inettype.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
@@ -63,10 +60,7 @@
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp>
-#include <com/sun/star/deployment/VersionException.hpp>
-#include <com/sun/star/deployment/InstallException.hpp>
 #include <com/sun/star/deployment/Prerequisites.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 #include <unotools/tempfile.hxx>

@@ -75,7 +69,6 @@
 #include "dp_properties.hxx"

 #include <vector>
-#include <list>
 #include <algorithm>

 using namespace ::dp_misc;
@@ -21,9 +21,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H

 #include <dp_misc.h>
-#include <dp_interact.h>
 #include "dp_activepackages.hxx"
-#include <rtl/ref.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <ucbhelper/content.hxx>
@@ -19,11 +19,10 @@


 #include "dp_manager.h"
-#include <dp_resource.h>
 #include <dp_services.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/servicedecl.hxx>
-#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
+#include <com/sun/star/deployment/XPackageManagerFactory.hpp>
 #include <unordered_map>

 using namespace ::dp_misc;
@@ -23,6 +23,7 @@

 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <o3tl/optional.hxx>


@@ -25,15 +25,13 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/xml/dom/XElement.hpp>
 #include <com/sun/star/xml/dom/XNodeList.hpp>
+#include <osl/diagnose.h>
 #include <rtl/bootstrap.hxx>
-#include <rtl/string.h>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <unotools/configmgr.hxx>

 #include <strings.hrc>
-#include <dp_resource.h>
 #include <dp_shared.hxx>

 #include <dp_dependencies.hxx>
@@ -23,23 +23,22 @@
 #include <sal/config.h>

 #include <comphelper/sequence.hxx>
-#include <comphelper/seqstream.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <o3tl/optional.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/deployment/DeploymentException.hpp>
-#include <com/sun/star/beans/Optional.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/io/SequenceInputStream.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/xml/dom/DOMException.hpp>
 #include <com/sun/star/xml/dom/XNode.hpp>
@@ -51,7 +50,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <ucbhelper/content.hxx>
@@ -25,8 +25,6 @@
 #include <com/sun/star/deployment/XPackage.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <osl/diagnose.h>
-#include <rtl/string.h>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>

 #include <dp_identifier.hxx>
@@ -22,8 +22,6 @@

 #include <comphelper/interaction.hxx>

-#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <osl/diagnose.h>

@@ -22,12 +22,12 @@
 #include <chrono>

 #include <dp_misc.h>
-#include <dp_version.hxx>
 #include <dp_interact.h>
 #include <rtl/uri.hxx>
 #include <rtl/digest.h>
 #include <rtl/random.h>
 #include <rtl/bootstrap.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <osl/file.hxx>
@@ -40,6 +40,7 @@
 #include <com/sun/star/bridge/UnoUrlResolver.hpp>
 #include <com/sun/star/bridge/XUnoUrlResolver.hpp>
 #include <com/sun/star/deployment/ExtensionManager.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <memory>
 #include <string_view>
@@ -18,7 +18,6 @@
 */


-#include <dp_misc.h>
 #include <dp_platform.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -18,12 +18,7 @@
 */


-#include <dp_misc.h>
 #include <dp_resource.h>
-#include <osl/module.hxx>
-#include <osl/mutex.hxx>
-#include <unotools/resmgr.hxx>
-#include <rtl/ustring.h>
 #include <unotools/configmgr.hxx>
 #include <i18nlangtag/languagetag.hxx>

@@ -27,7 +27,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <ucbhelper/content.hxx>
 #include <xmlscript/xml_helper.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
 #include <com/sun/star/ucb/ContentInfo.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
@@ -20,7 +20,6 @@

 #include <sal/config.h>

-#include <com/sun/star/deployment/XPackage.hpp>
 #include <rtl/ustring.hxx>

 #include <dp_version.hxx>
@@ -21,7 +21,6 @@

 #include <memory>

-#include <stdlib.h>
 #include <time.h>
 #ifndef _WIN32
 #include <unistd.h>
@@ -34,7 +33,6 @@
 #include <comphelper/random.hxx>
 #include <sal/types.h>
 #include <osl/file.hxx>
-#include <osl/socket.hxx>
 #include <osl/security.hxx>
 #include <unotools/bootstrap.hxx>
 #include <tools/config.hxx>
@@ -18,14 +18,9 @@
 */


-#include <rtl/string.h>
-#include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
-#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include <dp_misc.h>

 #include "dp_compbackenddb.hxx"

@@ -36,6 +36,7 @@
 #include <xmlscript/xml_helper.hxx>
 #include <svl/inettype.hxx>
 #include <tools/diagnose_ex.h>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -31,8 +31,6 @@
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/uri.hxx>
-#include <osl/file.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/ucbhelper.hxx>
@@ -41,11 +39,8 @@
 #include <comphelper/lok.hxx>
 #include <svl/inettype.hxx>
 #include <com/sun/star/configuration/Update.hpp>
-#include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/util/XRefreshable.hpp>
 #include <deque>
 #include <memory>
 #include <utility>
@@ -18,14 +18,10 @@
 */


-#include <rtl/string.h>
-#include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include <dp_misc.h>

 #include "dp_configurationbackenddb.hxx"

@@ -24,10 +24,8 @@
 #include <dp_backend.h>
 #include <dp_ucb.h>
 #include <rtl/ustring.hxx>
-#include <rtl/uri.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
-#include <osl/file.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/unwrapargs.hxx>
 #include <ucbhelper/content.hxx>
@@ -35,7 +33,6 @@
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/deployment/ExtensionRemovedException.hpp>
 #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp>
-#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
@@ -18,9 +18,6 @@
 */


-#include <rtl/string.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <osl/file.hxx>
 #include <com/sun/star/deployment/DeploymentException.hpp>
@@ -29,7 +26,6 @@
 #include <com/sun/star/xml/xpath/XPathAPI.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XActiveDataControl.hpp>
-#include <dp_ucb.h>
 #include <dp_misc.h>
 #include <ucbhelper/content.hxx>
 #include <xmlscript/xml_helper.hxx>
@@ -25,27 +25,24 @@
 #include <strings.hrc>
 #include <dp_registry.hxx>
 #include <dp_misc.h>
-#include <dp_resource.h>
-#include <dp_interact.h>
 #include <dp_ucb.h>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/sequence.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/deployment/PackageRegistryBackend.hpp>
+#include <com/sun/star/deployment/XPackageTypeInfo.hpp>
+#include <com/sun/star/deployment/XPackageRegistry.hpp>
 #include <set>
 #include <unordered_map>
 #include <unordered_set>
@@ -25,7 +25,6 @@
 #include <dp_ucb.h>
 #include <dp_interact.h>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <rtl/string.hxx>
 #include <osl/file.hxx>
 #include <ucbhelper/content.hxx>
 #include <comphelper/servicedecl.hxx>
@@ -18,9 +18,7 @@
 */


-#include <rtl/string.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <dp_misc.h>
 #include "dp_executablebackenddb.hxx"


@@ -27,11 +27,9 @@
 #include <dp_ucb.h>
 #include <rtl/uri.hxx>
 #include <osl/file.hxx>
-#include <rtl/bootstrap.hxx>
 #include <ucbhelper/content.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <svl/inettype.hxx>
-#include <uno/current_context.hxx>
 #include <unotools/pathoptions.hxx>

 #if HAVE_FEATURE_DESKTOP
@@ -18,14 +18,9 @@
 */


-#include <rtl/string.h>
-#include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
-#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include <dp_misc.h>

 #include "dp_helpbackenddb.hxx"

@@ -21,17 +21,13 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKEND_H

 #include <dp_misc.h>
-#include <dp_resource.h>
 #include <dp_shared.hxx>
 #include <dp_interact.h>
 #include <rtl/ref.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/deployment/XPackageRegistry.hpp>
-#include <com/sun/star/deployment/XPackageManager.hpp>
-#include <com/sun/star/deployment/InvalidRemovedParameterException.hpp>
 #include <unordered_map>
 #include <strings.hrc>

@@ -20,6 +20,7 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX

+#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <deque>
 #include <vector>
@@ -18,13 +18,9 @@
 */


-#include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
-#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include <dp_misc.h>

 #include "dp_extbackenddb.hxx"

@@ -27,18 +27,18 @@
 #include <dp_platform.hxx>
 #include <dp_descriptioninfoset.hxx>
 #include <dp_identifier.hxx>
+#include <dp_resource.h>
 #include <rtl/uri.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <ucbhelper/content.hxx>
 #include <svl/inettype.hxx>
-#include <comphelper/anytostring.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
@@ -65,9 +65,6 @@
 #include <com/sun/star/deployment/LicenseException.hpp>
 #include <com/sun/star/deployment/PlatformException.hpp>
 #include <com/sun/star/deployment/Prerequisites.hpp>
-#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
-#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include <com/sun/star/deployment/XPackageManager.hpp>
 #include <o3tl/optional.hxx>
 #include <tools/diagnose_ex.h>

@@ -23,15 +23,12 @@
 #include "dp_lib_container.h"
 #include <dp_backend.h>
 #include <dp_ucb.h>
-#include <rtl/uri.hxx>
 #include <ucbhelper/content.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <svl/inettype.hxx>
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/script/XLibraryContainer3.hpp>
-#include <com/sun/star/util/XMacroExpander.hpp>
 #include <memory>
 #include "dp_scriptbackenddb.hxx"

@@ -18,12 +18,7 @@
 */


-#include <rtl/string.h>
-#include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/dom/XDocument.hpp>
-#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include <dp_misc.h>
 #include "dp_scriptbackenddb.hxx"


@@ -23,13 +23,8 @@
 #include <cppuhelper/implbase.hxx>

 #include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>

-#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 namespace dp_registry
 {
 namespace backend
@@ -26,7 +26,6 @@
 #include "dp_parceldesc.hxx"
 #include <rtl/uri.hxx>
 #include <ucbhelper/content.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <svl/inettype.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -8,7 +8,6 @@
 */

 #include <config_features.h>
-#include <config_folders.h>

 #include <stdio.h>
 #include <string.h>
@@ -75,8 +74,6 @@
 #include <com/sun/star/reflection/XIdlClass.hpp>
 #include <com/sun/star/reflection/XIdlReflection.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
-#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
@@ -89,8 +86,6 @@
 #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #include <com/sun/star/xml/crypto/XCertificateCreator.hpp>
-#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
-#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/security/XCertificate.hpp>

 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
@@ -98,9 +93,7 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>

-#include <editeng/fontitem.hxx>
 #include <editeng/flstitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -108,12 +101,9 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/lokcharthelper.hxx>
 #include <sfx2/DocumentSigner.hxx>
-#include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/sidebar/SidebarDockingWindow.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
-#include <svx/ruler.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svxids.hrc>
 #include <svx/ucsubset.hxx>
@@ -127,15 +117,11 @@
 #include <vcl/floatwin.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/ptrstyle.hxx>
-#include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/ImageTree.hxx>
 #include <vcl/ITiledRenderable.hxx>
-#include <vcl/IDialogRenderable.hxx>
 #include <vcl/dialog.hxx>
 #include <unicode/uchar.h>
-#include <unotools/configmgr.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/pathoptions.hxx>
@@ -144,7 +130,6 @@
 #include <osl/module.hxx>
 #include <comphelper/sequence.hxx>
 #include <sfx2/sfxbasemodel.hxx>
-#include <svl/eitem.hxx>
 #include <svl/undo.hxx>
 #include <unotools/datetime.hxx>
 #include <i18nlangtag/mslangid.hxx>
@@ -21,7 +21,6 @@

 #include <boost/property_tree/json_parser.hpp>

-#include <rtl/ref.hxx>
 #include <cppuhelper/supportsservice.hxx>

 #include <com/sun/star/task/XInteractionAbort.hpp>
@@ -26,9 +26,8 @@

 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/task/DocumentPasswordRequest2.hpp>
-#include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkException.hpp>
+#include <com/sun/star/task/InteractionClassification.hpp>
+#include <com/sun/star/task/XInteractionHandler2.hpp>

 namespace desktop {
    struct LibLibreOffice_Impl;
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <iterator>
 #include <map>
-#include <new>
 #include <set>

 #include <migration.hxx>
@@ -33,7 +32,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <unotools/bootstrap.hxx>
-#include <rtl/bootstrap.hxx>
 #include <rtl/uri.hxx>
 #include <i18nlangtag/lang.h>
 #include <tools/diagnose_ex.h>
@@ -44,21 +42,17 @@

 #include <com/sun/star/configuration/Update.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/util/XStringSubstitution.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/FileSystemStorageFactory.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/frame/theUICommandDescription.hpp>
 #include <com/sun/star/ui/UIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>

 using namespace osl;
@@ -19,27 +19,18 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX
 #define INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX

-#include <algorithm>
 #include <memory>
 #include <unordered_map>
 #include <vector>

-#include <migration.hxx>
-
 #include <sal/types.h>
-#include <rtl/string.hxx>
 #include <rtl/ustring.hxx>

 #include <com/sun/star/uno/Reference.hxx>

 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>

 namespace desktop
 {
@@ -22,6 +22,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>
 #include <sal/log.hxx>
+#include <osl/file.hxx>


 using namespace ::com::sun::star;
@@ -27,7 +27,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
-#include <osl/file.hxx>


 class INetURLObject;
@@ -19,10 +19,7 @@


 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/types.h>
@@ -41,7 +38,6 @@
 #include <stack>
 #include <stdio.h>

-#include <osl/thread.hxx>
 #include <osl/diagnose.h>

 #define SERVICE_NAME "com.sun.star.migration.Java"
@@ -20,15 +20,8 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX
 #define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX

-#include <cppuhelper/implementationentry.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
-#include <memory>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/uno/Sequence.hxx>


 namespace migration
@@ -19,25 +19,18 @@


 #include "oo3extensionmigration.hxx"
-#include <rtl/instance.hxx>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
-#include <osl/thread.h>
 #include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/textsearch.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <ucbhelper/content.hxx>

 #include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/ucb/XCommandInfo.hpp>
-#include <com/sun/star/ucb/TransferInfo.hpp>
-#include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/xml/xpath/XPathAPI.hpp>
 #include <com/sun/star/xml/xpath/XPathException.hpp>
 #include <com/sun/star/xml/dom/DOMException.hpp>
@@ -25,14 +25,12 @@
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>

 #include <osl/mutex.hxx>
-#include <osl/file.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <ucbhelper/content.hxx>

 namespace com { namespace sun { namespace star {
    namespace uno {
--- a/Show More
+++ b/Show More