Remove duplicated includes and defines. Identified with "cat $i | grep '^#include' | sort | uniq -d".

95 files changed, 3 insertions, 213 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 64cb550d787b..ea548a9ee528 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -32,7 +32,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <vcl/image.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/combobox.hxx>
 #include <svx/charmap.hxx>
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 8f009293fb9c..432d134f50e9 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -71,17 +71,14 @@
 #include <vcl/accel.hxx>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
-#include <tools/rc.hxx>
 #include <i18npool/lang.h>
 #include <tools/resmgr.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/cmdevt.hxx>
 #include <vcl/font.hxx>
 #include <tools/color.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/region.hxx>
 #include <vcl/mapmod.hxx>
 #include <tools/fract.hxx>
@@ -96,13 +93,11 @@
 #include <format.hxx>
 #include <utility.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/image.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/window.hxx>
 #include <sfx2/minarray.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/combobox.h>
-#include <vcl/edit.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/lstbox.hxx>
@@ -144,14 +139,12 @@
 #include <osl/thread.h>
 #include <vcl/apptypes.hxx>
 #include <tools/dynary.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfx.hrc>
 #include <svl/memberid.hrc>
 #include <vcl/syswin.hxx>
-#include <vcl/virdev.hxx>
 #include <tools/datetime.hxx>
 #include <tools/wldcrd.hxx>
 #include <parse.hxx>
@@ -355,13 +348,9 @@
 #include <sfx2/msg.hxx>
 #include <svl/itemset.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <vcl/floatwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/window.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/objface.hxx>
-#include <vcl/event.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <symbol.hxx>
@@ -376,34 +365,26 @@
 #include <svl/ownlist.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/stritem.hxx>
-#include <vcl/mapmod.hxx>
 #include <sfx2/ipfrm.hxx>
 #include <vcl/dialog.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/svstdarr.hxx>
 #include <sfx2/bindings.hxx>
 #include <dialog.hxx>
-#include <vcl/button.hxx>
 #include <vcl/symbol.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabdlg.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
-#include <vcl/group.hxx>
 #include <svx/optgenrl.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/group.hxx>
 #include <document.hxx>
-#include <vcl/field.hxx>
 #include <vcl/spinfld.hxx>
 #include <vcl/menubtn.hxx>
-#include <vcl/scrbar.hxx>
 #include <svtools/ctrlbox.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
 #include <svtools/ctrltool.hxx>
 #include <sfx2/interno.hxx>
@@ -426,7 +407,6 @@
 #include <svx/svxids.hrc>
 #include <view.hxx>
 #include <sfx2/dockwin.hxx>
-#include <vcl/dockwin.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/clientsh.hxx>
 #include <svtools/scrwin.hxx>
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index ffae33b07d0c..0cac5855bafd 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
@@ -47,7 +46,6 @@
 #include <com/sun/star/ucb/InteractiveAppException.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
-#include <framework/interaction.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <ucbhelper/simpleinteractionrequest.hxx>
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 89d99a4f5c1f..7e2c3b485d1d 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_starmath.hxx"
 
 
-#include <vector>
 #include <osl/mutex.hxx>
 #include <ucbhelper/content.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx
index 1816e483ab90..767e29dcad34 100644
--- a/starmath/source/typemap.cxx
+++ b/starmath/source/typemap.cxx
@@ -45,14 +45,9 @@
 #define ITEMID_HYPHENREGION     0
 #define ITEMID_FONT             0
 #define ITEMID_FONTHEIGHT       0
-#define ITEMID_COLOR            0
-#define ITEMID_BRUSH            0
 #define ITEMID_BRUSH            0
 #define ITEMID_BOX              0
 #define ITEMID_LINE             0
-#define ITEMID_BRUSH            0
-#define ITEMID_SPELLCHECK       0
-#define ITEMID_HYPHENREGION     0
 #define ITEMID_LINESPACING      0
 #define ITEMID_ADJUST           0
 #define ITEMID_WIDOWS           0
@@ -62,10 +57,8 @@
 #define ITEMID_FMTSPLIT         0
 #define ITEMID_PAGEMODEL        0
 #define ITEMID_FONTLIST         0
-#define ITEMID_FONT             0
 #define ITEMID_POSTURE          0
 #define ITEMID_WEIGHT           0
-#define ITEMID_FONTHEIGHT       0
 #define ITEMID_FONTWIDTH        0
 #define ITEMID_UNDERLINE        0
 #define ITEMID_CROSSEDOUT       0
