doubled includes

Change-Id: I70ec796188e2388e1e4d699126f7ae817f5ff86e

138 files changed, 0 insertions, 199 deletions

diff --git a/autodoc/source/ary/idl/i_module.cxx b/autodoc/source/ary/idl/i_module.cxx
index 2ac7b04afdad..a6a7b871b377 100644
--- a/autodoc/source/ary/idl/i_module.cxx
+++ b/autodoc/source/ary/idl/i_module.cxx
@@ -24,7 +24,6 @@
 // NOT FULLY DECLARED SERVICES
 #include <cosv/tpl/processor.hxx>
 #include <ary/idl/i_gate.hxx>
-#include <ary/idl/i_module.hxx>
 #include <ary/idl/i_service.hxx>
 #include <ary/idl/i_interface.hxx>
 #include <ary/idl/i_struct.hxx>
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 651400d7f803..553f02ceffd9 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -19,7 +19,6 @@
 
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5f4ea93e6212..74462090a59b 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -61,8 +61,6 @@ using namespace comphelper;
 using namespace osl;
 using namespace com::sun::star;
 
-#include <comphelper/string.hxx>
-
 #include "date.hxx"
 #include "stdobj.hxx"
 #include <basic/sbstdobj.hxx>
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index eb2dceb389ed..67bba961aabb 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -56,7 +56,6 @@
 #include <com/sun/star/util/PathSubstitution.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/deployment/ExtensionManager.hpp>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <basic/sbmod.hxx>
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index b4c2550862b3..530a5c87bf6d 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -41,7 +41,6 @@
 
 #include "cppu/EnvDcp.hxx"
 #include "cascade_mapping.hxx"
-#include "IdentityMapping.hxx"
 #include "loadmodule.hxx"
 
 using namespace std;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index dac9ec83cde2..b464af532774 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -64,7 +64,6 @@
 #include "dp_version.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "ucbhelper/content.hxx"
-#include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
 #include "salhelper/thread.hxx"
 #include "com/sun/star/uno/Sequence.h"
diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
index c5486eb27ad2..658d37bc20a6 100644
--- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
+++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <uno/environment.h>
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index bc3ad7f591f3..6b2351b32b83 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -31,7 +31,6 @@
 #include "sourcecontext.hxx"
 #include "../../inc/DtObjFactory.hxx"
 #include <rtl/ustring.h>
-#include <process.h>
 #include <winuser.h>
 #include <stdio.h>
 
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index bf615f12ef28..4295bd47fb5e 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -24,7 +24,6 @@
 #include "../misc/ImplHelper.hxx"
 #include "../misc/WinClip.hxx"
 #include "DTransHelper.hxx"
-#include "../misc/ImplHelper.hxx"
 #include "TxtCnvtHlp.hxx"
 #include "MimeAttrib.hxx"
 #include "FmtFilter.hxx"
diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx
index 0824d16fce35..0b5ef3ad50cd 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.cxx
@@ -34,8 +34,6 @@ CComModule _Module;
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <rtl/process.h>
 #include <cppuhelper/servicefactory.hxx>
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 13ab909256ee..3682fc6cf5b0 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 52547a392473..ed0f7adf7d90 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -57,7 +57,6 @@
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/embed/StateChangeInProgressException.hpp>
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 8c309d026e62..04795ffa5761 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/embed/XInplaceClient.hpp>
 #include <com/sun/star/embed/XWindowSupplier.hpp>
 #include <com/sun/star/embed/StateChangeInProgressException.hpp>
-#include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/EmbedMapUnits.hpp>
 #include <com/sun/star/embed/EntryInitModes.hpp>
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 6a467bdb7d0c..985a748a0ab8 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -21,7 +21,6 @@
 #include <sanedlg.hxx>
 #include <osl/thread.hxx>
 #include <boost/shared_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 32d871016e7b..6cebafb0053e 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -26,8 +26,6 @@
 #include <tools/solar.h>
 #include <com/sun/star/sheet/FormulaToken.hpp>
 
