From f447ac9ec99e5db055056e2f89dab741f94fba0a Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Fri, 30 Mar 2012 22:30:06 +0900
Subject: removed duplicate includes in sfx2

---
 sfx2/inc/sfx2/appuno.hxx               | 1 -
 sfx2/inc/sfx2/dinfdlg.hxx              | 1 -
 sfx2/inc/sfx2/doctdlg.hxx              | 1 -
 sfx2/inc/sfx2/mgetempl.hxx             | 1 -
 sfx2/inc/sfx2/objsh.hxx                | 1 -
 sfx2/inc/sfx2/printopt.hxx             | 1 -
 sfx2/inc/sfx2/sfxbasemodel.hxx         | 1 -
 sfx2/source/appl/app.cxx               | 2 --
 sfx2/source/appl/appdata.cxx           | 1 -
 sfx2/source/appl/appdde.cxx            | 1 -
 sfx2/source/appl/appserv.cxx           | 2 --
 sfx2/source/appl/appuno.cxx            | 1 -
 sfx2/source/appl/imestatuswindow.cxx   | 1 -
 sfx2/source/appl/newhelp.cxx           | 1 -
 sfx2/source/appl/shutdownicon.cxx      | 1 -
 sfx2/source/appl/shutdownicon.hxx      | 1 -
 sfx2/source/appl/workwin.cxx           | 2 --
 sfx2/source/bastyp/fltfnc.cxx          | 3 ---
 sfx2/source/control/dispatch.cxx       | 3 ---
 sfx2/source/control/shell.cxx          | 1 -
 sfx2/source/dialog/dinfdlg.cxx         | 2 --
 sfx2/source/dialog/recfloat.cxx        | 1 -
 sfx2/source/dialog/taskpane.cxx        | 1 -
 sfx2/source/dialog/templdlg.cxx        | 1 -
 sfx2/source/doc/docfile.cxx            | 2 --
 sfx2/source/doc/doctemplates.cxx       | 1 -
 sfx2/source/doc/docvor.cxx             | 1 -
 sfx2/source/doc/guisaveas.cxx          | 1 -
 sfx2/source/doc/objstor.cxx            | 1 -
 sfx2/source/doc/objuno.cxx             | 1 -
 sfx2/source/doc/sfxbasemodel.cxx       | 2 --
 sfx2/source/inc/eventsupplier.hxx      | 1 -
 sfx2/source/menu/mnuitem.cxx           | 1 -
 sfx2/source/statbar/stbitem.cxx        | 1 -
 sfx2/source/toolbox/tbxitem.cxx        | 4 ----
 sfx2/source/view/frame.cxx             | 1 -
 sfx2/source/view/ipclient.cxx          | 1 -
 sfx2/source/view/sfxbasecontroller.cxx | 3 ---
 sfx2/source/view/viewfrm.cxx           | 3 ---
 sfx2/source/view/viewsh.cxx            | 3 ---
 40 files changed, 59 deletions(-)

diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index 00e8129b2994..40dfada6665f 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/frame/XDispatchResultListener.hpp>
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Reference.h>
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 8e1dbee971d0..47b071ca172d 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -38,7 +38,6 @@
 #include <svl/stritem.hxx>
 #include <svtools/svmedit.hxx>
 
-#include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <svtools/headbar.hxx>
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index 9d3261bb12d3..1d9160c38847 100644
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.hxx
@@ -34,7 +34,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
 
 class SfxModalDefParentHelper;
 
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index 21af363ca94f..7ca453cc45c9 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -37,7 +37,6 @@
 #include <sfx2/tabdlg.hxx>
 
 #include <svtools/svmedit2.hxx>