@@ -82,9 +75,6 @@
 #define ITEMID_LANGUAGE         0
 #define ITEMID_NOLINEBREAK      0
 #define ITEMID_NOHYPHENHERE     0
-#define ITEMID_COLOR            0
-#define ITEMID_FONT             0
-#define ITEMID_FONTHEIGHT       0
 #define ITEMID_SEARCH           0
 #define ITEMID_COLOR_TABLE      0
 #define ITEMID_GRADIENT_LIST    0
@@ -99,7 +89,6 @@
 #define ITEMID_CHARTTEXTORDER   0
 #define ITEMID_CHARTTEXTORIENT  0
 #define ITEMID_DOUBLE           0
-#define ITEMID_TABSTOP          0
 #define ITEMID_PAPERBIN         0
 #define ITEMID_SIZE             0
 #define ITEMID_LRSPACE          0
@@ -108,12 +97,9 @@
 #define ITEMID_OPAQUE           0
 #define ITEMID_PROTECT          0
 #define ITEMID_MACRO            0
-#define ITEMID_BOX              0
 #define ITEMID_BOXINFO          0
 #define ITEMID_FMTBREAK         0
 #define ITEMID_FMTKEEP          0
-#define ITEMID_LINE             0
-#define ITEMID_BRUSH            0
 
 #define CharSetItem SfxVoidItem
 #define FontFamilyItem SfxVoidItem
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 1692dd8a3ca4..417057e224ac 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -31,7 +31,6 @@
 
 
 #include <osl/mutex.hxx>
-#include <osl/mutex.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/ctrltool.hxx>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 48c883f2c624..54dc62b377de 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -49,7 +49,6 @@
 #include <IDocumentChartDataProviderAccess.hxx>
 #include <IDocumentOutlineNodes.hxx>
 #include <IDocumentListItems.hxx>
-#include <set>
 
 #include <IDocumentListsAccess.hxx>
 class SwList;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index bfb8696617f1..6977045715f0 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -760,7 +760,6 @@
 #include "svx/layctrl.hxx"
 #include "svx/lboxctrl.hxx"
 #include "svx/linectrl.hxx"
-#include "sfx2/linkmgr.hxx"
 #include "filter/msfilter/mscodec.hxx"
 #include "filter/msfilter/msdffimp.hxx"
 #include "filter/msfilter/msfiltertracer.hxx"
@@ -954,7 +953,6 @@
 #include "vcl/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
-#include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
 
 #include "xmloff/DocumentSettingsContext.hxx"
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 6dcb67029666..a59473b0889b 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -35,7 +35,6 @@
 #include <sfx2/module.hxx>
 
 #include <tools/shl.hxx>
-#include <svl/lstner.hxx>
 #include "swdllapi.h"
 #include "shellid.hxx"
 #include <fldupde.hxx>
diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx
index cdfb12748a1a..11a15cfc91a2 100644
--- a/sw/inc/unomailmerge.hxx
+++ b/sw/inc/unomailmerge.hxx
@@ -44,8 +44,6 @@
 #include <svl/itemprop.hxx>
 #include <sfx2/objsh.hxx>   // SfxObjectShellRef
 