-#include <limits.h>
-
 namespace formula
 {
 
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index bc2eef398aee..8791661f63db 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -24,7 +24,6 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index ba60c97b9d26..eb63dd4b0cea 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -36,8 +36,6 @@
 
 #include "..\FOPServiceInfo.hxx"
 
-#include <osl/file.hxx>
-
 #define _WIN32_DCOM
 
 #include <windows.h>
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index e6627187b60f..e9bc6ed74915 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -52,7 +52,6 @@
 #include <vcl/button.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
 
 #include "../source/office/iodlg.hxx"
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index bb77320c838e..31f280a11182 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
 
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 07011c6ea71e..adef138c4b0b 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -33,7 +33,6 @@
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
-#include <stdtypes.h>
 #include <properties.h>
 #include <stdtypes.h>
 #include <uielement/menubarmanager.hxx>
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index 8b1d49926b81..85f3d51ee635 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -33,7 +33,6 @@
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
-#include <stdtypes.h>
 #include <properties.h>
 #include <stdtypes.h>
 #include <uielement/menubarmanager.hxx>
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index b301a625e284..b9a620fae235 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -44,9 +44,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
-
-#include <vcl/button.hxx>
-
 #include <vcl/button.hxx>
 #include <vcl/morebtn.hxx>
 
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 8fedd0c00b69..ea474fb2f7b4 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -27,7 +27,6 @@
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 #include <properties.h>
-#include <stdtypes.h>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index dba73cb546f6..8993456ceecd 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/ConfigurationEvent.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
 
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 404adbfddb15..23d9c3f13e25 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/ConfigurationEvent.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 7e7de4eebdb1..4ad55af1d3d4 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 37c1709ea762..0592e0c78605 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -38,15 +38,12 @@
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
-#include <com/sun/star/frame/XToolbarController.hpp>
-
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index c53ac70c03ef..185bebe3eabd 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -52,7 +52,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
 #include <osl/file.hxx>
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index f9cb485f54a7..c1ea381619b1 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -35,7 +35,6 @@
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 #include <properties.h>
-#include <stdtypes.h>
 #include <uiconfiguration/globalsettings.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
 #include <framework/addonsoptions.hxx>
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 3b0f4cbe9160..b0275f7c0c7e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -77,7 +77,6 @@
 #include <toolkit/unohlp.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>
-#include <comphelper/processfactory.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 6d948742f2fb..7ab35026445a 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -47,7 +47,6 @@
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
-#include <osl/file.hxx>
 #include <osl/time.h>
 
 namespace framework{
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 50307c746809..be5d8b187b76 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/ConfigurationEvent.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 8bda564dcac3..6d5fc8226bb9 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -48,7 +48,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
-#include <rtl/logfile.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespaces
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 10955aa71161..7bb51100033f 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -36,7 +36,6 @@
 #include <uielement/spinfieldtoolbarcontroller.hxx>
 #include <uielement/edittoolbarcontroller.hxx>
 #include <uielement/dropdownboxtoolbarcontroller.hxx>
-#include <uielement/toolbarmerger.hxx>
 
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index c6ad1bf77b40..e3e3669f05a3 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -42,7 +42,6 @@
 
 #include <i18npool/mslangid.hxx>
 #include <svl/languageoptions.hxx>
-#include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <svtools/langtab.hxx>
 #include <classes/fwlresid.hxx>
 
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 83e60fd8e2b1..69fc8b6928be 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
 #include <svtools/langtab.hxx>
 #include "sal/types.h"
-#include <vcl/svapp.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <i18npool/mslangid.hxx>
@@ -43,8 +42,6 @@
 #include <com/sun/star/frame/XModule.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <classes/fwkresid.hxx>
-#include <classes/resource.hrc>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -52,7 +49,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include <toolkit/unohlp.hxx>
 #include <tools/gen.hxx>
 #include <com/sun/star/awt/Command.hpp>
 #include <svl/languageoptions.hxx>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index bfb8f2843a82..5f158c824400 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -69,13 +69,11 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
 #include <osl/file.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <svtools/acceleratorexecute.hxx>
 #include <rtl/logfile.hxx>
 #include "svtools/miscopt.hxx"
-#include <framework/addonmenu.hxx>
 #include <uielement/menubarmerger.hxx>
 
 // Be careful removing this "bad" construct. There are serious problems
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index db99cdbb98f2..4047c301b34c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -70,7 +70,6 @@
 #include <vcl/taskpanelist.hxx>
 #include <rtl/logfile.hxx>
 #include <svtools/menuoptions.hxx>
-#include <unotools/cmdoptions.hxx>
 #include <boost/bind.hpp>
 #include <svtools/acceleratorexecute.hxx>
 
diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx
index 68e31366db00..f06592fda599 100644
--- a/hwpfilter/source/hpara.cxx
+++ b/hwpfilter/source/hpara.cxx
@@ -28,7 +28,6 @@
 #include "hpara.h"
 #include "hbox.h"
 #include "hutil.h"
-#include "hutil.h"
 
 bool LineInfo::Read(HWPFile & hwpf, HWPPara *pPara)
 {
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 1d0a819b3d4c..e380b223e0f9 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -27,7 +27,6 @@
 #include "boost/scoped_ptr.hpp"
 #include "rtl/strbuf.hxx"
 
-#include "common.hxx"
 #include "export.hxx"
 #include "cfgmerge.hxx"
 #include "tokens.h"
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 78c7ed10fe69..787458bcde56 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <iostream>
-#include <fstream>
 #include <vector>
 #include <rtl/strbuf.hxx>
 #ifdef WNT
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 37310db0bdb3..6bfeb581c282 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -24,7 +24,6 @@
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
-#include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
@@ -44,7 +43,6 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/util/XFlushListener.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index f447738b2167..27ded1364693 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -24,7 +24,6 @@
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
-#include <i18npool/mslangid.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/useroptions.hxx>
 #include <cppuhelper/factory.hxx>   // helper for factories
@@ -44,11 +43,6 @@
 #include "dicimp.hxx"
 #include "lngopt.hxx"
 
-#include "defs.hxx"
-#include "dlistimp.hxx"
-#include "dicimp.hxx"
-#include "lngopt.hxx"
-
 using namespace osl;
 using namespace com::sun::star;
 using namespace com::sun::star::lang;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 949692e24388..79df931269d5 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/uno/Any.h>
 #include <tools/solar.h>
 
-#include <svl/itemprop.hxx>
 #include "linguistic/misc.hxx"
 #include "defs.hxx"
 
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 37031268137f..13515b681074 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/dom/DocumentBuilder.hpp>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <oox/core/filterdetect.hxx>
 #include <comphelper/storagehelper.hxx>
 using ::com::sun::star::uno::XComponentContext;
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 63cdcecc8f6f..2953660ea442 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -31,7 +31,6 @@
 #include "oox/drawingml/textparagraph.hxx"
 #include "oox/drawingml/textrun.hxx"
 #include "oox/drawingml/customshapeproperties.hxx"
-#include "diagramlayoutatoms.hxx"
 #include "layoutnodecontext.hxx"
 
 using namespace ::com::sun::star;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 325144c1de4d..d26002af3d07 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 54ff53726059..1f260ac6fa23 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -31,8 +31,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <comphelper/processfactory.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/confignode.hxx>
 #include <i18npool/mslangid.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index b11a55537d16..056ebf8773d5 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/ContainerEvent.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/report/XReportComponent.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XGroup.hpp>
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 0ab27166bc60..4f42791f01a6 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -27,7 +27,6 @@
 #include "Tools.hxx"
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
 #include "ReportHelperImpl.hxx"
-#include "corestrings.hrc"
 // =============================================================================
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index bee9fd0c5ea7..4065403d4918 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -24,7 +24,6 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/property.hxx>
 #include "Tools.hxx"
-#include "corestrings.hrc"
 // =============================================================================
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 6ba062301b62..b951698d365c 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -69,7 +69,6 @@
 #include <connectivity/dbconversion.hxx>
 #include "UndoActions.hxx"
 #include "UndoEnv.hxx"
-#include <algorithm>
 #include <functional>
 
 namespace rptui
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index dfc8b75a125c..39d7968db555 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/report/XReportControlModel.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <tools/debug.hxx>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 7a41d84c36a5..ba25f5e15e0e 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -28,8 +28,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <comphelper/types.hxx>
 #include "xmlEnums.hxx"
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmluconv.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/numehelp.hxx>
 #include "xmlHelper.hxx"
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 73349a4f64d9..94b44f9288ee 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp>
 #include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/documentconstants.hxx>
@@ -33,7 +32,6 @@
 #include <unotools/saveopt.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <connectivity/dbtools.hxx>
-#include <rtl/ustrbuf.hxx>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 1bcc317c51f5..01afab511ff3 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/report/XShape.hpp>
 #include "xmlCell.hxx"
 #include "xmlstrings.hrc"
-#include <com/sun/star/report/XShape.hpp>
 #include <com/sun/star/report/XFormattedField.hpp>
 #include <com/sun/star/report/XFixedText.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 1bb3c718c4e8..efced521fd80 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/awt/ImagePosition.hpp>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <xmloff/prstylei.hxx>
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 2bdc6814fb9b..68610a0a9603 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/documentconstants.hxx>
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index c908e9278229..d380cf6c30e2 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -32,7 +32,6 @@
 #include "xmlstrings.hrc"
 #include <connectivity/dbtools.hxx>
 #include <tools/debug.hxx>
-#include "xmlstrings.hrc"
 #include <com/sun/star/report/XShape.hpp>
 #include <com/sun/star/report/XFixedLine.hpp>
 
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 3aa9267c53db..22fbd1550575 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -50,7 +50,6 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlmetai.hxx>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <svtools/sfxecode.hxx>
 #include "xmlEnums.hxx"
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 003b205ee57e..681023fb232c 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
-#include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/i18n/XCollator.hpp>
 
 #include <vcl/waitobj.hxx>
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 360d2ca1d23d..324a048a5214 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -26,7 +26,6 @@
 #include "ModuleHelper.hxx"
 #include "helpids.hrc"
 #include "UITools.hxx"
-#include "uistrings.hrc"
 #include "ReportController.hxx"
 #include "Condition.hxx"
 
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 6e5a30947a1b..41e74f2b2768 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -25,7 +25,6 @@
 #include "ReportController.hxx"
 #include "ModuleHelper.hxx"
 #include "ColorChanger.hxx"
-#include "RptResId.hrc"
 #include "helpids.hrc"
 #include "reportformula.hxx"
 #include <com/sun/star/util/URL.hpp>
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index fbaa6179833d..07db3b7e1373 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -23,12 +23,8 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <svtools/transfer.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
 #include <svtools/treelistbox.hxx>
-#include <svtools/transfer.hxx>
 #include <vcl/floatwin.hxx>
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/containermultiplexer.hxx>
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index ae62afae451b..1c469f96b666 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -26,7 +26,6 @@
 #include "ReportSection.hxx"
 #include <comphelper/propmultiplex.hxx>
 #include "cppuhelper/basemutex.hxx"
-#include <svtools/colorcfg.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <svx/svdedtv.hxx>
 #include <SectionView.hxx>
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index ab1f255cddf6..7ff0af1af88c 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -48,7 +48,6 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include "helpids.hrc"
-#include "uistrings.hrc"
 #include "RptResId.hrc"
 #include "PropertyForward.hxx"
 //........................................................................
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index e54aa2779979..33b8ccbff73b 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
-#include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/util/Color.hpp>
 #include <vcl/svapp.hxx>
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 6c51b8f0bad7..508846c1bc6c 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -146,7 +146,6 @@
 #include <toolkit/helper/convert.hxx>
 #include "GroupsSorting.hxx"
 #include "PageNumber.hxx"
-#include <toolkit/helper/vclunohelper.hxx>
 #include "UndoEnv.hxx"
 #include "ReportControllerObserver.hxx"
 
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 842f3609f564..5440a78fee2f 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -34,7 +34,6 @@
 #include "dlgedclip.hxx"
 #include "ColorChanger.hxx"
 #include "RptObject.hxx"
-#include "RptObject.hxx"
 #include "ModuleHelper.hxx"
 #include "EndMarker.hxx"
 #include <svx/svdpagv.hxx>
diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
index c2109bfc4803..bd090b6ccd68 100644
--- a/rsc/inc/vclrsc.hxx
+++ b/rsc/inc/vclrsc.hxx
@@ -25,7 +25,6 @@
 #include <tools/wintypes.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/mapunit.hxx>
-#include <tools/wintypes.hxx>
 #include <rsc/rsc-vcl-shared-types.hxx>
 
 #include <com/sun/star/awt/Key.hpp>
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 93a3281bdc69..47d79b89187b 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -780,7 +780,6 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, sal_uLong nFileKey )
     fprintf( fOutput, "#include <vcl/fixed.hxx>\n" );
     fprintf( fOutput, "#include <vcl/group.hxx>\n" );
     fprintf( fOutput, "#include <vcl/image.hxx>\n" );
-    fprintf( fOutput, "#include <vcl/button.hxx>\n" );
     fprintf( fOutput, "#include <vcl/keycod.hxx>\n" );
     fprintf( fOutput, "#include <vcl/lstbox.hxx>\n" );
     fprintf( fOutput, "#include <vcl/mapmod.hxx>\n" );
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 93b3b17c2632..6e109b7a3c97 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -27,7 +27,6 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
 #include "unotest/uniquepipename.hxx"
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 #include <osl/thread.hxx>
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 810d3be31054..cb4331318df8 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -35,8 +35,6 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include <map>
-
 class ScBaseCell;
 class ScFormulaCell;
 class ScTokenArray;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5c190678e4a6..67be28a9be18 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -33,7 +33,6 @@
 #include "types.hxx"
 #include "formula/grammar.hxx"
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include "scdllapi.h"
 #include "typedstrdata.hxx"
 #include "compressedarray.hxx"
 #include <tools/fract.hxx>
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index dfc992de0bed..52852475672d 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -103,7 +103,6 @@
 #include <oox/ole/vbaproject.hxx>
 #include <oox/ole/olestorage.hxx>
 #include <unotools/streamwrap.hxx>
-#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 using namespace ::comphelper;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 8506f120093e..29f9618107da 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -82,7 +82,6 @@
 #include "inputwin.hxx"
 #include "msgpool.hxx"
 #include "scresid.hxx"
-#include "anyrefdg.hxx"
 #include "dwfunctr.hxx"
 #include "formdata.hxx"
 #include "tpprint.hxx"
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 4bd4c05b3467..d3e1bbff2109 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -43,7 +43,6 @@
 #include "conditio.hxx"
 #include "stlpool.hxx"
 #include "tabvwsh.hxx"
-#include "conditio.hxx"
 #include "colorscale.hxx"
 #include "colorformat.hxx"
 #include "reffact.hxx"
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index d55ade83ffd7..1b3790e55929 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -32,7 +32,6 @@
 
 #include "formula/formula.hxx"
 #include "IAnyRefDialog.hxx"
-#include "anyrefdg.hxx"
 
 class ScViewData;
 class ScDocument;
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 2f445925be54..b7895138df0c 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -30,7 +30,6 @@
 #include "rangenam.hxx"
 #include "anyrefdg.hxx"
 
-#include <vcl/morebtn.hxx>
 #include <vcl/lstbox.hxx>
 
 #include <svx/ctredlin.hxx>
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index f15f0ab2edbb..1a2e82b8d3b8 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -87,7 +87,6 @@
 #include "excelvbahelper.hxx"
 
 #include <basic/sbmod.hxx>
-#include <basic/sbuno.hxx>
 #include <basic/sbxobj.hxx>
 
 #include "viewutil.hxx"
diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx
index 881445790700..259959ae7fa9 100644
--- a/scripting/source/provider/ScriptingContext.hxx
+++ b/scripting/source/provider/ScriptingContext.hxx
@@ -27,12 +27,9 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/proparrhlp.hxx>
-
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/broadcasthelper.hxx>
 
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index c6680c76acd8..a7b3e7584c1d 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -71,8 +71,6 @@
 // for debug
 #include <comphelper/anytostring.hxx>
 
-
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/script/XScriptListener.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index e5e48347a169..978c69e5d8e4 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -71,7 +71,6 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svtools/helpopt.hxx>
-#include <svtools/miscopt.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/shl.hxx>
 #include <unotools/bootstrap.hxx>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 109522070d9b..93dc978cb7c9 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -59,7 +59,6 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <comphelper/string.hxx>
 
 #include "documentfontsdialog.hxx"
 #include <sfx2/sfx.hrc>
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index fe50565536d0..a5631c9d7486 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -31,7 +31,6 @@
 #include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index 34f4560a58ce..ac7b736dc72b 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -33,7 +33,6 @@
 #include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 6e8bbd9a9cd6..ca41910d5118 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -33,7 +33,6 @@
 #include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 20dd08b7bdea..4945433e5abc 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -31,7 +31,6 @@
 #include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/WrappedTargetException.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index c162f7755e7b..91d7632507f4 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -27,13 +27,6 @@
 #include "internal/utilities.hxx"
 #include "internal/config.hxx"
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <commctrl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include <commctrl.h>
 #include <tchar.h>
 #include "internal/resource.h"
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 06bec1a86249..1b610bcc9851 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
 #include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <osl/diagnose.h>
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index 415826053ec5..5bdb6bf19315 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -23,10 +23,7 @@
 #include <com/sun/star/system/XSystemShellExecute.hpp>
 #include <cppuhelper/servicefactory.hxx>
 
-
 #include <osl/file.hxx>
-
-#include <cppuhelper/servicefactory.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <osl/diagnose.h>
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index c79976c129ab..fe63c0bcfead 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -41,7 +41,6 @@
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/graph.hxx>
 
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index bdc6a3bbab91..eb72a582213d 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/presentation/XShapeEventListener.hpp>
 #include <com/sun/star/presentation/XSlideShowListener.hpp>
-#include <com/sun/star/awt/MouseButton.hpp>
 
 #include "shapemanagerimpl.hxx"
 
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index 7d4c788dacd4..8660ef8d1d44 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -21,7 +21,6 @@
 // must be first
 #include <canvas/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/diagnose_ex.h>
 
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 8fb9e212b16e..5050d4fc2efc 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -26,7 +26,6 @@
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 namespace slideshow
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 4e10dfcff833..5948fc621942 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -57,7 +57,6 @@
 
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
 #include <boost/unordered_map.hpp>
 
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx
index 7cb91a790051..9cad386043fb 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -32,7 +32,6 @@
 #include <svgio/svgreader/svgellipsenode.hxx>
 #include <svgio/svgreader/svglinenode.hxx>
 #include <svgio/svgreader/svgpolynode.hxx>
-#include <svgio/svgreader/svgsymbolnode.hxx>
 #include <svgio/svgreader/svgtextnode.hxx>
 #include <svgio/svgreader/svgcharacternode.hxx>
 #include <svgio/svgreader/svgtspannode.hxx>
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index 74f29909e110..e453c08a3ebb 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgnode.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svgio/svgreader/svgdocument.hxx>
 #include <svgio/svgreader/svgnode.hxx>
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 317648e210b5..f015523671ba 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -31,7 +31,6 @@
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <svgio/svgreader/svgclippathnode.hxx>
 #include <svgio/svgreader/svgmasknode.hxx>
-#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svgio/svgreader/svgmarkernode.hxx>
 #include <basegfx/curve/b2dcubicbezier.hxx>
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 450efbdf4978..9e3094fba9dd 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -32,8 +32,6 @@
 #include <sfx2/docfile.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <vcl/svapp.hxx>
-
-#include <vcl/graphicfilter.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmmodel.hxx>
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 9feff429c046..819f3d5b87ee 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -36,7 +36,6 @@
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xlinjoit.hxx>
-#include <svx/xlinjoit.hxx>
 #include <svx/xlncapit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xdash.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index c3363919c636..91775be362f4 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -45,7 +45,6 @@
 #include <svx/svdpagv.hxx>
 #include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/xbitmap.hxx>
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 2560611bf35e..40a2603a034f 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -28,7 +28,6 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/button.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <svtools/valueset.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index 4bce02311064..a9c7e119472d 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -20,13 +20,8 @@
 #define _SW_JAVAEDIT_HXX
 
 #include <svx/stddlg.hxx>
-
 #include <vcl/fixed.hxx>
-
 #include <svtools/svmedit.hxx>
-
-#include <vcl/button.hxx>
-
 #include <vcl/button.hxx>
 
 class SwWrtShell;
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx
index 30587dce2fc6..ccb898815d1c 100644
--- a/sw/source/ui/inc/wrap.hxx
+++ b/sw/source/ui/inc/wrap.hxx
@@ -21,13 +21,8 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/basedlgs.hxx>
-
-#include <vcl/button.hxx>
-
 #include <vcl/button.hxx>
-
 #include <vcl/fixed.hxx>
-
 #include <vcl/field.hxx>
 
 class Window;
diff --git a/toolkit/inc/toolkit/controls/roadmapentry.hxx b/toolkit/inc/toolkit/controls/roadmapentry.hxx
index 53713c91754b..e0f6a99dc0fa 100644
--- a/toolkit/inc/toolkit/controls/roadmapentry.hxx
+++ b/toolkit/inc/toolkit/controls/roadmapentry.hxx
@@ -24,7 +24,6 @@
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <comphelper/proparrhlp.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 
diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
index 6664182e0148..50288a083f35 100644
--- a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
@@ -31,11 +31,9 @@
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/sequence.hxx>
 #include <toolkit/controls/controlmodelcontainerbase.hxx>
-#include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
 using namespace ::com::sun::star::uno;
-//using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index b97a6bd00e81..f7912f6acf42 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -40,7 +40,6 @@
 #include <toolkit/helper/macros.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
-#include <toolkit/helper/macros.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/accessibilityclient.hxx>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 2a9cbf866350..bc9b75b46725 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -41,7 +41,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <comphelper/types.hxx>
 
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 7ad8b7e5dc7a..40499e928dab 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -34,7 +34,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/sequence.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 7ef444192870..33923a5903bd 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -28,7 +28,6 @@
 #include <toolkit/helper/property.hxx>
 #include <algorithm>
 #include <functional>
-#include <comphelper/sequence.hxx>
 
 
 #define GCM_PROPERTY_ID_POS_X               1
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 78e3a27f040d..e07c4edcce74 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -34,7 +34,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/sequence.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index f3d9bd9a85ae..0b9e0ed02c23 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -37,10 +37,7 @@
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/servicenames.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
-#include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <toolkit/controls/accessiblecontrolcontext.hxx>
 #include <comphelper/container.hxx>
 
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 9e116164eb83..c539fbdaab06 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -46,7 +46,6 @@
 #include <comphelper/types.hxx>
 #include <functional>
 #include <algorithm>
-#include <toolkit/helper/property.hxx>
 
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Sequence;
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index ee1d76b93f2a..4cecef1ad62b 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -45,7 +45,6 @@
 #include <toolkit/controls/tkthrobber.hxx>
 #include <toolkit/controls/animatedimages.hxx>
 #include <toolkit/controls/spinningprogress.hxx>
-#include <toolkit/controls/dialogcontrol.hxx>
 #include <toolkit/controls/tabpagemodel.hxx>
 #include <toolkit/controls/tabpagecontainer.hxx>
 #include "toolkit/dllapi.h"
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 9496dcc6a7bc..ca6b76e0b644 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "ucpext_content.hxx"
-
 #include "ucpext_content.hxx"
 #include "ucpext_provider.hxx"
 #include "ucpext_resultset.hxx"
@@ -36,10 +33,7 @@
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-#include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <com/sun/star/lang/IllegalAccessException.hpp>
 #include <com/sun/star/deployment/PackageInformationProvider.hpp>
 
 #include <ucbhelper/contentidentifier.hxx>
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 7a791ede9093..f93626e35f11 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -46,8 +46,6 @@
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/fd_inputstream.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
-#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/cancelcommandexecution.hxx>
 #include <ucbhelper/simpleauthenticationrequest.hxx>
 #include <com/sun/star/lang/IllegalAccessException.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index b675f25109bb..e08b72788074 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -38,12 +38,10 @@
 #include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkGeneralException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
@@ -56,7 +54,6 @@
 #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
 #include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/ucb/XContentCreator.hpp>
 
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 27732f298fd3..760715a9c937 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -58,8 +58,6 @@
 #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
 #include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
 #include <comphelper/processfactory.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 720cfcff7403..8261011e3d87 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/logfile.hxx>
 #include "itemholder1.hxx"
 
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 7d2dee5d4539..8dbb0ddd4311 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -25,7 +25,6 @@
 #include "cdatasection.hxx"
 #include "documentfragment.hxx"
 #include "text.hxx"
-#include "cdatasection.hxx"
 #include "comment.hxx"
 #include "processinginstruction.hxx"
 #include "entityreference.hxx"
diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx
index 3db024bfdeee..d568446b7d33 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include <cppuhelper/factory.hxx>
 
 #include "../dom/documentbuilder.hxx"
 #include "../dom/saxbuilder.hxx"
diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx
index 0d7aeb1b335b..89d00bd6067d 100644
--- a/unoxml/source/xpath/xpathapi.hxx
+++ b/unoxml/source/xpath/xpathapi.hxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
 #include <com/sun/star/xml/dom/XNode.hpp>
 #include <com/sun/star/xml/dom/XNodeList.hpp>
-#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
 #include <com/sun/star/xml/xpath/XXPathObject.hpp>
 #include <com/sun/star/xml/xpath/XXPathExtension.hpp>
 #include <com/sun/star/xml/xpath/Libxml2ExtensionHandle.hpp>
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 73d1d3a2512a..2234bdb11a91 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -27,7 +27,6 @@
 #include "generic/printergfx.hxx"
 #include "salbmp.hxx"
 #include "impfont.hxx"
-#include "outfont.hxx"
 #include "outdev.h"
 #include "fontsubset.hxx"
 #include "salprn.hxx"
diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx
index 60048df5f794..f45737930a02 100644
--- a/vcl/inc/vcl/printerinfomanager.hxx
+++ b/vcl/inc/vcl/printerinfomanager.hxx
@@ -26,7 +26,6 @@
 #include "vcl/dllapi.h"
 #include "vcl/helper.hxx"
 #include "vcl/jobdata.hxx"
-#include "vcl/helper.hxx"
 #include "osl/file.hxx"
 
 #include <cstdio>
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index e9a4edf78c0c..ddd7d090cd03 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -49,7 +49,6 @@
 #include "vcl/unohelp2.hxx"
 
 #include "salinst.hxx"
-#include "svdata.hxx"
 #include "svsys.h"
 
 #include "com/sun/star/i18n/XCharacterClassification.hpp"
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 9bccdf7c2aba..164384a4e1da 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -29,7 +29,6 @@
 #include <tools/gen.hxx>
 #include <unotools/fontcfg.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/string.hxx>
 #include <uno/current_context.hxx>
 
 #include "vcl/configsettings.hxx"
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index b989b80f826d..bf19753b1f15 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/awt/XGraphics.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/XGraphicRenderer.hpp>
-#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index b30db08d85f6..888e25f5048e 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -27,7 +27,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 #include <vcl/image.hxx>
 
 #include <bmpfast.hxx>
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 00c2f6970dd4..819673043e15 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -30,7 +30,6 @@
 #include "vcl/decoview.hxx"
 #include "vcl/configsettings.hxx"
 #include "vcl/help.hxx"
-#include "vcl/decoview.hxx"
 #include "vcl/layout.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/unohelp.hxx"
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 2a174c125f9f..e49fb29184dd 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -30,7 +30,6 @@
 #include <vcl/event.hxx>
 
 #include <math.h>
-#include <limits.h>
 
 // -----------
 // - Defines -
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 6338236c6c40..8451f81bdf91 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -21,7 +21,6 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/taskpanelist.hxx>
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index f02a25b0d532..ed1f0361eacf 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -37,7 +37,6 @@
 #ifdef FREEBSD
 #include <sys/types.h>
 #include <sys/time.h>
-#include <unistd.h>
 #endif
 
 #include <osl/process.h>
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 1246140efbc6..6a3368577d5d 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -25,7 +25,6 @@
 #include <pthread.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <string.h>
 
 #if defined(SOLARIS) || defined(AIX)
 #include <sal/alloca.h>
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index fd4eeec66941..76ef59886ac4 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -43,10 +43,6 @@
 #include <X11/Xresource.h>
 #include "tools/postx.h"
 
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
 namespace vcl_sal {
 
 class NetWMAdaptor : public WMAdaptor
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 14a19495b22a..24fdbb6f7afd 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -29,7 +29,6 @@
 #if defined(FREEBSD) || defined(NETBSD)
 #include <sys/types.h>
 #include <sys/time.h>
-#include <unistd.h>
 #endif
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <unx/gtk/gtkdata.hxx>
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
index f8132a0010f5..b7fd592cef3e 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -12,10 +12,8 @@
 #ifdef ENABLE_GMENU_INTEGRATION
 
 #include <unx/gtk/gloactiongroup.h>
-
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtkframe.hxx>
-#include <unx/gtk/gtksalmenu.hxx>
 
 
 /*
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 7d84c7963161..1724ac506385 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -31,7 +31,6 @@
 #ifdef FREEBSD
 #include <sys/types.h>
 #include <sys/time.h>
-#include <unistd.h>
 #endif
 
 #include <osl/thread.h>