Removed duplicated includes

Change-Id: I5362d997bfa086c9fb1726efcb15132a966684f6
Reviewed-on: https://gerrit.libreoffice.org/12160
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

77 files changed, 18 insertions, 109 deletions

diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx
index 1f6c8c8c85bb..79bf79c46649 100644
--- a/avmedia/source/macavf/macavfcommon.hxx
+++ b/avmedia/source/macavf/macavfcommon.hxx
@@ -41,7 +41,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/awt/Rectangle.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 0b1b1d654932..c642ee1fa948 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -33,7 +33,6 @@
 
 #include "ChartModel.hxx"
 #include <unonames.hxx>
-#include <DataSeriesHelper.hxx>
 
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index e07ffbe529a5..165b179521f5 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -21,7 +21,6 @@
 #include "dlg_ObjectProperties.hxx"
 #include "ResourceIds.hrc"
 #include "Strings.hrc"
-#include "ResourceIds.hrc"
 #include "tp_AxisLabel.hxx"
 #include "tp_DataLabel.hxx"
 #include "tp_LegendPosition.hxx"
diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx
index fe78e75b92c2..1e4e8c67cd91 100644
--- a/chart2/source/controller/inc/res_Titles.hxx
+++ b/chart2/source/controller/inc/res_Titles.hxx
@@ -22,7 +22,6 @@
 #include "TitleDialogData.hxx"
 #include <vcl/builder.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/fixed.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
index ce81771e8efa..6acd53e960ff 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
@@ -13,7 +13,6 @@
 #include <MutexContainer.hxx>
 #include <ChartTypeTemplate.hxx>
 #include <OPropertySet.hxx>
-#include <MutexContainer.hxx>
 #include <ServiceMacros.hxx>
 
 #include <comphelper/uno3.hxx>
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index ac193c675aa7..a5a35e26a5d6 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -30,8 +30,6 @@
 #include <editeng/unoprnms.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include <algorithm>
-
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index c16bb022ff38..15073c3f5137 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -15,7 +15,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <comphelper/InlineContainer.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/FlagSequence.hpp>
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index eeb58f8a5b73..6b15abb5b2a1 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -24,17 +24,16 @@
 #include "osl/file.hxx"
 
 #include <string.h>
-#if defined(SAL_W32)
-#include <io.h>
-
-#include <direct.h>
 #include <errno.h>
+
+#if defined(SAL_W32)
+#   include <io.h>
+#   include <direct.h>
 #endif
 
 #ifdef UNX
-#include <sys/stat.h>
-#include <errno.h>
-#include <unistd.h>
+#   include <sys/stat.h>
+#   include <unistd.h>
 #endif
 
 #include "codemaker/global.hxx"
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 728e01aea794..eebe107ffbad 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <ucbhelper/content.hxx>
 #include <connectivity/dbexception.hxx>
-#include <connectivity/dbconversion.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/property.hxx>
 #include <comphelper/string.hxx>
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index b63e421b328f..43ee0c1b45e6 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -44,7 +44,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <osl/file.h>
 #include <osl/process.h>
-#include <connectivity/dbexception.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 3c08dd8d5e27..0c8a47a1c2af 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -31,7 +31,6 @@
 #include <iostream>
 #endif
 #include <connectivity/PColumn.hxx>
-#include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
 #include "TConnection.hxx"
 #include <comphelper/types.hxx>
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index f44c2b0d721b..2bd095605487 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -78,7 +78,6 @@
 #include <iterator>
 #include <boost/scoped_array.hpp>
 #include "mtftools.hxx"
-#include "outdevstate.hxx"
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 48dfd753d40b..a671783eb293 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -56,7 +56,6 @@
 #include "rtl/string.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