-#include <functional>
-
 namespace com { namespace sun { namespace star {
 
     namespace sdbc {
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 8cf7ba57424d..6b2cd2048f96 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 72983224efca..a00fd79587dd 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -37,7 +37,6 @@
 #include <rootfrm.hxx>
 #include <txtfrm.hxx>
 #include <sectfrm.hxx>
-#include <pagefrm.hxx>
 #include <section.hxx>
 #include <viewsh.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 3e887948031e..2bbcd31da7b8 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -102,7 +102,6 @@
 #include <fmtfordr.hxx>
 #include <fmtflcnt.hxx>
 #include <fchrfmt.hxx>
-#include <fmtautofmt.hxx>
 #include <fmtinfmt.hxx>
 #include <fmtcnct.hxx>
 #include <fmtline.hxx>
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 392af4aeffb4..c4684a0849e6 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -39,7 +39,6 @@
 #include <pam.hxx>
 #include <pamtyp.hxx>
 #include <txtfrm.hxx>
-#include <section.hxx>
 #include <fmtcntnt.hxx>
 #include <frmatr.hxx>
 #include <swtable.hxx>
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 3a8f5b86c6d9..ee40b03ef4e7 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -42,7 +42,6 @@
 #include <ndindex.hxx>
 #include <swtable.hxx>
 #include <ndtxt.hxx>
-#include <ndole.hxx>
 #include <calc.hxx>
 #include <frmfmt.hxx>
 #include <cellfml.hxx>
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 349347da477f..6a593f7254b8 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -67,9 +67,7 @@
 
 #include <svx/svdpagv.hxx>
 
-#include <dcontact.hxx>
 #include <txtfrm.hxx>
-#include <frmfmt.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <fmtornt.hxx>
 
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 3b651d450e97..ed5b9d52fcbf 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -67,7 +67,6 @@
 #include <undobj.hxx>
 #include <breakit.hxx>
 #include <hhcwrp.hxx>
-#include <breakit.hxx>
 #include <vcl/msgbox.hxx>
 #include "comcore.hrc"
 #include "editsh.hxx"
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 2846187e6d6f..a40a85dcfa12 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -40,7 +40,6 @@
 #include <svl/svarray.hxx>
 #endif
 #include <vcl/svapp.hxx>
-#include <vcl/svapp.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index a9d0361b4944..24b3109a0867 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -44,7 +44,6 @@
 #include <editeng/brkitem.hxx>
 #include <svl/whiter.hxx>
 #ifndef _ZFORLIST_HXX //autogen
-#define _ZFORLIST_DECLARE_TABLE
 #include <svl/zforlist.hxx>
 #endif
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 1d4cc7cafc23..eed114648328 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -68,7 +68,6 @@
 #include <fmtflcnt.hxx>
 #include <fmtcnct.hxx>
 #include <frmfmt.hxx>
-#include <dcontact.hxx>
 #include <txtflcnt.hxx>
 #include <docfld.hxx>   // fuer Expression-Felder
 #include <pam.hxx>
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 81b8726a0671..d52717457afa 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -49,7 +49,6 @@
 #include <docsort.hxx>
 #include <undobj.hxx>
 #include <tblsel.hxx>
-#include <cellatr.hxx>
 #include <redline.hxx>
 #include <node2lay.hxx>
 #include <unochart.hxx>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 36a73a573235..fff1943d6abb 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -60,7 +60,6 @@
 #include <swcrsr.hxx>
 #include <viscrs.hxx>
 #include <swtable.hxx>
-#include <ndtxt.hxx>
 #include <swundo.hxx>
 #include <tblsel.hxx>
 #include <fldbas.hxx>
@@ -87,7 +86,6 @@
 #include <node2lay.hxx>
 #include <comcore.hrc>
 #include "docsh.hxx"
-#include <tabcol.hxx>
 #include <unochart.hxx>
 
 #include <node.hxx>
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 1d0ee8bccddc..b261f8eca832 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -38,7 +38,6 @@
 #include <comphelper/mediadescriptor.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/lnkbase.hxx>
-#include <sfx2/linkmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <editeng/boxitem.hxx>
 #include <svx/svxids.hrc>       // fuer die EventIds
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 20dc81ae602e..59a6cd850d04 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -37,7 +37,6 @@
 #include <fmturl.hxx>
 #include <frmfmt.hxx>
 #include <doc.hxx>
-#include <docsh.hxx>
 #include <shellres.hxx>
 #include <viewimp.hxx>
 #include <pagefrm.hxx>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index ff4582d2f00b..1b37fc71a7d6 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -68,7 +68,6 @@
 #include <tools/datetime.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Time.hpp>
 
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index d5d5dfd0e6ed..91bfbe75ba5d 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -56,7 +56,6 @@
 #ifdef MAC
 #include <stdlib.h>
 #endif
-#include <float.h>
 
 using namespace ::com::sun::star;
 using namespace nsSwDocInfoSubType;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 1ba058310fe4..51c099c644ed 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -57,7 +57,6 @@
 #include <section.hxx>
 #include <cntfrm.hxx>
 #include <frmatr.hxx>
-#include <docsh.hxx>
 #include <ndole.hxx>
 
 #include <comphelper/classids.hxx>
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 36294b17d3d7..601a92cf472e 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -40,7 +40,6 @@
 #include "porlay.hxx"
 #include "txtfrm.hxx"
 #include "ndtxt.hxx"
-#include "txttypes.hxx"
 #include <editeng/paravertalignitem.hxx>
 
 class Font;
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index cf8b4e528c9b..280482794536 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -41,7 +41,6 @@
 #include "portxt.hxx"
 #include "pormulti.hxx"
 #include "porglue.hxx"
-#include "inftxt.hxx"
 #include "blink.hxx"
 #if OSL_DEBUG_LEVEL > 1
 
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 05b7680300a7..2faa8f207604 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -74,11 +74,6 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include <svx/obj3d.hxx>
-#include <editeng/txtrange.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <editeng/lspcitem.hxx>
 #include <svx/svdoedge.hxx>
 #include "doc.hxx"
 
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index dbd6b6653e47..53176f99fb01 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -87,11 +87,9 @@
 #include <SwStyleNameMapper.hxx>
 #include <numrule.hxx>
 
-#include <svl/intitem.hxx>
 #include <swtable.hxx>
 #include <docsh.hxx>
 #include <SwNodeNum.hxx>
-#include <svl/intitem.hxx>
 #include <list.hxx>
 
 SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0, 4 )
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index c39ece11ede0..3e7ba88a452c 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -48,8 +48,6 @@
 #include <unocrsrhelper.hxx>
 #include <hintids.hxx>
 
-#include <unomid.h>
-
 
 using rtl::OUString;
 using namespace rtl;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index b125081bace7..15f278a6db90 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/chart2/data/LabelOrigin.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>     // SvNumberFormatter
 #include <svtools/chartprettypainter.hxx>
@@ -55,7 +54,6 @@
 #include <frmfmt.hxx>
 #include <docsh.hxx>
 #include <ndole.hxx>
-#include <swtable.hxx>
 #include <swtypes.hxx>
 #include <unocore.hrc>
 
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index 035f2986d7b0..7a311aaf114a 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -45,7 +45,6 @@
 #include <viewimp.hxx>
 #include <breakit.hxx>
 #include <pam.hxx>
-#include <unobaseclass.hxx>
 #include <unotextrange.hxx>
 #include <pagefrm.hxx>
 #include <cntfrm.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 75d350d62411..d13b3a2f51db 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -41,12 +41,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/unolingu.hxx>
-#include <com/sun/star/text/ChapterFormat.hpp>
-#include <com/sun/star/text/ReferenceFieldPart.hpp>
-#include <com/sun/star/text/BibliographyDataField.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <hints.hxx>
 #include <cmdid.h>
 #include <swtypes.hxx>
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 0628706c66e7..a81f29c3edb3 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -61,7 +61,6 @@
 #include <doctxm.hxx>
 #include <fmtftntx.hxx>
 #include <fmtclbl.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <editeng/frmdiritem.hxx>
 #include <fmtcntnt.hxx>
 /* #109700# */
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index ae795ebdff3e..23e78806b80d 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -81,7 +81,6 @@
 #include <com/sun/star/chart2/data/XDataSequence.hpp>
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
 #include <com/sun/star/table/CellContentType.hpp>
-#include <unotbl.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index dcd8ac49feab..fc1b7582d2ea 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -32,7 +32,6 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/view/XRenderable.hpp>
 
 #include <hintids.hxx>
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 2bbafd0e30fc..49a586f063f8 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -60,7 +60,6 @@
 #include <swtable.hxx>
 #include <fmtcntnt.hxx>
 #include <editeng/boxitem.hxx>
-#include <frmatr.hxx>
 #include <frmfmt.hxx>
 #include <numrule.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index c964da86b200..6618b15649b2 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -50,7 +50,6 @@
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjitem.hxx>
 #include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
 #include <editeng/brshitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <editeng/keepitem.hxx>
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index e3bc2dc02816..afaf589f02fa 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -43,7 +43,6 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/boxitem.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <editeng/keepitem.hxx>
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index e9466a3347ee..db650319204f 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -40,7 +40,6 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/adjitem.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <editeng/brshitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/boxitem.hxx>
@@ -55,13 +54,11 @@
 
 #include <fmtornt.hxx>
 #include <fmturl.hxx>
-#include <fmtanchr.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtinfmt.hxx>
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
 #include <fmtfsize.hxx>
-#include <fmtinfmt.hxx>
 #include "frmatr.hxx"
 #include "charatr.hxx"
 #include <frmfmt.hxx>
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 0571ed9e6b39..e8b22a025a76 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -65,7 +65,6 @@
 #include "htmlfly.hxx"
 #include "swcss1.hxx"
 #include <com/sun/star/embed/XClassifiedObject.hpp>
-#include <com/sun/star/embed/EmbedStates.hpp>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <sot/clsids.hxx>
 
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 9367aad38285..aa7cf2e49d97 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -106,7 +106,6 @@
 #include <editeng/outlobj.hxx>
 #include <editeng/paperinf.hxx>
 
-#include <tools/stream.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 3005aa832696..74e48d955920 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -37,7 +37,6 @@
 #include <vcl/graph.hxx>
 #include <svl/urihelper.hxx>
 #include <editeng/boxitem.hxx>
-#include <editeng/boxitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/cmapitem.hxx>
 #include <editeng/cntritem.hxx>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 2e868b6b5850..b857ccaff352 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -66,7 +66,6 @@
 
 #include <comphelper/seqstream.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svtools/filter.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/unoapi.hxx>
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 5540a4125d44..073041c856bc 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -39,7 +39,6 @@
 #include <editeng/fontitem.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/svdotext.hxx>
 #include <svx/fmglob.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 46e427e3be28..ec9d61b3640d 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -49,7 +49,6 @@
 #include <hintids.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
-#include <editeng/shaditem.hxx>
 #include <filter/msfilter/msoleexp.hxx>
 #include <editeng/lrspitem.hxx> // SvxLRSpaceItem
 #include <editeng/ulspitem.hxx>
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1f0aa6d8d39e..0d1e738f3215 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -38,7 +38,6 @@
 #include <svx/xlineit.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/sdtaitm.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/sxctitm.hxx>
 #include <editeng/editeng.hxx>
@@ -64,7 +63,6 @@
 #include <svx/rectenum.hxx>
 #include <editeng/opaqitem.hxx>
 #include <editeng/shaditem.hxx>
-#include <editeng/shaditem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/outliner.hxx>         // #79453#
 #include <editeng/frmdiritem.hxx>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 8e3d1e3bc1ed..d85c15574632 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -40,7 +40,6 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <editeng/hyznitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/langitem.hxx>
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index fd8394a727a5..64556da05858 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -96,7 +96,6 @@
 #include <xmloff/odffields.hxx>
 
 #include <stdio.h>
-#include <algorithm>
 
 using namespace com::sun::star;
 using namespace sw::util;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index dc5a2141c863..72a89297d7ec 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -85,7 +85,6 @@
 #include <fmtclds.hxx>
 #include <pagedesc.hxx>
 #include <SwStyleNameMapper.hxx>
-#include <IMark.hxx>
 
 #include "ww8scan.hxx"          // WW8FieldDesc
 #include "ww8par.hxx"
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index dc20a954742f..5032661c8ad3 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -45,7 +45,6 @@
 #include <editeng/crsditem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
-#include <editeng/adjitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/brshitem.hxx>
 #include <editeng/spltitem.hxx>
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 7332d9c4f03f..833866423d38 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -3,7 +3,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <stdarg.h>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index ace9205e322c..951e02010146 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -44,7 +44,6 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/tstpitem.hxx>
-#include <editeng/boxitem.hxx>
 #include <editeng/brshitem.hxx>
 #include <editeng/langitem.hxx>
 
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 2b93dde31b54..165b21768feb 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -105,7 +105,6 @@
 #include <app.hrc>
 
 #include <cfgid.h>
-#include <unotools/moduleoptions.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 4d8ca66ae088..9eb5bcc4ce71 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -118,7 +118,6 @@
 
 #include <sfx2/fcontnr.hxx>
 
-#include "swabstdlg.hxx"
 #include "dialog.hrc"
 #include "swabstdlg.hxx"
 
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 407a68f21142..feddb201e6ec 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -35,6 +35,9 @@
 #include <hintids.hxx>
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSISORTDTOR
+#define _SVSTDARR_XUB_STRLEN
+#define _SVSTDARR_USHORTS
+#define _SVSTDARR_ULONGS
 #include <svl/svstdarr.hxx>
 
 #include "cmdid.h"
@@ -56,11 +59,6 @@
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <comphelper/processfactory.hxx>
 
-#define _SVSTDARR_XUB_STRLEN
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_ULONGS
-#include <svl/svstdarr.hxx>
-
 #include "charatr.hxx"
 #include "viewopt.hxx"
 #include "drpcps.hxx"
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 99c56fa670a4..48a603ec2f0e 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -133,7 +133,6 @@
 #include <osl/file.hxx>
 #include <swabstdlg.hxx>
 #include <fmthdft.hxx>
-#include <dbui.hrc>
 #include <envelp.hrc>
 #include <memory>
 #include <vector>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 4b2d7103f524..33ea1c257bb8 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -49,11 +49,9 @@
 #include <dbmgr.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <wrtsh.hxx>
-#include <sfx2/viewfrm.hxx>
 #include "vcl/msgbox.hxx" // RET_CANCEL
 
 #include <helpid.h>
-#include <dbui.hrc>
 #include <mailmergewizard.hrc>
 
 using namespace svt;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 4b6df926daf7..c99de01ea052 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -41,7 +41,6 @@
 #include <dbui.hrc>
 #include <swtypes.hxx>
 #include <mmoutputtypepage.hrc>
-#include <dbui.hrc>
 
 SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUTTYPE_PAGE)),
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index da927a1ddf9c..e38926479ee2 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -46,7 +46,6 @@
 
 
 #include <mmpreparemergepage.hrc>
-#include <dbui.hrc>
 
 #include <unomid.h>
 
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 9f3cb5a8db18..c4d3ffb9557d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -39,7 +39,6 @@
 #include "dialog.hrc"
 #include "misc.hrc"
 #include "chrdlg.hrc"
-#include "fldui.hrc"
 #include "table.hrc"
 #include "frmui.hrc"
 #include "dbui.hrc"
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index fbcb56963833..963afa879c18 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -37,7 +37,6 @@
 #include <tools/errinf.hxx>
 #endif
 #include <vcl/msgbox.hxx>
-#include <vcl/msgbox.hxx>
 #include <svl/macitem.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index a51624dfd3a4..6552154b6e00 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -67,9 +67,6 @@
 #include <annotation.hrc>
 #include "cmdid.h"
 
-#include <SwRewriter.hxx>
-#include <undobj.hxx>
-
 #include <sfx2/request.hxx>
 #include <sfx2/event.hxx>
 #include <svl/srchitem.hxx>
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 5ce2b2e7154e..655d9ff08884 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -65,7 +65,6 @@
 #include <cmdid.h>
 #include <helpid.h>
 #include <docvw.hrc>
-#include <docvw.hrc>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx
index 47dc19daf945..07c9a8c47d01 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/ui/inc/changedb.hxx
@@ -36,7 +36,6 @@
 #include <svtools/svtreebx.hxx>
 #include <svx/stddlg.hxx>
 #include "dbtree.hxx"
-#include <vcl/fixed.hxx>
 
 class SwFldMgr;
 class SwView;
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx
index f987b382562f..088fbe52e8d7 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/ui/inc/glossary.hxx
@@ -35,10 +35,6 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 
-#include <vcl/button.hxx>
-
-#include <vcl/fixed.hxx>
-
 #include <vcl/combobox.hxx>
 
 #include <vcl/menubtn.hxx>
diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx
index e6b4ccc22c50..e7519740509c 100644
--- a/sw/source/ui/inc/multmrk.hxx
+++ b/sw/source/ui/inc/multmrk.hxx
@@ -31,13 +31,9 @@
 
 
 #include <svx/stddlg.hxx>
-
 #include <vcl/fixed.hxx>
 #include <svtools/stdctrl.hxx>
-
 #include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-
 #include <vcl/button.hxx>
 
 class SwTOXMgr;
diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx
index 9f5e24e93018..43e52bea056b 100644
--- a/sw/source/ui/inc/rowht.hxx
+++ b/sw/source/ui/inc/rowht.hxx
@@ -29,13 +29,8 @@
 #define _ROWHT_HXX
 
 #include <svx/stddlg.hxx>
-
 #include <vcl/field.hxx>
-
 #include <vcl/fixed.hxx>
-
-#include <vcl/button.hxx>
-
 #include <vcl/button.hxx>
 
 class SwWrtShell;
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 93f070db50f7..16afdf28537e 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -37,7 +37,6 @@
 
 #include <rsc/rscsfx.hxx>
 #include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
-#include <com/sun/star/text/XDocumentIndex.hpp>
 #include <com/sun/star/text/XTextSectionsSupplier.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index aecefe81f0bb..81930b247ebe 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -74,7 +74,6 @@
 #include <SwRewriter.hxx>
 #include <undobj.hxx>
 
-#include "swuiidxmrk.hxx"
 #include <unomid.h>
 
 
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 3b843bc5191c..1992b910f8bf 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -62,7 +62,6 @@
 #include <ndtxt.hxx>
 #include <fmtruby.hxx>
 #include <breakit.hxx>
-#include <docsh.hxx>
 
 #include <olmenu.hrc>
 
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 29b39f3e1aa1..d59afae88f5d 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -54,9 +54,6 @@
 #include "viewopt.hxx"
 #include "wrtsh.hxx"
 #include "wview.hxx"
-#include "swabstdlg.hxx"
-#include "chrdlg.hrc"
-
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
@@ -83,7 +80,6 @@
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
 #include <svl/stritem.hxx>
-#include <svtools/filter.hxx>
 #include <svtools/langtab.hxx>
 #include <svx/dlgutil.hxx>
 #include <unotools/lingucfg.hxx>
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index ed1db36e8824..61f83828edd7 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -116,9 +116,7 @@
 #include <editeng/editview.hxx>
 
 #include <svl/languageoptions.hxx>
-#include <editeng/langitem.hxx>
 #include <svtools/langtab.hxx>
-#include <svl/slstitm.hxx>
 
 #include <docsh.hxx>
 #include <svl/undo.hxx>
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 6796f6539524..789a77691364 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -48,7 +48,6 @@
 #include <editeng/adjitem.hxx>
 #include <editeng/crsditem.hxx>
 #include <editeng/shdditem.hxx>
-#include <editeng/hyznitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
@@ -64,18 +63,13 @@
 #include <svl/ctloptions.hxx>
 #include <svtools/langtab.hxx>
 #include <svl/languageoptions.hxx>
-#include <sfx2/bindings.hxx>
 #include <vcl/msgbox.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/request.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/editstat.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/htmlmode.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/slstitm.hxx>
 #include <editeng/langitem.hxx>
-#include <svtools/langtab.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/writingmodeitem.hxx>
@@ -87,26 +81,6 @@
 #include <editeng/editview.hxx>
 #include <vcl/outdev.hxx>
 #include <editeng/hyznitem.hxx>
-#include <editeng/kernitem.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/lspcitem.hxx>
-#include <editeng/orphitem.hxx>
-#include <editeng/outliner.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/scripttypeitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/spltitem.hxx>
-#include <svx/svdoutl.hxx>
-#include <svx/svdview.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/widwitem.hxx>
-#include <editeng/writingmodeitem.hxx>
-#include <tools/shl.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 
 #include <cmdid.h>
 #include <doc.hxx>
@@ -133,8 +107,6 @@
 #include "misc.hrc"
 
 
-#include <langhelper.hxx>
-
 using namespace ::com::sun::star;
 
 void SwDrawTextShell::Execute( SfxRequest &rReq )
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index d85c6080e70a..22d9de6afc3a 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -83,9 +83,6 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 
-#include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
-
 #include <cppuhelper/bootstrap.hxx>
 
 #include "swabstdlg.hxx"
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index a654536a4ce3..e372c652739c 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -34,7 +34,6 @@
 #include <grfsh.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
-#include <docary.hxx>
 #include <textsh.hxx>
 #include <viewopt.hxx>
 #include <swundo.hxx>
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index f67979da8ad8..98189839a369 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -97,7 +97,6 @@
 
 #include <popup.hrc>
 #include <shells.hrc>
-#include <table.hrc>
 #include <cmdid.h>
 #include <globals.hrc>
 #include <helpid.h>
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 624006baba9e..bce16f3bd3fb 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -56,7 +56,6 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <basesh.hxx>
-#include <wrtsh.hxx>
 #include <flddat.hxx>
 #include <numrule.hxx>
 #include <textsh.hxx>
@@ -72,7 +71,6 @@
 #include <shells.hrc>
 
 #include <sfx2/app.hxx>
-#include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include "swabstdlg.hxx"
 #include "dialog.hrc"
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index 0e998d7c6224..d8c1bcf186fe 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -36,7 +36,6 @@
 
 #include "errhdl.hxx"
 #include "view.hxx"
-#include "initui.hxx"
 #include "cmdid.h"
 #include "textsh.hxx"
 #include "initui.hxx"
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 437f87dd1993..4bb1808b01bf 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -103,7 +103,6 @@
 #include <web.hrc>
 #include "paratr.hxx"
 #include <crsskip.hxx>
-#include <docstat.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/app.hxx>
 #include <breakit.hxx>
@@ -117,7 +116,6 @@
 #include <IDocumentStatistics.hxx>
 
 #include <sfx2/sfxdlg.hxx>
-#include <svl/languageoptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index b3085bba254e..9359e1d3c78d 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -35,7 +35,6 @@
 #include <vcl/msgbox.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
-#include <svx/htmlmode.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <editeng/ulspitem.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index f6dc85da4d47..e7dc3609d987 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -39,7 +39,6 @@
 #include <vcl/msgbox.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
-#include <svx/htmlmode.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <editeng/ulspitem.hxx>
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 90fa616a19b7..c80b6f2e21fc 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -76,7 +76,6 @@
 #include <navsh.hxx>
 #include <globdoc.hxx>
 #include <scroll.hxx>
-#include <globdoc.hxx>
 #include <navipi.hxx>
 #include <gloshdl.hxx>
 #include <usrpref.hxx>
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 4123c303717f..503c22bde96b 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -45,7 +45,6 @@
 
 #include <sfx2/progress.hxx>
 #include <sfx2/app.hxx>
-#include <svl/flagitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/oldprintadaptor.hxx>
 #include <svtools/printdlg.hxx>
@@ -83,7 +82,6 @@
 #include <globals.hrc>
 #include <view.hrc>
 #include <app.hrc>
-#include <svl/eitem.hxx>
 #include <swwrtshitem.hxx>
 #include "swabstdlg.hxx"
 #include <svl/slstitm.hxx>
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 4248070ebf31..d77b81be2aa3 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -55,11 +55,6 @@
 #include "cfgitems.hxx"
 #include "prtopt.hxx"
 
-
-#include "swmodule.hxx"
-#include "cfgitems.hxx"
-#include "prtopt.hxx"
-
 using rtl::OUString;
 
 using namespace comphelper;
diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
index 26f7da7579e0..35ef4c578447 100644
--- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
+++ b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
@@ -33,7 +33,6 @@
 #include <pvprtdat.hxx>
 #include <swtypes.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <doc.hxx>
 #include <vcl/svapp.hxx>
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index ed85d476fbe0..27cb34b6d98d 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -32,7 +32,6 @@
 
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <osl/mutex.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/urihelper.hxx>
 #include <svx/dataaccessdescriptor.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index b6503a5c7f4d..00a504b3db3a 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -43,9 +43,7 @@
 #include <swtypes.hxx>
 #include <wdocsh.hxx>
 #include <wrtsh.hxx>
-#include <view.hxx>
 #include <pview.hxx>
-#include <srcview.hxx>
 #include <viewsh.hxx>
 #include <pvprtdat.hxx>
 #include <swprtopt.hxx>
@@ -78,7 +76,6 @@
 #include <globdoc.hxx>
 #include <viewopt.hxx>
 #include <unochart.hxx>
-#include <doc.hxx>
 #include <charatr.hxx>
 #include <svx/xmleohlp.hxx>
 #include <globals.hrc>
@@ -123,11 +120,7 @@
 // <--
 #include <numrule.hxx>
 
-///////////////////////////Modified on Jun. 14th//////////////////////////
-///////////////////////for getDocumentLanguages///////////////////////////
-//-->
 #include <editeng/langitem.hxx>
-#include <doc.hxx>
 #include <docary.hxx>      //SwCharFmts
 #include <i18npool/mslangid.hxx>
 
@@ -153,8 +146,6 @@
 #include <svl/languageoptions.hxx>
 #include <svx/svdview.hxx>
 
-//
-//<--
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::i18n;
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 94d4408578f6..4ce43e5a5797 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -84,7 +84,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <vcl/scrbar.hxx>
-#include <comcore.hrc>
 #include <undobj.hxx>
 #include <swundo.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 8b8eb4440a72..a196060c58a7 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
-#include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/form/XFormsSupplier.hpp>
 #include <com/sun/star/document/XRedlinesSupplier.hpp>
 #include <ooo/vba/XControlProvider.hpp>
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 1507d3fc0e56..560ae185bbff 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -61,7 +61,6 @@
 #include <vbahelper/vbashaperange.hxx>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/text/ControlCharacter.hpp>
 #include "vbarows.hxx"
 #include "vbacolumns.hxx"
 #include "vbatablehelper.hxx"
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 87935e9eaab1..cc0a588e4eb3 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -33,7 +33,6 @@
 #include <tools/string.hxx>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/string.hxx>
 
 #ifdef WNT
 #include <tools/prewin.h>
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index c22d80e0ef05..6c20638e5f67 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -106,8 +106,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sfx2/viewfrm.hxx>
 
-#include <editeng/acorrcfg.hxx>
-
 #include "PostItMgr.hxx"
 
 using namespace sw::mark;