From a7724966ab4fc8cd680a20e4f2a65f276e001a39 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 22 Oct 2013 15:58:57 +0300
Subject: Bin comments that claim to say why some header is included

They are practically always useless, often misleading or obsolete.

Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
---
 sw/inc/IDocumentRedlineAccess.hxx            |  2 +-
 sw/inc/crsrsh.hxx                            | 14 ++++-----
 sw/inc/dlelstnr.hxx                          |  2 +-
 sw/inc/doc.hxx                               |  2 +-
 sw/inc/editsh.hxx                            |  2 +-
 sw/inc/fmtcol.hxx                            |  2 +-
 sw/inc/format.hxx                            |  4 +--
 sw/inc/frmatr.hxx                            |  4 +--
 sw/inc/grfatr.hxx                            |  6 ++--
 sw/inc/hintids.hxx                           |  2 +-
 sw/inc/htmltbl.hxx                           |  2 +-
 sw/inc/index.hxx                             |  2 +-
 sw/inc/pagedesc.hxx                          |  2 +-
 sw/inc/pam.hxx                               | 10 +++----
 sw/inc/shellio.hxx                           |  2 +-
 sw/inc/splargs.hxx                           |  2 +-
 sw/inc/swtypes.hxx                           |  2 +-
 sw/inc/tblafmt.hxx                           |  2 +-
 sw/inc/tox.hxx                               |  2 +-
 sw/inc/txtatr.hxx                            |  2 +-
 sw/inc/unochart.hxx                          | 10 +++----
 sw/inc/unocoll.hxx                           |  8 ++---
 sw/inc/unodraw.hxx                           |  6 ++--
 sw/inc/unosrch.hxx                           |  2 +-
 sw/inc/unotxdoc.hxx                          |  4 +--
 sw/source/core/access/accnotextframe.cxx     |  2 +-
 sw/source/core/access/accpara.cxx            | 10 +++----
 sw/source/core/access/accpara.hxx            |  2 +-
 sw/source/core/access/accselectionhelper.cxx |  2 +-
 sw/source/core/access/acctextframe.cxx       |  2 +-
 sw/source/core/attr/calbck.cxx               |  6 ++--
 sw/source/core/bastyp/swcache.cxx            |  2 +-
 sw/source/core/doc/doc.cxx                   | 28 +++++++++---------
 sw/source/core/doc/docdde.cxx                |  8 ++---
 sw/source/core/doc/docdesc.cxx               |  2 +-
 sw/source/core/doc/docdraw.cxx               |  6 ++--
 sw/source/core/doc/docedt.cxx                | 12 ++++----
 sw/source/core/doc/docfld.cxx                |  4 +--
 sw/source/core/doc/docfmt.cxx                |  8 ++---
 sw/source/core/doc/docglbl.cxx               |  2 +-
 sw/source/core/doc/doclay.cxx                |  8 ++---
 sw/source/core/doc/docnew.cxx                | 16 +++++-----
 sw/source/core/doc/docnum.cxx                |  2 +-
 sw/source/core/doc/docruby.cxx               |  6 ++--
 sw/source/core/doc/fmtcol.cxx                |  2 +-
 sw/source/core/doc/notxtfrm.cxx              |  2 +-
 sw/source/core/docnode/ndnotxt.cxx           |  2 +-
 sw/source/core/docnode/ndnum.cxx             |  2 +-
 sw/source/core/docnode/node.cxx              |  2 +-
 sw/source/core/docnode/nodes.cxx             |  4 +--
 sw/source/core/docnode/swbaslnk.cxx          |  2 +-
 sw/source/core/draw/dcontact.cxx             |  2 +-
 sw/source/core/edit/autofmt.cxx              |  2 +-
 sw/source/core/edit/edatmisc.cxx             | 10 +++----
 sw/source/core/edit/edattr.cxx               |  8 ++---
 sw/source/core/edit/eddel.cxx                |  2 +-
 sw/source/core/edit/edfcol.cxx               |  6 ++--
 sw/source/core/edit/edfld.cxx                |  2 +-
 sw/source/core/edit/edfldexp.cxx             |  2 +-
 sw/source/core/edit/edfmt.cxx                |  2 +-
 sw/source/core/edit/edglbldc.cxx             |  2 +-
 sw/source/core/edit/edglss.cxx               |  8 ++---
 sw/source/core/edit/editsh.cxx               |  4 +--
 sw/source/core/edit/edlingu.cxx              | 20 ++++++-------
 sw/source/core/edit/edsect.cxx               | 10 +++----
 sw/source/core/fields/chpfld.cxx             |  6 ++--
 sw/source/core/fields/ddetbl.cxx             |  2 +-
 sw/source/core/fields/docufld.cxx            |  6 ++--
 sw/source/core/fields/reffld.cxx             |  2 +-
 sw/source/core/fields/tblcalc.cxx            |  4 +--
 sw/source/core/frmedt/fecopy.cxx             |  2 +-
 sw/source/core/frmedt/fefly1.cxx             |  4 +--
 sw/source/core/frmedt/feshview.cxx           |  6 ++--
 sw/source/core/frmedt/fetab.cxx              |  2 +-
 sw/source/core/frmedt/fews.cxx               |  6 ++--
 sw/source/core/inc/swfont.hxx                |  4 +--
 sw/source/core/layout/atrfrm.cxx             |  2 +-
 sw/source/core/layout/colfrm.cxx             |  6 ++--
 sw/source/core/layout/findfrm.cxx            |  2 +-
 sw/source/core/layout/fly.cxx                |  2 +-
 sw/source/core/layout/flyincnt.cxx           |  2 +-
 sw/source/core/layout/layact.cxx             |  8 ++---
 sw/source/core/layout/pagechg.cxx            |  2 +-
 sw/source/core/layout/pagedesc.cxx           |  2 +-
 sw/source/core/layout/paintfrm.cxx           |  2 +-
 sw/source/core/layout/sectfrm.cxx            | 32 ++++++++++----------
 sw/source/core/layout/ssfrm.cxx              |  2 +-
 sw/source/core/layout/tabfrm.cxx             |  4 +--
 sw/source/core/layout/virtoutp.hxx           |  4 +--
 sw/source/core/ole/ndole.cxx                 |  2 +-
 sw/source/core/swg/swblocks.cxx              |  2 +-
 sw/source/core/table/swtable.cxx             |  4 +--
 sw/source/core/text/atrstck.cxx              |  4 +--
 sw/source/core/text/blink.cxx                |  6 ++--
 sw/source/core/text/frmcrsr.cxx              | 18 ++++++------
 sw/source/core/text/frmform.cxx              | 30 +++++++++----------
 sw/source/core/text/frminf.cxx               |  6 ++--
 sw/source/core/text/frmpaint.cxx             | 28 +++++++++---------
 sw/source/core/text/guess.cxx                |  4 +--
 sw/source/core/text/guess.hxx                |  2 +-
 sw/source/core/text/inftxt.cxx               | 20 ++++++-------
 sw/source/core/text/itradj.cxx               |  6 ++--
 sw/source/core/text/itratr.cxx               |  6 ++--
 sw/source/core/text/itrcrsr.cxx              | 12 ++++----
 sw/source/core/text/itrform2.cxx             | 32 ++++++++++----------
 sw/source/core/text/itrpaint.cxx             | 28 +++++++++---------
 sw/source/core/text/itrtxt.cxx               |  2 +-
 sw/source/core/text/porexp.cxx               |  2 +-
 sw/source/core/text/porfld.cxx               |  8 ++---
 sw/source/core/text/porfly.cxx               | 16 +++++-----
 sw/source/core/text/porglue.cxx              |  8 ++---
 sw/source/core/text/porlay.cxx               | 18 ++++++------
 sw/source/core/text/porlay.hxx               |  2 +-
 sw/source/core/text/porlin.hxx               |  2 +-
 sw/source/core/text/pormulti.cxx             | 22 +++++++-------
 sw/source/core/text/porref.cxx               |  4 +--
 sw/source/core/text/porrst.cxx               | 16 +++++-----
 sw/source/core/text/portox.cxx               |  4 +--
 sw/source/core/text/portxt.cxx               | 10 +++----
 sw/source/core/text/redlnitr.cxx             | 14 ++++-----
 sw/source/core/text/txtdrop.cxx              | 10 +++----
 sw/source/core/text/txtfld.cxx               | 40 ++++++++++++-------------
 sw/source/core/text/txtfly.cxx               | 28 +++++++++---------
 sw/source/core/text/txtfrm.cxx               | 28 +++++++++---------
 sw/source/core/text/txtftn.cxx               | 10 +++----
 sw/source/core/text/txthyph.cxx              | 10 +++----
 sw/source/core/text/txtinit.cxx              | 12 ++++----
 sw/source/core/text/txtio.cxx                |  4 +--
 sw/source/core/text/txttab.cxx               |  2 +-
 sw/source/core/text/widorp.cxx               |  2 +-
 sw/source/core/tox/tox.cxx                   |  2 +-
 sw/source/core/txtnode/atrfld.cxx            |  8 ++---
 sw/source/core/txtnode/atrflyin.cxx          | 10 +++----
 sw/source/core/txtnode/atrftn.cxx            |  4 +--
 sw/source/core/txtnode/fmtatr2.cxx           | 10 +++----
 sw/source/core/txtnode/fntcache.cxx          |  6 ++--
 sw/source/core/txtnode/fntcap.cxx            |  2 +-
 sw/source/core/txtnode/ndtxt.cxx             |  8 ++---
 sw/source/core/txtnode/swfont.cxx            |  6 ++--
 sw/source/core/txtnode/thints.cxx            |  2 +-
 sw/source/core/txtnode/txtatr2.cxx           |  6 ++--
 sw/source/core/txtnode/txtedt.cxx            |  6 ++--
 sw/source/core/undo/rolbck.cxx               |  8 ++---
 sw/source/core/undo/unbkmk.cxx               |  2 +-
 sw/source/core/undo/undel.cxx                |  2 +-
 sw/source/core/undo/undraw.cxx               |  2 +-
 sw/source/core/undo/unins.cxx                |  2 +-
 sw/source/core/undo/unoutl.cxx               |  2 +-
 sw/source/core/undo/unovwr.cxx               |  2 +-
 sw/source/core/unocore/unochart.cxx          |  2 +-
 sw/source/core/unocore/unofield.cxx          |  2 +-
 sw/source/core/unocore/unotbl.cxx            |  4 +--
 sw/source/core/view/viewpg.cxx               |  2 +-
 sw/source/core/view/vnew.cxx                 |  4 +--
 sw/source/core/view/vprint.cxx               | 20 ++++++-------
 sw/source/filter/ascii/parasc.cxx            |  4 +--
 sw/source/filter/ascii/wrtasc.cxx            |  4 +--
 sw/source/filter/basflt/fltini.cxx           |  2 +-
 sw/source/filter/basflt/shellio.cxx          |  4 +--
 sw/source/filter/html/swhtml.cxx             |  8 ++---
 sw/source/filter/html/wrthtml.cxx            |  6 ++--
 sw/source/filter/inc/msfilter.hxx            | 10 +++----
 sw/source/filter/inc/wrt_fn.hxx              |  2 +-
 sw/source/filter/ww1/fltshell.cxx            | 14 ++++-----
 sw/source/filter/ww1/w1filter.cxx            |  2 +-
 sw/source/filter/ww1/w1par.cxx               | 12 ++++----
 sw/source/filter/ww8/styles.cxx              |  6 ++--
 sw/source/filter/ww8/writerhelper.cxx        | 44 ++++++++++++++--------------
 sw/source/filter/ww8/writerhelper.hxx        | 14 ++++-----
 sw/source/filter/ww8/wrtw8esh.cxx            |  2 +-
 sw/source/filter/ww8/wrtww8.cxx              |  8 ++---
 sw/source/filter/ww8/wrtww8.hxx              |  2 +-
 sw/source/filter/ww8/wrtww8gr.cxx            |  6 ++--
 sw/source/filter/ww8/ww8atr.cxx              | 12 ++++----
 sw/source/filter/ww8/ww8graf.cxx             |  8 ++---
 sw/source/filter/ww8/ww8graf2.cxx            | 10 +++----
 sw/source/filter/ww8/ww8par.cxx              | 16 +++++-----
 sw/source/filter/ww8/ww8par.hxx              |  6 ++--
 sw/source/filter/ww8/ww8par2.cxx             | 18 ++++++------
 sw/source/filter/ww8/ww8par2.hxx             |  6 ++--
 sw/source/filter/ww8/ww8par3.cxx             |  2 +-
 sw/source/filter/ww8/ww8par4.cxx             |  6 ++--
 sw/source/filter/ww8/ww8par5.cxx             | 20 ++++++-------
 sw/source/filter/ww8/ww8par6.cxx             | 10 +++----
 sw/source/filter/ww8/ww8scan.cxx             |  6 ++--
 sw/source/filter/ww8/ww8scan.hxx             |  4 +--
 sw/source/filter/xml/swxml.cxx               |  2 +-
 sw/source/filter/xml/xmlexp.cxx              |  2 +-
 sw/source/filter/xml/xmlimp.cxx              |  2 +-
 sw/source/filter/xml/xmlithlp.hxx            |  4 +--
 sw/source/filter/xml/xmltble.cxx             |  2 +-
 sw/source/filter/xml/xmltbli.cxx             |  2 +-
 sw/source/ui/app/apphdl.cxx                  |  8 ++---
 sw/source/ui/app/appopt.cxx                  | 10 +++----
 sw/source/ui/app/docsh.cxx                   | 10 +++----
 sw/source/ui/app/docsh2.cxx                  |  4 +--
 sw/source/ui/app/docst.cxx                   |  2 +-
 sw/source/ui/app/error.src                   |  2 +-
 sw/source/ui/app/swmodul1.cxx                |  4 +--
 sw/source/ui/app/swmodule.cxx                |  2 +-
 sw/source/ui/chrdlg/chardlg.cxx              |  2 +-
 sw/source/ui/config/optpage.cxx              |  2 +-
 sw/source/ui/config/uinums.cxx               |  2 +-
 sw/source/ui/dbui/mailmergewizard.cxx        |  2 +-
 sw/source/ui/dialog/regionsw.cxx             |  2 +-
 sw/source/ui/dialog/uiregionsw.cxx           |  4 +--
 sw/source/ui/dochdl/gloshdl.cxx              |  6 ++--
 sw/source/ui/dochdl/swdtflvr.cxx             |  6 ++--
 sw/source/ui/docvw/AnnotationWin.cxx         |  2 +-
 sw/source/ui/docvw/edtwin.cxx                |  2 +-
 sw/source/ui/docvw/edtwin3.cxx               |  2 +-
 sw/source/ui/fldui/fldmgr.cxx                |  6 ++--
 sw/source/ui/fldui/xfldui.cxx                |  2 +-
 sw/source/ui/fmtui/tmpdlg.cxx                | 20 ++++++-------
 sw/source/ui/inc/bookmark.hxx                |  2 +-
 sw/source/ui/inc/content.hxx                 |  2 +-
 sw/source/ui/inc/outline.hxx                 |  2 +-
 sw/source/ui/inc/uivwimp.hxx                 |  2 +-
 sw/source/ui/inc/unoatxt.hxx                 |  6 ++--
 sw/source/ui/inc/unomailmerge.hxx            |  6 ++--
 sw/source/ui/inc/unomod.hxx                  |  4 +--
 sw/source/ui/inc/unotxvw.hxx                 |  2 +-
 sw/source/ui/index/idxmrk.cxx                |  2 +-
 sw/source/ui/index/swuiidxmrk.cxx            |  2 +-
 sw/source/ui/lingu/hhcwrp.cxx                |  4 +--
 sw/source/ui/lingu/olmenu.cxx                |  2 +-
 sw/source/ui/lingu/sdrhhcwrap.cxx            |  8 ++---
 sw/source/ui/misc/bookmark.cxx               |  4 +--
 sw/source/ui/misc/glossary.cxx               |  2 +-
 sw/source/ui/misc/glshell.cxx                |  2 +-
 sw/source/ui/misc/outline.cxx                |  2 +-
 sw/source/ui/misc/pgfnote.cxx                |  2 +-
 sw/source/ui/shells/basesh.cxx               |  2 +-
 sw/source/ui/shells/drwtxtex.cxx             |  2 +-
 sw/source/ui/shells/drwtxtsh.cxx             |  2 +-
 sw/source/ui/shells/textfld.cxx              |  2 +-
 sw/source/ui/shells/textidx.cxx              |  2 +-
 sw/source/ui/shells/textsh.cxx               |  2 +-
 sw/source/ui/shells/textsh1.cxx              |  2 +-
 sw/source/ui/uiview/srcview.cxx              |  2 +-
 sw/source/ui/uiview/view0.cxx                |  2 +-
 sw/source/ui/uiview/viewling.cxx             | 18 ++++++------
 sw/source/ui/uiview/viewsrch.cxx             |  2 +-
 sw/source/ui/uiview/viewtab.cxx              |  4 +--
 sw/source/ui/uno/unomailmerge.cxx            |  2 +-
 sw/source/ui/uno/unotxdoc.cxx                | 12 ++++----
 sw/source/ui/utlui/navicfg.cxx               |  2 +-
 sw/source/ui/utlui/navipi.cxx                |  2 +-
 sw/source/ui/utlui/viewlayoutctrl.cxx        |  2 +-
 sw/source/ui/web/wtextsh.cxx                 |  2 +-
 sw/source/ui/wrtsh/delete.cxx                |  2 +-
 sw/source/ui/wrtsh/select.cxx                |  2 +-
 sw/source/ui/wrtsh/wrtsh1.cxx                |  2 +-
 sw/source/ui/wrtsh/wrtsh2.cxx                | 12 ++++----
 sw/source/ui/wrtsh/wrtundo.cxx               |  2 +-
 255 files changed, 787 insertions(+), 787 deletions(-)

(limited to 'sw')

diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 191d820dfab2..690b5b8c2e65 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -23,7 +23,7 @@
  #include <sal/types.h>
  #include <tools/solar.h>
 
- #include <limits.h> // USHRT_MAX
+ #include <limits.h>
 
  #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 8994c37bdf06..3d3e8d912917 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -27,13 +27,13 @@
 
 #include <IShellCursorSupplier.hxx>
 #include "swdllapi.h"