-#include "sal/types.h"
 
 namespace {
 
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index ab390fafdfbe..e23a7e57b524 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -25,8 +25,6 @@
 #include <cppunit/plugin/TestPlugIn.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "sal/types.h"
-
 #include "Rec.hpp"
 
 namespace
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index 15f3b7dac7cc..f34a5fc27c69 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -29,7 +29,6 @@
 #include "Interface1.hpp"
 
 #include "rtl/ustring.hxx"
-#include "sal/types.h"
 
 namespace
 {
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index db2bc538d463..9385dcd4e317 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/types.h>
-
 #include <test/cppuhelper/propertysetmixin/CppSupplier.hpp>
 #include <test/cppuhelper/propertysetmixin/JavaSupplier.hpp>
 #include <test/cppuhelper/propertysetmixin/XSupplier.hpp>
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index 494a75e3b4ef..1bccf2fc3639 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/types.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 00fb685f6295..a6605579099b 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/types.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 1a67ee8dec33..03f587bcc164 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -31,7 +31,6 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <thesdlg.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svxerr.hxx>
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index fe3f5a784ced..538ee5757436 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -54,8 +54,6 @@
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include "com/sun/star/beans/NamedValue.hpp"
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index b550c564f365..0cc179bc99d2 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -21,7 +21,6 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <osl/file.hxx>
 #include <sfx2/app.hxx>
 #include <svl/fstathelper.hxx>
 
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 0ba4a619bc7f..3e9eed92ce71 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -35,8 +35,6 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include "xdialogcreator.hxx"
-#include "oleembobj.hxx"
 #include <xdialogcreator.hxx>
 #include <oleembobj.hxx>
 
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 4111d1d1a319..ac0c4b7688e1 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -19,16 +19,17 @@
 
 
 #if defined WNT
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
-#include <curl/curl.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+#   ifdef _MSC_VER
+#       pragma warning(push, 1) /* disable warnings within system headers */
+#   endif
+#   include <curl/curl.h>
+#   ifdef _MSC_VER
+#       pragma warning(pop)
+#   endif
 #else
-#include <curl/curl.h>
+#   include <curl/curl.h>
 #endif
+
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 50df6baceae7..f0bc107d4ad0 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -32,7 +32,6 @@
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XController.hdl>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index dd1bc79053ec..02b9fe69402e 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -19,7 +19,6 @@
 
 
 #include "componenttools.hxx"
-#include "services.hxx"
 #include "DatabaseForm.hxx"
 #include "EventThread.hxx"
 #include "frm_module.hxx"
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index 8874068caab4..8e19cf05b975 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -518,7 +518,6 @@ LwpStyleManager::~LwpStyleManager()
     m_StyleList.clear();
 }
 
-#include "xfilter/xfstylemanager.hxx"
 /*
 VO_PARASTYLE/VO_CHARACTERSTYLE call this method to add its created style to XFStyleManager
 1. Add the style to XFStyleManager, and return the <office:styles> style name
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index d5c3a2453a78..8f1b99254917 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -36,7 +36,6 @@
 #include <rtl/instance.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include "oox/core/fastparser.hxx"
-#include "oox/core/filterdetect.hxx"
 #include "oox/core/fragmenthandler.hxx"
 #include "oox/core/recordparser.hxx"
 #include "oox/core/relationshandler.hxx"
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 8eb755fcf633..6404cf9bd56e 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -70,7 +70,6 @@ using ::com::sun::star::container::XIndexReplace;
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::drawing;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 2a908306e23a..1966f7bcbfef 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -40,7 +40,6 @@
 #include <editeng/charscaleitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/xtable.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/emphasismarkitem.hxx>
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index b1b3f68e82ac..2fa10d6fec22 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -140,7 +140,6 @@
 #include "GroupsSorting.hxx"
 #include "PageNumber.hxx"
 #include "UndoEnv.hxx"
-#include "ReportControllerObserver.hxx"
 
 #include <boost/mem_fn.hpp>
 #include <boost/bind.hpp>
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index cfc9c410ef0f..e593387a8788 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -208,8 +208,6 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
-#include <svl/zforlist.hxx>
-
 #define SC_DOC_NEW          0xFFFF
 
 #define SC_MACROCALL_ALLOWED        0
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index ef3e8dce8403..dc7ea89f4551 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -22,7 +22,6 @@
 #include "helper/shared_test_impl.hxx"
 
 #include "docsh.hxx"
-#include "postit.hxx"
 #include "patattr.hxx"
 #include "scitems.hxx"
 #include "document.hxx"
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index fd3840ab348e..be1955da0295 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -46,7 +46,6 @@
 #include "editutil.hxx"
 #include "cellvalue.hxx"
 #include "attrib.hxx"
-#include "dpsave.hxx"
 #include "dpshttab.hxx"
 #include <scopetools.hxx>
 #include <columnspanset.hxx>
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 10b064277967..3e93a2d75214 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <column.hxx>
-#include <clipcontext.hxx>
 #include <clipparam.hxx>
 #include <cellvalue.hxx>
 #include <attarray.hxx>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 04bbbce4d9f5..b7661fe40afa 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -62,7 +62,6 @@
 #include <refhint.hxx>
 #include <listenerquery.hxx>
 #include <bcaslot.hxx>
-#include "rangelst.hxx"
 
 #include <svl/sharedstringpool.hxx>
 
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 721a46b07854..ba5f1fc99de8 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -64,7 +64,6 @@
 #include "chgviset.hxx"
 #include "XMLStylesImportHelper.hxx"
 #include "sheetdata.hxx"
-#include "unonames.hxx"
 #include "rangeutl.hxx"
 #include "postit.hxx"
 #include "formulaparserpool.hxx"
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 3d0cc117ef73..0db4dfa56838 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_PVFUNDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_PVFUNDLG_HXX
 
-#include <boost/scoped_ptr.hpp>
-
 #include <com/sun/star/sheet/DataPilotFieldReference.hpp>
 #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
 
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index df22072aef92..a8ad2ffab4f9 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -28,7 +28,6 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/msgbox.hxx>
-#include <vcl/settings.hxx>
 
 #include "anminfo.hxx"
 #include "animobjs.hxx"
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index d172e9e5a8d5..7cd3c733afe5 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -34,8 +34,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <config_features.h>
-
 #include <editeng/editdata.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 9f6d25b8dd14..d087c755cdd1 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -33,7 +33,6 @@
 
 #include <vcl/settings.hxx>
 #include <vcl/msgbox.hxx>
-#include <vcl/settings.hxx>
 
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index c829c1d763f5..e72529f0c3b8 100644
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -88,8 +88,6 @@ sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath )
 #else // this is UNX
 
 
-#include <sal/types.h>
-
 sal_Bool IsReadonlyAccordingACL( const sal_Unicode* )
 {
     // to be implemented
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 5add3bb6765b..371b76603043 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -29,7 +29,6 @@
 #include "osl/thread.h"
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
-#include "sal/macros.h"
 
 #include "gconfaccess.hxx"
 
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index d47708eff967..f60b687132f7 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/types.h>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx
index 93f2a01a0f0f..4a2ec1d3c0c8 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -24,7 +24,6 @@
 #include <svx/xflbmtit.hxx>
 #include <svx/xflbmpit.hxx>
 #include <svx/xflbmsxy.hxx>
-#include <svx/xflbmsxy.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/xsflclit.hxx>
 #include <svx/xflbmsli.hxx>
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index fae791cb0b79..65996a05569e 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -41,7 +41,6 @@
 #include <swatrset.hxx>
 #include <frmatr.hxx>
 #include "unostyle.hxx"
-#include "viewsh.hxx"
 #include "docsh.hxx"
 #include <crsrsh.hxx>
 #include "fesh.hxx"
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 0de966f9f794..8594f22b5408 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -31,7 +31,6 @@
 #include <SwUndoField.hxx>
 #include <flddat.hxx>
 #include <cntfrm.hxx>
-#include <dbfld.hxx>
 #include <section.hxx>
 #include <docufld.hxx>
 #include <switerator.hxx>
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index 63146ac23fbe..d99c71496997 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -38,7 +38,6 @@
 #include <dcontact.hxx>
 #include <unoframe.hxx>
 #include <docary.hxx>
-#include <dcontact.hxx>
 #include <textboxhelper.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 671285fb385a..c5590335d420 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -18,7 +18,6 @@
  */
 #include <DocumentStylePoolManager.hxx>
 #include <doc.hxx>
-#include <poolfmt.hxx>
 #include <DocumentSettingManager.hxx>
 #include <IDocumentState.hxx>
 #include <IDocumentUndoRedo.hxx>
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6959e49d7f89..2281b086da34 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -32,7 +32,6 @@
 #include <DocumentOutlineNodesManager.hxx>
 #include <DocumentContentOperationsManager.hxx>
 #include <DocumentRedlineManager.hxx>
-#include <DocumentFieldsManager.hxx>
 #include <DocumentStatisticsManager.hxx>
 #include <DocumentStateManager.hxx>
 #include <DocumentStylePoolManager.hxx>
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index d9c9af706e65..861ab97d2c1d 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -68,7 +68,6 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <switerator.hxx>
 #include <algorithm>
-#include <drawdoc.hxx>
 #include <txtfly.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 854c1f722942..8fe4b7ccc9ba 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -40,7 +40,6 @@
 #include <DocumentSettingManager.hxx>
 #include <IDocumentState.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include <IDocumentLayoutAccess.hxx>
 #include <cmdid.h>
 #include <drawdoc.hxx>
 #include <textboxhelper.hxx>
@@ -83,7 +82,6 @@
 #include <HandleAnchorNodeChg.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <switerator.hxx>
-#include <drawdoc.hxx>
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 9c766ea375ce..f45b6a83e589 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -69,7 +69,6 @@
 
 //UUUU
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
-#include <drawdoc.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index a38265989d7d..dee2a9bdf624 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -81,7 +81,6 @@
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <ndtxt.hxx>
-#include <drawdoc.hxx>
 
 #include <svtools/borderhelper.hxx>
 
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 4ce9ffacaaab..89a45c9f7d01 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -25,7 +25,6 @@
 #include "doc.hxx"
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include <IDocumentStylePoolAccess.hxx>
 #include "fmtinfmt.hxx"
 #include "ndtxt.hxx"
 #include "pagedesc.hxx"
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 8bcb838d3227..0102e7916b00 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -68,7 +68,6 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <switerator.hxx>
-#include <drawdoc.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index e6177030b7d3..8e4d879b550a 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -121,13 +121,11 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <svx/unobrushitemhelper.hxx>
-#include <svx/xfillit0.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xgrscit.hxx>
 #include <svx/xflbmtit.hxx>
 #include <svx/xflbmpit.hxx>
 #include <svx/xflbmsxy.hxx>
-#include <svx/xflbmsxy.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/xsflclit.hxx>
 #include <svx/xflbmsli.hxx>
@@ -139,7 +137,6 @@
 #include <svx/xflhtit.hxx>
 #include <svx/xfltrit.hxx>
 #include <swunohelper.hxx>
-#include <drawdoc.hxx>
 #include <fefly.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 8a5e4f555528..efc0ead33edc 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -60,7 +60,6 @@
 #include <SwStyleNameMapper.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
-#include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index ed381b74d6a9..ba5cdf716ea3 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "crsrsh.hxx"
-#include "drawdoc.hxx"
 #include "rootfrm.hxx"
 #include "pagefrm.hxx"
 #include "viewimp.hxx"
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index b3c36870652f..90ba7b096236 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -38,8 +38,6 @@
 #include "textboxhelper.hxx"
 #include "wrtww8.hxx"
 
-#include "wrtww8.hxx"
-
 #include <comphelper/random.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/flagguard.hxx>
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index e787e5a660a3..ded50407b043 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -42,8 +42,6 @@
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 
-#include <boost/scoped_ptr.hpp>
-
 class SwGrfNode;
 class SdrObject;
 
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index b371b8e24dab..b97e7024b160 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -51,7 +51,6 @@
 
 
 #include <IDocumentDrawModelAccess.hxx>
-#include <writerhelper.hxx>
 
 using namespace com::sun::star;
 using namespace oox;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 104cdbeddb01..606178f44aca 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -96,7 +96,6 @@
 #include "sfx2/sfxsids.hrc"
 #include <svl/urihelper.hxx>
 #include <unotools/saveopt.hxx>
-#include <drawdoc.hxx>
 
 #include <algorithm>
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 1d271f7dd7fe..58718c238b27 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -60,7 +60,6 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <IDocumentStatistics.hxx>
-#include <IDocumentStylePoolAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentExternalData.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index af4a75f0075d..e399b3899c65 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -67,7 +67,6 @@
 
 
 #include <pausethreadstarting.hxx>
-#include <drawdoc.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index bd515dd98731..520bba8b01bc 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -62,7 +62,6 @@
 #include <svx/xflftrit.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/drawitem.hxx>
-#include <drawdoc.hxx>
 
 // The Format names in the list of all names have the
 // following family as their first character:
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index 007218a213d5..249efb3986d6 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -44,7 +44,6 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <docary.hxx>
 #include <edtwin.hxx>
-#include <drawdoc.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index d70580112d20..2679b8b4f6c8 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -69,8 +69,6 @@
 #include <doc.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 
-#include <doc.hxx>
-#include <docsh.hxx>
 #include <svx/drawitem.hxx>
 #define SwGrfShell
 
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 6d48aa9dbd85..939a6f84b065 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -57,7 +57,6 @@
 
 #include <cmdid.h>
 #include <IDocumentRedlineAccess.hxx>
-#include <doc.hxx>
 
 //UUUU
 #include <doc.hxx>
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 41109f66617b..700580312477 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -22,7 +22,6 @@
 #include <boost/noncopyable.hpp>
 #include "vcl/svapp.hxx"
 #include "osl/mutex.hxx"
-#include "sal/config.h"
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/implbase2.hxx"
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 94fe04a65af4..4fd8d23ecac5 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -117,7 +117,6 @@ using org::libreoffice::touch::ByteBufferWrapper;
 #include <vcl/wrkwin.hxx>
 #include <vcl/throbber.hxx>
 #include "toolkit/awt/vclxspinbutton.hxx"
-#include "toolkit/awt/scrollabledialog.hxx"
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/awt/scrollabledialog.hxx>
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index cceadeecab30..e9c8e0bb9a1d 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -34,8 +34,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-#include <rtl/character.hxx>
-
 #include <algorithm>
 #include <limits>
 #include <memory>
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
index 1262f3e9e7c2..1b91d02839d3 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
@@ -20,13 +20,12 @@
 #include <cstddef>
 
 #include <kdemodalityfilter.hxx>
+#include <kdialogbase.h>
 
 #if ENABLE_TDE
-#include <tdeapplication.h>
-#include <kdialogbase.h>
+#   include <tdeapplication.h>
 #else // ENABLE_TDE
-#include <kapplication.h>
-#include <kdialogbase.h>
+#   include <kapplication.h>
 #endif // ENABLE_TDE
 
 #include <netwm.h>
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 56c5355169bc..f7cb766ba845 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -46,7 +46,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index d673843b683d..21ffa8e15f29 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -20,7 +20,6 @@
 #include <TblStylePrHandler.hxx>
 #include <PropertyMap.hxx>
 #include <ooxml/resourceids.hxx>
-#include <dmapperLoggers.hxx>
 #include <resourcemodel/QNameToString.hxx>
 
 #include "dmapperLoggers.hxx"
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index cfba3804793a..94601f91e62e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -47,7 +47,6 @@
 #include <ooxml/resourceids.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 #include <dmapper/GraphicHelpers.hxx>
 
 #include <rtfsdrimport.hxx>
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 42dcca99ad7a..9f2cdd8b8d60 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -27,7 +27,6 @@
 #include "formattributes.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <callbacks.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "callbacks.hxx"
 #include "strings.hxx"
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 4cecc1bc01d0..cd2db541c39b 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -48,7 +48,6 @@
 
 //UUUU
 #include <xmloff/EnumPropertyHdl.hxx>
-#include <com/sun/star/drawing/FillStyle.hpp>
 #include "XMLFillBitmapSizePropertyHandler.hxx"
 #include "XMLBitmapLogicalSizePropertyHandler.hxx"
 #include <com/sun/star/drawing/RectanglePoint.hpp>