diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 49a060e25d42..381508c81e65 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -26,22 +26,12 @@
  *
  ************************************************************************/
 
-
-#include <cstdlib>
-#include <vector>
-
-#include <memory>
-#include <unistd.h>
 #include "app.hxx"
 #include "desktop.hrc"
-#include "appinit.hxx"
-#include "officeipcthread.hxx"
 #include "cmdlineargs.hxx"
-#include "desktopresid.hxx"
 #include "dispatchwatcher.hxx"
 #include "configinit.hxx"
 #include "lockfile.hxx"
-#include "cmdlinehelp.hxx"
 #include "userinstall.hxx"
 #include "desktopcontext.hxx"
 #include "exithelper.hxx"
@@ -53,101 +43,55 @@
 #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp>
 #include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/configuration/MissingBootstrapFileException.hpp>
 #include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
 #include <com/sun/star/configuration/InstallationIncompleteException.hpp>
 #include <com/sun/star/configuration/backend/BackendSetupException.hpp>
 #include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/task/XJobExecutor.hpp>
 #include <com/sun/star/task/XRestartManager.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/ui/XUIElementFactoryRegistration.hpp>
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
 
-#include <com/sun/star/java/XJavaVM.hpp>
-#include <tools/solar.h>
 #include <toolkit/unohlp.hxx>
-#include <osl/security.hxx>
-#include <rtl/ref.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
 #include <unotools/confignode.hxx>
-#include <unotools/ucbhelper.hxx>
-#include <tools/tempfile.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <osl/module.h>
 #include <osl/file.hxx>
 #include <osl/process.h>
-#include <osl/signal.h>
-#include <osl/thread.hxx>
-#include <rtl/uuid.h>
 #include <rtl/uri.hxx>
 #include <unotools/pathoptions.hxx>
-#include <svl/languageoptions.hxx>
 #include <unotools/internaloptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/menuoptions.hxx>
-#include <unotools/syslocaleoptions.hxx>
-#include <unotools/syslocale.hxx>
 #include <svl/folderrestriction.hxx>
-#include <unotools/tempfile.hxx>
 #include <rtl/logfile.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/bootstrap.hxx>
-#include <rtl/instance.hxx>
 #include <vcl/help.hxx>
 #include <vcl/msgbox.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/stdtext.hxx>
-#include <vcl/msgbox.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
 #include <ucbhelper/contentbroker.hxx>
-#include <unotools/bootstrap.hxx>
-#include <cppuhelper/bootstrap.hxx>
 
 #include <svtools/fontsubstconfig.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <svtools/apearcfg.hxx>
-#include <unotools/misccfg.hxx>
 #include <svtools/filter.hxx>
 
 #include "langselect.hxx"