-#include <svtools/svmedit.hxx>
 
 /* expected:
     SID_TEMPLATE_NAME   :   In: StringItem, Name of Template
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 228bc97615d5..fdb53b2b7022 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -52,7 +52,6 @@
 
 #include <vcl/timer.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/bitmap.hxx>
 #include <sot/storage.hxx>
 #include <rsc/rscsfx.hxx>
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index f58fe53bb4ff..60cf39478812 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -35,7 +35,6 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/print.hxx>
 
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 25c5312548bb..e3e0350663a6 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -88,7 +88,6 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
 #include <osl/mutex.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/document/XViewDataSupplier.hpp>
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index e792eea8e923..b39243b438cf 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -101,7 +101,6 @@
 #include <sfx2/event.hxx>
 #include "imestatuswindow.hxx"
 #include "workwin.hxx"
-#include <sfx2/module.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include "sfx2/stbitem.hxx"
@@ -110,7 +109,6 @@
 #include <tools/svlibrary.hxx>
 
 #ifdef DBG_UTIL
-#include <sfx2/tbxctrl.hxx>
 #include <sfx2/mnuitem.hxx>
 #endif
 
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index a5904eb7fc8f..571797055c63 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -34,7 +34,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/dateitem.hxx>
-#include <vcl/menu.hxx>
 #include <vcl/wrkwin.hxx>
 #include "comphelper/processfactory.hxx"
 
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 5f2420ae59cb..98a7c5e8b3f0 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -44,7 +44,6 @@
 #include "appdata.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f547e000da00..c83bd0b328d8 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -81,7 +81,6 @@
 #include <unotools/bootstrap.hxx>
 #include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -113,7 +112,6 @@
 #include "app.hrc"
 #include <sfx2/passwd.hxx>
 #include "sfx2/sfxresid.hxx"
-#include "arrdecl.hxx"
 #include <sfx2/childwin.hxx>
 #include "appdata.hxx"
 #include "sfx2/minfitem.hxx"
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index fe9e65a082a9..03d783c025f1 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -81,7 +81,6 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/registry/RegistryValueType.hpp>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XButton.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index d9230e23a932..a7f0e1c161a4 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -49,7 +49,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "vcl/svapp.hxx"
-#include "osl/mutex.hxx"
 
 //TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver
 class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star::beans::XPropertyChangeListener>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 2ea1687f3074..fc9bf30fb193 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -72,7 +72,6 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 2f56e0b91aee..be58cbca81c0 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index d9e6e17bf802..de70a016563d 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -11,7 +11,6 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 68c24ed2df7e..12f858e38bbf 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -36,7 +36,6 @@
 #include "workwin.hxx"
 #include <sfx2/viewfrm.hxx>
 #include "arrdecl.hxx"
-#include <sfx2/viewfrm.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dockwin.hxx>
@@ -44,7 +43,6 @@
 #include "splitwin.hxx"
 #include <sfx2/msgpool.hxx>
 #include "sfx2/sfxresid.hxx"
-#include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>      // SFX_ITEMSET_SET
 #include <vcl/taskpanelist.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 794432fe45b8..599832dba787 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -77,12 +77,10 @@
 #include <com/sun/star/loader/XImplementationLoader.hpp>
 #include <com/sun/star/loader/CannotActivateFactoryException.hpp>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/ucb/XContent.hpp>
-#include <rtl/ustring.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <comphelper/mediadescriptor.hxx>
@@ -118,7 +116,6 @@ using namespace ::com::sun::star::beans;
 #include <sfx2/request.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/appuno.hxx>
-#include <sfx2/viewfrm.hxx>
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <functional>
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index e517432d3deb..6e08d456dd9f 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -41,8 +41,6 @@
 #include <stdlib.h>  // due to bsearch
 
 #include <svtools/helpopt.hxx>
-#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 // due to nAutoPageID
 #include "appdata.hxx"
@@ -64,7 +62,6 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/module.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/mnumgr.hxx>
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index fbb5cd6304c2..a9b3f5cfc67c 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -46,7 +46,6 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/dispatch.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/mnumgr.hxx>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 2b4e06db0be0..ba0d0c29d4a6 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -41,10 +41,8 @@
 #include <memory>
 
 #include <comphelper/string.hxx>
-#include <comphelper/processfactory.hxx>
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
-#include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index debd5c3f8b3c..285d2b975634 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <svl/eitem.hxx>
 #include <svtools/generictoolboxcontroller.hxx>
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 7a85eaab6cb0..6169998dd946 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -42,7 +42,6 @@
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/awt/XControl.hpp>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b5809ba5018d..7f3fa7ebea6c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -37,7 +37,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/intlwrapper.hxx>
-#include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index ba7ffb8e5603..2dc357275737 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -88,7 +88,6 @@
 #include <svl/intitem.hxx>
 #include <svtools/svparser.hxx> // SvKeyValue
 #include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <svl/svstdarr.hxx>
 
 #include <unotools/streamwrap.hxx>
@@ -106,7 +105,6 @@ using namespace ::com::sun::star::io;
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/docpasswordhelper.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/inetmime.hxx>
 #include <unotools/ucblockbytes.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 24b7f7600c8a..c5807fd93952 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -162,7 +162,6 @@ typedef vector< GroupData_Impl* > GroupList_Impl;
 //=============================================================================
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
 class TplTaskEnvironment : public ::cppu::WeakImplHelper1< ucb::XCommandEnvironment >
 {
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 70fbf7c4e488..00a0037f6007 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -67,7 +67,6 @@
 #include "docvor.hrc"
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svtools/localresaccess.hxx>
 #include <svtools/addresstemplate.hxx>
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 6273b9237c04..5795c8d0b72f 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -58,7 +58,6 @@
 
 #include "guisaveas.hxx"
 
-#include <unotools/pathoptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index fd47493f00cd..b65c75f27bf3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -78,7 +78,6 @@
 #include <svtools/sfxecode.hxx>
 #include <unotools/securityoptions.hxx>
 #include <cppuhelper/weak.hxx>
-#include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 
 #include <unotools/saveopt.hxx>
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 76413d3d0b6c..f95a8b9a8e39 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -53,7 +53,6 @@
 #include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 #include <tools/errcode.hxx>
 #include <svl/cntwids.hrc>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index b4e0d0a67fab..00b61ab627f5 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -59,7 +59,6 @@
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
 #include <com/sun/star/ui/XUIConfigurationStorage.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
@@ -122,7 +121,6 @@
 #include <sfx2/evntconf.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#include <sfx2/viewfrm.hxx>
 #include "appdata.hxx"
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 02bc89f147e5..4a43c1f88854 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -53,7 +53,6 @@
 #include <comphelper/sequenceasvector.hxx>
 #include <sfx2/sfxuno.hxx>
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <svl/lstner.hxx>
 #include <unotools/eventcfg.hxx>
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 49dce66a07e8..58d5de148c4a 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <comphelper/processfactory.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 7049cc1c95bd..c74c66e0d209 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -52,7 +52,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <toolkit/unohlp.hxx>
 #include <toolkit/helper/convert.hxx>
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 1e3fc03ebd3e..0fab12577fd6 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -97,12 +97,8 @@
 #include "workwin.hxx"
 #include "sfx2/imgmgr.hxx"
 #include "virtmenu.hxx"
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/module.hxx>
 #include "sfx2/imagemgr.hxx"
 
-#include <com/sun/star/frame/XModuleManager.hpp>
-
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::frame::status;
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 2e1c16861f84..9edb55017af3 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -65,7 +65,6 @@
 #include <sfx2/fcontnr.hxx>
 #include "impframe.hxx"
 #include <sfx2/appuno.hxx>
-#include <sfx2/viewfrm.hxx>
 #include "workwin.hxx"
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index cb3bc575bb34..0c22e263a76c 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -56,7 +56,6 @@
 #include <sfx2/dispatch.hxx>
 #include "workwin.hxx"
 #include "guisaveas.hxx"
-#include <sfx2/viewfrm.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <vcl/salbtype.hxx>
 #include <svtools/ehdl.hxx>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 932c2f567f31..a32dcb7d6c1b 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <basic/sbstar.hxx>
 #include <uno/mapping.hxx>
 #include <sfx2/viewsh.hxx>
@@ -79,7 +78,6 @@
 #include <workwin.hxx>
 #include <sfx2/objface.hxx>
 
-#include <osl/mutex.hxx>
 #include <osl/mutex.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/sequence.hxx>
@@ -87,7 +85,6 @@
 #include <toolkit/helper/convert.hxx>
 #include <framework/titlehelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <tools/diagnose_ex.h>
 
 #include <boost/unordered_map.hpp>
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0b8a3eb8b728..d939c7eb55fa 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -55,14 +55,12 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XFrames.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
@@ -134,7 +132,6 @@ namespace css = ::com::sun::star;
 #include <sfx2/docfile.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/msgpool.hxx>
-#include <sfx2/viewfrm.hxx>
 #include "viewimp.hxx"
 #include <sfx2/sfxbasecontroller.hxx>
 #include <sfx2/sfx.hrc>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index cbb5cdabf5b0..3c6a2de10c42 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -73,7 +73,6 @@
 #include <sfx2/dispatch.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/docfac.hxx>
-#include "view.hrc"
 #include "sfxlocal.hrc"
 #include <sfx2/sfxbasecontroller.hxx>
 #include "sfx2/mailmodelapi.hxx"
@@ -86,8 +85,6 @@
 #include <sfx2/docfilt.hxx>
 #include "openuriexternally.hxx"
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
-- 
cgit