-#include <swtypes.hxx>          // for SWPOSDOC
-#include <viewsh.hxx>           // for ViewShell
-#include <calbck.hxx>           // for SwClient
-#include <cshtyp.hxx>           // for CursorShell types
-#include <crstate.hxx>          // for CursorMove-States
-#include <toxe.hxx>             // SwTOXSearchDir
-#include <tblsel.hxx>           // SwTblSearchType
+#include <swtypes.hxx>
+#include <viewsh.hxx>
+#include <calbck.hxx>
+#include <cshtyp.hxx>
+#include <crstate.hxx>
+#include <toxe.hxx>
+#include <tblsel.hxx>
 #include <viscrs.hxx>
 #include <node.hxx>
 #include <tblsel.hxx>
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 8ce12ebc54f0..acf9f2a2a6a4 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/XDesktop2.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 
 
 namespace com { namespace sun { namespace star {
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3dc2f6f9d176..5e1138e99ede 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -51,7 +51,7 @@ class SwList;
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <swatrset.hxx>
-#include <toxe.hxx>             // enums
+#include <toxe.hxx>
 #include <flyenum.hxx>
 #include <flypos.hxx>
 #include <itabenum.hxx>
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d3a1aa5a3516..43987f8fdf97 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -24,7 +24,7 @@
 #include <vcl/font.hxx>
 #include <editeng/swafopt.hxx>
 #include "swdllapi.h"
-#include <crsrsh.hxx>   // For base class.
+#include <crsrsh.hxx>
 #include <itabenum.hxx>
 #include <swdbdata.hxx>
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 590f53449c54..85e54ec8565b 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -21,7 +21,7 @@
 
 #include "swdllapi.h"
 #include <frmatr.hxx>
-#include <swtypes.hxx> // For MAXLEVEL.
+#include <swtypes.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <rtl/ustring.hxx>
 
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 5463e9f9162d..d6f801031767 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -21,8 +21,8 @@
 
 #include <tools/solar.h>
 #include "swdllapi.h"
-#include <swatrset.hxx>     ///< For SfxItemPool/-Set, Attr forward decl.
-#include <calbck.hxx>       ///< For SwModify.
+#include <swatrset.hxx>
+#include <calbck.hxx>
 #include <hintids.hxx>
 
 class IDocumentSettingAccess;
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index 402005d02b79..b5c59d7215d5 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -19,8 +19,8 @@
 #ifndef _FRMATR_HXX
 #define _FRMATR_HXX
 
-#include <hintids.hxx> // IDs of attributes before frmitems to make sure
-#include <format.hxx>  // they are available for implementation of the inlines.
+#include <hintids.hxx>
+#include <format.hxx>
 
 // Inlines
 
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index d4190465e10e..7b84836b67d5 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -19,14 +19,14 @@
 #ifndef _GRFATR_HXX
 #define _GRFATR_HXX
 
-#include <hintids.hxx>      // For the WhichIds @@@ must be included first @@@
+#include <hintids.hxx>
 #include <tools/gen.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svx/grfcrop.hxx>
 #include "swdllapi.h"
-#include <swatrset.hxx>     // For inlines.
-#include <format.hxx>       // For inlines.
+#include <swatrset.hxx>
+#include <format.hxx>
 
 /******************************************************************************
  *  class SwMirrorGrf
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 97ee553f4035..8d5feceeef67 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -20,7 +20,7 @@
 #define _HINTIDS_HXX
 
 #include <tools/solar.h>
-#include <sal/types.h>          // for sal_Unicode
+#include <sal/types.h>
 #include "swdllapi.h"
 
 // For SwTxtHints without end index the following char is added:
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index fe855242f0cf..b9d9f22e31c2 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -25,7 +25,7 @@
 #include <editeng/svxenum.hxx>
 
 #include "swtypes.hxx"
-#include "node.hxx"     ///< For SwStartNode
+#include "node.hxx"
 
 
 class SwTableBox;
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 6934c26142e0..e59d0d843b6d 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -24,7 +24,7 @@
 #include "rtl/instance.hxx"
 #include <tools/solar.h>
 #include <tools/string.hxx>
-#include <tools/rtti.hxx>               // for RTTI of SwIndexReg
+#include <tools/rtti.hxx>
 #include <swdllapi.h>
 
 // Maximum index in IndexArray (for testing on overflows).
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index e668dfd240ae..e1ab6f7290ef 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -22,7 +22,7 @@
 #include <tools/fract.hxx>
 #include <tools/color.hxx>
 #include "swdllapi.h"
-#include <swtypes.hxx>  ///< For SwTwips.
+#include <swtypes.hxx>
 #include <frmfmt.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/borderline.hxx>
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 7003b6422bff..f48dff8e85be 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -19,13 +19,13 @@
 #ifndef _PAM_HXX
 #define _PAM_HXX
 
-#include <stddef.h>         ///< For MemPool.
+#include <stddef.h>
 #include <sal/types.h>
 #include <tools/mempool.hxx>
-#include <cshtyp.hxx>       ///< For function definitions.
-#include <ring.hxx>         ///< Super class.
-#include <index.hxx>        ///< For SwIndex.
-#include <ndindex.hxx>      ///< For SwNodeIndex.
+#include <cshtyp.hxx>
+#include <ring.hxx>
+#include <index.hxx>
+#include <ndindex.hxx>
 #include "swdllapi.h"
 
 class SwFmt;
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 328593f19ae4..3e0d0f597a20 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -35,7 +35,7 @@
 #include <tools/ref.hxx>
 #include <swdllapi.h>
 #include <swtypes.hxx>
-#include <docfac.hxx>   // SwDocFac
+#include <docfac.hxx>
 #include <iodetect.hxx>
 #include <IMark.hxx>
 
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 2c7d6af110b0..16e5c8cae73e 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -22,7 +22,7 @@
 #include <i18nlangtag/lang.h>
 #include <tools/solar.h>
 #include <tools/gen.hxx>
-#include <limits.h>       // USHRT_MAX
+#include <limits.h>
 
 class SwTxtNode;
 class SwIndex;
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 1426b0260768..fe2636e26348 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -22,7 +22,7 @@
 #include <tools/solar.h>
 #include <SwGetPoolIdFromName.hxx>
 
-#include <limits.h>     //For LONG_MAX.
+#include <limits.h>
 #include <com/sun/star/uno/Reference.h>
 #include "swdllapi.h"
 #include <i18nlangtag/languagetag.hxx>
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 6ef82568ba13..a5444a9f2dff 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -30,7 +30,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
-#include "hintids.hxx"          // _Always_ before the solar-items!
+#include "hintids.hxx"
 #include <svx/algitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 047cc1553172..8e5a3b746a55 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -29,7 +29,7 @@
 #include <toxe.hxx>
 #include <calbck.hxx>
 
-#include <vector> // #i21237#
+#include <vector>
 
 namespace com { namespace sun { namespace star {
     namespace text { class XDocumentIndexMark; }
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index d28112979800..0536e65ccdb6 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -19,7 +19,7 @@
 #ifndef _TXTATR_HXX
 #define _TXTATR_HXX
 
-#include <txatbase.hxx>     // SwTxtAttr/SwTxtAttrEnd
+#include <txatbase.hxx>
 #include <calbck.hxx>
 
 
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 16baeacc6def..f5753136ec8c 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -41,11 +41,11 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 
-#include <cppuhelper/interfacecontainer.h>  //OMultiTypeInterfaceContainerHelper
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
-#include <cppuhelper/implbase10.hxx> // helper for implementations
+#include <cppuhelper/interfacecontainer.h>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase10.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <tools/link.hxx>
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 271491ec1061..928466513fa6 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -25,10 +25,10 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase3.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <IMark.hxx>
 #include <unobaseclass.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index d285554f89d2..a505e16a0645 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -28,9 +28,9 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <cppuhelper/implbase3.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <svl/itemprop.hxx>
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 63d3f72e9f0e..45936615510f 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/util/XPropertyReplace.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase3.hxx>
 #include <rtl/ustring.hxx>
 
 class SfxItemPropertySet;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 0c2378cc89dc..2f5a1e1cc8e4 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -65,8 +65,8 @@
 #include <svx/fmdmod.hxx>
 #include <editeng/UnoForbiddenCharsTable.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase4.hxx>
 
 #include <unobaseclass.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index b79e7945a000..d0a0de9d6731 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -27,7 +27,7 @@
 #include <ndnotxt.hxx>
 #include <flyfrm.hxx>
 #include <cntfrm.hxx>
-#include <hints.hxx> //#i73249#
+#include <hints.hxx>
 #include "accnotextframe.hxx"
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 20b86d67a0e8..7e6be84936d0 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -44,10 +44,10 @@
 #include <accpara.hxx>
 #include <access.hrc>
 #include <accportions.hxx>
-#include <sfx2/viewsh.hxx>          // for ExecuteAtViewShell(...)
-#include <sfx2/viewfrm.hxx>         // for ExecuteAtViewShell(...)
-#include <sfx2/dispatch.hxx>        // for ExecuteAtViewShell(...)
-#include <unotools/charclass.hxx>   // for GetWordBoundary
+#include <sfx2/viewsh.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/dispatch.hxx>
+#include <unotools/charclass.hxx>
 #include <unocrsr.hxx>
 #include <unoport.hxx>
 #include <doc.hxx>
@@ -68,7 +68,7 @@
 // #i10825#
 #include <parachangetrackinginfo.hxx>
 #include <com/sun/star/text/TextMarkupType.hpp>
-#include <comphelper/stlunosequence.hxx> // #i92233#
+#include <comphelper/stlunosequence.hxx>
 #include <comphelper/servicehelper.hxx>
 
 #include <algorithm>
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 5776c4c986f7..468e33a02388 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
 #include <boost/unordered_map.hpp>
 #include <accselectionhelper.hxx>
-#include <calbck.hxx> // #i108125#
+#include <calbck.hxx>
 
 class SwTxtFrm;
 class SwTxtNode;
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index f7f033288c9d..7ea2522e2dda 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -25,7 +25,7 @@
 #include <svx/AccessibleShape.hxx>
 #include <viewsh.hxx>
 #include <fesh.hxx>
-#include <vcl/svapp.hxx>        // for SolarMutex
+#include <vcl/svapp.hxx>
 #include <flyfrm.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index a25506962608..118c3e003244 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -32,7 +32,7 @@
 #include <flyfrm.hxx>
 #include <accmap.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
-#include <hints.hxx> // #i73249#
+#include <hints.hxx>
 #include "acctextframe.hxx"
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index d270d42e1d86..57a6cae4cd89 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <frame.hxx>
-#include <hintids.hxx>          // contains RES_.. IDs
+#include <hintids.hxx>
 #include <hints.hxx>
-#include <swcache.hxx>          // mba: get rid of that dependency
-#include <swfntcch.hxx>         // mba: get rid of that dependency
+#include <swcache.hxx>
+#include <swfntcch.hxx>
 
 static SwClientIter* pClientIters = 0;
 
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 539ffe437e6c..ab0598e1b3f2 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -19,7 +19,7 @@
 
 #include <rtl/strbuf.hxx>
 #include <swcache.hxx>
-#include <limits.h>     // USHRT_MAX
+#include <limits.h>
 
 #ifdef DBG_UTIL
 void SwCache::Check()
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 26a03b4fd72d..b82639813518 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -73,48 +73,48 @@
 #include <swtable.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
-#include <swundo.hxx>           // for the  UndoIds
+#include <swundo.hxx>
 #include <UndoCore.hxx>
 #include <UndoInsert.hxx>
 #include <UndoSplitMove.hxx>
 #include <UndoTable.hxx>
-#include <pagedesc.hxx>         // DTor
+#include <pagedesc.hxx>
 #include <breakit.hxx>
 #include <ndole.hxx>
 #include <ndgrf.hxx>
-#include <rolbck.hxx>           // Undo attr
-#include <doctxm.hxx>           // for the index stuff
+#include <rolbck.hxx>
+#include <doctxm.hxx>
 #include <grfatr.hxx>
-#include <poolfmt.hxx>          // pool template ids
-#include <mvsave.hxx>           // for server functionality
+#include <poolfmt.hxx>
+#include <mvsave.hxx>
 #include <SwGrammarMarkUp.hxx>
 #include <scriptinfo.hxx>
-#include <acorrect.hxx>         // auto correction
-#include <mdiexp.hxx>           // status indicator
+#include <acorrect.hxx>
+#include <mdiexp.hxx>
 #include <docstat.hxx>
 #include <docary.hxx>
 #include <redline.hxx>
 #include <fldupde.hxx>
 #include <swbaslnk.hxx>
 #include <printdata.hxx>
-#include <cmdid.h>              // for the dflt printer in SetJob
-#include <statstr.hrc>          // StatLine string
+#include <cmdid.h>
+#include <statstr.hrc>
 #include <comcore.hrc>
 #include <SwUndoTOXChange.hxx>
 #include <SwUndoFmt.hxx>
 #include <unocrsr.hxx>
 #include <docsh.hxx>
 #include <viewopt.hxx>
-#include <docfld.hxx>           // _SetGetExpFld
-#include <docufld.hxx>          // SwPostItField
+#include <docfld.hxx>
+#include <docufld.hxx>
 #include <viewsh.hxx>
 #include <shellres.hxx>
 #include <txtfrm.hxx>
 #include <attrhint.hxx>
 #include <view.hxx>
 
-#include <wdocsh.hxx>           // SwWebDocShell
-#include <prtopt.hxx>           // SwPrintOptions
+#include <wdocsh.hxx>
+#include <prtopt.hxx>
 
 #include <vector>
 #include <map>
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index b2835b1e61ef..944800937eb9 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -22,15 +22,15 @@
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 
-#include <sfx2/linkmgr.hxx>         // LinkManager
+#include <sfx2/linkmgr.hxx>
 #include <unotools/charclass.hxx>
 #include <fmtcntnt.hxx>
 #include <doc.hxx>
-#include <swserv.hxx>           // for server functionality
+#include <swserv.hxx>
 #include <IMark.hxx>
 #include <bookmrk.hxx>
-#include <section.hxx>          // for SwSectionFmt
-#include <swtable.hxx>          // for SwTable
+#include <section.hxx>
+#include <swtable.hxx>
 #include <node.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 1f00833c7adb..ed370d675ceb 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -35,7 +35,7 @@
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <docary.hxx>
-#include <rootfrm.hxx>  //For DelPageDesc
+#include <rootfrm.hxx>
 #include <frmtool.hxx>
 #include <poolfmt.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 567ad9cd0d2c..e05fbd7fa1bb 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -40,12 +40,12 @@
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <docsh.hxx>
-#include <rootfrm.hxx>          // So that the RootDtor is called.
+#include <rootfrm.hxx>
 #include <poolfmt.hxx>
-#include <viewsh.hxx>           // for MakeDrawView
+#include <viewsh.hxx>
 #include <drawdoc.hxx>
 #include <UndoDraw.hxx>
-#include <swundo.hxx>           // for the UndoIds
+#include <swundo.hxx>
 #include <dcontact.hxx>
 #include <dview.hxx>
 #include <mvsave.hxx>
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 8f31aa973ab1..15792b089700 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -20,17 +20,17 @@
 #include <fmtanchr.hxx>
 #include <fmtcntnt.hxx>
 #include <txtftn.hxx>
-#include <acorrect.hxx>     // AutoCorrect
+#include <acorrect.hxx>
 #include <UndoManager.hxx>
 #include <docsh.hxx>
 #include <docary.hxx>
-#include <doctxm.hxx>       // when moving: correct indexes
+#include <doctxm.hxx>
 #include <ftnidx.hxx>
-#include <mdiexp.hxx>       // status bar
-#include <mvsave.hxx>       // structures to save when moving/deleting
+#include <mdiexp.hxx>
+#include <mvsave.hxx>
 #include <redline.hxx>
-#include <rootfrm.hxx>      // for UpdateFtn
-#include <splargs.hxx>      // for Spell
+#include <rootfrm.hxx>
+#include <splargs.hxx>
 #include <txtfrm.hxx>
 #include <UndoSplitMove.hxx>
 #include <UndoRedline.hxx>
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index aa10eef1ebad..43850ed366dc 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -37,7 +37,7 @@
 #include <fmtfld.hxx>
 #include <tox.hxx>
 #include <txttxmrk.hxx>
-#include <docfld.hxx>   // for expression fields
+#include <docfld.hxx>
 #include <docufld.hxx>
 #include <ddefld.hxx>
 #include <usrfld.hxx>
@@ -54,7 +54,7 @@
 #include <authfld.hxx>
 #include <txtinet.hxx>
 #include <fmtcntnt.hxx>
-#include <poolfmt.hrc>      // for InitFldTypes
+#include <poolfmt.hrc>
 
 #include <SwUndoField.hxx>
 #include "switerator.hxx"
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 156debb26223..223d48ccb387 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -39,16 +39,16 @@
 #include <IDocumentUndoRedo.hxx>
 #include <rootfrm.hxx>
 #include <pagefrm.hxx>
-#include <hints.hxx>            // for SwHyphenBug (in SetDefault)
+#include <hints.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
 #include <UndoCore.hxx>
 #include <UndoAttribute.hxx>
 #include <UndoInsert.hxx>
 #include <ndgrf.hxx>
-#include <pagedesc.hxx>         // For special treatment in InsFrmFmt
-#include <rolbck.hxx>           // Undo-Attr
-#include <mvsave.hxx>           // serve: Recognize changes
+#include <pagedesc.hxx>
+#include <rolbck.hxx>
+#include <mvsave.hxx>
 #include <txatbase.hxx>
 #include <swtable.hxx>
 #include <swtblfmt.hxx>
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 310213dc1668..cf611bad3e6a 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -38,7 +38,7 @@
 #include <docsh.hxx>
 #include <globdoc.hxx>
 #include <shellio.hxx>
-#include <swundo.hxx>       // for the UndoIds
+#include <swundo.hxx>
 #include <section.hxx>
 #include <doctxm.hxx>
 #include <poolfmt.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index b06d003e3a91..ba265a36b823 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -55,7 +55,7 @@
 #include <fmtcnct.hxx>
 #include <frmfmt.hxx>
 #include <txtflcnt.hxx>
-#include <docfld.hxx>       // for ExpressionFields
+#include <docfld.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
 #include <ndnotxt.hxx>
@@ -73,8 +73,8 @@
 #include <swundo.hxx>
 #include <flypos.hxx>
 #include <UndoInsert.hxx>
-#include <expfld.hxx>       // InsertLabel
-#include <poolfmt.hxx>      // PoolTemplate Ids
+#include <expfld.hxx>
+#include <poolfmt.hxx>
 #include <docary.hxx>
 #include <swtable.hxx>
 #include <tblsel.hxx>
@@ -85,7 +85,7 @@
 #include <ftninfo.hxx>
 #include <pagedesc.hxx>
 #include <PostItMgr.hxx>
-#include <comcore.hrc>      // STR ResIds
+#include <comcore.hrc>
 
 #include <unoframe.hxx>
 
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 36eaf7b20cd2..6c9ab2bcabd0 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -51,9 +51,9 @@
 #include <fmtfordr.hxx>
 #include <fmtpdsc.hxx>
 #include <pvprtdat.hxx>
-#include <rootfrm.hxx>  // So that the RootDtor is being called
+#include <rootfrm.hxx>
 #include <layouter.hxx>
-#include <pagedesc.hxx> // So that the PageDescs can be destroyed
+#include <pagedesc.hxx>
 #include <ndtxt.hxx>
 #include <printdata.hxx>
 #include <docfld.hxx>
@@ -62,12 +62,12 @@
 #include <docstat.hxx>
 #include <charfmt.hxx>
 #include <frmfmt.hxx>
-#include <rolbck.hxx>           // Undo attributes, SwHistory
-#include <poolfmt.hxx>          // for the Pool template
+#include <rolbck.hxx>
+#include <poolfmt.hxx>
 #include <dbmgr.hxx>
 #include <docsh.hxx>
-#include <acorrect.hxx>         // for the automatic adding of exceptions
-#include <visiturl.hxx>         // for the URLChange message
+#include <acorrect.hxx>
+#include <visiturl.hxx>
 #include <docary.hxx>
 #include <lineinfo.hxx>
 #include <drawdoc.hxx>
@@ -89,7 +89,7 @@
 #include <unochart.hxx>
 #include <fldbas.hxx>
 
-#include <cmdid.h>              // for the default printer in SetJob
+#include <cmdid.h>
 
 #include <pausethreadstarting.hxx>
 #include <numrule.hxx>
@@ -97,7 +97,7 @@
 #include <listfunc.hxx>
 
 #include <sfx2/Metadatable.hxx>
-#include <fmtmeta.hxx> // MetaFieldManager
+#include <fmtmeta.hxx>
 #include <boost/foreach.hpp>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 10b0387769d5..db5dd76b7cdb 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -27,7 +27,7 @@
 #include <IDocumentUndoRedo.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
-#include <doctxm.hxx>       // pTOXBaseRing
+#include <doctxm.hxx>
 #include <poolfmt.hxx>
 #include <UndoCore.hxx>
 #include <UndoRedline.hxx>
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 2e2bab72e041..2f3dc2623afc 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string.h>         // for strchr()
+#include <string.h>
 
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
@@ -28,12 +28,12 @@
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <docary.hxx>
-#include <mvsave.hxx>       // structures for Saving by Move/Delete
+#include <mvsave.hxx>
 #include <ndtxt.hxx>
 #include <txatbase.hxx>
 #include <rubylist.hxx>
 #include <pam.hxx>
-#include <swundo.hxx>       // for the UndoIds
+#include <swundo.hxx>
 #include <breakit.hxx>
 #include <crsskip.hxx>
 
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index be240163a7fe..80823a88ac93 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -22,7 +22,7 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <doc.hxx>          // for GetAttrPool
+#include <doc.hxx>
 #include <fmtcol.hxx>
 #include <fmtcolfunc.hxx>
 #include <hints.hxx>
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 2ea85fbf7102..46164fda6f0e 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -66,7 +66,7 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <svtools/embedhlp.hxx>
 #include <svx/charthelper.hxx>
-#include <dview.hxx> // #i99665#
+#include <dview.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index 7711eadabf26..b1b41a0d40e7 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -33,7 +33,7 @@
 #include <istyleaccess.hxx>
 #include <SwStyleNameMapper.hxx>
 
-#include <frmfmt.hxx> // #i73249#
+#include <frmfmt.hxx>
 
 SwNoTxtNode::SwNoTxtNode( const SwNodeIndex & rWhere,
                   const sal_uInt8 nNdType,
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 91b861ec9cbb..95edb7a82f75 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -21,7 +21,7 @@
 #include <doc.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
-#include <fldbas.hxx>           // UpdateFlds of the chapter numbering
+#include <fldbas.hxx>
 #include <docary.hxx>
 
 bool CompareSwOutlineNodes::operator()( SwNode* const& lhs, SwNode* const& rhs) const
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index e98377faee5c..bb17e7c63d06 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -40,7 +40,7 @@
 #include <cntfrm.hxx>
 #include <flyfrm.hxx>
 #include <txtfrm.hxx>
-#include <tabfrm.hxx>  // SwTabFrm
+#include <tabfrm.hxx>
 #include <viewsh.hxx>
 #include <paratr.hxx>
 #include <ftnidx.hxx>
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index e9a03e7fd109..54f5e2e0b242 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -29,14 +29,14 @@
 #include <numrule.hxx>
 #include <ndtxt.hxx>
 #include <ndnotxt.hxx>
-#include <swtable.hxx>      // fuer erzuegen / loeschen der Table-Frames
+#include <swtable.hxx>
 #include <tblsel.hxx>
 #include <section.hxx>
 #include <ddefld.hxx>
 #include <swddetbl.hxx>
 #include <frame.hxx>
 #include <txtatr.hxx>
-#include <tox.hxx> // InvalidateTOXMark
+#include <tox.hxx>
 
 #include <docsh.hxx>
 #include <svl/smplhint.hxx>
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 3de915c651ba..87af50cca97a 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -28,7 +28,7 @@
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/objsh.hxx>
 #include <editeng/boxitem.hxx>
-#include <svx/svxids.hrc>       // For the EventIds
+#include <svx/svxids.hrc>
 #include <sfx2/linkmgr.hxx>
 #include <svtools/soerr.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 2674ff7ab3f4..cf5c1e9866b5 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -42,7 +42,7 @@
 #include <fmtcntnt.hxx>
 #include <pagefrm.hxx>
 #include <rootfrm.hxx>
-#include <frmtool.hxx>  // Notify_Background
+#include <frmtool.hxx>
 #include <flyfrm.hxx>
 #include <frmfmt.hxx>
 #include <dflyobj.hxx>
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index e9b76a72f63c..e4a70ae3f804 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -46,7 +46,7 @@
 #include <pam.hxx>
 #include <edimp.hxx>
 #include <fesh.hxx>
-#include <swundo.hxx>       // for the UndoIds
+#include <swundo.hxx>
 #include <poolfmt.hxx>
 #include <ndtxt.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index 94218ac3e5e4..e270f49e3d82 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -18,12 +18,12 @@
  */
 
 #include <editsh.hxx>
-#include <doc.hxx>      // for aNodes
+#include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
-#include <pam.hxx>      // for SwPaM
-#include <edimp.hxx>    // for MACROS
-#include <swundo.hxx>   // for the UndoIds
-#include <ndtxt.hxx>    // fot Get-/ChgFmt Set-/GetAttrXXX
+#include <pam.hxx>
+#include <edimp.hxx>
+#include <swundo.hxx>
+#include <ndtxt.hxx>
 
 /*
  * hard formatting (Attribute)
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index d97be991f00e..d9cfcadcf0e5 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -27,9 +27,9 @@
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
 #include <editsh.hxx>
-#include <edimp.hxx>    // for MACROS
+#include <edimp.hxx>
 #include <doc.hxx>
-#include <swundo.hxx>   // for UNDO-Ids
+#include <swundo.hxx>
 #include <ndtxt.hxx>
 #include <ftnidx.hxx>
 #include <expfld.hxx>
@@ -39,10 +39,10 @@
 #include <txtfld.hxx>
 #include <fmtfld.hxx>
 #include <crsskip.hxx>
-#include <txtfrm.hxx>       // SwTxtFrm
+#include <txtfrm.hxx>
 #include <scriptinfo.hxx>
 #include <svl/ctloptions.hxx>
-#include <charfmt.hxx>  // #i27615#
+#include <charfmt.hxx>
 #include <numrule.hxx>
 
 #include <algorithm>
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 09b8a0c62549..5434de3b2ff9 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -23,7 +23,7 @@
 #include <editsh.hxx>
 #include <cntfrm.hxx>
 #include <pam.hxx>
-#include <swundo.hxx>       // fuer die UndoIds
+#include <swundo.hxx>
 #include <edimp.hxx>
 #include <IMark.hxx>
 #include <docary.hxx>
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 598a55e14ca5..f389800bac90 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -20,13 +20,13 @@
 #include <hintids.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <editsh.hxx>
-#include <doc.hxx>      // fuer SwTxtFmtColls
+#include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
-#include <edimp.hxx>    // fuer MACROS
+#include <edimp.hxx>
 #include <ndtxt.hxx>
 #include <paratr.hxx>
 #include <fmtpdsc.hxx>
-#include <viewopt.hxx>  // Formular view
+#include <viewopt.hxx>
 #include <SwRewriter.hxx>
 #include <numrule.hxx>
 #include <swundo.hxx>
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index c0312a85aa9f..4d40496ed575 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -20,7 +20,7 @@
 #include <unotools/charclass.hxx>
 #include <editsh.hxx>
 #include <fldbas.hxx>
-#include <ndtxt.hxx>        // GetCurFld
+#include <ndtxt.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
 #include <fmtfld.hxx>
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 452fa561176b..7def93e8f27b 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <doc.hxx>
 #include <docary.hxx>
-#include <ndtxt.hxx>        // GetCurFld
+#include <ndtxt.hxx>
 #include <txtfld.hxx>
 #include <fmtfld.hxx>
 #include <edimp.hxx>
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index 7459bab72ff2..532e2b23ebb8 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -25,7 +25,7 @@
 #include <fchrfmt.hxx>
 #include <frmfmt.hxx>
 #include <charfmt.hxx>
-#include "ndtxt.hxx"    // for GetXXXFmt
+#include "ndtxt.hxx"
 #include "hints.hxx"
 
 sal_uInt16 SwEditShell::GetCharFmtCount() const
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index 8a549c290403..b7490b72f0ac 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -24,7 +24,7 @@
 #include <ndtxt.hxx>
 #include <docary.hxx>
 #include <swwait.hxx>
-#include <swundo.hxx> // for UndoIds
+#include <swundo.hxx>
 #include <section.hxx>
 #include <doctxm.hxx>
 #include <edglbldc.hxx>
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 29533ed50f6e..c108035e6de1 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -27,12 +27,12 @@
 #include <editsh.hxx>
 #include <edimp.hxx>
 #include <frmfmt.hxx>
-#include <swundo.hxx>       // for UndoIds
+#include <swundo.hxx>
 #include <ndtxt.hxx>
-#include <swtable.hxx>      // for table copying
-#include <shellio.hxx>      // SwTextBlocks
+#include <swtable.hxx>
+#include <shellio.hxx>
 #include <acorrect.hxx>
-#include <swerror.h>        // SwTextBlocks
+#include <swerror.h>
 
 void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const OUString& rStr )
 {
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 4f7c0c870bf4..63eb5bcce609 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -36,11 +36,11 @@
 #include <frame.hxx>
 #include <cntfrm.hxx>
 #include <pam.hxx>
-#include <ndtxt.hxx>   // for SwTxtNode
+#include <ndtxt.hxx>
 #include <grfatr.hxx>
 #include <flyfrm.hxx>
 #include <swtable.hxx>
-#include <swundo.hxx>  // UNDO_START, UNDO_END
+#include <swundo.hxx>
 #include <calc.hxx>
 #include <edimp.hxx>
 #include <ndgrf.hxx>
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 58b1296b2c22..11c9a110c41b 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -38,20 +38,20 @@
 #include <editsh.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
-#include <rootfrm.hxx>      // SwRootFrm
+#include <rootfrm.hxx>
 #include <pam.hxx>
-#include <swundo.hxx>       // for the UndoIds
-#include <ndtxt.hxx>        // AdjHyphPos
-#include <viewopt.hxx>      // HyphStart/End
-#include <viscrs.hxx>       // SwShellCrsr
-#include <SwGrammarMarkUp.hxx> // SwWrongList
-#include <mdiexp.hxx>       // status display
-#include <statstr.hrc>      // StatLine-String
+#include <swundo.hxx>
+#include <ndtxt.hxx>
+#include <viewopt.hxx>
+#include <viscrs.hxx>
+#include <SwGrammarMarkUp.hxx>
+#include <mdiexp.hxx>
+#include <statstr.hrc>
 #include <cntfrm.hxx>
 #include <crsskip.hxx>
 #include <splargs.hxx>
-#include <redline.hxx>      // SwRedline
-#include <docary.hxx>       // SwRedlineTbl
+#include <redline.hxx>
+#include <docary.hxx>
 #include <docsh.hxx>
 #include <txatbase.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 88b0695acaa1..37ccd706cdab 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -22,13 +22,13 @@
 #include <IDocumentUndoRedo.hxx>
 #include <pam.hxx>
 #include <docary.hxx>
-#include <swundo.hxx>       // for the UndoIds
+#include <swundo.hxx>
 #include <section.hxx>
 #include <edimp.hxx>
-#include <sectfrm.hxx>      // SwSectionFrm
-#include <cntfrm.hxx>       // SwCntntFrm
-#include <tabfrm.hxx>       // SwTabFrm
-#include <rootfrm.hxx>      // SwRootFrm
+#include <sectfrm.hxx>
+#include <cntfrm.hxx>
+#include <tabfrm.hxx>
+#include <rootfrm.hxx>
 
 
 SwSection const*
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 7c1eb5217ddb..139b3213da54 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -19,11 +19,11 @@
 
 #include <com/sun/star/text/ChapterFormat.hpp>
 #include <doc.hxx>
-#include <frame.hxx>        // SwChapterFieldType::ChangeExpansion()
-#include <pam.hxx>          // for GetBodyTxtNode
+#include <frame.hxx>
+#include <pam.hxx>
 #include <ndtxt.hxx>
 #include <chpfld.hxx>
-#include <expfld.hxx>       // for GetBodyTxtNode
+#include <expfld.hxx>
 #include <unofldmid.h>
 #include <numrule.hxx>
 
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 940abf6f18c4..364f2b8dbc9b 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -24,7 +24,7 @@
 #include <ndtxt.hxx>
 #include <swtable.hxx>
 #include <swddetbl.hxx>
-#include <ddefld.hxx> // for FieldType
+#include <ddefld.hxx>
 #include <ndindex.hxx>
 #include <fldupde.hxx>
 #include <swtblfmt.hxx>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index dfafdcc05d40..317193da34b1 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -70,9 +70,9 @@
 #include <pagedesc.hxx>
 #include <fmtpdsc.hxx>
 #include <doc.hxx>
-#include <rootfrm.hxx>      // AuthorField
-#include <pagefrm.hxx>      //
-#include <cntfrm.hxx>       //
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <cntfrm.hxx>
 #include <pam.hxx>
 #include <viewsh.hxx>
 #include <dbmgr.hxx>
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index d5cc720c9fa1..abc373f38fe5 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -58,7 +58,7 @@
 
 #include <set>
 #include <map>
-#include <algorithm> // min, max
+#include <algorithm>
 
 #include <sfx2/childwin.hxx>
 
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index f3bc3e774646..61f86b4803ea 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -20,12 +20,12 @@
 #include <switerator.hxx>
 #include <cntfrm.hxx>
 #include <doc.hxx>
-#include <pam.hxx>      // for GetBodyTxtNode
+#include <pam.hxx>
 #include <ndtxt.hxx>
 #include <fmtfld.hxx>
 #include <txtfld.hxx>
 #include <expfld.hxx>
-#include <docfld.hxx>   // for _SetGetExpFld
+#include <docfld.hxx>
 #include <unofldmid.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index d35e3b961f26..9c5c0073c310 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdoole2.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/unomodel.hxx>
-#include <svx/svditer.hxx> // #i50824#
+#include <svx/svditer.hxx>
 #include <svx/svdograf.hxx>
 #include <unotools/streamwrap.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 574f0f220978..0194d4f52608 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -54,7 +54,7 @@
 #include <ndtxt.hxx>
 #include <edimp.hxx>
 #include <swtable.hxx>
-#include <mvsave.hxx>       // storage structures for Move/Delete
+#include <mvsave.hxx>
 #include <ndgrf.hxx>
 #include <flyfrms.hxx>
 #include <flypos.hxx>
@@ -65,7 +65,7 @@
 #include <notxtfrm.hxx>
 #include <HandleAnchorNodeChg.hxx>
 #include <frmatr.hxx>
-#include <fmtsrnd.hxx> // #i89920#
+#include <fmtsrnd.hxx>
 #include <ndole.hxx>
 #include <editeng/opaqitem.hxx>
 
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 3a93e69f8716..646c6b326c47 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdpagv.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <cmdid.h>
-#include <poolfmt.hrc>      // for InitFldTypes
+#include <poolfmt.hrc>
 #include <frmfmt.hxx>
 #include <frmatr.hxx>
 #include <fmtfsize.hxx>
@@ -67,12 +67,12 @@
 #include "ndole.hxx"
 #include "ndgrf.hxx"
 #include "ndtxt.hxx"
-#include "viewopt.hxx"                  // for GetHTMLMode
+#include "viewopt.hxx"
 #include "swundo.hxx"
 #include "notxtfrm.hxx"
 #include "txtfrm.hxx"
 #include "txatbase.hxx"
-#include "mdiexp.hxx"                   // for update of the statusline during dragging
+#include "mdiexp.hxx"
 #include <sortedobjs.hxx>
 #include <HandleAnchorNodeChg.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 37da8747297d..b2589d017cf1 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -56,7 +56,7 @@
 #include <swundo.hxx>
 #include <frmtool.hxx>
 
-#include <node.hxx> // #i23726#
+#include <node.hxx>
 // OD 2004-05-24 #i28701#
 #include <sortedobjs.hxx>
 
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 4d2412239fd6..59a514357d7a 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -39,15 +39,15 @@
 #include <tabfrm.hxx>
 #include <cellfrm.hxx>
 #include <flyfrms.hxx>
-#include <txtfrm.hxx>       // SwTxtFrm
+#include <txtfrm.hxx>
 #include <mdiexp.hxx>
 #include <edimp.hxx>
 #include <pagedesc.hxx>
 #include <fmtanchr.hxx>
 #include <environmentofanchoredobject.hxx>
-#include <ndtxt.hxx> // #i22341#
+#include <ndtxt.hxx>
 #include <dflyobj.hxx>
-#include <dcontact.hxx> // #i26791#
+#include <dcontact.hxx>
 
 
 using namespace com::sun::star;
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 6df1dd2d33fb..1176ca011ac4 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -25,8 +25,8 @@
 #include <tools/gen.hxx>
 #include <editeng/svxfont.hxx>
 #include <swtypes.hxx>
-#include <drawfont.hxx>     // SwDrawTextInfo
-#include <editeng/borderline.hxx> // SvxBorderLine
+#include <drawfont.hxx>
+#include <editeng/borderline.hxx>
 #include <boost/optional.hpp>
 
 class SfxItemSet;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 597f8db6f079..5c3a076db438 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -67,7 +67,7 @@
 #include <svtools/grfmgr.hxx>
 #include <unomid.h>
 #include <comcore.hrc>
-#include <svx/svdundo.hxx> // #111827#
+#include <svx/svdundo.hxx>
 #include <sortedobjs.hxx>
 #include <HandleAnchorNodeChg.hxx>
 #include <switerator.hxx>
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index ef7847c2578e..5088bf3e591b 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -25,9 +25,9 @@
 #include "frmtool.hxx"
 #include "colfrm.hxx"
 #include "pagefrm.hxx"
-#include "bodyfrm.hxx"   // ColumnFrms now with BodyFrm
-#include "rootfrm.hxx"   // wg. RemoveFtns
-#include "sectfrm.hxx"   // wg. FtnAtEnd-Flag
+#include "bodyfrm.hxx"
+#include "rootfrm.hxx"
+#include "sectfrm.hxx"
 #include "switerator.hxx"
 
 // ftnfrm.cxx:
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index d90c8a9e91c9..32aee617d33a 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -29,7 +29,7 @@
 #include "ftnfrm.hxx"
 #include "txtftn.hxx"
 #include "fmtftn.hxx"
-#include <txtfrm.hxx>   // SwTxtFrm
+#include <txtfrm.hxx>
 #include <switerator.hxx>
 
 /*************************************************************************
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 3f13e690e96e..bb9ebf9bf5a6 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -52,7 +52,7 @@
 #include "hints.hxx"
 #include "tabfrm.hxx"
 #include "txtfrm.hxx"
-#include "notxtfrm.hxx"   // GetGrfArea
+#include "notxtfrm.hxx"
 #include "flyfrms.hxx"
 #include "sectfrm.hxx"
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index e7d72c0d97c2..8064bcdb6efe 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -22,7 +22,7 @@
 #include "frmtool.hxx"
 #include "hints.hxx"
 #include <fmtornt.hxx>
-#include "txtfrm.hxx"       //fuer IsLocked()
+#include "txtfrm.hxx"
 #include "flyfrms.hxx"
 // OD 2004-01-19 #110582#
 #include <dflyobj.hxx>
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index cc14c74f91ad..2baace7723c0 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -34,13 +34,13 @@
 #include "flyfrm.hxx"
 #include "frmtool.hxx"
 #include "dcontact.hxx"
-#include "ndtxt.hxx"    // OnlineSpelling
+#include "ndtxt.hxx"
 #include "frmfmt.hxx"
 #include "swregion.hxx"
-#include "viewopt.hxx"  // test OnlineSpelling using internal TabPage
-#include "pam.hxx"      // OnlineSpelling needed because of the current cursor position
+#include "viewopt.hxx"
+#include "pam.hxx"
 #include "dbg_lay.hxx"
-#include "layouter.hxx" // LoopControlling
+#include "layouter.hxx"
 #include "docstat.hxx"
 #include "swevent.hxx"
 
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 533b2fb0ed64..20dc1a02dfd8 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -66,7 +66,7 @@
 #include "pagedesc.hxx"
 #include "poolfmt.hxx"
 #include <editeng/frmdiritem.hxx>
-#include <swfntcch.hxx> // SwFontAccess
+#include <swfntcch.hxx>
 #include <sortedobjs.hxx>
 #include <switerator.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index e53b1352d6d5..94ba341d7491 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -29,7 +29,7 @@
 #include <pagedesc.hxx>
 #include <swtable.hxx>
 #include <frmtool.hxx>
-#include <doc.hxx>          // for GetAttrPool
+#include <doc.hxx>
 #include <poolfmt.hrc>
 #include <poolfmt.hxx>
 #include <switerator.hxx>
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index d2cf32f2bf81..010347063bcf 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -80,7 +80,7 @@
 #define COL_NOTES_SIDEPANE_BORDER           RGB_COLORDATA(200,200,200)
 #define COL_NOTES_SIDEPANE_SCROLLAREA       RGB_COLORDATA(230,230,220)
 
-#include <svtools/borderhelper.hxx> //Need for svtools::DrawLine
+#include <svtools/borderhelper.hxx>
 
 #include "pagefrm.hrc"
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 99b6dda3fe79..d5f0f289934e 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -25,23 +25,23 @@
 #include <fmtftn.hxx>
 #include <fmtclbl.hxx>
 #include "sectfrm.hxx"
-#include "section.hxx"      // SwSection
-#include "frmtool.hxx"      // StackHack
-#include "doc.hxx"          // SwDoc
-#include "cntfrm.hxx"       // SwCntntFrm
-#include "rootfrm.hxx"      // SwRootFrm
-#include "pagefrm.hxx"      // SwPageFrm
-#include "fmtpdsc.hxx"      // SwFmtPageDesc
-#include "fmtcntnt.hxx"     // SwFmtCntnt
-#include "ndindex.hxx"      // SwNodeIndex
+#include "section.hxx"
+#include "frmtool.hxx"
+#include "doc.hxx"
+#include "cntfrm.hxx"
+#include "rootfrm.hxx"
+#include "pagefrm.hxx"
+#include "fmtpdsc.hxx"
+#include "fmtcntnt.hxx"
+#include "ndindex.hxx"
 #include "ftnidx.hxx"
-#include "txtfrm.hxx"       // SwTxtFrm
-#include "fmtclds.hxx"      // SwFmtCol
-#include "colfrm.hxx"       // SwColumnFrm
-#include "tabfrm.hxx"       // SwTabFrm
-#include "flyfrm.hxx"       // SwFlyFrm
-#include "ftnfrm.hxx"       // SwFtnFrm
-#include "layouter.hxx"     // SwLayouter
+#include "txtfrm.hxx"
+#include "fmtclds.hxx"
+#include "colfrm.hxx"
+#include "tabfrm.hxx"
+#include "flyfrm.hxx"
+#include "ftnfrm.hxx"
+#include "layouter.hxx"
 #include "dbg_lay.hxx"
 #include "viewsh.hxx"
 #include "viewopt.hxx"
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 4ae962ef751b..b0a125435389 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -28,7 +28,7 @@
 #include <dcontact.hxx>
 #include <dflyobj.hxx>
 #include <flyfrm.hxx>
-#include <txtfrm.hxx>       // ClearPara()
+#include <txtfrm.hxx>
 #include <cellfrm.hxx>
 #include <swtable.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index b9f840282590..2e25de503eaf 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -56,9 +56,9 @@
 #include "rowfrm.hxx"
 #include "cellfrm.hxx"
 #include "flyfrms.hxx"
-#include "txtfrm.hxx"       //HasFtn()
+#include "txtfrm.hxx"
 #include "htmltbl.hxx"
-#include "sectfrm.hxx"  //SwSectionFrm
+#include "sectfrm.hxx"
 #include <fmtfollowtextflow.hxx>
 #include <sortedobjs.hxx>
 #include <objectformatter.hxx>
diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx
index 97348cffbb38..18479d537971 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.hxx
@@ -21,8 +21,8 @@
 
 #include <vcl/virdev.hxx>
 
-#include "swtypes.hxx"      // UCHAR
-#include "swrect.hxx"       // SwRect
+#include "swtypes.hxx"
+#include "swrect.hxx"
 
 class ViewShell;
 #define VIRTUALHEIGHT 64
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index d0330598f04d..3f624e0389e1 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>   // #i119941
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <cppuhelper/implbase1.hxx>
 
 #include <cppuhelper/implbase2.hxx>
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 8b308a95493d..c35212645a26 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -32,7 +32,7 @@
 #include <shellio.hxx>
 #include <swblocks.hxx>
 #include <ndtxt.hxx>
-#include <mdiexp.hxx>       // Progress
+#include <mdiexp.hxx>
 #include <SwXMLTextBlocks.hxx>
 #include <docsh.hxx>
 #include <swunohelper.hxx>
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 5e3c57a7d289..11b26adbbe7a 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <float.h>
 #include <hintids.hxx>
-#include <hints.hxx>    // for SwAttrSetChg
+#include <hints.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/adjustitem.hxx>
@@ -35,7 +35,7 @@
 #include <fmtfld.hxx>
 #include <frmatr.hxx>
 #include <doc.hxx>
-#include <docary.hxx>   // for RedlineTbl()
+#include <docary.hxx>
 #include <frame.hxx>
 #include <swtable.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 08c3d999bb0c..18e49095e265 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -52,8 +52,8 @@
 #include <fmtinfmt.hxx>
 #include <txtinet.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include <viewsh.hxx>   // ViewShell
-#include <viewopt.hxx>  // SwViewOptions
+#include <viewsh.hxx>
+#include <viewopt.hxx>
 
 #define STACK_INCREMENT 4
 
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index a8e7c919593b..22c7344ffa0f 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -19,11 +19,11 @@
 
 
 #include "viewsh.hxx"
-#include "rootfrm.hxx"  // GetOleShell()
-#include "txtfrm.hxx"   // FindRootFrm()
+#include "rootfrm.hxx"
+#include "txtfrm.hxx"
 #include "blink.hxx"
 #include "porlin.hxx"
-#include "porlay.hxx"   // SwLineLayout
+#include "porlay.hxx"
 
 // Sichtbare Zeit:
 #define BLINK_ON_TIME       2400L
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 96ae5a09f862..305790bb905b 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ndtxt.hxx"        // GetNode()
-#include "pam.hxx"          // SwPosition
+#include "ndtxt.hxx"
+#include "pam.hxx"
 #include "frmtool.hxx"
 #include "viewopt.hxx"
 #include "paratr.hxx"
@@ -31,18 +31,18 @@
 #include <editeng/tstpitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lspcitem.hxx>
-#include <pormulti.hxx>     // SwMultiPortion
+#include <pormulti.hxx>
 #include <doc.hxx>
 #include <sortedobjs.hxx>
 
 #include <unicode/ubidi.h>
 
-#include "txtfrm.hxx"       // SwTxtFrm
-#include "inftxt.hxx"       // SwTxtSizeInfo
-#include "itrtxt.hxx"       // SwTxtCursor
-#include "crstate.hxx"      // SwTxtCursor
-#include "viewsh.hxx"       // InvalidateWindows
-#include "swfntcch.hxx"     // SwFontAccess
+#include "txtfrm.hxx"
+#include "inftxt.hxx"
+#include "itrtxt.hxx"
+#include "crstate.hxx"
+#include "viewsh.hxx"
+#include "swfntcch.hxx"
 #include "flyfrm.hxx"
 
 
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index e36de8761102..355e5d2b5e1e 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -21,32 +21,32 @@
 #include <hintids.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/hyphenzoneitem.hxx>
-#include <pagefrm.hxx>      // ChangeFtnRef
-#include <ndtxt.hxx>        // MakeFrm()
-#include <dcontact.hxx>     // SwDrawContact
-#include <dflyobj.hxx>      // SwVirtFlyDrawObj
+#include <pagefrm.hxx>
+#include <ndtxt.hxx>
+#include <dcontact.hxx>
+#include <dflyobj.hxx>
 #include <flyfrm.hxx>
-#include <ftnfrm.hxx>       // SwFtnFrm
+#include <ftnfrm.hxx>
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
 #include <paratr.hxx>
-#include <viewopt.hxx>      // SwViewOptions
-#include <viewsh.hxx>       // ViewShell
+#include <viewopt.hxx>
+#include <viewsh.hxx>
 #include <frmatr.hxx>
 #include <pam.hxx>
 #include <flyfrms.hxx>
 #include <fmtanchr.hxx>
-#include <itrform2.hxx>     // SwTxtFormatter
-#include <widorp.hxx>       // Widows and Orphans
+#include <itrform2.hxx>
+#include <widorp.hxx>
 #include <txtcache.hxx>
-#include <porrst.hxx>       // SwEmptyPortion
-#include <blink.hxx>        // pBlink
-#include <porfld.hxx>       // SwFldPortion
-#include <sectfrm.hxx>      // SwSectionFrm
-#include <pormulti.hxx>     // SwMultiPortion
+#include <porrst.hxx>
+#include <blink.hxx>
+#include <porfld.hxx>
+#include <sectfrm.hxx>
+#include <pormulti.hxx>
 
 #include <rootfrm.hxx>
-#include <frmfmt.hxx>       // SwFrmFmt
+#include <frmfmt.hxx>
 // OD 2004-05-24 #i28701#
 #include <sortedobjs.hxx>
 
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 5a65a07cd62f..4df500fe3f0f 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <pam.hxx>          // GetSpaces
-#include <frminf.hxx>       // SwTxtFrminfo
-#include <itrtxt.hxx>       // SwTxtMargin
+#include <pam.hxx>
+#include <frminf.hxx>
+#include <itrtxt.hxx>
 
 /*************************************************************************
  *                   SwTxtMargin::GetTxtStart()
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 8a70fca97f93..881f932ff74a 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -20,10 +20,10 @@
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <hintids.hxx>
-#include <tools/shl.hxx> // SW_MOD
+#include <tools/shl.hxx>
 #include <editeng/pgrditem.hxx>
 #include <editeng/lrspitem.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <paratr.hxx>
 
@@ -32,18 +32,18 @@
 #include <charfmt.hxx>
 #include "rootfrm.hxx"
 #include <pagefrm.hxx>
-#include <viewsh.hxx>   // ViewShell
-#include <viewimp.hxx>  // SwViewImp
-#include <viewopt.hxx>  // SwViewOption
-#include <frmtool.hxx>  // DrawGraphic
-#include <txtfrm.hxx>   // SwTxtFrm
-#include <itrpaint.hxx> // SwTxtPainter
-#include <txtpaint.hxx> // SwSaveClip
-#include <txtcache.hxx> // SwTxtLineAccess
-#include <flyfrm.hxx>   // SwFlyFrm
-#include <redlnitr.hxx> // SwRedlineItr
-#include <swmodule.hxx> // SW_MOD
-#include <tabfrm.hxx>   // SwTabFrm (Redlining)
+#include <viewsh.hxx>
+#include <viewimp.hxx>
+#include <viewopt.hxx>
+#include <frmtool.hxx>
+#include <txtfrm.hxx>
+#include <itrpaint.hxx>
+#include <txtpaint.hxx>
+#include <txtcache.hxx>
+#include <flyfrm.hxx>
+#include <redlnitr.hxx>
+#include <swmodule.hxx>
+#include <tabfrm.hxx>
 #include <numrule.hxx>
 #include <SwGrammarMarkUp.hxx>
 
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 63bc94d59f08..8239d94d63e1 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -19,14 +19,14 @@
 
 #include <ctype.h>
 #include <editeng/unolingu.hxx>
-#include <tools/shl.hxx>    // needed for SW_MOD() macro
+#include <tools/shl.hxx>
 #include <dlelstnr.hxx>
 #include <swmodule.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <guess.hxx>
 #include <inftxt.hxx>
 #include <pagefrm.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <com/sun/star/i18n/BreakType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 92f05cb03653..c6deb076376d 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -22,7 +22,7 @@
 
 #include "txttypes.hxx"
 #include "breakit.hxx"
-#include "porrst.hxx"   // SwHangingPortion
+#include "porrst.hxx"
 
 class SwTxtFormatInfo;
 
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 52a0b170f305..46b1c867aa12 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -46,18 +46,18 @@
 #include <swmodule.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <viewsh.hxx>   // ViewShell
-#include <viewopt.hxx>  // SwViewOptions
-#include <frmtool.hxx>  // DrawGraphic
+#include <viewsh.hxx>
+#include <viewopt.hxx>
+#include <frmtool.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDeviceAccess.hxx>
-#include <paratr.hxx>   // SwFmtDrop
-#include <rootfrm.hxx>  // SwRootFrm
-#include <inftxt.hxx>   // SwTxtInfo
-#include <blink.hxx>    // SwBlink
-#include <noteurl.hxx>  // SwNoteURL
-#include <porftn.hxx>   // SwFtnPortion
-#include <porrst.hxx>   // SwHangingPortion
+#include <paratr.hxx>
+#include <rootfrm.hxx>
+#include <inftxt.hxx>
+#include <blink.hxx>
+#include <noteurl.hxx>
+#include <porftn.hxx>
+#include <porrst.hxx>
 #include <itratr.hxx>
 #include <accessibilityoptions.hxx>
 #include <wrong.hxx>
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 1dcb60399f67..1fd18c3cabdd 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -21,13 +21,13 @@
 #include <vcl/outdev.hxx>
 #include <IDocumentSettingAccess.hxx>
 
-#include "frame.hxx"       // CalcFlyAdjust()
+#include "frame.hxx"
 #include "paratr.hxx"
 #include "itrtxt.hxx"
 #include "porglue.hxx"
 #include "porlay.hxx"
-#include "porfly.hxx"       // CalcFlyAdjust()
-#include "pordrop.hxx"       // CalcFlyAdjust()
+#include "porfly.hxx"
+#include "pordrop.hxx"
 #include "pormulti.hxx"
 #include <portab.hxx>
 
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 7a74d3ea0277..37819b144c34 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -34,13 +34,13 @@
 #include <frmfmt.hxx>
 #include <fmtfld.hxx>
 #include <doc.hxx>
-#include <viewsh.hxx>   // ViewShell
+#include <viewsh.hxx>
 #include <rootfrm.hxx>
 #include <docary.hxx>
 #include <ndtxt.hxx>
 #include <dcontact.hxx>
-#include <fldbas.hxx>      // SwField
-#include <pam.hxx>         // SwPosition        (lcl_MinMaxNode)
+#include <fldbas.hxx>
+#include <pam.hxx>
 #include <itratr.hxx>
 #include <htmltbl.hxx>
 #include <swtable.hxx>
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index fa3fa081807e..9c1d30901a7f 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -31,7 +31,7 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/borderline.hxx>
 #include <frmatr.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <pagefrm.hxx>
@@ -39,12 +39,12 @@
 #include "itrtxt.hxx"
 #include "txtfrm.hxx"
 #include "flyfrms.hxx"
-#include "porglue.hxx"      // SwFlyCnt
-#include "porfld.hxx"       // SwFldPortion::IsFollow()
-#include "porfly.hxx"       // GetFlyCrsrOfst()
+#include "porglue.hxx"
+#include "porfld.hxx"
+#include "porfly.hxx"
 #include "pordrop.hxx"
-#include "crstate.hxx"      // SwCrsrMoveState
-#include <pormulti.hxx>     // SwMultiPortion
+#include "crstate.hxx"
+#include <pormulti.hxx>
 // #i111284#
 #include <numrule.hxx>
 
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 1fd8c7814f0b..180b240f64a7 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -31,29 +31,29 @@
 #include <ftninfo.hxx>
 #include <charfmt.hxx>
 #include <editeng/charrotateitem.hxx>
-#include <layfrm.hxx>       // GetFrmRstHeight, etc
+#include <layfrm.hxx>
 #include <viewsh.hxx>
-#include <viewopt.hxx>      // SwViewOptions
-#include <paratr.hxx>       // SwFmtDrop
+#include <viewopt.hxx>
+#include <paratr.hxx>
 #include <itrform2.hxx>
 #include <porrst.hxx>
-#include <portab.hxx>       // pLastTab->
-#include <porfly.hxx>       // CalcFlyWidth
-#include <portox.hxx>       // WhichTxtPortion
-#include <porref.hxx>       // WhichTxtPortion
-#include <porfld.hxx>       // SwNumberPortion for CalcAscent()
-#include <porftn.hxx>       // SwFtnPortion
+#include <portab.hxx>
+#include <porfly.hxx>
+#include <portox.hxx>
+#include <porref.hxx>
+#include <porfld.hxx>
+#include <porftn.hxx>
 #include <porhyph.hxx>
 #include <pordrop.hxx>
 #include <guess.hxx>
-#include <blink.hxx>        // pBlink
-#include <ftnfrm.hxx>       // WhichFirstPortion() -> move it
-#include <redlnitr.hxx>     // SwRedlineItr
+#include <blink.hxx>
+#include <ftnfrm.hxx>
+#include <redlnitr.hxx>
 #include <pagefrm.hxx>
-#include <pagedesc.hxx>     // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
-#include <doc.hxx>          // SwDoc
-#include <pormulti.hxx>     // SwMultiPortion
+#include <doc.hxx>
+#include <pormulti.hxx>
 #include <unotools/charclass.hxx>
 
 #include <vector>
@@ -61,7 +61,7 @@
 #include <config_graphite.h>
 
 #if OSL_DEBUG_LEVEL > 1
-#include <ndtxt.hxx>        // pSwpHints, output operator
+#include <ndtxt.hxx>
 #endif
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 7e7d4c7ac7fb..696f34348ca6 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "hintids.hxx"
-#include "flyfrm.hxx"     // SwFlyInCntFrm
-#include "viewopt.hxx"  // SwViewOptions
-#include "txtatr.hxx"  // SwINetFmt
+#include "flyfrm.hxx"
+#include "viewopt.hxx"
+#include "txtatr.hxx"
 #include <tools/multisel.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/udlnitem.hxx>
@@ -30,10 +30,10 @@
 #include <frmatr.hxx>
 #include <sfx2/printer.hxx>
 #include <fmtfld.hxx>
-#include <fldbas.hxx>      // SwField
+#include <fldbas.hxx>
 #include <rootfrm.hxx>
 #include <pagefrm.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 
 // #i12836# enhanced pdf export
@@ -43,18 +43,18 @@
 #include "flyfrms.hxx"
 #include "viewsh.hxx"
 #include "itrpaint.hxx"
-#include "txtfrm.hxx"   // pFrm
+#include "txtfrm.hxx"
 #include "txtfly.hxx"
 #include "swfont.hxx"
 #include "txtpaint.hxx"
-#include "portab.hxx"   // SwTabPortion::IsFilled
-#include "porfly.hxx"     // SwFlyCntPortion
-#include "porfld.hxx"   // SwGrfNumPortion
-#include "frmfmt.hxx"   // LRSpace
-#include "txatbase.hxx" // SwTxtAttr
-#include "charfmt.hxx"  // SwFmtCharFmt
-#include "redlnitr.hxx" // SwRedlineItr
-#include "porrst.hxx"   // SwArrowPortion
+#include "portab.hxx"
+#include "porfly.hxx"
+#include "porfld.hxx"
+#include "frmfmt.hxx"
+#include "txatbase.hxx"
+#include "charfmt.hxx"
+#include "redlnitr.hxx"
+#include "porrst.hxx"
 #include "pormulti.hxx"
 
 /*************************************************************************
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index e2a178758591..00de23124d49 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -25,7 +25,7 @@
 
 #include "pormulti.hxx"
 #include <pagefrm.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <porfld.hxx>
 
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index d0b3f3f127de..40eeb2aad5f1 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <viewopt.hxx>  // SwViewOptions
+#include <viewopt.hxx>
 #include <SwPortionHandler.hxx>
 #include <inftxt.hxx>
 #include <porexp.hxx>
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 2774cf1036cb..3e48b7b4cab4 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -24,20 +24,20 @@
 #include <editeng/brushitem.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
-#include <viewopt.hxx>  // SwViewOptions
+#include <viewopt.hxx>
 #include <SwPortionHandler.hxx>
 #include <porlay.hxx>
 #include <porfld.hxx>
 #include <inftxt.hxx>
-#include <blink.hxx>    // pBlink
-#include <frmtool.hxx>  // DrawGraphic
+#include <blink.hxx>
+#include <frmtool.hxx>
 #include <viewsh.hxx>
 #include <docsh.hxx>
 #include <doc.hxx>
 #include "rootfrm.hxx"
 #include <breakit.hxx>
 #include <porrst.hxx>
-#include <porftn.hxx>   // SwFtnPortion
+#include <porftn.hxx>
 #include <accessibilityoptions.hxx>
 #include <editeng/lrspitem.hxx>
 
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index cf824b4b5092..fc6278ca2e2c 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dcontact.hxx" // SwDrawContact
-#include "dflyobj.hxx"  // SwVirtFlyDrawObj
-#include "pam.hxx"      // SwPosition
-#include "flyfrm.hxx"   // SwFlyInCntFrm
+#include "dcontact.hxx"
+#include "dflyobj.hxx"
+#include "pam.hxx"
+#include "flyfrm.hxx"
 #include "rootfrm.hxx"
-#include "frmfmt.hxx"   // SwFrmFmt
+#include "frmfmt.hxx"
 #include "viewsh.hxx"
 
 #include <vcl/outdev.hxx>
@@ -33,10 +33,10 @@
 #include <fmtornt.hxx>
 #include <frmatr.hxx>
 #include "flyfrms.hxx"
-#include "txatbase.hxx" // SwTxtAttr
+#include "txatbase.hxx"
 #include "porfly.hxx"
-#include "porlay.hxx"   // SetFly
-#include "inftxt.hxx"   // SwTxtPaintInfo
+#include "porlay.hxx"
+#include "inftxt.hxx"
 
 // OD 2004-05-24 #i28701#
 #include <sortedobjs.hxx>
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 8769a41448b1..19fa51e80949 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -18,13 +18,13 @@
  */
 
 #include "swrect.hxx"
-#include "paratr.hxx"   // pTabStop, ADJ*
-#include "viewopt.hxx"  // SwViewOptions
+#include "paratr.hxx"
+#include "viewopt.hxx"
 #include <SwPortionHandler.hxx>
 #include "porglue.hxx"
 #include "inftxt.hxx"
-#include "porlay.hxx"   // SwParaPortion, SetFull
-#include "porfly.hxx"   // SwParaPortion, SetFull
+#include "porlay.hxx"
+#include "porfly.hxx"
 #include <comphelper/string.hxx>
 
 /*************************************************************************
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 8224bbb25322..3e0ee4f4b43a 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -21,13 +21,13 @@
 #include "porlay.hxx"
 #include "itrform2.hxx"
 #include "porglue.hxx"
-#include "porexp.hxx"   // SwQuoVadisPortion
-#include "blink.hxx"    // pBlink
-#include "redlnitr.hxx" // SwRedlineItr
-#include "porfly.hxx"   // SwFlyCntPortion
-#include <porrst.hxx>   // SwHangingPortion
-#include <pormulti.hxx> // SwMultiPortion
-#include <pordrop.hxx> // SwDropPortion
+#include "porexp.hxx"
+#include "blink.hxx"
+#include "redlnitr.hxx"
+#include "porfly.hxx"
+#include <porrst.hxx>
+#include <pormulti.hxx>
+#include <pordrop.hxx>
 #include <breakit.hxx>
 #include <unicode/uchar.h>
 #include <com/sun/star/i18n/ScriptType.hpp>
@@ -44,8 +44,8 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <charfmt.hxx>
 #include <fchrfmt.hxx>
-#include <docary.hxx>   // SwRedlineTbl
-#include <redline.hxx>  // SwRedline
+#include <docary.hxx>
+#include <redline.hxx>
 #include <section.hxx>
 #include <switerator.hxx>
 #include <IDocumentRedlineAccess.hxx>
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index b8e566884f69..ac89498d782c 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -22,7 +22,7 @@
 #include <tools/fract.hxx>
 #include <scriptinfo.hxx>
 
-#include "swrect.hxx"   // SwRepaint
+#include "swrect.hxx"
 #include "portxt.hxx"
 #include "swfont.hxx"
 
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 48329b463b51..fb17d745b782 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -19,7 +19,7 @@
 #ifndef _PORLIN_HXX
 #define _PORLIN_HXX
 
-#include "possiz.hxx"       // SwPosSize
+#include "possiz.hxx"
 
 #ifdef DBG_UTIL
 #include <libxml/xmlwriter.h>
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index f3721f404920..ab18a829ad7e 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -24,26 +24,26 @@
 #include <editeng/charrotateitem.hxx>
 #include <vcl/outdev.hxx>
 #include <fmtfld.hxx>
-#include <fldbas.hxx>      // SwField
+#include <fldbas.hxx>
 #include <txatbase.hxx>
-#include <fmtruby.hxx>  // SwFmtRuby
-#include <txtatr.hxx>   // SwTxtRuby
+#include <fmtruby.hxx>
+#include <txtatr.hxx>
 #include <charfmt.hxx>
 #include <txtinet.hxx>
 #include <fchrfmt.hxx>
-#include <layfrm.hxx>       // GetUpper()
+#include <layfrm.hxx>
 #include <SwPortionHandler.hxx>
-#include <pormulti.hxx>     // SwMultiPortion
-#include <inftxt.hxx>       // SwTxtSizeInfo
-#include <itrpaint.hxx>     // SwTxtPainter
-#include <viewopt.hxx>      // SwViewOptions
-#include <itrform2.hxx>     // SwTxtFormatter
-#include <porfld.hxx>       // SwFldPortion
+#include <pormulti.hxx>
+#include <inftxt.hxx>
+#include <itrpaint.hxx>
+#include <viewopt.hxx>
+#include <itrform2.hxx>
+#include <porfld.hxx>
 #include <porglue.hxx>
 #include <breakit.hxx>
 #include <pagefrm.hxx>
 #include <rowfrm.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <swtable.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/core/text/porref.cxx b/sw/source/core/text/porref.cxx
index adad0f62a6da..0cb2538251fe 100644
--- a/sw/source/core/text/porref.cxx
+++ b/sw/source/core/text/porref.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <SwPortionHandler.hxx>
-#include "viewopt.hxx"  // SwViewOptions
+#include "viewopt.hxx"
 
 #include "porref.hxx"
-#include "inftxt.hxx"       // GetTxtSize()
+#include "inftxt.hxx"
 
 /*************************************************************************
  *               virtual SwRefPortion::Paint()
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 16a87ea73b85..5e80d374d443 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -26,21 +26,21 @@
 #include <editeng/pgrditem.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <viewsh.hxx>   // ViewShell
+#include <viewsh.hxx>
 #include <viewopt.hxx>
-#include <ndtxt.hxx>    // SwTxtNode
-#include <pagefrm.hxx>  // SwPageFrm
+#include <ndtxt.hxx>
+#include <pagefrm.hxx>
 #include <paratr.hxx>
 #include <SwPortionHandler.hxx>
 #include <porrst.hxx>
 #include <inftxt.hxx>
-#include <txtpaint.hxx> // ClipVout
-#include <swfntcch.hxx> // SwFontAccess
+#include <txtpaint.hxx>
+#include <swfntcch.hxx>
 #include <tgrditem.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <frmatr.hxx>
-#include <redlnitr.hxx> // SwRedlineItr
-#include <porfly.hxx>   // SwFlyPortion
+#include <redlnitr.hxx>
+#include <porfly.hxx>
 #include <atrhndl.hxx>
 #include "rootfrm.hxx"
 
diff --git a/sw/source/core/text/portox.cxx b/sw/source/core/text/portox.cxx
index 347ddbb43167..5e1c9f703c29 100644
--- a/sw/source/core/text/portox.cxx
+++ b/sw/source/core/text/portox.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <SwPortionHandler.hxx>
-#include "viewopt.hxx"  // SwViewOptions
+#include "viewopt.hxx"
 
 #include "portox.hxx"
-#include "inftxt.hxx"       // GetTxtSize()
+#include "inftxt.hxx"
 
 /*************************************************************************
  *               virtual SwToxPortion::Paint()
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 31c93f1ec5ab..01afab67d721 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -21,19 +21,19 @@
 
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <i18nlangtag/mslangid.hxx>
-#include <hintids.hxx>     // CH_TXTATR
+#include <hintids.hxx>
 #include <EnhancedPDFExportHelper.hxx>
 #include <SwPortionHandler.hxx>
 #include <porlay.hxx>
 #include <inftxt.hxx>
-#include <guess.hxx>    // SwTxtGuess, line break
+#include <guess.hxx>
 #include <porglue.hxx>
-#include <portab.hxx>       // pLastTab->
-#include <porfld.hxx>       // SwFldPortion
+#include <portab.hxx>
+#include <porfld.hxx>
 #include <wrong.hxx>
 #include <viewsh.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include <viewopt.hxx>  // SwViewOptions
+#include <viewopt.hxx>
 #include <editeng/borderline.hxx>
 
 #include <IMark.hxx>
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 1529ad6c5e60..675ae619cbc2 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -22,18 +22,18 @@
 #include <tools/shl.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <swmodule.hxx>
-#include <redline.hxx>      // SwRedline
-#include <txtatr.hxx>       // SwTxt ...
-#include <docary.hxx>       // SwRedlineTbl
-#include <itratr.hxx>       // SwAttrIter
-#include <ndtxt.hxx>        // SwTxtNode
-#include <doc.hxx>          // SwDoc
+#include <redline.hxx>
+#include <txtatr.hxx>
+#include <docary.hxx>
+#include <itratr.hxx>
+#include <ndtxt.hxx>
+#include <doc.hxx>
 #include <rootfrm.hxx>
 #include <breakit.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/cmdevt.hxx>
 #include <vcl/settings.hxx>
-#include <txtfrm.hxx>       // SwTxtFrm
+#include <txtfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <redlnitr.hxx>
 #include <extinput.hxx>
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index cc03993dd009..025613c6a5a2 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -22,14 +22,14 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <paratr.hxx>
-#include <txtfrm.hxx>   // Format()
+#include <txtfrm.hxx>
 #include <charfmt.hxx>
-#include <viewopt.hxx>  // SwViewOption
-#include <viewsh.hxx>   // ViewShell
+#include <viewopt.hxx>
+#include <viewsh.hxx>
 #include <pordrop.hxx>
 #include <itrform2.hxx>
-#include <txtpaint.hxx> // SwSaveClip
-#include <blink.hxx>    // pBlink
+#include <txtpaint.hxx>
+#include <blink.hxx>
 #include <breakit.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index ea4841c90850..266c96cda1f4 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -22,32 +22,32 @@
 #include <txtfld.hxx>
 #include <charfmt.hxx>
 
-#include "viewsh.hxx"   // NewFldPortion, GetDoc()
-#include "doc.hxx"      // NewFldPortion, GetSysFldType()
-#include "rootfrm.hxx"  // Info ueber virt. PageNumber
-#include "pagefrm.hxx"  // NewFldPortion, GetVirtPageNum()
-#include "ndtxt.hxx"    // NewNumberPortion, pHints->GetNum()
-#include "fldbas.hxx"      // SwField
-#include "viewopt.hxx"  // SwViewOptions
-#include "flyfrm.hxx"   //IsInBody()
+#include "viewsh.hxx"
+#include "doc.hxx"
+#include "rootfrm.hxx"
+#include "pagefrm.hxx"
+#include "ndtxt.hxx"
+#include "fldbas.hxx"
+#include "viewopt.hxx"
+#include "flyfrm.hxx"
 #include "viewimp.hxx"
-#include "txtatr.hxx"   // SwTxtFld
-#include "swfont.hxx"   // NewFldPortion, new SwFont
-#include "fntcache.hxx"   // NewFldPortion, SwFntAccess
+#include "txtatr.hxx"
+#include "swfont.hxx"
+#include "fntcache.hxx"
 #include "porfld.hxx"
-#include "porftn.hxx"   // NewExtraPortion
-#include "porref.hxx"   // NewExtraPortion
-#include "portox.hxx"   // NewExtraPortion
-#include "porhyph.hxx"   // NewExtraPortion
-#include "porfly.hxx"   // NewExtraPortion
-#include "itrform2.hxx"   // SwTxtFormatter
+#include "porftn.hxx"
+#include "porref.hxx"
+#include "portox.hxx"
+#include "porhyph.hxx"
+#include "porfly.hxx"
+#include "itrform2.hxx"
 #include "chpfld.hxx"
 #include "dbfld.hxx"
 #include "expfld.hxx"
 #include "docufld.hxx"
-#include "pagedesc.hxx"  // NewFldPortion, GetNum()
-#include <pormulti.hxx>     // SwMultiPortion
-#include "fmtmeta.hxx" // lcl_NewMetaPortion
+#include "pagedesc.hxx"
+#include <pormulti.hxx>
+#include "fmtmeta.hxx"
 
 
 /*************************************************************************
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 5cd468f99565..e1511a46cf0a 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -23,20 +23,20 @@
 
 #include "pagefrm.hxx"
 #include "rootfrm.hxx"
-#include "pam.hxx"          // SwPosition
-#include "swregion.hxx"     // SwRegionRects
-#include "dflyobj.hxx"      // SdrObject
-#include "flyfrm.hxx"       // SwFlyFrm
-#include "frmtool.hxx"      // ::DrawGraphic
-#include "porfly.hxx"       // NewFlyCntPortion
-#include "porfld.hxx"       // SwGrfNumPortion
-#include "txtfly.hxx"       // SwTxtFly
-#include "txtpaint.hxx"     // SwSaveClip
-#include "txtatr.hxx"       // SwTxtFlyCnt
+#include "pam.hxx"
+#include "swregion.hxx"
+#include "dflyobj.hxx"
+#include "flyfrm.hxx"
+#include "frmtool.hxx"
+#include "porfly.hxx"
+#include "porfld.hxx"
+#include "txtfly.hxx"
+#include "txtpaint.hxx"
+#include "txtatr.hxx"
 #include "notxtfrm.hxx"
-#include "fmtcnct.hxx"      // SwFmtChain
+#include "fmtcnct.hxx"
 #include "inftxt.hxx"
-#include <pormulti.hxx>     // SwMultiPortion
+#include <pormulti.hxx>
 #include <svx/obj3d.hxx>
 #include <editeng/txtrange.hxx>
 #include <editeng/lrspitem.hxx>
@@ -46,7 +46,7 @@
 #include <fmtsrnd.hxx>
 #include <fmtanchr.hxx>
 #include <frmfmt.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <sortedobjs.hxx>
 #include <layouter.hxx>
@@ -57,7 +57,7 @@
 
 #ifdef DBG_UTIL
 #include "viewsh.hxx"
-#include "viewopt.hxx"  // SwViewOptions, only for testing (Test2)
+#include "viewopt.hxx"
 #include "doc.hxx"
 #endif
 
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 3ee2bc80a7ed..03dbba33344a 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -30,13 +30,13 @@
 #include <editeng/pgrditem.hxx>
 #include <swmodule.hxx>
 #include <SwSmartTagMgr.hxx>
-#include <doc.hxx>      // GetDoc()
+#include <doc.hxx>
 #include "rootfrm.hxx"
-#include <pagefrm.hxx>  // InvalidateSpelling
+#include <pagefrm.hxx>
 #include <rootfrm.hxx>
-#include <viewsh.hxx>   // ViewShell
-#include <pam.hxx>      // SwPosition
-#include <ndtxt.hxx>        // SwTxtNode
+#include <viewsh.hxx>
+#include <pam.hxx>
+#include <ndtxt.hxx>
 #include <txtatr.hxx>
 #include <paratr.hxx>
 #include <viewopt.hxx>
@@ -44,7 +44,7 @@
 #include <flyfrm.hxx>
 #include <tabfrm.hxx>
 #include <frmtool.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <dbg_lay.hxx>
 #include <fmtfld.hxx>
@@ -54,20 +54,20 @@
 #include <charatr.hxx>
 #include <ftninfo.hxx>
 #include <fmtline.hxx>
-#include <txtfrm.hxx>       // SwTxtFrm
-#include <sectfrm.hxx>      // SwSectFrm
-#include <itrform2.hxx>       // Iteratoren
-#include <widorp.hxx>       // SwFrmBreak
+#include <txtfrm.hxx>
+#include <sectfrm.hxx>
+#include <itrform2.hxx>
+#include <widorp.hxx>
 #include <txtcache.hxx>
-#include <fntcache.hxx>     // GetLineSpace benutzt pLastFont
+#include <fntcache.hxx>
 #include <SwGrammarMarkUp.hxx>
 #include <lineinfo.hxx>
 #include <SwPortionHandler.hxx>
 #include <dcontact.hxx>
 #include <sortedobjs.hxx>
-#include <txtflcnt.hxx>     // SwTxtFlyCnt
-#include <fmtflcnt.hxx>     // SwFmtFlyCnt
-#include <fmtcntnt.hxx>     // SwFmtCntnt
+#include <txtflcnt.hxx>
+#include <fmtflcnt.hxx>
+#include <fmtcntnt.hxx>
 #include <numrule.hxx>
 #include <swtable.hxx>
 #include <fldupde.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 5a3f7ac0448a..8cbf49526434 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -39,17 +39,17 @@
 // #i28701#
 #include <sortedobjs.hxx>
 
-#include "swfont.hxx"   // new SwFont
+#include "swfont.hxx"
 #include "porftn.hxx"
 #include "porfly.hxx"
 #include "porlay.hxx"
 #include "txtfrm.hxx"
 #include "itrform2.hxx"
-#include "ftnfrm.hxx"   // FindQuoVadisFrm(),
+#include "ftnfrm.hxx"
 #include "pagedesc.hxx"
-#include "redlnitr.hxx" // SwRedlnItr
-#include "sectfrm.hxx"  // SwSectionFrm
-#include "layouter.hxx" // Endnote-Collection
+#include "redlnitr.hxx"
+#include "sectfrm.hxx"
+#include "layouter.hxx"
 #include "frmtool.hxx"
 #include "ndindex.hxx"
 
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index a234dcfbef5c..909f2ad42469 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -21,14 +21,14 @@
 #include <editeng/unolingu.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <EnhancedPDFExportHelper.hxx>
-#include <viewopt.hxx>  // SwViewOptions
+#include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <SwPortionHandler.hxx>
-#include <porhyph.hxx>  //
+#include <porhyph.hxx>
 #include <inftxt.hxx>
-#include <itrform2.hxx> //
-#include <guess.hxx>    //
-#include <splargs.hxx>  // SwInterHyphInfo
+#include <itrform2.hxx>
+#include <guess.hxx>
+#include <splargs.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index dedd5802b2e7..d43913117880 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -19,8 +19,8 @@
 
 
 #include "swcache.hxx"
-#include "fntcache.hxx"     // pFntCache ( SwFont/ScrFont-PrtFont cache )
-#include "swfntcch.hxx"     // pSwFontCache ( SwAttrSet/SwFont cache )
+#include "fntcache.hxx"
+#include "swfntcch.hxx"
 #include "txtfrm.hxx"
 #include "txtcache.hxx"
 #include "porlay.hxx"
@@ -34,10 +34,10 @@
 #include "porftn.hxx"
 #include "porhyph.hxx"
 #include "pordrop.hxx"
-#include "blink.hxx"    // Blink manager
-#include "init.hxx"     // Declarations for _TextInit() and _TextFinit()
-#include "txtfly.hxx"   // SwContourCache
-#include "dbg_lay.hxx"  // Layout Debug file output
+#include "blink.hxx"
+#include "init.hxx"
+#include "txtfly.hxx"
+#include "dbg_lay.hxx"
 
 SwCache *SwTxtFrm::pTxtCache = 0;
 long SwTxtFrm::nMinPrtLine = 0;
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 4de7e4eff595..b6995d1d64bf 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -121,8 +121,8 @@ const char *GetPrepName( const PrepareHint )
 #else
 #include <limits.h>
 #include <stdlib.h>
-#include "swtypes.hxx"      // ZTCCONST
-#include "swfont.hxx"     // SwDropPortion
+#include "swtypes.hxx"
+#include "swfont.hxx"
 
 #define CONSTCHAR( name, string ) static const sal_Char name[] = string
 
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index bafe565e5b0b..a466b6624fe2 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -27,7 +27,7 @@
 #include <frmatr.hxx>
 #include <SwPortionHandler.hxx>
 
-#include "viewopt.hxx"  // SwViewOptions
+#include "viewopt.hxx"
 #include "portab.hxx"
 #include "inftxt.hxx"
 #include "itrform2.hxx"
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 3548f78e2434..190108246039 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -35,7 +35,7 @@
 #include "widorp.hxx"
 #include "txtfrm.hxx"
 #include "itrtxt.hxx"
-#include "sectfrm.hxx"  //SwSectionFrm
+#include "sectfrm.hxx"
 #include "ftnfrm.hxx"
 
 #undef WIDOWTWIPS
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 1a469d0aefd4..c7e177f01c84 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -31,7 +31,7 @@
 #include <paratr.hxx>
 #include <editeng/tstpitem.hxx>
 #include <SwStyleNameMapper.hxx>
-#include <hints.hxx> // SwPtrMsgPoolItem
+#include <hints.hxx>
 #include <algorithm>
 #include <functional>
 #include <switerator.hxx>
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 51c43baee0bd..7bf3e3f997c1 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "fldbas.hxx"          // fuer FieldType
+#include "fldbas.hxx"
 #include <fmtfld.hxx>
 #include <txtfld.hxx>
 #include <docufld.hxx>
@@ -29,9 +29,9 @@
 #include "ddefld.hxx"
 #include "usrfld.hxx"
 #include "expfld.hxx"
-#include "swfont.hxx"       // fuer GetFldsColor
-#include "ndtxt.hxx"        // SwTxtNode
-#include "calc.hxx"         // Update fuer UserFields
+#include "swfont.hxx"
+#include "ndtxt.hxx"
+#include "calc.hxx"
 #include "hints.hxx"
 #include <IDocumentFieldsAccess.hxx>
 #include <fieldhint.hxx>
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index a52606fc2ca1..b44d4914a3a7 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -19,13 +19,13 @@
 
 
 #include "hintids.hxx"
-#include "cntfrm.hxx"       // _GetFly
+#include "cntfrm.hxx"
 #include "doc.hxx"
 #include <IDocumentUndoRedo.hxx>
-#include "pam.hxx"          // fuer SwTxtFlyCnt
-#include "flyfrm.hxx"       // fuer SwTxtFlyCnt
-#include "ndtxt.hxx"        // SwFlyFrmFmt
-#include "frmfmt.hxx"       // SwFlyFrmFmt
+#include "pam.hxx"
+#include "flyfrm.hxx"
+#include "ndtxt.hxx"
+#include "frmfmt.hxx"
 #include <fmtflcnt.hxx>
 #include <txtflcnt.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index be898145eab1..4260c8f4621d 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <doc.hxx>
-#include <cntfrm.hxx>       // OSL_ENSURE(in ~SwTxtFtn()
-#include <pagefrm.hxx>      // RemoveFtn()
+#include <cntfrm.hxx>
+#include <pagefrm.hxx>
 #include <fmtftn.hxx>
 #include <txtftn.hxx>
 #include <ftnidx.hxx>
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 3443c01b1388..cb3c33f94a65 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -31,9 +31,9 @@
 #include <txtatr.hxx>
 #include <fmtruby.hxx>
 #include <charfmt.hxx>
-#include <hints.hxx>        // SwUpdateAttr
+#include <hints.hxx>
 #include <unostyle.hxx>
-#include <unoevent.hxx>     // SwHyperlinkEventDescriptor
+#include <unoevent.hxx>
 #include <com/sun/star/text/RubyAdjust.hpp>
 
 #include <cmdid.h>
@@ -41,11 +41,11 @@
 #include <SwStyleNameMapper.hxx>
 
 #include <fmtmeta.hxx>
-#include <ndtxt.hxx> // for meta
-#include <doc.hxx> // for meta
+#include <ndtxt.hxx>
+#include <doc.hxx>
 #include <unometa.hxx>
 #include <docsh.hxx>
-#include <svl/zforlist.hxx> // GetNumberFormat
+#include <svl/zforlist.hxx>
 
 #include <boost/bind.hpp>
 #include <algorithm>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 125e4b7cb9ac..59660bc1cd90 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -31,12 +31,12 @@
 #include <viewopt.hxx>
 #include <fntcache.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include <swfont.hxx>       // CH_BLANK + CH_BULLET
+#include <swfont.hxx>
 #include <wrong.hxx>
 #include "dbg_lay.hxx"
-#include <txtfrm.hxx>       // SwTxtFrm
+#include <txtfrm.hxx>
 #include <pagefrm.hxx>
-#include <pagedesc.hxx> // SwPageDesc
+#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <scriptinfo.hxx>
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 3717575b0212..892273778f01 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -29,7 +29,7 @@
 #include <fntcache.hxx>
 #include <swfont.hxx>
 #include <breakit.hxx>
-#include <txtfrm.hxx>       // SwTxtFrm
+#include <txtfrm.hxx>
 #include <scriptinfo.hxx>
 
 using namespace ::com::sun::star::i18n;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4e5152f170fc..0856cca0863a 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -52,16 +52,16 @@
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <docary.hxx>
-#include <pam.hxx>        // for SwPosition
+#include <pam.hxx>
 #include <fldbas.hxx>
 #include <paratr.hxx>
 #include <txtfrm.hxx>
 #include <ftnfrm.hxx>
 #include <ftnboss.hxx>
 #include <rootfrm.hxx>
-#include <pagedesc.hxx>   // for SwPageDesc
-#include <expfld.hxx>     // for SwTblField
-#include <section.hxx>    // for SwSection
+#include <pagedesc.hxx>
+#include <expfld.hxx>
+#include <section.hxx>
 #include <mvsave.hxx>
 #include <swcache.hxx>
 #include <SwGrammarMarkUp.hxx>
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 9ed61d325147..0a361cac51a7 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -53,10 +53,10 @@
 #include <IDocumentSettingAccess.hxx>
 #include <vcl/window.hxx>
 #include <charatr.hxx>
-#include <viewsh.hxx>       // Bildschirmabgleich
+#include <viewsh.hxx>
 #include <swfont.hxx>
-#include <fntcache.hxx>     // FontCache
-#include <txtfrm.hxx>       // SwTxtFrm
+#include <fntcache.hxx>
+#include <txtfrm.hxx>
 #include <scriptinfo.hxx>
 
 #ifdef DBG_UTIL
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 803831184ea3..6d04de25d554 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -56,7 +56,7 @@
 #include <pam.hxx>
 #include <ndtxt.hxx>
 #include <txtfrm.hxx>
-#include <rolbck.hxx>           // fuer SwRegHistory
+#include <rolbck.hxx>
 #include <ddefld.hxx>
 #include <docufld.hxx>
 #include <expfld.hxx>
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 659a7561ead8..5fbfa56979ec 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -28,9 +28,9 @@
 #include <fchrfmt.hxx>
 #include <fmtinfmt.hxx>
 #include <charfmt.hxx>
-#include <ndtxt.hxx>        // SwCharFmt, SwTxtNode
-#include <poolfmt.hxx>      // RES_POOLCHR_INET_...
-#include <doc.hxx>          // SwDoc
+#include <ndtxt.hxx>
+#include <poolfmt.hxx>
+#include <doc.hxx>
 #include <fmtruby.hxx>
 #include <fmtmeta.hxx>
 
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index ad571cc0e644..1c82cc6e3871 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -35,7 +35,7 @@
 #include <splargs.hxx>
 #include <viewopt.hxx>
 #include <acmplwrd.hxx>
-#include <doc.hxx>      // GetDoc()
+#include <doc.hxx>
 #include <docsh.hxx>
 #include <txtfld.hxx>
 #include <fmtfld.hxx>
@@ -53,8 +53,8 @@
 #include <crstate.hxx>
 #include <UndoOverwrite.hxx>
 #include <txatritr.hxx>
-#include <redline.hxx>      // SwRedline
-#include <docary.hxx>       // SwRedlineTbl
+#include <redline.hxx>
+#include <docary.hxx>
 #include <scriptinfo.hxx>
 #include <docstat.hxx>
 #include <editsh.hxx>
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 4322608378d3..4ffa8fd52adf 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -38,19 +38,19 @@
 #include <fmtcnct.hxx>
 #include <frmfmt.hxx>
 #include <ftnidx.hxx>
-#include <doc.hxx>              // SwDoc.GetNodes()
+#include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <docary.hxx>
-#include <ndtxt.hxx>            // SwTxtNode
+#include <ndtxt.hxx>
 #include <paratr.hxx>
 #include <cellatr.hxx>
 #include <fldbas.hxx>
 #include <pam.hxx>
 #include <swtable.hxx>
-#include <ndgrf.hxx>            // SwGrfNode
+#include <ndgrf.hxx>
 #include <UndoCore.hxx>
 #include <IMark.hxx>
-#include <charfmt.hxx> // #i27615#
+#include <charfmt.hxx>
 #include <comcore.hrc>
 #include <undo.hrc>
 #include <bookmrk.hxx>
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index 0162ceb72a1f..d34d69e5c942 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -22,7 +22,7 @@
 
 #include "doc.hxx"
 #include "docary.hxx"
-#include "swundo.hxx"           // fuer die UndoIds
+#include "swundo.hxx"
 #include "pam.hxx"
 
 #include <UndoCore.hxx>
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index c9032f3165d3..9786ab76345a 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/app.hxx>
 #include <fldbas.hxx>
 #include <fmtfld.hxx>
-#include <comcore.hrc> // #111827#
+#include <comcore.hrc>
 #include <undo.hrc>
 #include <vector>
 
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 6890e816edd9..52aa1b3ced33 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -37,7 +37,7 @@
 #include <IDocumentUndoRedo.hxx>
 #include <docary.hxx>
 #include <frame.hxx>
-#include <swundo.hxx>           // fuer die UndoIds
+#include <swundo.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
 #include <UndoCore.hxx>
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index ac685dd9d8c3..cc182b23a9a2 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -52,7 +52,7 @@
 #include <acorrect.hxx>
 #include <dcontact.hxx>
 
-#include <comcore.hrc> // #111827#
+#include <comcore.hrc>
 #include <undo.hrc>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/unoutl.cxx b/sw/source/core/undo/unoutl.cxx
index 088eb42d1684..45b85a7edbd0 100644
--- a/sw/source/core/undo/unoutl.cxx
+++ b/sw/source/core/undo/unoutl.cxx
@@ -19,7 +19,7 @@
 
 
 #include "doc.hxx"
-#include "swundo.hxx"           // fuer die UndoIds
+#include "swundo.hxx"
 #include "pam.hxx"
 #include "ndtxt.hxx"
 
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 20d8c922b772..83a0e4f687f7 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -32,7 +32,7 @@
 #include <rolbck.hxx>
 #include <acorrect.hxx>
 #include <docary.hxx>
-#include <comcore.hrc> // #111827#
+#include <comcore.hrc>
 #include <undo.hrc>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 0a2b82700674..f57023e82c1a 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svl/zforlist.hxx>     // SvNumberFormatter
+#include <svl/zforlist.hxx>
 #include <svx/charthelper.hxx>
 
 #include <XMLRangeHelper.hxx>
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index f5fc29112263..fb74a806cb01 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -84,7 +84,7 @@
 #include <textapi.hxx>
 #include <editeng/outliner.hxx>
 #include <docsh.hxx>
-#include <fmtmeta.hxx> // MetaFieldManager
+#include <fmtmeta.hxx>
 #include <switerator.hxx>
 #include <bookmrk.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index a79e33ee919a..75bb8b0447af 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -23,7 +23,7 @@
 
 #include <svx/svxids.hrc>
 #include <editeng/memberids.hrc>
-#include <float.h> // for DBL_MIN
+#include <float.h>
 #include <swtypes.hxx>
 #include <cmdid.h>
 #include <unotbl.hxx>
@@ -74,7 +74,7 @@
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
-#include <svl/zforlist.hxx>     // SvNumberFormatter
+#include <svl/zforlist.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 909558e95ba0..c4d194777114 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -37,7 +37,7 @@
 #include <hints.hxx>
 #include <fntcache.hxx>
 
-#include <statstr.hrc>  // Text fuer SfxProgress
+#include <statstr.hrc>
 #include <comcore.hrc>
 
 #include <IDocumentFieldsAccess.hxx>
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index a09df55630ce..3275ace32a99 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -25,12 +25,12 @@
 #include <rootfrm.hxx>
 #include <viewimp.hxx>
 #include <viewopt.hxx>
-#include <txtfrm.hxx>       // Zugriff auf TxtCache
+#include <txtfrm.hxx>
 #include <notxtfrm.hxx>
 #include <fntcache.hxx>
 #include <docufld.hxx>
 #include <ptqueue.hxx>
-#include <dview.hxx>        // SdrView
+#include <dview.hxx>
 #include <ndgrf.hxx>
 #include <ndindex.hxx>
 #include <accessibilityoptions.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index e21abd4a27ae..aa4090445bcd 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -50,24 +50,24 @@
 #include <wdocsh.hxx>
 #include <fesh.hxx>
 #include <pam.hxx>
-#include <viewimp.hxx>      // Imp->SetFirstVisPageInvalid()
+#include <viewimp.hxx>
 #include <layact.hxx>
 #include <ndtxt.hxx>
 #include <fldbas.hxx>
-#include <docfld.hxx>       // _SetGetExpFld
-#include <docufld.hxx>      // PostItFld /-Type
+#include <docfld.hxx>
+#include <docufld.hxx>
 #include <shellres.hxx>
 #include <viewopt.hxx>
-#include <printdata.hxx>    // SwPrintData
+#include <printdata.hxx>
 #include <pagedesc.hxx>
-#include <poolfmt.hxx>      // for RES_POOLPAGE_JAKET
-#include <mdiexp.hxx>       // for accessing status bar
-#include <statstr.hrc>      //      -- " --
+#include <poolfmt.hxx>
+#include <mdiexp.hxx>
+#include <statstr.hrc>
 #include <ptqueue.hxx>
 #include <tabfrm.hxx>
-#include <txtfrm.hxx>       // MinPrtLine
-#include <viscrs.hxx>       // SwShellCrsr
-#include <fmtpdsc.hxx>      // SwFmtPageDesc
+#include <txtfrm.hxx>
+#include <viscrs.hxx>
+#include <fmtpdsc.hxx>
 #include <globals.hrc>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 290f7e5811b1..058e67a78943 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -36,8 +36,8 @@
 #include <pagedesc.hxx>
 #include <breakit.hxx>
 #include <swerror.h>
-#include <statstr.hrc>          // ResId for the status bar
-#include <mdiexp.hxx>           // ...Percent()
+#include <statstr.hrc>
+#include <mdiexp.hxx>
 #include <poolfmt.hxx>
 
 #include "vcl/metric.hxx"
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 3b03c5b99b48..083e76594e56 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -23,13 +23,13 @@
 #include <pam.hxx>
 #include <doc.hxx>
 #include <ndtxt.hxx>
-#include <mdiexp.hxx>           // ...Percent()
+#include <mdiexp.hxx>
 #include <docary.hxx>
 #include <fmtcntnt.hxx>
 #include <frmfmt.hxx>
 #include <wrtasc.hxx>
 
-#include <statstr.hrc>          // ResId for status bar
+#include <statstr.hrc>
 
 //-----------------------------------------------------------------
 
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 06c14cf1f0a9..897006ff1f31 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include <stdio.h>                      // sscanf
+#include <stdio.h>
 #include <hintids.hxx>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 3d40cb8456d4..a81df40f893e 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -40,8 +40,8 @@
 #include <IDocumentUndoRedo.hxx>
 #include <pam.hxx>
 #include <editsh.hxx>
-#include <undobj.hxx>           // fuer Undo Insert-Dokument
-#include <swundo.hxx>           // fuer Undo Insert-Dokument
+#include <undobj.hxx>
+#include <swundo.hxx>
 #include <swtable.hxx>
 #include <tblsel.hxx>
 #include <pagedesc.hxx>
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7272b35c0bb3..787bb0ebc199 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -82,13 +82,13 @@
 #include <IDocumentUndoRedo.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
-#include <mdiexp.hxx>           // ...Percent()
+#include <mdiexp.hxx>
 #include <expfld.hxx>
 #include <poolfmt.hxx>
 #include <pagedesc.hxx>
-#include <IMark.hxx>        // fuer SwBookmark ...
+#include <IMark.hxx>
 #include <docsh.hxx>
-#include <editsh.hxx>       // fuer Start/EndAction
+#include <editsh.hxx>
 #include <docufld.hxx>
 #include <swcss1.hxx>
 #include <htmlvsh.hxx>
@@ -102,7 +102,7 @@
 
 #include <sfx2/viewfrm.hxx>
 
-#include <statstr.hrc>          // ResId fuer Statusleiste
+#include <statstr.hrc>
 #include <swerror.h>
 
 #define FONTSIZE_MASK           7
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index d9e3b8e08368..5a748dcdde74 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -59,10 +59,10 @@
 #include <pam.hxx>
 #include <doc.hxx>
 #include <ndtxt.hxx>
-#include <mdiexp.hxx>       // ...Percent()
+#include <mdiexp.hxx>
 #include <fltini.hxx>
 #include <viewopt.hxx>
-#include <IMark.hxx>        // fuer SwBookmark ...
+#include <IMark.hxx>
 #include <poolfmt.hxx>
 #include <pagedesc.hxx>
 #include <section.hxx>
@@ -74,7 +74,7 @@
 #include <htmlnum.hxx>
 #include <htmlfly.hxx>
 #include <swmodule.hxx>
-#include <statstr.hrc>      // ResId fuer Statusleiste
+#include <statstr.hrc>
 #include <swerror.h>
 #include <rtl/strbuf.hxx>
 
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index f33696ca7f10..c2e043439510 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -23,12 +23,12 @@
 #include <set>
 #include <map>
 #include <vector>
-#include <swtypes.hxx>       //SwTwips
-#include "wwstyles.hxx"      //ww::sti
-#include <rtl/textenc.h>     //rtl_TextEncoding
-#include <tools/gen.hxx>     //Size
+#include <swtypes.hxx>
+#include "wwstyles.hxx"
+#include <rtl/textenc.h>
+#include <tools/gen.hxx>
 #include <filter/msfilter/util.hxx>
-#include <fltshell.hxx>         // fuer den Attribut Stack
+#include <fltshell.hxx>
 #include <redline.hxx>
 #include <shellio.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 4d6d75200657..6e126c97d589 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef _WRT_FN_HXX
 #define _WRT_FN_HXX
-#include "hintids.hxx"      // fuer die Konstanten
+#include "hintids.hxx"
 
 // einige Forward-Deklarationen
 class SwNode;
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 459705f55293..1a8b816d6525 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -48,15 +48,15 @@
 #include <doc.hxx>
 #include <ndtxt.hxx>
 #include <frmatr.hxx>
-#include <fldbas.hxx>           // RES_SETEXPFLD
-#include <charatr.hxx>          // class SwFmtRefMark
-#include <swtable.hxx>          // class SwTableLines, ...
+#include <fldbas.hxx>
+#include <charatr.hxx>
+#include <swtable.hxx>
 #include <tox.hxx>
-#include <expfld.hxx>           // SwExpField
-#include <section.hxx>          // class SwSection
-#include <tblsel.hxx>           // class SwSelBoxes
+#include <expfld.hxx>
+#include <section.hxx>
+#include <tblsel.hxx>
 #include <pagedesc.hxx>
-#include <docsh.hxx>            // class SwDocSh
+#include <docsh.hxx>
 #include <fltshell.hxx>
 #include <viewsh.hxx>
 #include <shellres.hxx>
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 610233a877fc..a5c1e8e38d3c 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -50,7 +50,7 @@
 #include <expfld.hxx>
 #include <docufld.hxx>
 #include <ftninfo.hxx>
-#include <section.hxx>          // class SwSection
+#include <section.hxx>
 #include <fltini.hxx>
 #include <w1par.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx
index 6f00243286b1..ba035c80eb2e 100644
--- a/sw/source/filter/ww1/w1par.cxx
+++ b/sw/source/filter/ww1/w1par.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <pam.hxx>              // fuer SwPam
+#include <pam.hxx>
 #include <doc.hxx>
-#include <ndtxt.hxx>            // class SwTxtNode
-#include <fltini.hxx>           // Ww1Reader
+#include <ndtxt.hxx>
+#include <fltini.hxx>
 #include <w1par.hxx>
 #include <swfltopt.hxx>
-#include <mdiexp.hxx>           // StatLine...()
-#include <swerror.h>            // ERR_WW1_...
-#include <statstr.hrc>          // ResId fuer Statusleiste
+#include <mdiexp.hxx>
+#include <swerror.h>
+#include <statstr.hrc>
 
 //----------------------------------------
 //    Initialisieren der Feld-FilterFlags
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 8bcec465bc1a..b3c58e2e2f63 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -20,10 +20,10 @@
 
 #include "../inc/wwstyles.hxx"
 
-#include <functional>               //std::unary_function
-#include <algorithm>                //std::find_if
+#include <functional>
+#include <algorithm>
 #include "rtl/ustring.hxx"
-#include "staticassert.hxx"      //StaticAssert
+#include "staticassert.hxx"
 
 namespace
 {
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 558bb468cf52..740bdd29c3f8 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -26,30 +26,30 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 
-#include <algorithm>                //std::swap
-#include <functional>               //std::binary_function
-#include <svl/itemiter.hxx>  //SfxItemIter
-#include <svx/svdobj.hxx>        //SdrObject
-#include <svx/svdoole2.hxx>      //SdrOle2Obj
-#include <svx/fmglob.hxx>        //FmFormInventor
-#include <editeng/formatbreakitem.hxx>       //SvxFmtBreakItem
-#include <editeng/tstpitem.hxx>      //SvxTabStopItem
-#include <ndtxt.hxx>             //SwTxtNode
-#include <ndnotxt.hxx>          //SwNoTxtNode
-#include <fmtcntnt.hxx>         //SwFmtCntnt
-#include <swtable.hxx>          //SwTable
-#include <frmfmt.hxx>           //SwFrmFmt
-#include <flypos.hxx>           //SwPosFlyFrms
-#include <fmtanchr.hxx>         //SwFmtAnchor
-#include <ndgrf.hxx>            //SwGrfNode
-#include <fmtfsize.hxx>         //SwFmtFrmSize
-#include <SwStyleNameMapper.hxx> //SwStyleNameMapper
-#include <docary.hxx>            //SwCharFmts
-#include <charfmt.hxx>           //SwCharFmt
-#include <fchrfmt.hxx>           //SwFmtCharFmt
+#include <algorithm>
+#include <functional>
+#include <svl/itemiter.hxx>
+#include <svx/svdobj.hxx>
+#include <svx/svdoole2.hxx>
+#include <svx/fmglob.hxx>
+#include <editeng/formatbreakitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <ndtxt.hxx>
+#include <ndnotxt.hxx>
+#include <fmtcntnt.hxx>
+#include <swtable.hxx>
+#include <frmfmt.hxx>
+#include <flypos.hxx>
+#include <fmtanchr.hxx>
+#include <ndgrf.hxx>
+#include <fmtfsize.hxx>
+#include <SwStyleNameMapper.hxx>
+#include <docary.hxx>
+#include <charfmt.hxx>
+#include <fchrfmt.hxx>
 #include <unotools/streamwrap.hxx>
 #include <numrule.hxx>
-#include <vcl/svapp.hxx>//For i120928
+#include <vcl/svapp.hxx>
 
 using namespace com::sun::star;
 using namespace nsSwGetPoolIdFromName;
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index e411ac8fee03..e026ca513635 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -27,13 +27,13 @@
 
 #include <sfx2/objsh.hxx>
 #include "types.hxx"
-#include <svl/itempool.hxx>     //SfxItemPool
-#include <svl/itemset.hxx>      //SfxItemSet
-#include <format.hxx>               //SwFmt
-#include <node.hxx>                 //SwCntntNode
-#include <pam.hxx>                  //SwPaM
-#include <tools/poly.hxx>           //Polygon, PolyPolygon
-#include <doc.hxx>                  //SwDoc
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <format.hxx>
+#include <node.hxx>
+#include <pam.hxx>
+#include <tools/poly.hxx>
+#include <doc.hxx>
 
 class SwTxtFmtColl;
 class SwCharFmt;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index f10cd83e762f..2803d160a8e6 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -57,7 +57,7 @@
 #include <fmtsrnd.hxx>
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
-#include <fmtfollowtextflow.hxx> // #i30669#
+#include <fmtfollowtextflow.hxx>
 #include <dcontact.hxx>
 #include <frmfmt.hxx>
 #include <flyfrm.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b26b77effbae..95ef3fad8511 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -27,7 +27,7 @@
 #include <algorithm>
 
 #include <hintids.hxx>
-#include <string.h>             // memcpy()
+#include <string.h>
 #include <osl/endian.h>
 #include <docsh.hxx>
 
@@ -77,8 +77,8 @@
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
 #include <tools/urlobj.hxx>
-#include <mdiexp.hxx>           // Progress
-#include <statstr.hrc>          // ResId for the status bar
+#include <mdiexp.hxx>
+#include <statstr.hrc>
 #include <fmtline.hxx>
 #include <fmtfsize.hxx>
 #include <comphelper/extract.hxx>
@@ -111,7 +111,7 @@
 #include "WW8Sttbf.hxx"
 #include <editeng/charrotateitem.hxx>
 #include "WW8FibData.hxx"
-#include "numrule.hxx"//For i120928
+#include "numrule.hxx"
 
 using namespace css;
 using namespace sw::util;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 36892f670e6d..ec9eb54f08b7 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -20,7 +20,7 @@
 #ifndef _WRTWW8_HXX
 #define _WRTWW8_HXX
 
-#include <tools/solar.h>        // UINTXX
+#include <tools/solar.h>
 #include <tools/gen.hxx>
 #include <editeng/editdata.hxx>
 #include <boost/optional.hpp>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 2b00b75a016b..92677df1b81d 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -36,7 +36,7 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <filter/msfilter/msoleexp.hxx>
-#include <editeng/lrspitem.hxx> // SvxLRSpaceItem
+#include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <svx/svdoole2.hxx>
@@ -44,8 +44,8 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <fmtanchr.hxx>
 #include <ndgrf.hxx>
-#include <frmfmt.hxx>       // class SwFlyFrmFmt
-#include <grfatr.hxx>       // class SwCropGrf
+#include <frmfmt.hxx>
+#include <grfatr.hxx>
 #include <ndole.hxx>
 #include <ndtxt.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 1e02d131a585..ca57cf27d2fa 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -88,16 +88,16 @@
 #include <txtfld.hxx>
 #include <txtftn.hxx>
 #include <poolfmt.hxx>
-#include <doc.hxx>          // Doc for footnotes
+#include <doc.hxx>
 #include <docary.hxx>
 #include <pam.hxx>
 #include <paratr.hxx>
-#include <fldbas.hxx>       // for SwField
-#include <docufld.hxx>      // for SwField
+#include <fldbas.hxx>
+#include <docufld.hxx>
 #include <expfld.hxx>
-#include <pagedesc.hxx>     // for SwPageDesc
-#include <flddat.hxx>       // for Date fields
-#include <ndtxt.hxx>        // for Numrules
+#include <pagedesc.hxx>
+#include <flddat.hxx>
+#include <ndtxt.hxx>
 #include <swrect.hxx>
 #include <reffld.hxx>
 #include <ftninfo.hxx>
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 3ebfce2c6590..d7ed633f4ed4 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -58,7 +58,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <svx/xfltrit.hxx>
 #include <filter/msfilter/msdffimp.hxx>
-#include <grfatr.hxx>           // class SwCropGrf
+#include <grfatr.hxx>
 #include <fmtornt.hxx>
 #include <fmtcntnt.hxx>
 #include <frmfmt.hxx>
@@ -70,12 +70,12 @@
 #include <ndtxt.hxx>
 #include <dcontact.hxx>
 #include <docsh.hxx>
-#include <mdiexp.hxx>           // Progress
+#include <mdiexp.hxx>
 #include <fmtcnct.hxx>
 #include "ww8struc.hxx"
 #include "ww8scan.hxx"
-#include "ww8par.hxx"           // class SwWWImplReader
-#include "ww8par2.hxx"          // SwWW8StyInf
+#include "ww8par.hxx"
+#include "ww8par2.hxx"
 #include "ww8graf.hxx"
 #include <fmtinfmt.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index ae756e21ab7f..e63038c8200c 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -30,20 +30,20 @@
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <grfatr.hxx>           // class SwCropGrf
+#include <grfatr.hxx>
 #include <fmtflcnt.hxx>
 #include <fmtanchr.hxx>
 #include <frmfmt.hxx>
 #include <fltshell.hxx>
 #include <pam.hxx>
 #include <doc.hxx>
-#include <ndtxt.hxx>            // class SwTxtNode
-#include <mdiexp.hxx>           // Progress
+#include <ndtxt.hxx>
+#include <mdiexp.hxx>
 #include "writerwordglue.hxx"
 #include "ww8struc.hxx"
 #include "ww8scan.hxx"
-#include "ww8par.hxx"           // class SwWWImplReader
-#include "ww8par2.hxx"          // struct WWFlyPara
+#include "ww8par.hxx"
+#include "ww8par2.hxx"
 #include "ww8graf.hxx"
 #include <vcl/graphicfilter.hxx>
 #include <vcl/wmf.hxx>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 313b423d5e03..b3d3426a5cd3 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -63,8 +63,8 @@
 #include <ftninfo.hxx>
 #include <fmtftn.hxx>
 #include <txtftn.hxx>
-#include <ndtxt.hxx>            // class SwTxtNode
-#include <pagedesc.hxx>         // class SwPageDesc
+#include <ndtxt.hxx>
+#include <pagedesc.hxx>
 #include <paratr.hxx>
 #include <fmtclbl.hxx>
 #include <section.hxx>
@@ -73,10 +73,10 @@
 #include <swfltopt.hxx>
 #include <viewsh.hxx>
 #include <shellres.hxx>
-#include <mdiexp.hxx>           // Progress
-#include <statstr.hrc>          // ResId for Statusbar
-#include <swerror.h>            // ERR_WW8_...
-#include <swtable.hxx>          // class SwTableLines, ...
+#include <mdiexp.hxx>
+#include <statstr.hrc>
+#include <swerror.h>
+#include <swtable.hxx>
 #include <fchrfmt.hxx>
 #include <charfmt.hxx>
 
@@ -91,13 +91,13 @@
 #include <fmtflcnt.hxx>
 #include <txatbase.hxx>
 
-#include "ww8par2.hxx"          // class WW8RStyle, class WW8AnchorPara
+#include "ww8par2.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
-#include <svl/itemiter.hxx>     //SfxItemIter
+#include <svl/itemiter.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <basic/basmgr.hxx>
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 789a5a6b1534..ffe4317e8112 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -32,15 +32,15 @@
 #include <map>
 #include <utility>
 
-#include "ww8struc.hxx"     // WW8_BRC
-#include "ww8scan.hxx"  // WW8Fib
+#include "ww8struc.hxx"
+#include "ww8scan.hxx"
 #include "ww8glsy.hxx"
 #include "wrtww8.hxx"
 #include "../inc/msfilter.hxx"
 #include <xmloff/odffields.hxx>
 #include <IMark.hxx>
 
-#include <swtypes.hxx>  // enum RndStdIds
+#include <swtypes.hxx>
 #include <fmtfsize.hxx>
 #include <fmtornt.hxx>
 #include <fmtsrnd.hxx>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 70492ba5512a..b4ddec9074c5 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -36,14 +36,14 @@
 #include <editeng/charrotateitem.hxx>
 #include <editeng/pgrditem.hxx>
 #include <msfilter.hxx>
-#include <pam.hxx>              // fuer SwPam
+#include <pam.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
-#include <ndtxt.hxx>            // class SwTxtNode
-#include <paratr.hxx>           // SwNumRuleItem
-#include <poolfmt.hxx>          // RES_POOLCOLL_STANDARD
-#include <swtable.hxx>          // class SwTableLines, ...
-#include <tblsel.hxx>           // class _SwSelBox
+#include <ndtxt.hxx>
+#include <paratr.hxx>
+#include <poolfmt.hxx>
+#include <swtable.hxx>
+#include <tblsel.hxx>
 #include <mdiexp.hxx>
 #include <fmtpdsc.hxx>
 #include <txtftn.hxx>
@@ -52,14 +52,14 @@
 #include <fmtftn.hxx>
 #include <charfmt.hxx>
 #include <SwStyleNameMapper.hxx>
-#include <fltshell.hxx>         // for the attribute stack
+#include <fltshell.hxx>
 #include <fmtanchr.hxx>
 #include <fmtrowsplt.hxx>
-#include <fmtfollowtextflow.hxx> // #i33818#
+#include <fmtfollowtextflow.hxx>
 #include <numrule.hxx>
 #include "../inc/wwstyles.hxx"
 #include "writerhelper.hxx"
-#include "ww8struc.hxx"         // struct TC
+#include "ww8struc.hxx"
 #include "ww8par.hxx"
 #include "ww8par2.hxx"
 
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index ca8a31da5e71..99342b30f805 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -20,14 +20,14 @@
 #ifndef _WW8PAR2_HXX
 #define _WW8PAR2_HXX
 
-#include <swtypes.hxx>  // enum RndStdIds
+#include <swtypes.hxx>
 #include <fmtfsize.hxx>
 #include <fmtornt.hxx>
 #include <fmtsrnd.hxx>
 #include <editeng/lrspitem.hxx>
 
-#include "ww8scan.hxx"  // class WW8Style
-#include "ww8par.hxx"   // WW8_BRC5
+#include "ww8scan.hxx"
+#include "ww8par.hxx"
 
 class WW8RStyle;
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 9e877ad84b74..29dbf460febf 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -76,7 +76,7 @@
 #include "writerhelper.hxx"
 #include "writerwordglue.hxx"
 #include "ww8par.hxx"
-#include "ww8par2.hxx"  // wg. Listen-Attributen in Styles
+#include "ww8par2.hxx"
 
 #include <IMark.hxx>
 #include <unotools/fltrcfg.hxx>
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index e71bfa86854d..be0ca0f0040d 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -40,8 +40,8 @@
 #include <frmfmt.hxx>
 #include <pam.hxx>
 #include <ndgrf.hxx>
-#include <docsh.hxx>            // fuer Ole-Node
-#include <mdiexp.hxx>           // Progress
+#include <docsh.hxx>
+#include <mdiexp.hxx>
 #include <redline.hxx>
 #include <fltshell.hxx>
 #include <unodraw.hxx>
@@ -53,7 +53,7 @@
 
 #include "ww8scan.hxx"
 #include "ww8par.hxx"
-#include "ww8par2.hxx"          // WWFlyPara::BoxUpWidth()
+#include "ww8par2.hxx"
 
 struct OLE_MFP
 {
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 5a72a197ff10..af740e6ed9cc 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -43,18 +43,18 @@
 #include <editeng/langitem.hxx>
 #include <fmtfld.hxx>
 #include <fmtanchr.hxx>
-#include <pam.hxx>              // fuer SwPam
+#include <pam.hxx>
 #include <doc.hxx>
-#include <charatr.hxx>          // class SwFmtFld
-#include <flddat.hxx>           // class SwDateTimeField
-#include <docufld.hxx>          // class SwPageNumberField
-#include <reffld.hxx>           // class SwGetRefField
+#include <charatr.hxx>
+#include <flddat.hxx>
+#include <docufld.hxx>
+#include <reffld.hxx>
 #include <IMark.hxx>
-#include <expfld.hxx>           // class SwSetExpField
-#include <dbfld.hxx>            // class SwDBField
+#include <expfld.hxx>
+#include <dbfld.hxx>
 #include <usrfld.hxx>
 #include <tox.hxx>
-#include <section.hxx>          // class SwSection
+#include <section.hxx>
 #include <ndtxt.hxx>
 #include <fmtinfmt.hxx>
 #include <chpfld.hxx>
@@ -70,7 +70,7 @@
 #include <pagedesc.hxx>
 #include <SwStyleNameMapper.hxx>
 
-#include "ww8scan.hxx"          // WW8FieldDesc
+#include "ww8scan.hxx"
 #include "ww8par.hxx"
 #include "ww8par2.hxx"
 #include "writerhelper.hxx"
@@ -78,7 +78,7 @@
 #include <unotools/fltrcfg.hxx>
 #include <xmloff/odffields.hxx>
 
-#include <algorithm> // #i24377#
+#include <algorithm>
 
 #define MAX_FIELDLEN 64000
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 90038c8412b8..3e13770f71b6 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -70,10 +70,10 @@
 #include <doctok/sprmids.hxx>
 #include <fmtpdsc.hxx>
 #include <node.hxx>
-#include <ndtxt.hxx> // SwTxtNode, siehe unten: JoinNode()
-#include <pam.hxx>              // fuer SwPam
+#include <ndtxt.hxx>
+#include <pam.hxx>
 #include <doc.hxx>
-#include <pagedesc.hxx>         // class SwPageDesc
+#include <pagedesc.hxx>
 #include <fmtanchr.hxx>
 #include <fmtcntnt.hxx>
 #include <fchrfmt.hxx>
@@ -90,11 +90,11 @@
 #include <tgrditem.hxx>
 #include <hfspacingitem.hxx>
 #include <swtable.hxx>
-#include <fltini.hxx>   //For CalculateFlySize
+#include <fltini.hxx>
 #include "writerhelper.hxx"
 #include "writerwordglue.hxx"
 #include "ww8scan.hxx"
-#include "ww8par2.hxx"          // class WW8RStyle, class WwAnchorPara
+#include "ww8par2.hxx"
 #include "ww8graf.hxx"
 
 // #i27767#
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index d999f987f4fc..c89faf7f1852 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -33,8 +33,8 @@
 #define OSL_ENSURE( a, b )
 
 #else                       // dump
-#include <swerror.h>        // ERR_WW6_...
-#include <swtypes.hxx>      // DELETEZ
+#include <swerror.h>
+#include <swtypes.hxx>
 
 #endif                      // dump
 #include <comphelper/processfactory.hxx>
@@ -42,7 +42,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <i18nlangtag/lang.h>
 #include <editeng/unolingu.hxx>
-#include <vcl/svapp.hxx>    // Application  #i90932#
+#include <vcl/svapp.hxx>
 
 #include <stdio.h>
 
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 55c2d5b2fcf2..e6fa8c2eba62 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -27,13 +27,13 @@
 #include <vector>
 #include <list>
 #include <algorithm>
-#include <tools/solar.h>        // UINTXX
+#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include "rtl/ustring.hxx"
 #include "hash_wrap.hxx"
 #include "sortedarray.hxx"
 
-#include "ww8struc.hxx"         // FIB, STSHI, STD...
+#include "ww8struc.hxx"
 #include <types.hxx>
 
 #include <unomid.h>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 9c955e16195b..5fdc03a60767 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -68,7 +68,7 @@
 #include <svx/svditer.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
-#include <sfx2/docfilt.hxx> // #i70748#
+#include <sfx2/docfilt.hxx>
 #include <istyleaccess.hxx>
 
 #include <sfx2/DocumentMetadataAccess.hxx>
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index d26eb60b8371..1a1e200546f6 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -61,7 +61,7 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
-#include <pausethreadstarting.hxx> // #i73788#
+#include <pausethreadstarting.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 618748fe1ac4..51a94811dee6 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -59,7 +59,7 @@
 // for locking SolarMutex: svapp + mutex
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <unotxdoc.hxx>    // for initXForms()
+#include <unotxdoc.hxx>
 
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xformsimport.hxx>
diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx
index 1b38dd7bc099..821887085135 100644
--- a/sw/source/filter/xml/xmlithlp.hxx
+++ b/sw/source/filter/xml/xmlithlp.hxx
@@ -22,8 +22,8 @@
 
 #include <sal/types.h>
 #include <xmloff/xmlement.hxx>
-#include "hintids.hxx"  // for following include
-#include <editeng/brushitem.hxx> // for SvxGraphicsPosition
+#include "hintids.hxx"
+#include <editeng/brushitem.hxx>
 
 namespace editeng { class SvxBorderLine; }
 
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 4fa9d73b4dcf..470c5c2b4154 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -45,7 +45,7 @@
 #include "swddetbl.hxx"
 #include <ndole.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <sfx2/linkmgr.hxx>  // for cTokenSeparator
+#include <sfx2/linkmgr.hxx>
 #include "unotbl.hxx"
 #include "xmltexte.hxx"
 #include "xmlexp.hxx"
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 2e129a2123c5..fcc73bd3ff1e 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -48,7 +48,7 @@
 #include "cellatr.hxx"
 #include "swddetbl.hxx"
 #include "ddefld.hxx"
-#include <sfx2/linkmgr.hxx>  // for cTokenSeparator
+#include <sfx2/linkmgr.hxx>
 #include "xmlimp.hxx"
 #include "xmltbli.hxx"
 
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index cf21d0f3fb06..d73fcfb8edaf 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -55,21 +55,21 @@
 #include <srcview.hxx>
 #include <wrtsh.hxx>
 #include <docsh.hxx>
-#include <cmdid.h>          // Function-Ids
+#include <cmdid.h>
 #include <initui.hxx>
 #include <uitool.hxx>
 #include <swmodule.hxx>
 #include <wdocsh.hxx>
 #include <wview.hxx>
 #include <usrpref.hxx>
-#include <gloslst.hxx>      // SwGlossaryList
-#include <glosdoc.hxx>      // SwGlossaryList
+#include <gloslst.hxx>
+#include <glosdoc.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <cfgitems.hxx>
 #include <prtopt.hxx>
 #include <modcfg.hxx>
-#include <globals.h>        // e.g. global Constants
+#include <globals.h>
 #include <app.hrc>
 #include <fontcfg.hxx>
 #include <barcfg.hxx>
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 238229ee05e5..4c1c2415afe2 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cmdid.h>          // Function-Ids
+#include <cmdid.h>
 
 
 #include <com/sun/star/i18n/ScriptType.hpp>
 
 #include <hintids.hxx>
-#include <cmdid.h>          // Funktion-Ids
+#include <cmdid.h>
 #include <vcl/msgbox.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
@@ -48,8 +48,8 @@
 #include <wrtsh.hxx>
 #include <IDocumentDeviceAccess.hxx>
 #include <uitool.hxx>
-#include <initui.hxx>                   // for ::GetGlossaries()
-#include <fldbas.hxx>      //for UpdateFields
+#include <initui.hxx>
+#include <fldbas.hxx>
 #include <wview.hxx>
 #include <cfgitems.hxx>
 #include <prtopt.hxx>
@@ -62,7 +62,7 @@
 #include <unotools/lingucfg.hxx>
 #include <editeng/unolingu.hxx>
 #include <globals.hrc>
-#include <globals.h>        // e.g. global Constants
+#include <globals.h>
 #include <svl/slstitm.hxx>
 #include "swabstdlg.hxx"
 #include <swwrtshitem.hxx>
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index cec89922bc82..0a601cad2d80 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -55,18 +55,18 @@
 #include <swwait.hxx>
 #include <printdata.hxx>
 #include <frmatr.hxx>
-#include <view.hxx>         // for the current view
+#include <view.hxx>
 #include <edtwin.hxx>
 #include <PostItMgr.hxx>
-#include <wrtsh.hxx>        // connection to Core
-#include <docsh.hxx>        // document creation
+#include <wrtsh.hxx>
+#include <docsh.hxx>
 #include <basesh.hxx>
 #include <viewopt.hxx>
 #include <wdocsh.hxx>
 #include <swmodule.hxx>
 #include <globdoc.hxx>
 #include <usrpref.hxx>
-#include <shellio.hxx>      // I/O
+#include <shellio.hxx>
 #include <docstyle.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
@@ -83,7 +83,7 @@
 #include <ftnidx.hxx>
 #include <fldbas.hxx>
 #include <docary.hxx>
-#include <swerror.h>        // Error messages
+#include <swerror.h>
 #include <helpid.h>
 #include <cmdid.h>
 #include <globals.hrc>
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index d2f9b7cbf052..d520ea76fca3 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -62,8 +62,8 @@
 #include <comphelper/classids.hxx>
 #include <fmtcol.hxx>
 #include <swevent.hxx>
-#include <view.hxx>         // for the current view
-#include <docsh.hxx>        // creation of documents
+#include <view.hxx>
+#include <docsh.hxx>
 #include <docary.hxx>
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index d24c85aac1c7..b070e8bee8f2 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -64,7 +64,7 @@
 #include "docstyle.hxx"
 #include "uiitems.hxx"
 #include "fmtcol.hxx"
-#include "frmmgr.hxx"       //SwFrmValid
+#include "frmmgr.hxx"
 #include "swevent.hxx"
 #include "edtwin.hxx"
 #include "unochart.hxx"
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index 9cfda2491094..49836ac4d553 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -22,7 +22,7 @@
 #include "globals.hrc"
 #include "app.hrc"
 #include "swerror.h"
-#include "comcore.hrc" // MS:   Why are there resources at the Core-Side now
+#include "comcore.hrc"
 
 String STR_COMCORE_READERROR
 {
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 7b59769508f1..6fd4075676b0 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -28,7 +28,7 @@
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
@@ -50,7 +50,7 @@
 #include <docsh.hxx>
 #include <dbmgr.hxx>
 #include <uinums.hxx>
-#include <prtopt.hxx>   // for PrintOptions
+#include <prtopt.hxx>
 #include <navicfg.hxx>
 #include <doc.hxx>
 #include <cmdid.h>
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index cab58197017d..b0f44e7e4bf8 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -31,7 +31,7 @@
 #include <svx/insctrl.hxx>
 #include <svx/selctrl.hxx>
 #include <svx/linectrl.hxx>
-#include <svx/tbxctl.hxx>            // at the moment wrong include-protection!
+#include <svx/tbxctl.hxx>
 #include <svx/fillctrl.hxx>
 #include <svx/tbcontrl.hxx>
 #include <svx/verttexttbxctrl.hxx>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 5df7743faef2..58c19adb778c 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -35,7 +35,7 @@
 #include <uitool.hxx>
 #include <fmtinfmt.hxx>
 #include <macassgn.hxx>
-#include <chrdlg.hxx>       // the dialog
+#include <chrdlg.hxx>
 #include <swmodule.hxx>
 #include <poolfmt.hxx>
 
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7cdca6a5c1a9..d7efd5391f70 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -30,7 +30,7 @@
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
 #include <uitool.hxx>
-#include <cfgitems.hxx> //Items for Sw-pages
+#include <cfgitems.hxx>
 #include <poolfmt.hxx>
 #include <uiitems.hxx>
 #include <initui.hxx>
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index cf1ffd580d48..f708f9e300b3 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -29,7 +29,7 @@
 
 #include <tools/resid.hxx>
 #include <fmtornt.hxx>
-#include <swtypes.hxx>      // empty string
+#include <swtypes.hxx>
 #include <wrtsh.hxx>
 #include <uinums.hxx>
 #include <poolfmt.hxx>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 527dee034415..575ae3832f2c 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -33,7 +33,7 @@
 #include <dbmgr.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <wrtsh.hxx>
-#include "vcl/msgbox.hxx" // RET_CANCEL
+#include "vcl/msgbox.hxx"
 
 #include <helpid.h>
 #include <mailmergewizard.hrc>
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index dd7b1ab47cc5..0985ea99c0f3 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -41,7 +41,7 @@
 #include <view.hxx>
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <column.hxx>
 #include <fmtfsize.hxx>
 #include <shellio.hxx>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 673f0189b8fb..9961006afa69 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -41,13 +41,13 @@
 #include <IMark.hxx>
 #include <section.hxx>
 #include <docary.hxx>
-#include <doc.hxx>                      // for the SwSectionFmt-Array
+#include <doc.hxx>
 #include <basesh.hxx>
 #include <wdocsh.hxx>
 #include <view.hxx>
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <column.hxx>
 #include <fmtfsize.hxx>
 #include <shellio.hxx>
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 257be043a101..fc584fc37e11 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -33,15 +33,15 @@
 #include <fmtcol.hxx>
 #include <docary.hxx>
 #include <wrtsh.hxx>
-#include <uitool.hxx>                   // error messages
+#include <uitool.hxx>
 #include <view.hxx>
 #include <swevent.hxx>
 #include <gloshdl.hxx>
 #include <glosdoc.hxx>
 #include <shellio.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <expfld.hxx>
-#include <initui.hxx>                   // for ::GetGlossaries()
+#include <initui.hxx>
 #include <gloslst.hxx>
 #include <swdtflvr.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index d3344b2ad09a..dbf5f29fedf1 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -90,8 +90,8 @@
 #include <view.hxx>
 #include <docsh.hxx>
 #include <wdocsh.hxx>
-#include <fldbas.hxx>       //DDE
-#include <swundo.hxx>       // for Undo-Ids
+#include <fldbas.hxx>
+#include <swundo.hxx>
 #include <pam.hxx>
 #include <ndole.hxx>
 #include <swwait.hxx>
@@ -100,7 +100,7 @@
 #include <SwCapObjType.hxx>
 #include <cmdid.h>
 #include <dochdl.hrc>
-#include <comcore.hrc> // #111827#
+#include <comcore.hrc>
 #include <sot/stg.hxx>
 #include <svx/svditer.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index d08226efa105..2b471485c8f5 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -42,7 +42,7 @@
 #include <editeng/editeng.hxx>
 #include <editeng/editobj.hxx>
 
-#include <docufld.hxx> // SwPostItField
+#include <docufld.hxx>
 #include <txtfld.hxx>
 #include <ndtxt.hxx>
 #include <view.hxx>
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 9ced231648c3..62c5bb1d8444 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -133,7 +133,7 @@
 
 #include <IMark.hxx>
 #include <doc.hxx>
-#include <txatbase.hxx> // FIXME this sucks
+#include <txatbase.hxx>
 #include <xmloff/odffields.hxx>
 
 #include <PostItMgr.hxx>
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index edc3bd0cb45e..b6874c3be867 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -31,7 +31,7 @@
 #include "modcfg.hxx"
 #include "swtable.hxx"
 #include "docsh.hxx"
-#include "pagedesc.hxx"     // Aktuelles Seitenformat
+#include "pagedesc.hxx"
 #include <frmatr.hxx>
 #include <editeng/frmdiritem.hxx>
 
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index f349fefaa68a..6897d9608fc1 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -51,9 +51,9 @@
 #include <svl/zformat.hxx>
 #include <vcl/mnemonic.hxx>
 #include <view.hxx>
-#include <wrtsh.hxx>        // active window
-#include <doc.hxx>      // active window
-#include <docsh.hxx>        // active window
+#include <wrtsh.hxx>
+#include <doc.hxx>
+#include <docsh.hxx>
 #include <swmodule.hxx>
 #include <charatr.hxx>
 #include <fmtinfmt.hxx>
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx
index de49dd77bfab..5510639a0880 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/ui/fldui/xfldui.cxx
@@ -29,7 +29,7 @@
 #include <comphelper/processfactory.hxx>
 #include <fldmgr.hxx>
 #include <dbmgr.hxx>
-#include <wrtsh.hxx>        // active window
+#include <wrtsh.hxx>
 #include <view.hxx>
 #include <swmodule.hxx>
 
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 9ed8c830c5d7..9d05aa567f95 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -36,17 +36,17 @@
 #include <viewopt.hxx>
 #include <pgfnote.hxx>
 #include <pggrid.hxx>
-#include <tmpdlg.hxx>       // the dialog
-#include <column.hxx>       // columns
-#include <drpcps.hxx>       // initials
-#include <frmpage.hxx>      // frames
-#include <wrap.hxx>         // frames
-#include <frmmgr.hxx>       // frames
-#include <ccoll.hxx>        // CondColl
+#include <tmpdlg.hxx>
+#include <column.hxx>
+#include <drpcps.hxx>
+#include <frmpage.hxx>
+#include <wrap.hxx>
+#include <frmmgr.hxx>
+#include <ccoll.hxx>
 #include <swuiccoll.hxx>
-#include <docstyle.hxx>     //
-#include <fmtcol.hxx>       //
-#include <macassgn.hxx>     //
+#include <docstyle.hxx>
+#include <fmtcol.hxx>
+#include <macassgn.hxx>
 #include <poolfmt.hxx>
 #include <uitool.hxx>
 #include <shellres.hxx>
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index 372df26ee9e4..1b0c10bbd706 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -24,7 +24,7 @@
 
 #include <vcl/button.hxx>
 
-#include "swlbox.hxx"       // SwComboBox
+#include "swlbox.hxx"
 
 class SwWrtShell;
 class SfxRequest;
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 9d8d4ddcbf64..3ae614e92609 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef _CONTENT_HXX
 #define _CONTENT_HXX
-#include <limits.h>     // USHRT_MAX
+#include <limits.h>
 #include "swcont.hxx"
 
 #include <vcl/menu.hxx>
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index bdd3351ebf6c..c1577367e84a 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -35,7 +35,7 @@
 
 #include <vcl/field.hxx>
 
-#include "swtypes.hxx"      //for MAXLEVEL
+#include "swtypes.hxx"
 #include <numprevw.hxx>
 #include <numberingtypelistbox.hxx>
 #include "rtl/ustring.hxx"
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index 1466a809668c..02ac96489243 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -25,7 +25,7 @@
 #include <sfx2/objsh.hxx>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weakref.hxx>
 
 class SwXTextView;
diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx
index 9237315ecec3..614878ee50ba 100644
--- a/sw/source/ui/inc/unoatxt.hxx
+++ b/sw/source/ui/inc/unoatxt.hxx
@@ -31,9 +31,9 @@
 #include <com/sun/star/text/XText.hpp>
 #include <svl/itemprop.hxx>
 #include <svl/lstner.hxx>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase6.hxx>
 #include <svtools/unoevent.hxx>
 class SwTextBlocks;
 class SwGlossaries;
diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx
index 6ac450e9a164..706e2b6a5c6c 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/ui/inc/unomailmerge.hxx
@@ -21,9 +21,9 @@
 #define _UNOMAILMERGE_HXX_
 
 #include <functional>
-#include <cppuhelper/implbase5.hxx> // WeakImplHelper4
-#include <cppuhelper/interfacecontainer.hxx>    // OMultiTypeInterfaceContainerHelperVar
-#include <unotools/configitem.hxx>  // !! needed for OMultiTypeInterfaceContainerHelperVar !!
+#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <unotools/configitem.hxx>
 
 
 #include <com/sun/star/task/XJob.hpp>
diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/ui/inc/unomod.hxx
index ef7c511c4370..1ad40b363eb5 100644
--- a/sw/source/ui/inc/unomod.hxx
+++ b/sw/source/ui/inc/unomod.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <comphelper/ChainablePropertySet.hxx>
 #include <comphelper/SettingsHelper.hxx>
 #include <usrpref.hxx>
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 30c5fb17c4a4..1ab5918adbbb 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
-#include <cppuhelper/implbase8.hxx> // helper for implementations
+#include <cppuhelper/implbase8.hxx>
 #include <svl/itemprop.hxx>
 #include "calbck.hxx"
 #include "TextCursorHelper.hxx"
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 19fae85694b9..7a717fd42939 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -40,7 +40,7 @@
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <multmrk.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <cmdid.h>
 #include <index.hrc>
 #include <idxmrk.hrc>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index e3d9c951ea04..5741b629b3bf 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -45,7 +45,7 @@
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <multmrk.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <cmdid.h>
 #include <app.hrc>
 #include <index.hrc>
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 3472ba542c58..4f5de524200a 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -20,7 +20,7 @@
 #include <hintids.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <swundo.hxx>         // for Undo-Ids
+#include <swundo.hxx>
 #include <globals.hrc>
 #include <splargs.hxx>
 
@@ -34,7 +34,7 @@
 #include <sdrhhcwrap.hxx>
 #include <doc.hxx>
 #include <docsh.hxx>
-#include <mdiexp.hxx>       // Progress
+#include <mdiexp.hxx>
 #include <edtwin.hxx>
 #include <crsskip.hxx>
 #include <index.hxx>
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 4e8cfd5da4de..474179be91c9 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -23,7 +23,7 @@
 #include "comcore.hrc"
 #include "crsskip.hxx"
 #include "doc.hxx"
-#include "docsh.hxx"        //CheckSpellChanges
+#include "docsh.hxx"
 #include "edtwin.hxx"
 #include "helpid.h"
 #include "hintids.hxx"
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index 703cef2a4853..f8ffa1a1c75c 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -34,11 +34,11 @@
 #include <unotools/localedatawrapper.hxx>
 #include <sdrhhcwrap.hxx>
 #include <frmfmt.hxx>
-#include <docsh.hxx>        //     "     "     "
-#include <wrtsh.hxx>        //  MakeVisible
+#include <docsh.hxx>
+#include <wrtsh.hxx>
 #include <view.hxx>
-#include <dcontact.hxx>     // Spelling von DrawObj
-#include <doc.hxx>        //     "     "     "
+#include <dcontact.hxx>
+#include <doc.hxx>
 #include <docary.hxx>
 #include <edtwin.hxx>
 
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index d84684739dce..93e74980dd3e 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -25,9 +25,9 @@
 
 #include "view.hxx"
 #include "basesh.hxx"
-#include "wrtsh.hxx"        //
+#include "wrtsh.hxx"
 #include "cmdid.h"
-#include "bookmark.hxx"     // SwInsertBookmarkDlg
+#include "bookmark.hxx"
 #include "IMark.hxx"
 #include "globals.hrc"
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index b939e4ad409b..629a3190e808 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -52,7 +52,7 @@
 #include <glossary.hxx>
 #include <gloshdl.hxx>
 #include <glosbib.hxx>
-#include <initui.hxx>                   // for ::GetGlossaries()
+#include <initui.hxx>
 #include <glosdoc.hxx>
 #include <macassgn.hxx>
 #include <swevent.hxx>
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index c7d43825ddb1..d2617851130f 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -41,7 +41,7 @@
 #include <IDocumentUndoRedo.hxx>
 #include <glosdoc.hxx>
 #include <shellio.hxx>
-#include <initui.hxx>                   // for ::GetGlossaries()
+#include <initui.hxx>
 #include <cmdid.h>
 #include <swerror.h>
 #include <misc.hrc>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6947ff451a10..dab46835c456 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -42,7 +42,7 @@
 #include <viewopt.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <helpid.h>
-#include <globals.hrc>      // for template name 'none'
+#include <globals.hrc>
 #include <misc.hrc>
 #include <paratr.hxx>
 
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 51da82c94dab..16888cdcc2f7 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -21,7 +21,7 @@
 #include <hintids.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>               // XColorList
+#include <svx/xtable.hxx>
 #include <sal/macros.h>
 #include <vcl/field.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 2926d96353cf..5480849c1de2 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -101,7 +101,7 @@
 #include "table.hrc"
 #include <modcfg.hxx>
 #include <instable.hxx>
-#include <svx/fmshell.hxx> // for FN_XFORMS_DESIGN_MODE
+#include <svx/fmshell.hxx>
 #include <SwRewriter.hxx>
 #include <comcore.hrc>
 
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index eb8ed5e6de0f..1d2a9828b984 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -82,7 +82,7 @@
 #include <edtwin.hxx>
 #include <globals.hrc>
 #include <hintids.hxx>
-#include <initui.hxx>               // for SpellPointer
+#include <initui.hxx>
 #include <langhelper.hxx>
 #include <chrdlgmodes.hxx>
 #include <pardlg.hxx>
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index eb960c506fb4..acba5599fa90 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -50,7 +50,7 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <viewopt.hxx>
-#include <initui.hxx>               // for SpellPointer
+#include <initui.hxx>
 #include <drwtxtsh.hxx>
 #include <swundo.hxx>
 #include <breakit.hxx>
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 0637abce40dc..66b1f20a60d4 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -19,7 +19,7 @@
 
 
 #include <crsskip.hxx>
-#include <hintids.hxx>  //_always_ before the solar-items
+#include <hintids.hxx>
 
 #include <sfx2/lnkbase.hxx>
 #include <fmtfld.hxx>
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index 4ceb302e907f..054bbcfe61b4 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -32,7 +32,7 @@
 #include "cmdid.h"
 #include "view.hxx"
 #include "wrtsh.hxx"
-#include "swundo.hxx"                   // for Undo-Ids
+#include "swundo.hxx"
 #include "textsh.hxx"
 #include "idxmrk.hxx"
 #include "cnttab.hxx"
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 49f248e056f7..bbbb1b713f25 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -74,7 +74,7 @@
 #include <textsh.hxx>
 #include <frmfmt.hxx>
 #include <tablemgr.hxx>
-#include <swundo.hxx>       // for Undo-IDs
+#include <swundo.hxx>
 #include <shellio.hxx>
 #include <frmdlg.hxx>
 #include <usrpref.hxx>
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 5f7e8ae93fe7..75c263fd8b8d 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -68,7 +68,7 @@
 #include <docstat.hxx>
 #include <outline.hxx>
 #include <tablemgr.hxx>
-#include <swundo.hxx>       // for Undo-IDs
+#include <swundo.hxx>
 #include <reffld.hxx>
 #include <docsh.hxx>
 #include <mdiexp.hxx>
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 52e87e203391..dc4b6528c962 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -70,7 +70,7 @@
 #include <sfx2/msg.hxx>
 #include <shellio.hxx>
 
-#include <cmdid.h>          // FN_       ...
+#include <cmdid.h>
 #include <helpid.h>
 #include <globals.hrc>
 #include <shells.hrc>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index bcb06f67b3c2..721b200d864a 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -51,7 +51,7 @@
 #include "docsh.hxx"
 #include "doc.hxx"
 #include "globals.hrc"
-#include "cmdid.h"          // FN_       ...
+#include "cmdid.h"
 #include "globdoc.hxx"
 #include "wview.hxx"
 #include "shells.hrc"
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 64fb3968a8af..05fa81f48fb0 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -40,24 +40,24 @@
 #include <editeng/SpellPortions.hxx>
 #include <swmodule.hxx>
 #include <swwait.hxx>
-#include <initui.hxx>               // for SpellPointer
+#include <initui.hxx>
 #include <uitool.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <basesh.hxx>
-#include <docsh.hxx>                // CheckSpellChanges
-#include <viewopt.hxx>              // Viewoptions
-#include <swundo.hxx>               // for Undo-Ids
-#include <hyp.hxx>                  // hyphenation
-#include <olmenu.hxx>               // PopupMenu for OnlineSpelling
-#include <pam.hxx>                  // Spelling: Multiselection
+#include <docsh.hxx>
+#include <viewopt.hxx>
+#include <swundo.hxx>
+#include <hyp.hxx>
+#include <olmenu.hxx>
+#include <pam.hxx>
 #include <edtwin.hxx>
 #include <crsskip.hxx>
 #include <ndtxt.hxx>
 #include <vcl/lstbox.hxx>
 #include <cmdid.h>
 #include <globals.hrc>
-#include <comcore.hrc>              // STR_MULT_INTERACT_SPELL_WARN
+#include <comcore.hrc>
 #include <view.hrc>
 #include <hhcwrp.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
@@ -76,7 +76,7 @@
 #include <rtl/ustring.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
-#include "stmenu.hxx"              // PopupMenu for smarttags
+#include "stmenu.hxx"
 #include <svx/dialogs.hrc>
 #include <svtools/langtab.hxx>
 #include <unomid.h>
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index c92d90a78d50..58f02b262ee7 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -48,7 +48,7 @@
 #include <workctrl.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <uitool.hxx>
 #include <cmdid.h>
 #include <docsh.hxx>
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index e5c4f30a23e6..513cc515ea63 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -45,8 +45,8 @@
 #include "cmdid.h"
 #include "viewopt.hxx"
 #include "tabcol.hxx"
-#include "frmfmt.hxx"       // Current format
-#include "pagedesc.hxx"     // Current page format
+#include "frmfmt.hxx"
+#include "pagedesc.hxx"
 #include "wview.hxx"
 #include "fmtcol.hxx"
 #include "section.hxx"
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index c68b141dc80f..f1a75fe0bf73 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -22,7 +22,7 @@
 #include <svl/itemprop.hxx>
 #include <svl/urihelper.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include <tools/shl.hxx>    // GetAppData
+#include <tools/shl.hxx>
 #include <unotools/tempfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index a051c7014f3a..1242e3e8abdc 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -50,7 +50,7 @@
 #include <unosrch.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/objsh.hxx>   // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell)
+#include <sfx2/objsh.hxx>
 #include <unoprnms.hxx>
 #include <unostyle.hxx>
 #include <unodraw.hxx>
@@ -107,14 +107,14 @@
 #include <numrule.hxx>
 
 #include <editeng/langitem.hxx>
-#include <docary.hxx>      //SwCharFmts
+#include <docary.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 #include <format.hxx>
-#include <charfmt.hxx>    //SwCharFmt
-#include <fmtcol.hxx>     //SwTxtFmtColl
-#include <unostyle.hxx>   //SwAutoStyleFamily
-#include <istyleaccess.hxx> // handling of automatic styles
+#include <charfmt.hxx>
+#include <fmtcol.hxx>
+#include <unostyle.hxx>
+#include <istyleaccess.hxx>
 
 #include <svl/stylepool.hxx>
 #include <swatrset.hxx>
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx
index 54065a3f29fe..b4e545fa6f77 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/ui/utlui/navicfg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <swtypes.hxx>  // for pathfinder
+#include <swtypes.hxx>
 #include <navicfg.hxx>
 #include <swcont.hxx>
 #include <osl/diagnose.h>
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 8b6534cca4eb..3ff736cfa376 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -30,7 +30,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dockwin.hxx>
 #include <vcl/toolbox.hxx>
-#include <swtypes.hxx>  // for pathfinder
+#include <swtypes.hxx>
 #include <swmodule.hxx>
 #include <view.hxx>
 #include <navicfg.hxx>
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 30549452c6d1..87bd107c4e59 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -24,7 +24,7 @@
 #include <svl/eitem.hxx>
 #include <svx/viewlayoutitem.hxx>
 #include <utlui.hrc>
-#include <swtypes.hxx>  // for pathfinder
+#include <swtypes.hxx>
 
 SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem );
 
diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx
index 00ce8a75a814..80958cb8740e 100644
--- a/sw/source/ui/web/wtextsh.cxx
+++ b/sw/source/ui/web/wtextsh.cxx
@@ -20,7 +20,7 @@
 #include "hintids.hxx"
 #include <sfx2/objface.hxx>
 #include <sfx2/app.hxx>
-#include <svl/srchitem.hxx> //***
+#include <svl/srchitem.hxx>
 #include <basic/sbxvar.hxx>
 #include <svx/svxids.hrc>
 
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index f19455e0d681..79a948480c74 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -20,7 +20,7 @@
 #include <wrtsh.hxx>
 #include <crsskip.hxx>
 #include <swcrsr.hxx>
-#include <editeng/lrspitem.hxx> // #i23725#
+#include <editeng/lrspitem.hxx>
 // #134369#
 #include <view.hxx>
 #include <drawbase.hxx>
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index c55c1e59d30a..8eb0d6a53392 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -33,7 +33,7 @@
 #include <mdiexp.hxx>
 #include <fmtcol.hxx>
 #include <frmfmt.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <swevent.hxx>
 #include <swdtflvr.hxx>
 #include <crsskip.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 8b974bda7715..03b8ad2b663b 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -70,7 +70,7 @@
 #include <frmmgr.hxx>
 #include <shellio.hxx>
 #include <uinums.hxx>
-#include <swundo.hxx>  // for Undo-Ids
+#include <swundo.hxx>
 #include <swcli.hxx>
 #include <poolfmt.hxx>
 #include <wview.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 264806c63f2d..69cc78be3460 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <hintids.hxx>      // define ITEMIDs
+#include <hintids.hxx>
 #include <svl/macitem.hxx>
 #include <sfx2/frame.hxx>
 #include <vcl/msgbox.hxx>
@@ -31,10 +31,10 @@
 #include <sfx2/linkmgr.hxx>
 #include <fmtinfmt.hxx>
 #include <frmatr.hxx>
-#include <swtypes.hxx>      // SET_CURR_SHELL
+#include <swtypes.hxx>
 #include <wrtsh.hxx>
 #include <docsh.hxx>
-#include <fldbas.hxx>       // Fields
+#include <fldbas.hxx>
 #include <expfld.hxx>
 #include <ddefld.hxx>
 #include <docufld.hxx>
@@ -42,9 +42,9 @@
 #include <swundo.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
-#include <viewopt.hxx>      // SwViewOptions
-#include <frmfmt.hxx>       // for UpdateTable
-#include <swtable.hxx>      // for UpdateTable
+#include <viewopt.hxx>
+#include <frmfmt.hxx>
+#include <swtable.hxx>
 #include <mdiexp.hxx>
 #include <view.hxx>
 #include <swevent.hxx>
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx
index 734de3b051f9..511d11deeca1 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/ui/wrtsh/wrtundo.cxx
@@ -21,7 +21,7 @@
 #include <sfx2/app.hxx>
 #include <svl/slstitm.hxx>
 #include <wrtsh.hxx>
-#include <swundo.hxx>                   // for Undo-Ids
+#include <swundo.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <swdtflvr.hxx>
 #include <svtools/svtresid.hxx>
-- 
cgit