diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 5087fdae129c..43391664cfc0 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -21,7 +21,7 @@
 #include "basidesh.hrc"
 #include "helpid.hrc"
 
-#include "baside2.hxx" // unfortunately pModulWindow is needed partly...
+#include "baside2.hxx"
 #include "baside3.hxx"
 #include "basobj.hxx"
 #include "iderdll.hxx"
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 74c7ea9559b8..93f7177263ee 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -24,7 +24,7 @@
 #include <macrodlg.hrc>
 #include <basidesh.hrc>
 #include <basidesh.hxx>
-#include <baside2.hrc>      // ID's for Images
+#include <baside2.hrc>
 #include <basobj.hxx>
 #include <baside3.hxx>
 
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index c0748556651b..66d79853c799 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -22,7 +22,7 @@
 #include <osl/thread.h>
 #include <basic/sbx.hxx>
 #include "sb.hxx"
-#include <string.h>     // memset() etc
+#include <string.h>
 #include "image.hxx"
 #include <codegen.hxx>
 SbiImage::SbiImage()
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 2ea51d4275db..166a07e5cb50 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -24,7 +24,7 @@
 #include <sbunoobj.hxx>
 #include <basic/sbuno.hxx>
 
-#include <limits.h> // USHRT_MAX
+#include <limits.h>
 
 using com::sun::star::uno::Reference;
 using namespace com::sun::star;
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index e56d70669eb9..8346e566d400 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -19,7 +19,7 @@
 
 
 #include "sbcomp.hxx"
-#include <basic/sbx.hxx>        // because of ...IMPL_REF(...sbxvariable)
+#include <basic/sbx.hxx>
 #include "expr.hxx"
 
 /***************************************************************************
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 549c56168262..691c5ea5931a 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -84,7 +84,7 @@ using namespace com::sun::star::uno;
 SbxVariable* getDefaultProp( SbxVariable* pRef );
 
 #if defined (WNT)
-#include <direct.h>   // _getdcwd get current work directory, _chdrive
+#include <direct.h>
 #endif
 
 #include <basic/sbobjmod.hxx>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index de275d740735..bf83745efd25 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -21,7 +21,7 @@
 
 #include <cstddef>
 
-#include <stdlib.h> // getenv
+#include <stdlib.h>
 #include <vcl/svapp.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 851c6a8caa93..571eeb757230 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -19,7 +19,7 @@
 
 
 #include <tools/errcode.hxx>
-#include <vcl/svapp.hxx>        // for SvtSysLocale
+#include <vcl/svapp.hxx>
 
 #include <basic/sbx.hxx>
 #include <basic/sbxvar.hxx>
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index e2891085ad6c..b7338d8c8778 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -36,9 +36,9 @@ COMMENT: Visual-Basic treats the following (invalid) format-strings
       (this class behaves the same way)
 */
 
-#include <stdio.h>          // for: sprintf()
-#include <float.h>          // for: DBL_DIG, DBL_EPSILON
-#include <math.h>           // for: floor(), fabs(), log10(), pow()
+#include <stdio.h>
+#include <float.h>
+#include <math.h>
 
 //=================================================================
 //=========================== DEFINES =============================
diff --git a/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx
index e82975102ebd..80d508596a53 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.hxx
@@ -31,7 +31,7 @@ class  OutputDevice;
 class  Window;
 class  Size;
 
-#include <cairo.h>  //cannot be inside a namespace, otherwise Quartz fails to compile.
+#include <cairo.h>
 
 namespace cairo {
     typedef cairo_t Cairo;
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index 5a256e9bb3dd..6ad7ee10dbac 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
 #include <canvas/canvastools.hxx>
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index 64eb81d73e03..1527896aee45 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <canvas/debug.hxx>
 #include <canvas/canvastools.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index 96a01ca146d9..3aac160064e0 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx
index 57690d3325e9..3d0d564cc479 100644
--- a/canvas/source/directx/dx_canvasfont.cxx
+++ b/canvas/source/directx/dx_canvasfont.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include "dx_winstuff.hxx"
 #include "dx_spritecanvas.hxx"
 #include "dx_canvasfont.hxx"
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index 3f15f0d4d00c..59d26e47627f 100644
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <vcl/window.hxx>
 #include <vcl/canvastools.hxx>
 #include <canvas/debug.hxx>
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 4ab23b45c30c..4b112285791f 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <basegfx/numeric/ftools.hxx>
 
 #include <canvas/debug.hxx>
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index d2dbc34779c7..9d93a610405f 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index f1fda287d455..8ab7b3a4a4a5 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <vcl/window.hxx>
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx
index 721e1f2dd8c0..2556bb936470 100644
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index d6c60aa9c34d..5d054ff420d9 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -23,7 +23,7 @@
 #include <canvas/rendering/isurfaceproxy.hxx>
 #include <canvas/rendering/isurfaceproxymanager.hxx>
 #include "dx_ibitmap.hxx"
-#include "dx_canvasfont.hxx" //winstuff
+#include "dx_canvasfont.hxx"
 #include "dx_gdiplususer.hxx"
 #include "dx_rendermodule.hxx"
 
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index 3afdc42fd459..4909b0161861 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ctype.h> // don't ask. msdev breaks otherwise...
+#include <ctype.h>
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
 
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index bed64145b5f9..21e3e05fd089 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -55,7 +55,7 @@
 #undef WB_RIGHT
 
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h> // TODO(Q1): extract minimal set of required headers for gdiplus
+#include <windows.h>
 
 #if DIRECTX_VERSION < 0x0900
 
diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index bfc9ec59e531..1348f7ecba8c 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -19,7 +19,7 @@
 
 #include <comphelper/seqstream.hxx>
 
-#include <memory.h> // for memcpy
+#include <memory.h>
 
 namespace comphelper
 {
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index dd64a39b7f67..4dcac2a61923 100644
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
@@ -22,7 +22,7 @@
 
 #include "sal/config.h"
 
-#include <boost/unordered_map.hpp> // using the boost container because it explicitly allows recursive types
+#include <boost/unordered_map.hpp>
 #include <set>
 
 #include "boost/noncopyable.hpp"
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 85459bcc9c2f..ef33afc7143e 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -176,7 +176,7 @@ namespace connectivity
 #endif
 }
 
-#include <ctype.h>      //isdigit
+#include <ctype.h>
 namespace dbtools
 {
 //------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 6c6e429f0d28..c0f6f75b0156 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -34,7 +34,7 @@
 #include <svl/zforlist.hxx>
 #include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
-#include <stdio.h>      //sprintf
+#include <stdio.h>
 #include <ucbhelper/content.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 18c3bd511999..bace952397dc 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -28,7 +28,7 @@
 #include <osl/thread.h>
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
-#include <stdio.h>      //sprintf
+#include <stdio.h>
 #include <comphelper/extract.hxx>
 #include <comphelper/numbers.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 21ea27026e95..678cec02b83b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
@@ -71,7 +71,7 @@
 #include "nsIDirectoryService.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
-#include "nsIChromeRegistry.h" // chromeReg
+#include "nsIChromeRegistry.h"
 #include "nsIStringBundle.h"
 #include "nsIObserverService.h"
 #include "nsHashtable.h"
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index dc77784601c9..0de2424fd0f1 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -129,7 +129,7 @@ static nsresult enumSubs(nsIAbDirectory * parentDir,nsISupportsArray * array)
     return rv;
 }
 
-#include <prmem.h> //need for PR_FREEIF
+#include <prmem.h>
 static nsresult insertPABDescription()
 {
     nsresult rv = NS_OK ;
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index d8e659c382f7..4cc6e0c46ea8 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -23,7 +23,7 @@
 #define YY_EXIT 1               // YY_FATAL will not halt the application
 
 #ifndef _CSTDARG_
-#include <cstdarg>      // std::va_list
+#include <cstdarg>
 #endif
 
 #include <string.h>
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index dbe58b382bcb..221864dbb3f1 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -24,7 +24,7 @@
 #include <cppcanvas/renderer.hxx>
 #include <action.hxx>
 
-#include <memory> // auto_ptr
+#include <memory>
 
 namespace basegfx {
     class B2DPoint;
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 31c26fa4ee9c..f9acf9dd23c9 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/types.h>
 
-#include <stdlib.h> // wntmsci10 does not like <cstdlib>
+#include <stdlib.h>
 
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestFixture.h>
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1a92832b26b1..b0755361a2d2 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -37,7 +37,7 @@
 #include "cuires.hrc"
 #include "acccfg.hrc"
 
-#include <svx/svxids.hrc> // SID_CHARMAP, SID_ATTR_SPECIALCHAR
+#include <svx/svxids.hrc>
 
 //-----------------------------------------------
 // include interface declarations
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 38b393120e6c..e0ca7ef4c89d 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -39,7 +39,7 @@
 #include <cuires.hrc>
 #include "headertablistbox.hxx"
 #include "macropg_impl.hxx"
-#include <svx/dialogs.hrc> // RID_SVXPAGE_MACROASSIGN
+#include <svx/dialogs.hrc>
 #include <comphelper/namedvaluecollection.hxx>
 
 #include <algorithm>
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 61e87d3351b0..ea8f32c666d9 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -23,8 +23,8 @@
 #include <vcl/vclmedit.hxx>
 #include "selector.hxx"
 #include <dialmgr.hxx>
-#include <svx/fmresids.hrc> // for RID_SVXIMG_...
-#include <svx/dialmgr.hxx>  // for RID_SVXIMG_...
+#include <svx/fmresids.hrc>
+#include <svx/dialmgr.hxx>
 #include <cuires.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/msg.hxx>
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index e027b7480037..4d34a685a7a3 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -27,7 +27,7 @@
 #include "cuigrfflt.hxx"
 #include "grfflt.hrc"
 #include <cuires.hrc>
-#include <svx/dialogs.hrc> // RID_SVX_GRFFILTER_DLG_...
+#include <svx/dialogs.hrc>
 
 // --------------------------------------
 // - GraphicFilterDialog::PreviewWindow -
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 444f5291e98c..d82418ae8ff4 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -25,7 +25,7 @@
 #include "hldoctp.hxx"
 #include "hldocntp.hxx"
 #include "hyperdlg.hrc"
-#include <svx/svxids.hrc> // SID_READONLY_MODE
+#include <svx/svxids.hrc>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::frame::XFrame;
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index ca8aa20f925a..9f3ea3e06f75 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -27,7 +27,7 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svx/svxids.hrc>   // SID_ATTR_...
+#include <svx/svxids.hrc>
 
 #include <cuires.hrc>
 #include <svx/postattr.hxx>
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 43d6360a63c0..2a2a982d6c47 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -25,7 +25,7 @@
 #include "cuitabarea.hxx"
 #include "svx/svdmodel.hxx"
 #include "border.hxx"
-#include <svx/dialogs.hrc> // RID_SVXPAGE_...
+#include <svx/dialogs.hrc>
 
 SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
 : SfxTabDialog        ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index bbe94bc85f6d..87857a97287a 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -25,14 +25,14 @@
 #include <sfx2/objsh.hxx>
 #include <cuires.hrc>
 #include "srchxtra.hrc"
-#include <svx/svxitems.hrc> // RID_ATTR_BEGIN
-#include <svx/dialmgr.hxx>  // item resources
+#include <svx/svxitems.hrc>
+#include <svx/dialmgr.hxx>
 #include <editeng/flstitem.hxx>
 #include "chardlg.hxx"
 #include "paragrph.hxx"
 #include <dialmgr.hxx>
 #include "backgrnd.hxx"
-#include <svx/dialogs.hrc> // RID_SVXPAGE_...
+#include <svx/dialogs.hrc>
 #include <tools/resary.hxx>
 #include <rtl/strbuf.hxx>
 #include "svtools/treelistentry.hxx"
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 480789745fae..8193a1c9231c 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -77,9 +77,9 @@
 #include "page.hxx"
 #include "postdlg.hxx"
 #include "grfpage.hxx"
-#include "scriptdlg.hxx" // for ScriptOrgDialog
-#include "selector.hxx" // for SvxScriptSelectorDialog
-#include "macropg.hxx" // for SvxMacroAssignDlg
+#include "scriptdlg.hxx"
+#include "selector.hxx"
+#include "macropg.hxx"
 #include "sdrcelldlg.hxx"
 #include "newtabledlg.hxx"
 #include "macroass.hxx"
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 2263eb2539d7..5588138a70d5 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -23,7 +23,7 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/vclmedit.hxx>
-#include <sfx2/basedlgs.hxx>        ///< for SfxModalDialog
+#include <sfx2/basedlgs.hxx>
 #include <vector>
 
 // class AboutDialog -----------------------------------------------------
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index caf6e6605c24..2e9eee0f29e9 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -24,7 +24,7 @@
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/vclmedit.hxx> // #i68101#
+#include <vcl/vclmedit.hxx>
 
 /// Dialog for editing a name
 class SvxNameDialog : public ModalDialog
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 9c1382b35d59..2924abbcc78d 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -33,7 +33,7 @@
 #include <svtools/valueset.hxx>
 
 #include <vector>
-#include <memory>   // for auto_ptr
+#include <memory>
 
 class SvxCommonLinguisticControl;
 //.............................................................................
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index db70d5ccd2d1..e0667ef0a06b 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -30,7 +30,7 @@
 #include <vcl/field.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/svmedit.hxx>  // MultiLineEdit
+#include <svtools/svmedit.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 
 class VclFrame;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 78bdeb09e69d..c59d0784d920 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -26,8 +26,8 @@
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 
-#include <svtools/svmedit.hxx>  // MultiLineEdit
-#include <svtools/svtabbx.hxx>  // MultiLineEdit
+#include <svtools/svmedit.hxx>
+#include <svtools/svtabbx.hxx>
 
 /********************** SvUpdateLinksDialog ******************************
 *************************************************************************/
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 1fda0cf9d649..e468684772ea 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -22,8 +22,8 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svx/relfld.hxx>       // SvxRelativeField
-#include <svx/paraprev.hxx>     // Preview
+#include <svx/relfld.hxx>
+#include <svx/paraprev.hxx>
 #include <svx/frmdirlbox.hxx>
 #include <vcl/lstbox.hxx>
 #include <svx/flagsdef.hxx>
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 182c0f10488e..ec3acc9cf66d 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/stream.hxx>            // header for SvStream
+#include <tools/stream.hxx>
 #include "cfgchart.hxx"
 #include <dialmgr.hxx>
 #include <cuires.hrc>
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 5f70a123ebba..35f2e267ab09 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -22,7 +22,7 @@
 #include "optchart.hxx"
 #include <dialmgr.hxx>
 #include <vcl/msgbox.hxx>
-#include <svx/svxids.hrc> // for SID_SCH_EDITOPTIONS
+#include <svx/svxids.hrc>
 
 namespace
 {
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 5dacdf68a79e..4f99dba4e580 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -31,7 +31,7 @@
 #include "cuioptgenrl.hxx"
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
-#include <svx/svxids.hrc> // SID_FIELD_GRABFOCUS
+#include <svx/svxids.hrc>
 
 #include <boost/ref.hpp>
 #include <boost/make_shared.hpp>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 1a896f7a146f..249fece993b8 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -50,7 +50,7 @@
 #include "helpid.hrc"
 #include <svx/ofaitem.hxx>
 #include <sfx2/htmlmode.hxx>
-#include <svx/svxids.hrc> // slot ids, mostly for changetracking
+#include <svx/svxids.hrc>
 
 // for security TP
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 04a314ba5b2b..fc18ea79d4b3 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -51,7 +51,7 @@
 #include "cuicharmap.hxx"
 #include <editeng/unolingu.hxx>
 #include <dialmgr.hxx>
-#include <svx/svxids.hrc> // SID_OPEN_SMARTTAGSOPTIONS
+#include <svx/svxids.hrc>
 
 static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
 
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 8d5d6349aec9..a8b2e0e7aae6 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -20,7 +20,7 @@
 #include "autocdlg.hrc"
 #include <cuires.hrc>
 #include "helpid.hrc"
-#include <svx/svxids.hrc> // SID_AUTOFORMAT
+#include <svx/svxids.hrc>
 
 /**************************************************************************/
 /*                                                                        */
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 7c2251703c12..6713ee885ac6 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -27,7 +27,7 @@
 #include "border.hrc"
 #include "helpid.hrc"
 
-#include <svx/xtable.hxx>               // XColorList
+#include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index f7e3f0a3cbd5..3e6807c22070 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -31,7 +31,7 @@
 #include <svx/dialogs.hrc>
 #include <svtools/unitconv.hxx>
 #include <svl/languageoptions.hxx>
-#include <svx/xtable.hxx>       // XColorList
+#include <svx/xtable.hxx>
 #include "chardlg.hxx"
 #include "editeng/fontitem.hxx"
 #include <editeng/postitem.hxx>
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index be95f47f6f45..1a41bde3560f 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -31,7 +31,7 @@
 #include <grfpage.hrc>
 #include <rtl/ustring.hxx>
 #include <cuires.hrc>
-#include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP
+#include <svx/dialogs.hrc>
 
 #define CM_1_TO_TWIP        567
 #define TWIP_TO_INCH        1440
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 18b8e5e1ca09..016e40bf6640 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -46,9 +46,9 @@
 #include <dialmgr.hxx>
 #include <sfx2/module.hxx>
 #include <svl/stritem.hxx>
-#include <svx/dialogs.hrc>  // for RID_SVXPAGE_PAGE
+#include <svx/dialogs.hrc>
 #include <editeng/eerdll.hxx>
-#include <editeng/editrids.hrc> // for RID_SVXSTR_PAPERBIN...,
+#include <editeng/editrids.hrc>
 #include <svx/svxids.hrc>
 
 // #i4219#
@@ -57,7 +57,7 @@
 #include <svl/aeitem.hxx>
 #include <sfx2/request.hxx>
 
-#include <numpages.hxx>     // for GetI18nNumbering()
+#include <numpages.hxx>
 
 // static ----------------------------------------------------------------
 
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index bab5f57149d6..e9dd1d88a359 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -27,15 +27,15 @@
 // LO/windows.h conflict
 #undef WB_LEFT
 #undef WB_RIGHT
-#include "msdasc.h"        // OLE DB Service Component header
+#include "msdasc.h"
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 #include "stdio.h"
 
-#include <initguid.h>  // Include only once in your application
-#include <adoid.h>     // needed for CLSID_CADOConnection
-#include <adoint.h>    // needed for ADOConnection
+#include <initguid.h>
+#include <adoid.h>
+#include <adoint.h>
 
 #include "adodatalinks.hxx"
 
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index c334e1e43f67..cd7e3783e05a 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/ucbhelper.hxx>
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index cbe10764790f..bcc8a9366622 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -20,7 +20,7 @@
 
 #include <paralist.hxx>
 
-#include <editeng/outliner.hxx>  // only because of Paragraph, this must be changed!
+#include <editeng/outliner.hxx>
 #include <editeng/numdef.hxx>
 
 #include <osl/diagnose.h>
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 08d29aa5ab58..e253ed9fc68f 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -21,7 +21,7 @@
 #include <editeng/forbiddencharacterstable.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <editeng/unolingu.hxx> // LocalToLanguage, LanguageToLocale
+#include <editeng/unolingu.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 2e410132eebc..656f144218ea 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -28,7 +28,7 @@
 #include <editeng/unoedhlp.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outliner.hxx>
-#include <editeng/editobj.hxx>      // only for the GetText crutch
+#include <editeng/editobj.hxx>
 
 #include <editeng/unofored.hxx>
 
diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h
index d40c14243d14..422a66b7dd01 100644
--- a/extensions/source/activex/SOActionsApproval.h
+++ b/extensions/source/activex/SOActionsApproval.h
@@ -26,7 +26,7 @@
 #pragma once
 #endif
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h
index 908abf8106c8..7e37c8a5b7e8 100644
--- a/extensions/source/activex/SOActiveX.h
+++ b/extensions/source/activex/SOActiveX.h
@@ -22,7 +22,7 @@
 #ifndef __SOACTIVEX_H_
 #define __SOACTIVEX_H_
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 
 #pragma warning (disable:4505)
     // permanently suppress "unreferenced local function has been removed" warning
diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h
index 9816ad33bde9..9eb4d6aca9a1 100644
--- a/extensions/source/activex/SOComWindowPeer.h
+++ b/extensions/source/activex/SOComWindowPeer.h
@@ -26,7 +26,7 @@
 #pragma once
 #endif
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h
index ab6706611154..f731f4058166 100644
--- a/extensions/source/activex/SODispatchInterceptor.h
+++ b/extensions/source/activex/SODispatchInterceptor.h
@@ -26,7 +26,7 @@
 #pragma once
 #endif
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index b8ede5b0efac..616680e9bc43 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/form/XForm.hpp>
 // #100312# -----------------
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <vcl/splitwin.hxx>
 #include "toolbar.hxx"
 #include "formcontrolcontainer.hxx"
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 560b085d43e8..590ee389de63 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -26,7 +26,7 @@
 #include <svl/urihelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
@@ -60,7 +60,7 @@
 #include "framectr.hxx"
 #include "datman.hxx"
 #include <bibconfig.hxx>
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index 60526e20b78c..61dca624b79b 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -19,7 +19,7 @@
 
 #ifndef BIBTOOLS_HXX
 
-#include <vcl/taskpanelist.hxx>     // includes also vcl/window.hxx
+#include <vcl/taskpanelist.hxx>
 
 namespace bib
 {
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 8683d936f9ad..2e516e176565 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -31,7 +31,7 @@
 #include "bib.hrc"
 #include <toolkit/helper/vclunohelper.hxx>
 #include "bibconfig.hxx"
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <vcl/svapp.hxx>
 #include "bibliography.hrc"
 #include <comphelper/processfactory.hxx>
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index c42f004e1be6..74a0b0348686 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/form/ListSourceType.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include "general.hxx"
 #include "sections.hrc"
 #include "bibresid.hxx"
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index a0c3ee1f3c33..fc888fd43eab 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -32,7 +32,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/scrbar.hxx>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include "bibshortcuthandler.hxx"
 
 
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index b7cc0f5bba26..58229c7c6084 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -29,7 +29,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/timer.hxx>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 class BibDataManager;
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 0521775c9539..6bef53ee4448 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -47,8 +47,8 @@
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
-#include <uno/dispatcher.h> // declaration of generic uno interface
-#include <uno/mapping.hxx> // mapping stuff
+#include <uno/dispatcher.h>
+#include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
 
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 6fe68ec148b3..d337c5f6e86e 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -21,7 +21,7 @@
 #include <osl/thread.h>
 #include <grid.hrc>
 #include <cstdio>
-#include <math.h> // for M_LN10 and M_E
+#include <math.h>
 
 #include <cmath>
 
diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h
index f6040823604b..9015ac3de0b5 100644
--- a/extensions/test/ole/AxTestComponents/Basic.h
+++ b/extensions/test/ole/AxTestComponents/Basic.h
@@ -21,7 +21,7 @@
 #ifndef __BASIC_H_
 #define __BASIC_H_
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 #import  "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/extensions/test/ole/AxTestComponents/Foo.h b/extensions/test/ole/AxTestComponents/Foo.h
index edc493246f1b..70c93dd819c7 100644
--- a/extensions/test/ole/AxTestComponents/Foo.h
+++ b/extensions/test/ole/AxTestComponents/Foo.h
@@ -21,7 +21,7 @@
 #ifndef __Foo_H_
 #define __Foo_H_
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 #import  "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
index 1c08dad7d331..272770816cfb 100644
--- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
+++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
@@ -21,7 +21,7 @@
 #ifndef __EVTLISTENER_H_
 #define __EVTLISTENER_H_
 
-#include "resource.h"       // Hauptsymbole
+#include "resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CEvtListener
diff --git a/extensions/test/ole/MfcControl/MfcControl.h b/extensions/test/ole/MfcControl/MfcControl.h
index ef7a4b4132a3..118431219144 100644
--- a/extensions/test/ole/MfcControl/MfcControl.h
+++ b/extensions/test/ole/MfcControl/MfcControl.h
@@ -29,7 +29,7 @@
     #error include 'afxctl.h' before including this file
 #endif
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CMfcControlApp : See MfcControl.cpp for implementation.
diff --git a/extensions/test/ole/MfcControl/StdAfx.h b/extensions/test/ole/MfcControl/StdAfx.h
index b3a303a6c19b..8ca3f5f4281c 100644
--- a/extensions/test/ole/MfcControl/StdAfx.h
+++ b/extensions/test/ole/MfcControl/StdAfx.h
@@ -29,17 +29,17 @@
 
 #define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 
-#include <afxctl.h>         // MFC support for ActiveX Controls
-#include <afxext.h>         // MFC extensions
-#include <afxdtctl.h>       // MFC support for Internet Explorer 4 Comon Controls
+#include <afxctl.h>
+#include <afxext.h>
+#include <afxdtctl.h>
 #ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>         // MFC support for Windows Common Controls
+#include <afxcmn.h>
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
 // Delete the two includes below if you do not wish to use the MFC
 //  database classes
-#include <afxdb.h>          // MFC database classes
-#include <afxdao.h>         // MFC DAO database classes
+#include <afxdb.h>
+#include <afxdao.h>
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
index e32e39fb90ed..a0eeca974b82 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
@@ -21,7 +21,7 @@
 #ifndef __CALLBACK_H_
 #define __CALLBACK_H_
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CCallback
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
index 2ebba602cc76..758c2aee28a0 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
@@ -21,7 +21,7 @@
 #ifndef __SIMPLE_H_
 #define __SIMPLE_H_
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CSimple
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 8764c341160c..0ff0a7496bda 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -29,8 +29,8 @@
 
 #include <usr/services.hxx>
 #include <usr/factoryhlp.hxx>
-#include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
-#include <usr/weak.hxx>      // OWeakObject
+#include <usr/reflserv.hxx>
+#include <usr/weak.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index fbfafa0bac90..83be75863cd0 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -28,8 +28,8 @@
 
 #include <usr/factoryhlp.hxx>
 
-#include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
-#include <usr/weak.hxx>      // OWeakObject
+#include <usr/reflserv.hxx>
+#include <usr/weak.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index 563cbda19074..9e07f892d6fe 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -25,8 +25,8 @@
 
 #include <usr/factoryhlp.hxx>
 
-#include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
-#include <usr/weak.hxx>      // OWeakObject
+#include <usr/reflserv.hxx>
+#include <usr/weak.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
diff --git a/extensions/test/stm/testfactreg.cxx b/extensions/test/stm/testfactreg.cxx
index 336476d44858..9c9fa35e4367 100644
--- a/extensions/test/stm/testfactreg.cxx
+++ b/extensions/test/stm/testfactreg.cxx
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
+#include <usr/reflserv.hxx>
 
 #include <usr/factoryhlp.hxx>
 #include "testfactreg.hxx"
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f5b655b9769a..2b8c56e09dc4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -105,7 +105,7 @@
 #include "svx/svditer.hxx"
 #include <svx/xpoly.hxx>
 #include "svx/xattr.hxx"
-#include <filter/msfilter/msdffimp.hxx> // externally visible header file
+#include <filter/msfilter/msdffimp.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 11bbf0efba6c..82cb589e719f 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -40,7 +40,7 @@
 #include <unotools/streamwrap.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <svtools/embedhlp.hxx>
-#include <filter/msfilter/msdffimp.hxx> // extern sichtbare Header-Datei
+#include <filter/msfilter/msdffimp.hxx>
 
 #include "filter/msfilter/msoleexp.hxx"
 
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 3cc481ead20c..7588b2c303d7 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -46,7 +46,7 @@
 #include "basegfx/polygon/b2dpolypolygon.hxx"
 #include "basegfx/polygon/b2dpolygontools.hxx"
 
-#include "unotools/saveopt.hxx" // only for testing of relative saving options in PDF
+#include "unotools/saveopt.hxx"
 
 #include "vcl/graphictools.hxx"
 #include "com/sun/star/beans/XPropertySet.hpp"
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index 8e1f0296dd7e..24bcdf0245f9 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <comphelper/stl_types.hxx>
 
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 7328bf3e8bad..80cb5c714763 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -58,7 +58,7 @@ namespace com { namespace sun { namespace star {
 #include "mip.hxx"
 #include <rtl/ustring.hxx>
 #include <vector>
-#include <memory> // auto_ptr
+#include <memory>
 
 
 
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx
index daa50bb2af20..e7045146d3ed 100644
--- a/forms/source/xforms/propertysetbase.cxx
+++ b/forms/source/xforms/propertysetbase.cxx
@@ -20,7 +20,7 @@
 
 #include "propertysetbase.hxx"
 
-#include <cppuhelper/typeprovider.hxx>  // for getImplementationId()
+#include <cppuhelper/typeprovider.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx
index 5f6e64273788..44298154e38b 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>  // for getenv()
+#include <stdlib.h>
 #include <stdio.h>
 
 #ifdef MACOSX
diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx
index c0971673d1f3..e62f89e8a077 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -25,8 +25,8 @@
 #ifdef _MSC_VER
 #pragma warning(push,1) // disable warnings within system headers
 #endif
-#include <windef.h>     // needed by winnls.h
-#include <winbase.h>    // needed by winnls.h
+#include <windef.h>
+#include <winbase.h>
 #include <winnls.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 192400756382..92cae013e60f 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/CharType.hpp>
 #include <com/sun/star/i18n/XLocaleData.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 
 #include <vector>
 
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index cc7cafcc3068..e8ee2e950159 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/i18n/CalendarDisplayCode.hpp>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 #include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <vector>
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index bace88f5592e..d5982e025ef3 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/i18n/XLocaleData4.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #define TRANSLITERATION_casemapping
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 141fcac04e93..e220968640b0 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -20,7 +20,7 @@
 #define _I18N_CHARACTERCLASSIFICATIONIMPL_HXX_
 
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <vector>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index bda8f3f831da..615fba4843da 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -20,7 +20,7 @@
 #define _I18N_INDEXENTRYSUPPLIER_HXX_
 
 #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index c006ad64dc7d..8ddb40d5c2b8 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -21,7 +21,7 @@
 #define _I18N_INDEXENTRYSUPPLIER_COMMON_HXX_
 
 #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <collatorImpl.hxx>
 
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 925b7d1daabd..e2ed6b2629ba 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -20,7 +20,7 @@
 #define _I18N_INPUTCHECKER_HXX_
 
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 55d317020673..8bf89022fdda 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/i18n/XLocaleData4.hpp>
 
 
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <cppu/macros.hxx>
 #include <com/sun/star/uno/Reference.h>
 
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 58c7ec4ed85a..767b4c1f225f 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
 #include <com/sun/star/i18n/NativeNumberMode.hpp>
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 5d6011f896c3..0a3ab44b034d 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 
 #include <com/sun/star/i18n/XNumberFormatCode.hpp>
 #include <com/sun/star/i18n/XLocaleData4.hpp>
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index 17d4bc566aee..d67a9d6a85a6 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -18,7 +18,7 @@
  */
 
 #include <com/sun/star/i18n/XOrdinalSuffix.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index c4c789729c48..42f91bf62cbd 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/linguistic2/XConversionDictionary.hpp>
 #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <osl/module.h>
 
 namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index 4d83cf23228b..8905d1806ea0 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/i18n/XExtendedTextConversion.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 1e41c5066a67..f927799501aa 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/i18n/XLocaleData4.hpp>
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <sal/types.h>
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index 60fe370b8fde..a400ed312b8e 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <com/sun/star/i18n/XScriptTypeDetector.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 
 //  ----------------------------------------------------
 //  class UnoScriptTypeDetector
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index 2e8dfa9b2c83..2e34af376155 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -20,7 +20,7 @@
 #include <breakiterator_th.hxx>
 #include <wtt.h>
 
-#include <string.h> // for memset
+#include <string.h>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 488b62ed9566..adf9737a09b6 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/i18n/NativeNumberSupplier.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include <string.h>     // memcpy()
+#include <string.h>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 94207d0a4eec..00f0bab3bf14 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -183,7 +183,7 @@ public: // ExtendedDocumentHandler
     {
     printf( "parsing document %s started\n", theLocale);
     of.writeAsciiString("#include <sal/types.h>\n\n\n");
-    of.writeAsciiString("#include <stdio.h> // debug printfs\n\n");
+    of.writeAsciiString("#include <stdio.h>\n\n");
     of.writeAsciiString("extern \"C\" {\n\n");
     }
 
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index 53dfc2fa2767..90399d333f18 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -57,7 +57,7 @@
 *************************************************************************/
 
 
-#include <string.h>     // strlen()
+#include <string.h>
 
 #if defined( _MSC_VER )
 #pragma warning(once: 4068)
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 683695e98f97..2f02d896376e 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -25,7 +25,7 @@
 
 #include <limits.h>
 #include <float.h>
-#include <memory> // auto_ptr<>
+#include <memory>
 
 using namespace ::rtl;
 
diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index fd6dadd0a791..a4cebb828711 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -29,7 +29,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
 
-#include <string.h> // for strcmp
+#include <string.h>
 #include <vector>
 #include <limits>
 #include <algorithm>
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index ad1e8943b952..4ac16a3a80a5 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -20,7 +20,7 @@
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #define _COMPHELPER_SEQUENCE_HXX_
 
-#include <algorithm> // copy algorithm
+#include <algorithm>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/diagnose.h>
 #include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index cb96dbd4e12b..a80cd4feac0f 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -27,7 +27,7 @@
 #include <stack>
 #include <set>
 
-#include <math.h> // prevent conflict between exception and std::exception
+#include <math.h>
 #include <functional>
 
 
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 5500b13433a6..6cd489d00f9b 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -32,7 +32,7 @@
 #include "editeng/editengdllapi.h"
 
 #include <tools/lineend.hxx>
-#include <tools/rtti.hxx>   // due to typedef TypeId
+#include <tools/rtti.hxx>
 
 #include <editeng/eedata.hxx>
 
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index b8f1236567d7..1625783be32b 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -35,7 +35,7 @@
 
 #include <svtools/grfmgr.hxx>
 
-#include <tools/rtti.hxx>   // due to typedef TypeId
+#include <tools/rtti.hxx>
 #include <vector>
 
 class OutlinerEditEng;
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 2d848ab8d9fd..14334f4865bf 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -19,7 +19,7 @@
 #ifndef _SVX_SVXFONT_HXX
 #define _SVX_SVXFONT_HXX
 
-#include <limits.h>     // USHRT_MAX
+#include <limits.h>
 #include <editeng/svxenum.hxx>
 #include <i18nlangtag/lang.h>
 #include <vcl/font.hxx>
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index ae109c5544d4..384bd0d5d798 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -20,7 +20,7 @@
 #ifndef FORMULA_OPCODE_HXX
 #define FORMULA_OPCODE_HXX
 
-#include "formula/compiler.hrc"                     // OpCodes
+#include "formula/compiler.hrc"
 #include <tools/solar.h>
 
 enum OpCodeEnum
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 9dec2d6dc15e..0fb1d5ecb75e 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -23,8 +23,8 @@
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <com/sun/star/linguistic2/XPossibleHyphens.hpp>
 #include <tools/solar.h>
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
 #include <linguistic/lngdllapi.h>
 
 namespace linguistic
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 546ab574f6a6..0a3688e918bd 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -31,8 +31,8 @@
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
 #include <unotools/pathoptions.hxx>
 #include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
diff --git a/include/o3tl/range.hxx b/include/o3tl/range.hxx
index a5ebacb4c6b8..1a28784a41bd 100644
--- a/include/o3tl/range.hxx
+++ b/include/o3tl/range.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_O3TL_RANGE_HXX
 
 
-#include <cstring>  // for std::size_t
+#include <cstring>
 #include <boost/assert.hpp>
 
 
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index b6f8ef641464..13e7a6bcd84b 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
@@ -19,7 +19,7 @@
 #ifndef _SFX2_OPENGRF_HXX
 #define _SFX2_OPENGRF_HXX
 
-#include <memory>       // auto_ptr
+#include <memory>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/dllapi.h>
 
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index a38398ac1ce7..1a4b121a56a9 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -21,7 +21,7 @@
 
 #include "svl/svldllapi.h"
 
-#include <cstdarg>  // std::va_list and friends
+#include <cstdarg>
 #include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
 #include <tools/solar.h>
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 85584d724b67..5446a14366b1 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/util/XModeChangeListener.hpp>
 #include <cppuhelper/implbase4.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <svx/svdtypes.hxx> // for SdrLayerID
+#include <svx/svdtypes.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 43c65b007be7..1f827e69e563 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/stream.hxx>
 #include <svx/svdsob.hxx>
-#include <svx/svdtypes.hxx> // fuer typedef SdrLayerID
+#include <svx/svdtypes.hxx>
 #include "svx/svxdllapi.h"
 #include <algorithm>
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 03efa0445847..4e8b4e5c7d88 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -39,7 +39,7 @@
 #include <boost/shared_ptr.hpp>
 
 class OutputDevice;
-#include <svx/svdtypes.hxx> // fuer enum RepeatFuncts
+#include <svx/svdtypes.hxx>
 #include "svx/svxdllapi.h"
 
 #include <rtl/ref.hxx>
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 18660b70c6a1..f92c843193c8 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -28,8 +28,8 @@
 #include <svl/lstner.hxx>
 #include <svl/poolitem.hxx>
 #include <svx/svdsob.hxx>
-#include <svx/svdtypes.hxx> // fuer SdrLayerID
-#include <svx/svdglue.hxx> // Klebepunkte
+#include <svx/svdtypes.hxx>
+#include <svx/svdglue.hxx>
 #include <svx/xdash.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/xenum.hxx>
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 4ffc9fc1a156..6ac698e484a5 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -23,7 +23,7 @@
 #include <vcl/field.hxx>
 #include <svx/itextprovider.hxx>
 #include <svx/svdoattr.hxx>
-#include <svx/svdtrans.hxx> // GeoStat
+#include <svx/svdtrans.hxx>
 #include <tools/datetime.hxx>
 #include <svx/xtextit0.hxx>
 #include "svdtext.hxx"
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index f6a68f56c897..e383fd1eb218 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -25,7 +25,7 @@
 #include <svl/smplhint.hxx>
 #include <svl/undo.hxx>
 #include <svx/svddrag.hxx>
-#include <svx/svdlayer.hxx>  // fuer SetOfByte
+#include <svx/svdlayer.hxx>
 #include <vcl/window.hxx>
 #include <svtools/colorcfg.hxx>
 #include <com/sun/star/awt/XControlContainer.hpp>
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index ab2c8a5d0b60..3aba3914cb02 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -24,7 +24,7 @@
 #include <svl/undo.hxx>
 #include <svl/style.hxx>
 #include <tools/gen.hxx>
-#include <svx/svdtypes.hxx> // for enum RepeatFuncts
+#include <svx/svdtypes.hxx>
 #include <svx/svdsob.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 715b355928da..620fd8c82c6d 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -39,7 +39,7 @@
 #include <cppuhelper/implbase9.hxx>
 #include <osl/mutex.hxx>
 
-#include <tools/gen.hxx>    // Size
+#include <tools/gen.hxx>
 #include <tools/link.hxx>
 
 #include <stdarg.h>
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 5d2fa6b1f20b..5db1a7c3c70d 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -12,7 +12,7 @@
 
 #include <typeinfo>
 #include <osl/module.hxx>
-#include <tools/resmgr.hxx> //for poxy ResHookProc typedef
+#include <tools/resmgr.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/window.hxx>
 #include <xmlreader/xmlreader.hxx>
diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx
index b6770320dbd3..d0b244ac1f08 100644
--- a/include/xmloff/xformsimport.hxx
+++ b/include/xmloff/xformsimport.hxx
@@ -22,7 +22,7 @@
 #include "sal/config.h"
 #include "xmloff/dllapi.h"
 
-#include <tools/solar.h> // for sal_uInt16
+#include <tools/solar.h>
 #include <com/sun/star/uno/Reference.hxx>
 
 class SvXMLImport;
diff --git a/include/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx
index f99c0a55ad73..fa6fcb3e9df0 100644
--- a/include/xmloff/xmlcnimp.hxx
+++ b/include/xmloff/xmlcnimp.hxx
@@ -20,8 +20,8 @@
 #ifndef _XMLOFF_XMLCNIMP_HXX
 #define _XMLOFF_XMLCNIMP_HXX
 
-#include "xmloff/dllapi.h"     //XMLOFF_DLLPUBLIC
-#include <sal/types.h>         //sal_uInt16 and sal_Bool
+#include "xmloff/dllapi.h"
+#include <sal/types.h>
 #include <boost/scoped_ptr.hpp>
 
 class SvXMLAttrCollection; //Forward declaration only.
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 156b70f95c5b..90ab99931359 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/weak.hxx>      // OWeakObject
+#include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase5.hxx>
 
 #include <osl/mutex.hxx>
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index e1dc80535568..2fdf85d742ce 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -28,7 +28,7 @@
 
 #include <cppuhelper/factory.hxx>
 
-#include <cppuhelper/implbase3.hxx>      // OWeakObject
+#include <cppuhelper/implbase3.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index 44f6244a0915..1dbfc312ee75 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -28,7 +28,7 @@
 
 #include <cppuhelper/factory.hxx>
 
-#include <cppuhelper/implbase1.hxx>      // OWeakObject
+#include <cppuhelper/implbase1.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index 99f9a1404826..bec6821bee00 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -22,7 +22,7 @@
 
 #include <osl/diagnose.h>
 
-#include <cppuhelper/factory.hxx>  // for EXTERN_SERVICE_CALLTYPE
+#include <cppuhelper/factory.hxx>
 
 using namespace ::rtl;
 using namespace ::cppu;
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 306c8be8f22b..5ce765681500 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -27,7 +27,7 @@
 
 #include <signal.h>
 
-#include <libxml/xmlexports.h> // define XMLCALL so expat.h does not redefine it
+#include <libxml/xmlexports.h>
 #include <expat.h>
 
 #include <rtl/string.hxx>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
index a70f754c2253..e69deab1c5de 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index df80e39586f0..686704ebfd1e 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
index 3de41f0b79c2..69be97943dc7 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -21,9 +21,9 @@
 #ifndef _LINGU2_HYPHENIMP_HXX_
 #define _LINGU2_HYPHENIMP_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.mm b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
index 1b744266e8d9..ce360a525e00 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
@@ -19,7 +19,7 @@
 
 
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 92502ad043ae..06db94287907 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -20,9 +20,9 @@
 #ifndef _MACSPELLIMP_H_
 #define _MACSPELLIMP_H_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase6.hxx>
 
 #ifdef MACOSX
 #include <premac.h>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 330b832ab2b9..c862fcc8c844 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -21,7 +21,7 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx b/lingucomponent/source/spellcheck/spell/sreg.cxx
index 3e90d7daf993..8d73e419e4cb 100644
--- a/lingucomponent/source/spellcheck/spell/sreg.cxx
+++ b/lingucomponent/source/spellcheck/spell/sreg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index d68fd25fae31..c0e84100f735 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index c04cc01587e9..9c9398ef39d9 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -20,9 +20,9 @@
 #ifndef _LINGU2_SPELLIMP_HXX_
 #define _LINGU2_SPELLIMP_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 6956be3eacb9..fb9d6fbed79b 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -25,8 +25,8 @@
 
 #include <tools/solar.h>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
 
 
 namespace linguistic
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 4bf271d02cd3..132f03d23366 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -19,7 +19,7 @@
 
 
 #include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index c12ea6993e2d..d362a90a6499 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -20,9 +20,9 @@
 #ifndef _LINGU2_THESIMP_HXX_
 #define _LINGU2_THESIMP_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase5.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
index 3fc7d243400a..56213005096c 100644
--- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
+++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 0d3b8a5895a5..44ba090d9abb 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -21,8 +21,8 @@
 #define _LINGUISTIC_IPRCACHE_HXX_
 
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase2.hxx>
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/document/XEventListener.hpp>
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 69e48adde93a..c924cc3da5d8 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -24,7 +24,7 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <rtl/instance.hxx>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XConversionDictionary.hpp>
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index c454824215e9..1928d82fee85 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -23,7 +23,7 @@
 #include <osl/mutex.hxx>
 #include <ucbhelper/content.hxx>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/linguistic2/XConversionDictionary.hpp>
 #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
 #include <com/sun/star/linguistic2/ConversionPropertyType.hpp>
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index a488c4a47259..7654fa4c7212 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -24,9 +24,9 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/stream.hxx>
 
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 05f514ef1615..9d8661515a3c 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -25,7 +25,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/useroptions.hxx>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 620f4ea5436d..a7638c770a7f 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -24,9 +24,9 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <vector>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 03a37317aaeb..7616f64d6e23 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -23,7 +23,7 @@
 #include <osl/mutex.hxx>
 #include <ucbhelper/content.hxx>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/linguistic2/XConversionDictionary.hpp>
 #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index a97ff13f1e1c..b7a95e773b5e 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index cebfbd3bafcb..c5a82671848d 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -30,8 +30,8 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <map>
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 9b6be98fdce4..924531b02d64 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -25,10 +25,10 @@
 #include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index c4bbc6ce5550..61298137c414 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -22,8 +22,8 @@
 
 #include <functional>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase5.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx
index f7a33fe1127d..02437a42af35 100644
--- a/linguistic/source/lngreg.cxx
+++ b/linguistic/source/lngreg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index a21ae825c672..4a96826ac995 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -20,9 +20,9 @@
 #ifndef _LINGUISTIC_LNGSVCMGR_HXX_
 #define _LINGUISTIC_LNGSVCMGR_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase3.hxx> // helper for implementations
-#include <cppuhelper/interfacecontainer.h>  //OMultiTypeInterfaceContainerHelper
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/interfacecontainer.h>
 
 
 #include <com/sun/star/uno/Reference.h>
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 3b2e04f30f1a..bd995191a367 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index c2e591afd54f..baec49f55c06 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -24,7 +24,7 @@
 #include "linguistic/misc.hxx"
 #include "iprcache.hxx"
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase7.hxx>
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 49dfc316c8be..b79b89be6e93 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -21,7 +21,7 @@
 #include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index 83832b40111e..31c4b77b4f20 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -32,9 +32,9 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <osl/mutex.hxx>
diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx
index 947ce429aa39..d0219f843013 100644
--- a/linguistic/workben/sprophelp.hxx
+++ b/linguistic/workben/sprophelp.hxx
@@ -22,8 +22,8 @@
 
 #include <tools/solar.h>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx
index d21dee45fc6d..3d63813ce881 100644
--- a/linguistic/workben/sreg.cxx
+++ b/linguistic/workben/sreg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index e4e7dd945c93..ff8837ae97e8 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <comphelper/string.hxx>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index 488b5e0ad7ee..f9fc388ad9a3 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -20,9 +20,9 @@
 #ifndef _LINGU2_SPELLIMP_HXX_
 #define _LINGU2_SPELLIMP_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <uno/lbnames.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 572297efdeac..6b210fd91c5f 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -71,8 +71,8 @@ using namespace std;
 
 #include "ut.hxx"
 #include "utlist.hxx"
-#include <tools/stream.hxx> // SvStream definition
-#include <sot/storage.hxx>  // SotStorageStream definition, add by  10/24/2005
+#include <tools/stream.hxx>
+#include <sot/storage.hxx>
 
 namespace OpenStormBento
 {
diff --git a/lotuswordpro/source/filter/first.hxx b/lotuswordpro/source/filter/first.hxx
index d533b90ad38a..2f58fc176213 100644
--- a/lotuswordpro/source/filter/first.hxx
+++ b/lotuswordpro/source/filter/first.hxx
@@ -56,7 +56,7 @@
 #ifndef FIRST_HXX
 #define FIRST_HXX
 
-#include "bento.hxx"        // Public header
+#include "bento.hxx"
 
 //#define ASSERT(cond) UT_ASSERT(cond)
 namespace OpenStormBento
diff --git a/np_sdk/npsdk/npunix.c b/np_sdk/npsdk/npunix.c
index 24ef766873dd..e6b9702e3d84 100644
--- a/np_sdk/npsdk/npunix.c
+++ b/np_sdk/npsdk/npunix.c
@@ -51,7 +51,7 @@
  *----------------------------------------------------------------------
  */
 
-#include <sal/types.h> // just for SAL_DLLPUBLIC_EXPORT
+#include <sal/types.h>
 
 #define XP_UNIX 1
 
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
index 20c2628da3f4..0e516e3f9958 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
@@ -35,8 +35,8 @@
 
 #include <stdio.h>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/queryinterface.hxx> // helper for queryInterface() impl
-#include <cppuhelper/factory.hxx> // helper for component factory
+#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/factory.hxx>
 // generated c++ interfaces
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index 33dc4ec4344d..f23e5cfee55c 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -33,7 +33,7 @@
  *
  *************************************************************************/
 
-#include <cppuhelper/implbase3.hxx> // "3" implementing three interfaces
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
 
diff --git a/odk/examples/OLE/activex/SOActiveX.h b/odk/examples/OLE/activex/SOActiveX.h
index 2f71bcd3108f..3e00dd51facd 100644
--- a/odk/examples/OLE/activex/SOActiveX.h
+++ b/odk/examples/OLE/activex/SOActiveX.h
@@ -38,7 +38,7 @@
 #ifndef __SOACTIVEX_H_
 #define __SOACTIVEX_H_
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
diff --git a/odk/examples/OLE/activex/SOComWindowPeer.h b/odk/examples/OLE/activex/SOComWindowPeer.h
index 55c9dd3a5e14..29856820bd57 100644
--- a/odk/examples/OLE/activex/SOComWindowPeer.h
+++ b/odk/examples/OLE/activex/SOComWindowPeer.h
@@ -44,7 +44,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "resource.h"       // main symbols
+#include "resource.h"
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
diff --git a/odk/examples/cpp/counter/counter.cxx b/odk/examples/cpp/counter/counter.cxx
index 6f65f5cb735e..9dd008e06762 100644
--- a/odk/examples/cpp/counter/counter.cxx
+++ b/odk/examples/cpp/counter/counter.cxx
@@ -46,8 +46,8 @@
 
 #include <stdio.h>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/queryinterface.hxx> // helper for queryInterface() impl
-#include <cppuhelper/factory.hxx> // helper for component factory
+#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/factory.hxx>
 // generated c++ interfaces
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 69921c29f5ca..0638cac4fe3c 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -36,7 +36,7 @@
 #include "oox/helper/graphichelper.hxx"
 #include "oox/helper/propertyset.hxx"
 
-#include <tools/solar.h>        // for the F_PI180 define
+#include <tools/solar.h>
 #include <tools/gen.hxx>
 #include <tools/mapunit.hxx>
 #include <editeng/unoprnms.hxx>
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 936a75f9f396..21b8626ddcb2 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -20,7 +20,7 @@
 #ifndef _MANIFEST_IMPORT_HXX
 #define _MANIFEST_IMPORT_HXX
 
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <comphelper/sequenceasvector.hxx>
 #include <vector>
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index cc79ba02d39a..284344e8d194 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -20,7 +20,7 @@
 #include <package/Deflater.hxx>
 #include <zlib.h>
 #include <com/sun/star/packages/zip/ZipConstants.hpp>
-#include <string.h> // for memset
+#include <string.h>
 
 using namespace com::sun::star::packages::zip::ZipConstants;
 using namespace com::sun::star;
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index 5745cef4bb1a..18efe9551b4a 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -19,7 +19,7 @@
 
 #include <package/Inflater.hxx>
 #include <zlib.h>
-#include <string.h> // for memset
+#include <string.h>
 
 using namespace com::sun::star::uno;
 using namespace ZipUtils;
diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx
index e1fc959b355e..6574fda14ae9 100644
--- a/package/source/zippackage/ZipPackageBuffer.cxx
+++ b/package/source/zippackage/ZipPackageBuffer.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <ZipPackageBuffer.hxx>
-#include <string.h> // for memcpy
+#include <string.h>
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index b9894a2feefe..20d2b9d9417f 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -19,7 +19,7 @@
 #ifndef _ZIP_PACKAGE_FOLDER_ENUMERATION_HXX
 #define _ZIP_PACKAGE_FOLDER_ENUMERATION_HXX
 
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <HashMaps.hxx>
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 6c6f675bfeeb..65884581b925 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "prtsetup.hxx"
-#include "helper.hxx" // for PaResId
+#include "helper.hxx"
 #include "rtsetup.hrc"
 #include "cmddlg.hxx"
 
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 781395b6239d..965f429fedd1 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -38,7 +38,7 @@
 #include <editeng/charscaleitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/xtable.hxx>       // XColorList
+#include <svx/xtable.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/emphasismarkitem.hxx>
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 040cf6b70545..7fcf2d97b981 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -33,7 +33,7 @@
 #include <reportformula.hxx>
 #include <toolkit/helper/property.hxx>
 
-#include <tools/color.hxx> // COL_TRANSPARENT
+#include <tools/color.hxx>
 #include <svtools/extcolorcfg.hxx>
 #include <unotools/confignode.hxx>
 
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 74ee7e492351..007f33b8bff4 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ctype.h>      // isdigit(), isalpha()
+#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 3a496b8db75e..056d2a4cd437 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -17,8 +17,8 @@
 #include <cstring>
 #include <sstream>
 
-#include <stdio.h> // vsnprintf
-#include <string.h> // strdup
+#include <stdio.h>
+#include <string.h>
 
 #include "osl/thread.hxx"
 #include "rtl/string.h"
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 2e6c2fef0c67..c51fe8287773 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <algorithm> // STL
+#include <algorithm>
 
 #include "testshl/stringhelper.hxx"
 
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 4878540bb06f..f4f25670f71a 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <stdio.h>
 
-#include <algorithm> // STL
+#include <algorithm>
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx
index 35d74bb6f90b..5cb3b11970c4 100644
--- a/sal/qa/sal/test_types.cxx
+++ b/sal/qa/sal/test_types.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <cstddef>
-#include <stdio.h> // C99 snprintf not necessarily in <cstdio>
-#include <string.h> // wntmsci10 does not know <cstring> std::strcmp
+#include <stdio.h>
+#include <string.h>
 
 #include <sal/types.h>
 #include <cppunit/TestFixture.h>
diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx
index 4e37b748833f..a6a2986e40e1 100644
--- a/sax/test/sax/testwriter.cxx
+++ b/sax/test/sax/testwriter.cxx
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include <com/sun/star/test/XSimpleTest.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>  // for the multiservice-factories
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a7f71af6e2f9..e4a245fa78c7 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -20,8 +20,8 @@
 #ifndef SC_CELLSUNO_HXX
 #define SC_CELLSUNO_HXX
 
-#include "global.hxx"           // ScRange, ScAddress
-#include "rangelst.hxx"         // ScRangeList
+#include "global.hxx"
+#include "rangelst.hxx"
 
 #include <editeng/unotext.hxx>
 #include <formula/grammar.hxx>
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index cd36cc441199..4f54357985e9 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -20,7 +20,7 @@
 #ifndef SC_CHART2UNO_HXX
 #define SC_CHART2UNO_HXX
 
-#include "cellsuno.hxx"     // for XModifyListenerArr_Impl / ScLinkListener
+#include "cellsuno.hxx"
 #include "rangelst.hxx"
 #include "externalrefmgr.hxx"
 #include "types.hxx"
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index bcc00b0c651a..8edab4cceccb 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -22,8 +22,8 @@
 
 #include "global.hxx"
 #include "dpobject.hxx"
-#include "rangeutl.hxx"     // ScArea
-#include "cellsuno.hxx"     // for XModifyListenerArr_Impl
+#include "rangeutl.hxx"
+#include "cellsuno.hxx"
 
 #include <svl/lstner.hxx>
 #include <svl/itemprop.hxx>
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index ad0549e04221..4a97e38fedd5 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <svl/lstner.hxx>
-#include "global.hxx"       ///< ScImportParam
+#include "global.hxx"
 #include <boost/ptr_container/ptr_vector.hpp>
 
 
diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx
index 375e76a2472d..1a02911c4e2d 100644
--- a/sc/inc/dpdimsave.hxx
+++ b/sc/inc/dpdimsave.hxx
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <map>
-#include "dpgroup.hxx"      ///< for ScDPNumGroupInfo
+#include "dpgroup.hxx"
 #include "scdllapi.h"
 #include "dptypes.hxx"
 
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index b2d7a4146cf2..ba4ff07af506 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -20,7 +20,7 @@
 #ifndef SC_DPTABSRC_HXX
 #define SC_DPTABSRC_HXX
 
-#include "global.hxx"       // enum ScSubTotalFunc
+#include "global.hxx"
 #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
 #include <com/sun/star/sheet/XHierarchiesSupplier.hpp>
 #include <com/sun/star/sheet/XLevelsSupplier.hpp>
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 9b61b0042739..65fae47150b1 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -20,7 +20,7 @@
 #ifndef SC_RANGENAM_HXX
 #define SC_RANGENAM_HXX
 
-#include "global.hxx" // -> enum UpdateRefMode
+#include "global.hxx"
 #include "address.hxx"
 #include "formula/grammar.hxx"
 #include "scdllapi.h"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ca208ea9fcfb..ba125ebcd4fa 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -20,8 +20,8 @@
 #ifndef SC_SC_HRC
 #define SC_SC_HRC
 
-#include <sfx2/sfx.hrc>      // ->#include <solar.hrc>
-#include <svx/dialogs.hrc>  // ->Svx-IDs
+#include <sfx2/sfx.hrc>
+#include <svx/dialogs.hrc>
 
 #include "sfx2/sfxcommands.h"
 #include "svx/svxcommands.h"
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index a2ae5ec2d1a9..a871663f2102 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -24,7 +24,7 @@
 #include "scdll.hxx"
 #include <vcl/timer.hxx>
 #include <svl/lstner.hxx>
-#include "global.hxx"       // ScInputMode
+#include "global.hxx"
 #include "shellids.hxx"
 #include <unotools/options.hxx>
 #include <tools/shl.hxx>
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 65505981685c..4c6ba42aedd7 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -20,7 +20,7 @@
 #ifndef SC_TEXTSUNO_HXX
 #define SC_TEXTSUNO_HXX
 
-#include "global.hxx"           // ScRange, ScAddress
+#include "global.hxx"
 #include "address.hxx"
 #include <editeng/unotext.hxx>
 #include <svl/brdcst.hxx>
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 042c4b51a5d4..71d9caee6778 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -37,7 +37,7 @@
 #include "sc.hrc"
 #include "globstr.hrc"
 
-#include "textuno.hxx"  // ScHeaderFooterContentObj
+#include "textuno.hxx"
 
 using namespace com::sun::star;
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index c62ff84c66f5..6e356ee73fb8 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -27,7 +27,7 @@
 #include "compiler.hxx"
 #include "brdcst.hxx"
 #include "markdata.hxx"
-#include "detfunc.hxx"          // for Notes in Sort/Swap
+#include "detfunc.hxx"
 #include "postit.hxx"
 #include "globalnames.hxx"
 #include "cellvalue.hxx"
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f5be76f31e4e..e3393057eae9 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -31,7 +31,7 @@
 #include "editutil.hxx"
 #include "subtotal.hxx"
 #include "markdata.hxx"
-#include "compiler.hxx"         // ScTokenArray GetCodeLen
+#include "compiler.hxx"
 #include "dbdata.hxx"
 #include "fillinfo.hxx"
 #include "segmenttree.hxx"
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e656d5173db9..b344e37e6028 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -29,10 +29,10 @@
 #include "formula/errorcodes.hxx"
 #include "formula/token.hxx"
 #include "brdcst.hxx"
-#include "docoptio.hxx"         // GetStdPrecision for GetMaxNumberStringLen
+#include "docoptio.hxx"
 #include "subtotal.hxx"
 #include "markdata.hxx"
-#include "detfunc.hxx"          // For Notes for DeleteRange
+#include "detfunc.hxx"
 #include "postit.hxx"
 #include "stringutil.hxx"
 #include "docpool.hxx"
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 018dc1c158bb..1f8b87241928 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -64,7 +64,7 @@
 #include "attrib.hxx"
 #include "patattr.hxx"
 #include "globstr.hrc"
-#include "sc.hrc"           // Slot-IDs
+#include "sc.hrc"
 
 #define SC_MAX_POOLREF      (SFX_ITEMS_OLD_MAXREF - 39)
 #define SC_SAFE_POOLREF     (SC_MAX_POOLREF + 20)
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 77d1278fd784..982d97765ad3 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -68,7 +68,7 @@
 #include "validat.hxx"
 #include "progress.hxx"
 #include "detdata.hxx"
-#include "sc.hrc"               // FID_DATACHANGED
+#include "sc.hrc"
 #include "ddelink.hxx"
 #include "chgtrack.hxx"
 #include "chgviset.hxx"
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 611aa2cf2940..73f8d71598f8 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -52,9 +52,9 @@
 #include "dociter.hxx"
 #include "detdata.hxx"
 #include "detfunc.hxx"
-#include "inputopt.hxx"     // GetExpandRefs
+#include "inputopt.hxx"
 #include "chartlis.hxx"
-#include "sc.hrc"           // SID_LINK
+#include "sc.hrc"
 #include "hints.hxx"
 #include "dpobject.hxx"
 #include "drwlayer.hxx"
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 459888aa76e1..56ce8d1c0ff9 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -23,14 +23,14 @@
 #include "brdcst.hxx"
 #include "bcaslot.hxx"
 #include "formulacell.hxx"
-#include "formula/errorcodes.hxx"       // errCircularReference
+#include "formula/errorcodes.hxx"
 #include "scerrors.hxx"
 #include "docoptio.hxx"
 #include "refupdat.hxx"
 #include "table.hxx"
 #include "progress.hxx"
-#include "scmod.hxx"        // SC_MOD
-#include "inputopt.hxx"     // GetExpandRefs
+#include "scmod.hxx"
+#include "inputopt.hxx"
 #include "conditio.hxx"
 #include "colorscale.hxx"
 #include "sheetevents.hxx"
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index cb5162b5988c..f9e4bd3bc2b1 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -71,7 +71,7 @@
 #include "chartlis.hxx"
 #include "chartlock.hxx"
 #include "refupdat.hxx"
-#include "validat.hxx"      // fuer HasMacroCalls
+#include "validat.hxx"
 #include "markdata.hxx"
 #include "scmod.hxx"
 #include "printopt.hxx"
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 4c2bf25d7c1d..7eac811e49f2 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -49,7 +49,7 @@
 #include "rechead.hxx"
 #include "poolhelp.hxx"
 #include "docpool.hxx"
-#include "detfunc.hxx"      // for UpdateAllComments
+#include "detfunc.hxx"
 #include "editutil.hxx"
 #include "postit.hxx"
 #include "charthelper.hxx"
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8232af15fd8e..dee85dddab83 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -74,7 +74,7 @@
 #include "hints.hxx"
 #include "detdata.hxx"
 #include "dpobject.hxx"
-#include "detfunc.hxx"      // for UpdateAllComments
+#include "detfunc.hxx"
 #include "scmod.hxx"
 #include "dociter.hxx"
 #include "progress.hxx"
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 5106cd836bb7..bab39888eae1 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -27,8 +27,8 @@
 #include "dpgroup.hxx"
 #include "document.hxx"
 #include "rechead.hxx"
-#include "pivot.hxx"        // PIVOT_DATA_FIELD
-#include "dapiuno.hxx"      // ScDataPilotConversion
+#include "pivot.hxx"
+#include "dapiuno.hxx"
 #include "miscuno.hxx"
 #include "scerrors.hxx"
 #include "refupdat.hxx"
@@ -71,7 +71,7 @@
 #include <sal/macros.h>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <svl/zforlist.hxx>     // IsNumberFormat
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 
 #include <vector>
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index e774f8e18119..ab95110cf579 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -33,7 +33,7 @@
 #include "docpool.hxx"
 #include "markdata.hxx"
 #include "attrib.hxx"
-#include "formula/errorcodes.hxx"       // errNoValue
+#include "formula/errorcodes.hxx"
 #include "miscuno.hxx"
 #include "globstr.hrc"
 #include "stlpool.hxx"
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 33445d5c8da0..e57683e40871 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -26,7 +26,7 @@
 #include "globstr.hrc"
 #include "dpitemdata.hxx"
 
-#include "document.hxx"     // for DumpState only!
+#include "document.hxx"
 #include "stlalgorithm.hxx"
 #include "dpresfilter.hxx"
 #include "dputil.hxx"
@@ -36,7 +36,7 @@
 #include <rtl/strbuf.hxx>
 
 #include <math.h>
-#include <float.h>          //! Test !!!
+#include <float.h>
 #include <algorithm>
 #include <boost/unordered_map.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 9f98b321ac36..d3fb4e7c1ec0 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -39,7 +39,7 @@
 #include "dptabres.hxx"
 #include "dptabdat.hxx"
 #include "global.hxx"
-#include "datauno.hxx"      // ScDataUnoConversion
+#include "datauno.hxx"
 #include "miscuno.hxx"
 #include "unonames.hxx"
 #include "dpitemdata.hxx"
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 4ce3ee56bc5e..225c0cec5769 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -21,7 +21,7 @@
 #include "scitems.hxx"
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
-#include <editeng/editdata.hxx>     // can be removed if table has a bLayoutRTL flag
+#include <editeng/editdata.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/brushitem.hxx>
 
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index e8aed7776d99..bcdae436fc10 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -33,7 +33,7 @@
 #include "userlist.hxx"
 #include "pivot.hxx"
 #include "rechead.hxx"
-#include "formula/errorcodes.hxx"                           // fuer errNoValue
+#include "formula/errorcodes.hxx"
 #include "refupdat.hxx"
 #include "stlpool.hxx"
 #include "stlsheet.hxx"
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index c7c4fd168c8c..7c8c1467b6a6 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -37,7 +37,7 @@
 #include "attrib.hxx"
 
 
-#include <vcl/svapp.hxx>    // GetSettings()
+#include <vcl/svapp.hxx>
 
 #include "globstr.hrc"
 #include "sc.hrc"
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 851cf6c86b2c..5a63338aacd1 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -36,7 +36,7 @@
 #include "refupdat.hxx"
 #include "markdata.hxx"
 #include "progress.hxx"
-#include "hints.hxx"        // fuer Paint-Broadcast
+#include "hints.hxx"
 #include "prnsave.hxx"
 #include "tabprotection.hxx"
 #include "sheetevents.hxx"
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index be791ca1abcb..aa4f7fba7c12 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -26,7 +26,7 @@
 #include "olinetab.hxx"
 #include "rechead.hxx"
 #include "stlpool.hxx"
-#include "attarray.hxx"     // Iterator
+#include "attarray.hxx"
 #include "markdata.hxx"
 #include "progress.hxx"
 #include "dociter.hxx"
diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx
index 05eddd11fd39..c2a702469e53 100644
--- a/sc/source/core/inc/addinlis.hxx
+++ b/sc/source/core/inc/addinlis.hxx
@@ -20,7 +20,7 @@
 #ifndef SC_ADDINLIS_HXX
 #define SC_ADDINLIS_HXX
 
-#include "adiasync.hxx" // for ScAddInDocs PtrArr
+#include "adiasync.hxx"
 #include <com/sun/star/sheet/XResultListener.hpp>
 #include <com/sun/star/sheet/XVolatileResult.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index b2500ff09a09..50f457744e67 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -21,7 +21,7 @@
 #define SC_PARCLASS_HXX
 
 #include "formula/opcode.hxx"
-#include <sys/types.h>  // size_t
+#include <sys/types.h>
 
 namespace formula
 {
diff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.src
index c6a8cbfbc4b9..d89ad7011907 100644
--- a/sc/source/core/src/compiler.src
+++ b/sc/source/core/src/compiler.src
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // Definition RID_XXX
-#include <formula/compiler.hrc> // Definition SC_OPCODE_XXX (interne OpCodes)
+#include "sc.hrc"
+#include <formula/compiler.hrc>
 
 Resource RID_FUNCTION_CATEGORIES
 {
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index db0d521cc731..2e100964eb93 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -50,7 +50,7 @@
 #include "rangeseq.hxx"
 #include "funcdesc.hxx"
 #include "svl/sharedstring.hxx"
-#include "formulaopt.hxx"  //fdo50118
+#include "formulaopt.hxx"
 
 using namespace com::sun::star;
 
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index fa945c0754ce..c7a213c0e5e7 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -22,7 +22,7 @@
 #include <vcl/svapp.hxx>
 
 #include "addinlis.hxx"
-#include "miscuno.hxx" // SC_IMPL_SERVICE_INFO
+#include "miscuno.hxx"
 #include "document.hxx"
 #include "brdcst.hxx"
 #include "sc.hrc"
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index 76ec8dd2cbb9..3232b0e6fb0a 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -23,7 +23,7 @@
 #include "brdcst.hxx"
 #include "global.hxx"
 #include "document.hxx"
-#include "sc.hrc"       // FID_DATACHANGED
+#include "sc.hrc"
 #include <osl/thread.h>
 
 ScAddInAsyncs theAddInAsyncTbl;
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index 67fa14aa3d68..8631823a79b4 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -20,7 +20,7 @@
 #include "scitems.hxx"
 #include <svl/intitem.hxx>
 #include <svl/zforlist.hxx>
-#include <float.h>              // DBL_MIN
+#include <float.h>
 
 #include "chartarr.hxx"
 #include "document.hxx"
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index ab07a637bd14..fa0e0aab5c09 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -24,8 +24,8 @@
 #include "global.hxx"
 #include "rechead.hxx"
 #include "scerrors.hxx"
-#include "scmod.hxx"        // SC_MOD
-#include "inputopt.hxx"     // GetExpandRefs
+#include "scmod.hxx"
+#include "inputopt.hxx"
 #include "patattr.hxx"
 #include "hints.hxx"
 #include "markdata.hxx"
@@ -34,7 +34,7 @@
 #include "tokenarray.hxx"
 #include "refupdatecontext.hxx"
 
-#include <tools/shl.hxx>        // SHL_CALC
+#include <tools/shl.hxx>
 #include <tools/rtti.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/itemset.hxx>
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index e2156d3653fb..dfa8cf9c9b40 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -20,7 +20,7 @@
 #include <vcl/svapp.hxx>
 
 #include "optutil.hxx"
-#include "global.hxx"       // for pSysLocale
+#include "global.hxx"
 #include <unotools/syslocale.hxx>
 
 sal_Bool ScOptionsUtil::IsMetricSystem()
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index bb8be285024b..6b5888dd8f71 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/sheet/FormulaLanguage.hpp>
 #include <rtl/strbuf.hxx>
 #include "compiler.hxx"
-#include "sc.hrc"   // VAR_ARGS
+#include "sc.hrc"
 #endif
 
 /* Following assumptions are made:
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 076b302b88a1..c11056624012 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>             // qsort
+#include <stdlib.h>
 #include <comphelper/string.hxx>
 #include <unotools/collatorwrapper.hxx>
 
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 883d02d98c69..8b8468395351 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -22,7 +22,7 @@
 
 #include "unitconv.hxx"
 #include "global.hxx"
-#include "viewopti.hxx"         //! move ScLinkConfigItem to separate header!
+#include "viewopti.hxx"
 
 using namespace utl;
 using namespace com::sun::star::uno;
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 22c26d7c1257..55034093ced2 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -24,7 +24,7 @@
 #include "global.hxx"
 #include "scmatrix.hxx"
 
-#include <stdio.h> // printf
+#include <stdio.h>
 
 const sal_uInt16    TokenPool::nScTokenOff = 8192;
 
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index 521879cb879b..9042cbaae8ce 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -39,7 +39,7 @@
 #include "xestyle.hxx"
 #include "xeroot.hxx"
 
-#include "excrecds.hxx"  // for filter manager
+#include "excrecds.hxx"
 #include "tabprotection.hxx"
 #include "document.hxx"
 #include "scextopt.hxx"
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index ff5dd4d412f6..9ba1b89fec65 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -20,7 +20,7 @@
 #ifndef SC_TOOL_H
 #define SC_TOOL_H
 
-#include <attrib.hxx>    //!!! noch noetig?????
+#include <attrib.hxx>
 #include <document.hxx>
 
 // Defaultwerte
diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx
index 0340f854ec31..86d9bb3eabf9 100644
--- a/sc/source/filter/inc/xltracer.hxx
+++ b/sc/source/filter/inc/xltracer.hxx
@@ -22,7 +22,7 @@
 #ifndef SC_XLTRACER_HXX
 #define SC_XLTRACER_HXX
 
-#include "global.hxx"        // ScAddress
+#include "global.hxx"
 #include "xltools.hxx"
 
 // As Trace features become implemented, we can safely delete the enum entry as
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 6e2baf472db3..20634c9d3831 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -72,7 +72,7 @@
 #include "rfindlst.hxx"
 #include "inputopt.hxx"
 #include "simpleformulacalc.hxx"
-#include "compiler.hxx"         // fuer Formel-Preview
+#include "compiler.hxx"
 #include "editable.hxx"
 #include "funcdesc.hxx"
 #include "markdata.hxx"
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f6488ebf0b87..b32fb5d7506e 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -34,7 +34,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/imgmgr.hxx>
-#include <stdlib.h>     // qsort
+#include <stdlib.h>
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <vcl/cursor.hxx>
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index f904eebfdd61..58011b8b37b1 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -41,7 +41,7 @@
 #include <svtools/parhtml.hxx>
 #include <sot/formats.hxx>
 
-#include "scitems.hxx"      // fuer tbxctrls etc.
+#include "scitems.hxx"
 #include "scmod.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
@@ -111,7 +111,7 @@
 #include <svx/imapdlg.hxx>
 
 #include "editutil.hxx"
-#include <svx/svdfield.hxx>     //  SdrRegisterFieldClasses
+#include <svx/svdfield.hxx>
 
 #include "dwfunctr.hxx"
 #include "acredlin.hxx"
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 4b504dc36943..47c2bfd7860a 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -31,7 +31,7 @@
 #include "transobj.hxx"
 #include "drwtrans.hxx"
 #include "scmod.hxx"
-#include "dbfunc.hxx"   // for CopyToClip
+#include "dbfunc.hxx"
 #include "docsh.hxx"
 #include "drawview.hxx"
 #include "drwlayer.hxx"
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 7e482d28a0b8..7391feddfd42 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -29,7 +29,7 @@
 #include "scresid.hxx"
 
 #include "globstr.hrc"
-#include "sc.hrc" // consdlg.hrc has been deleted
+#include "sc.hrc"
 
 #define _CONSDLG_CXX
 #include "consdlg.hxx"
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index fe5fff628a5a..09b40af271c6 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star;
 #include "sc.hrc"
 #include "dapitype.hrc"
 #include "miscuno.hxx"
-#include "dpsdbtab.hxx"         // ScImportSourceDesc
+#include "dpsdbtab.hxx"
 
 //-------------------------------------------------------------------------
 
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 8340ff66d880..5e783b67b5d6 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -24,7 +24,7 @@
 #include "document.hxx"
 #include "scresid.hxx"
 #include "globstr.hrc"
-#include "rangenam.hxx"     // IsNameValid
+#include "rangenam.hxx"
 #include "globalnames.hxx"
 #include "dbnamdlg.hxx"
 
diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc
index 7643789098f8..eec2d7ea65bf 100644
--- a/sc/source/ui/dbgui/pivot.hrc
+++ b/sc/source/ui/dbgui/pivot.hrc
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "sc.hrc" // ->RID_SCDLG_PIVOT_LAYOUT
+#include "sc.hrc"
 
 #define BTN_OK                  1
 #define BTN_CANCEL              2
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index be013f7360a1..2c0bb95c3aef 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -37,7 +37,7 @@
 #include "userlist.hxx"
 #include "rangeutl.hxx"
 #include "scresid.hxx"
-#include "sc.hrc"       // -> Slot IDs
+#include "sc.hrc"
 #include "globstr.hrc"
 
 #include "sortkeydlg.hxx"
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 9bdc44c648bf..ed5f1c873c6d 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -26,7 +26,7 @@
 #include "viewdata.hxx"
 #include "document.hxx"
 #include "scresid.hxx"
-#include "sc.hrc"       // -> Slot IDs
+#include "sc.hrc"
 
 #include "subtdlg.hxx"
 #include "subtdlg.hrc"
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 534ff443c760..f40981c7a0a2 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -34,7 +34,7 @@
 #include <sfx2/app.hxx>
 
 #include "scresid.hxx"
-#include "sc.hrc"       // -> Slot IDs
+#include "sc.hrc"
 
 #include "stringutil.hxx"
 #include "validat.hxx"
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index cebcb1b2d9e6..068ef32a482b 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -38,9 +38,9 @@
 #include "hints.hxx"
 #include "filter.hxx"
 
-#include "attrib.hxx"           // raus, wenn ResetAttrib am Dokument
-#include "patattr.hxx"          // raus, wenn ResetAttrib am Dokument
-#include "docpool.hxx"          // raus, wenn ResetAttrib am Dokument
+#include "attrib.hxx"
+#include "patattr.hxx"
+#include "docpool.hxx"
 
 #include "sc.hrc"
 #include "scabstdlg.hxx"
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 714107892b28..2190a1a0293e 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -38,7 +38,7 @@
 #include "olinetab.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
-#include "dociter.hxx"      // for lcl_EmptyExcept
+#include "dociter.hxx"
 #include "editable.hxx"
 #include "attrib.hxx"
 #include "drwlayer.hxx"
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 6da65ad87d47..9d1efe077b49 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -82,7 +82,7 @@
 #include "attrib.hxx"
 #include "asciiopt.hxx"
 #include "waitoff.hxx"
-#include "docpool.hxx"      // LoadCompleted
+#include "docpool.hxx"
 #include "progress.hxx"
 #include "pntlock.hxx"
 #include "docuno.hxx"
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 53e37a3de1c4..b4b80d6618ea 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -25,7 +25,7 @@
 
 using namespace ::com::sun::star;
 
-#include <math.h>       // prevent conflict between exception and std::exception
+#include <math.h>
 
 #include "scitems.hxx"
 #include <sfx2/fcontnr.hxx>
@@ -63,7 +63,7 @@ using namespace ::com::sun::star;
 #include "globstr.hrc"
 #include "global.hxx"
 #include "dbdocfun.hxx"
-#include "printfun.hxx"              // DrawToDev
+#include "printfun.hxx"
 #include "viewdata.hxx"
 #include "tabvwsh.hxx"
 #include "impex.hxx"
@@ -82,7 +82,7 @@ using namespace ::com::sun::star;
 #include "chartlis.hxx"
 #include "chartpos.hxx"
 #include "waitoff.hxx"
-#include "tablink.hxx"      // ScDocumentLoader statics
+#include "tablink.hxx"
 #include "drwlayer.hxx"
 #include "docoptio.hxx"
 #include "undostyl.hxx"
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 4dcc85246a56..a82c7191a663 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -25,7 +25,7 @@
 #include "impex.hxx"
 #include "brdcst.hxx"
 #include "rangenam.hxx"
-#include "sc.hrc"               // SC_HINT_AREAS_CHANGED
+#include "sc.hrc"
 
 using namespace formula;
 
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 6f73d8adebc1..90f612d7646b 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/editeng.hxx>  // EditEngine::IsSimpleCharInput
+#include <editeng/editeng.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index b1b95a85c1ac..8a119956e585 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -32,7 +32,7 @@
 #include "global.hxx"
 #include "drwlayer.hxx"
 #include "userdat.hxx"
-#include "tabvwsh.hxx"          // oder GetDocument irgendwo
+#include "tabvwsh.hxx"
 #include "document.hxx"
 #include "editutil.hxx"
 #include "futext.hxx"
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 3b8e8fd67843..7967163a94dc 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -26,7 +26,7 @@
 #include <sfx2/viewsh.hxx>
 
 #include "sc.hrc"
-#include "global.hxx"       // ScAddress
+#include "global.hxx"
 #include "scresid.hxx"
 #include "reffact.hxx"
 #include "document.hxx"
diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc
index 75598a331d2d..29c5c93b6163 100644
--- a/sc/source/ui/inc/acredlin.hrc
+++ b/sc/source/ui/inc/acredlin.hrc
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> RID_SCDLG_CHANGES
+#include "sc.hrc"
 
 #define BTN_OK          1
 #define BTN_CANCEL      2
diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc
index e10abb194a6a..a2b325e0f4d0 100644
--- a/sc/source/ui/inc/dbnamdlg.hrc
+++ b/sc/source/ui/inc/dbnamdlg.hrc
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> RID_SCDLG_DBNAMES
+#include "sc.hrc"
 
 #define BTN_OK          1
 #define BTN_CANCEL      2
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 16b649ab8d02..21a3a053a36e 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -28,7 +28,7 @@
 #include <vcl/button.hxx>
 #include <vcl/combobox.hxx>
 #include "anyrefdg.hxx"
-#include "global.hxx"       // ScAddress
+#include "global.hxx"
 #include "privsplt.hxx"
 #include "funcdesc.hxx"
 
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 55e7f12d86bf..c9a8928b02da 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -25,7 +25,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/morebtn.hxx>
 #include <svtools/stdctrl.hxx>
-#include "global.hxx" // -> ScQueryParam
+#include "global.hxx"
 #include "address.hxx"
 #include "anyrefdg.hxx"
 #include "queryparam.hxx"
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index 3d1f94011445..80401a713b42 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.hrc
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "sc.hrc"   // -> RID_SCDLG_FILTER
+#include "sc.hrc"
                     // -> RID_SCDLG_SPEC_FILTER
                     // -> RID_SCDLG_PIVOTFILTER
 
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 76d0fc874c95..bedc9596fc10 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -21,7 +21,7 @@
 #define SC_FORMULA_HXX
 
 #include "anyrefdg.hxx"
-#include "global.hxx"       // ScAddress
+#include "global.hxx"
 #include <svtools/stdctrl.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/group.hxx>
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index 4cd472949814..3b64bc167dd1 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -21,7 +21,7 @@
 #define SC_FUMARK_HXX
 
 #include "fupoor.hxx"
-#include "rangelst.hxx"         // ScRangeListRef
+#include "rangelst.hxx"
 
 
 /** Function for drawing a rectangle */
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index 5d34a18466ed..232bb74c8555 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -21,7 +21,7 @@
 #define SC_FUNCPAGE_HXX
 
 #include "funcutl.hxx"
-#include "global.hxx"       // ScAddress
+#include "global.hxx"
 #include <svtools/stdctrl.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/group.hxx>
diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc
index c27dc50de6eb..0df9dd40df23 100644
--- a/sc/source/ui/inc/highred.hrc
+++ b/sc/source/ui/inc/highred.hrc
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> RID_SCDLG_CHANGES
+#include "sc.hrc"
 
 #define BTN_OK               1
 #define BTN_CANCEL          2
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 67e5d5e666ca..ae49e073ef50 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc"   // -> RID_SCDLG_INSCELL
+#include "sc.hrc"
                     // -> RID_SCDLG_INSCONT
                     // -> RID_SCDLG_MOVETAB
                     // -> RID_SCDLG_STRINPUT
diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc
index 760c5852202d..c816099edb53 100644
--- a/sc/source/ui/inc/optload.hrc
+++ b/sc/source/ui/inc/optload.hrc
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "sc.hrc"   // -> RID_SCPAGE_OPREDLINE
+#include "sc.hrc"
 
 #define GB_LINK                 1
 #define RB_ALWAYS               2
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 3032defb8390..8ac8b9980cb4 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -21,7 +21,7 @@
 
 
 #include <vcl/window.hxx>
-#include "printfun.hxx"     // ScPrintState
+#include "printfun.hxx"
 #include "markdata.hxx"
 
 #include <vector>
diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx
index 8d1e43f98df7..4a6eaf31855b 100644
--- a/sc/source/ui/inc/select.hxx
+++ b/sc/source/ui/inc/select.hxx
@@ -22,7 +22,7 @@
 
 #include <vcl/seleng.hxx>
 
-#include "viewdata.hxx"     // ScSplitPos
+#include "viewdata.hxx"
 
 // ---------------------------------------------------------------------------
 
diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc
index 6620d52fc8a3..28262a70282a 100644
--- a/sc/source/ui/inc/simpref.hrc
+++ b/sc/source/ui/inc/simpref.hrc
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> RID_SCDLG_SIMPLEREF
+#include "sc.hrc"
 
 #define BTN_OK          1
 #define BTN_CANCEL      2
diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc
index d97022fc7c74..4b9186f2494a 100644
--- a/sc/source/ui/inc/sortdlg.hrc
+++ b/sc/source/ui/inc/sortdlg.hrc
@@ -18,7 +18,7 @@
  */
 
 
-#include "sc.hrc"   // -> RID_SCDLG_SORT
+#include "sc.hrc"
                     // -> RID_SCPAGE_SORT_FIELDS
                     // -> SCSTR_NONAME
                     // -> SCSTR_UNDEFINED
diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc
index ec74f7938e28..a8cc84d04148 100644
--- a/sc/source/ui/inc/tabopdlg.hrc
+++ b/sc/source/ui/inc/tabopdlg.hrc
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // ->RID_SCDLG_TABOP
+#include "sc.hrc"
 
 #define ED_FORMULARANGE         1
 #define ED_ROWCELL              2
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index b6f2e063f182..9734ed3d94d8 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -25,11 +25,11 @@
 #include <sfx2/viewfac.hxx>
 #include <editeng/svxenum.hxx>
 #include "scdllapi.h"
-#include "dbfunc.hxx"           // -> tabview
+#include "dbfunc.hxx"
 #include "target.hxx"
-#include "rangelst.hxx"         // ScRangeListRef
+#include "rangelst.hxx"
 #include "shellids.hxx"
-#include "tabprotection.hxx" // for ScPasswordHash
+#include "tabprotection.hxx"
 
 #include <boost/ptr_container/ptr_map.hpp>
 
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index e49a4ee8fef5..630c542a69d8 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -28,7 +28,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/virdev.hxx>
 #include "scdllapi.h"
-#include "scitems.hxx"          // due to enum SvxNumType
+#include "scitems.hxx"
 #include "popmenu.hxx"
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <cppuhelper/weakref.hxx>
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 5f8dae4fde7e..23eb82d4bda8 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -21,8 +21,8 @@
 #define SC_UNDODAT_HXX
 
 #include "undobase.hxx"
-#include "rangeutl.hxx"     // ScArea
-#include "rangelst.hxx"     // ScRangeListRef
+#include "rangeutl.hxx"
+#include "rangelst.hxx"
 #include "sortparam.hxx"
 #include "queryparam.hxx"
 #include "subtotalparam.hxx"
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index b9b50e4d4fe2..502b37da6bbb 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -25,7 +25,7 @@
 #include "scresid.hxx"
 #include "globstr.hrc"
 #include "simpref.hrc"
-#include "rangenam.hxx"     // IsNameValid
+#include "rangenam.hxx"
 #include "simpref.hxx"
 #include "scmod.hxx"
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index fa6c78b0ed5f..f2ba4a0c3f3b 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -40,7 +40,7 @@
 #include "scmod.hxx"
 #include "rangenam.hxx"
 #include "dbdata.hxx"
-#include "tablink.hxx"          // fuer Loader
+#include "tablink.hxx"
 #include "popmenu.hxx"
 #include "drwlayer.hxx"
 #include "transobj.hxx"
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 621d06b536fc..9297aae5f350 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -23,7 +23,7 @@
 #include "navcitem.hxx"
 #include "global.hxx"
 #include "navipi.hxx"
-#include "sc.hrc"       // -> Item-IDs
+#include "sc.hrc"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 85d33f5a45c2..385cef932f46 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -38,7 +38,7 @@
 #include "uiitems.hxx"
 #include "scresid.hxx"
 #include "docsh.hxx"
-#include "sc.hrc"       // -> Slot-IDs
+#include "sc.hrc"
 #include "optdlg.hrc"
 #include "globstr.hrc"
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index f47650123adf..a51f2a26275d 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -31,7 +31,7 @@
 #include "document.hxx"
 #include "docoptio.hxx"
 #include "scresid.hxx"
-#include "sc.hrc"       // -> Slot-IDs
+#include "sc.hrc"
 #include "optdlg.hrc"
 
 #include "tpcalc.hxx"
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 9235a0b344d1..c19e7bda9a15 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -32,7 +32,7 @@
 #include "rangeutl.hxx"
 #include "crdlg.hxx"
 #include "scresid.hxx"
-#include "sc.hrc"       // -> Slot-IDs
+#include "sc.hrc"
 #include "optdlg.hrc"
 #include "globstr.hrc"
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 1415868dde85..5a944ad51fe1 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -32,7 +32,7 @@
 #include "uiitems.hxx"
 #include "scresid.hxx"
 #include "docsh.hxx"
-#include "sc.hrc"       // -> Slot-IDs
+#include "sc.hrc"
 #include "optdlg.hrc"
 #include "globstr.hrc"
 #include <appoptio.hxx>
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc
index 99ae92003e75..f9060ff5e71d 100644
--- a/sc/source/ui/pagedlg/pagedlg.hrc
+++ b/sc/source/ui/pagedlg/pagedlg.hrc
@@ -18,7 +18,7 @@
  */
 
 
-#include "sc.hrc"   // -> RID_SCDLG_PAGE
+#include "sc.hrc"
                     // -> RID_SCPAGE_AREAS
 
 //================================================
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 8c0761fc83ba..e94555d9c414 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -51,7 +51,7 @@
 #include "AccessibleEditObject.hxx"
 
 #include "scuitphfedit.hxx"
-#include <memory> // header file for auto_ptr
+#include <memory>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index a8bcea960eb7..4a52c793d1ac 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> #include <sfx.hrc>
+#include "sc.hrc"
 #include <svx/globlmn.hrc>
 
 
diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src
index 117552ec157c..f6ab97174a48 100644
--- a/sc/source/ui/src/sc.src
+++ b/sc/source/ui/src/sc.src
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> #include <sfx.hrc>
+#include "sc.hrc"
 
 // App-Titel------------------------------------------------------
 
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 4d5dd944fea5..93ea5c345e60 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -73,8 +73,8 @@
 // ExtraData, but the HID_XXX are unsigned and exceed 32k. Code reading the
 // resource entries must consider this and undo the conversion.
 
-#include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX
-#include "formula/compiler.hrc" // SC_OPCODE_XXX
+#include "scfuncs.hrc"
+#include "formula/compiler.hrc"
 
 Resource RID_SC_FUNCTION_DESCRIPTIONS1
 {
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 462db0bb280d..c42c8dffc397 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> #include <sfx.hrc>
+#include "sc.hrc"
 
  // Strings fuer Interface-Namen ------------------------------------------
 
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index 197cfed19515..9c2c5feced7c 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc" // -> #include <sfx.hrc>
+#include "sc.hrc"
 #include <svx/globlmn.hrc>
-#include "tbinsert.hrc" // Sub-IDs
+#include "tbinsert.hrc"
 
 
  // ToolBoxen: ----------------------------------------------------------------
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index fcbc7aefb4c5..1b738d354207 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -31,9 +31,9 @@
 #include <svl/cjkoptions.hxx>
 
 #include "styledlg.hxx"
-#include "tabpages.hxx"     // Zellvorlagen
-#include "tphf.hxx"         // Seitenvorlage: Kopf-/Fusszeilen
-#include "tptable.hxx"      // Seitenvorlage: Tabelle
+#include "tabpages.hxx"
+#include "tphf.hxx"
+#include "tptable.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
 #include <svx/svxdlg.hxx>
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 4a2547a92b3a..7729556d3c92 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "scitems.hxx"              // SearchItem
+#include "scitems.hxx"
 
 #include "undoblk.hxx"
 #include "document.hxx"
@@ -28,7 +28,7 @@
 #include "global.hxx"
 #include "target.hxx"
 
-#include "undoolk.hxx"              // TODO move GetUndo in Document
+#include "undoolk.hxx"
 
 TYPEINIT1(ScUndoWidthOrHeight,      SfxUndoAction);
 
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index afe8288635f6..4a6888787de1 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -34,7 +34,7 @@
 #include "inputopt.hxx"
 #include "printopt.hxx"
 #include "userlist.hxx"
-#include "sc.hrc"           // VAR_ARGS
+#include "sc.hrc"
 #include "unonames.hxx"
 #include "funcdesc.hxx"
 #include <com/sun/star/sheet/FunctionArgument.hpp>
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index e16f8aee941b..9d2b61242c91 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -41,7 +41,7 @@
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <float.h>              // DBL_MIN
+#include <float.h>
 
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/util/CellProtection.hpp>
@@ -68,7 +68,7 @@
 #include "editsrc.hxx"
 #include "notesuno.hxx"
 #include "fielduno.hxx"
-#include "docuno.hxx"       // ScTableColumnsObj etc
+#include "docuno.hxx"
 #include "datauno.hxx"
 #include "dapiuno.hxx"
 #include "chartuno.hxx"
@@ -91,7 +91,7 @@
 #include "formulacell.hxx"
 #include "undocell.hxx"
 #include "undotab.hxx"
-#include "undoblk.hxx"      // fuer lcl_ApplyBorder - nach docfunc verschieben!
+#include "undoblk.hxx"
 #include "stlsheet.hxx"
 #include "dbdata.hxx"
 #include "attrib.hxx"
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0050395ecf45..0858adbac50b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -39,7 +39,7 @@
 #include <toolkit/awt/vclxdevice.hxx>
 
 #include <ctype.h>
-#include <float.h>  // DBL_MAX
+#include <float.h>
 
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/sheet/XNamedRanges.hpp>
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index b9a52fce836d..cddb4ea1d2e6 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -24,7 +24,7 @@
 #include "hints.hxx"
 #include "editsrc.hxx"
 #include "cellsuno.hxx"
-#include "servuno.hxx"      // fuer IDs
+#include "servuno.hxx"
 #include "unonames.hxx"
 #include "editutil.hxx"
 
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 3470065db668..0084fa3f23a5 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -32,7 +32,7 @@
 #include "validat.hxx"
 #include "document.hxx"
 #include "unonames.hxx"
-#include "styleuno.hxx"     // ScStyleNameConversion
+#include "styleuno.hxx"
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "stylehelper.hxx"
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index 807118617b3e..ee9e2f73ca20 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "vbavalidation.hxx"
-#include "vbaformatcondition.hxx" //#i108860
+#include "vbaformatcondition.hxx"
 #include <com/sun/star/sheet/XSheetCondition.hpp>
 #include <com/sun/star/sheet/ValidationType.hpp>
 #include <com/sun/star/sheet/ValidationAlertStyle.hpp>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 32fb834cbf6f..75d4a8dfa88b 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -60,13 +60,13 @@
 #include "editable.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
-#include "dpgroup.hxx"      // for ScDPNumGroupInfo
+#include "dpgroup.hxx"
 #include "spellparam.hxx"
 #include "postit.hxx"
 #include "clipparam.hxx"
 #include "pivot.hxx"
-#include "dpsdbtab.hxx"     // ScImportSourceDesc
-#include "dpshttab.hxx"     // ScSheetSourceDesc
+#include "dpsdbtab.hxx"
+#include "dpshttab.hxx"
 #include "dbdata.hxx"
 #include "docsh.hxx"
 #include "cliputil.hxx"
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index c6d3fdcf2871..c373d2d96cc4 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -51,7 +51,7 @@
 #include "validat.hxx"
 #include "scresid.hxx"
 
-#include "validate.hrc" // ScValidationDlg
+#include "validate.hrc"
 #include "scui_def.hxx"
 #include "scabstdlg.hxx"
 #include "impex.hxx"
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 9e2f38d8654e..418ca87dae6f 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -34,7 +34,7 @@
 #include "document.hxx"
 #include "docsh.hxx"
 #include "drwtrans.hxx"
-#include "transobj.hxx"     // SetDrawClipDoc
+#include "transobj.hxx"
 #include "drawutil.hxx"
 #include "scmod.hxx"
 #include "globstr.hrc"
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c08d00293347..f70b838b22ff 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -20,7 +20,7 @@
 
 #include "scitems.hxx"
 
-#include <memory> //auto_ptr
+#include <memory>
 #include <editeng/adjustitem.hxx>
 #include <svx/algitem.hxx>
 #include <editeng/editview.hxx>
@@ -46,8 +46,8 @@
 #include <comphelper/classids.hxx>
 #include <sal/macros.h>
 
-#include <svx/svdview.hxx>      // fuer Command-Handler (COMMAND_INSERTTEXT)
-#include <editeng/outliner.hxx>     // fuer Command-Handler (COMMAND_INSERTTEXT)
+#include <svx/svdview.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
@@ -82,10 +82,10 @@
 #include "editutil.hxx"
 #include "scresid.hxx"
 #include "inputhdl.hxx"
-#include "uiitems.hxx"          // Filter-Dialog - auslagern !!!
+#include "uiitems.hxx"
 #include "filtdlg.hxx"
-#include "impex.hxx"            // Sylk-ID fuer CB
-#include "formulacell.hxx"             // fuer Edit-Felder
+#include "impex.hxx"
+#include "formulacell.hxx"
 #include "patattr.hxx"
 #include "notemark.hxx"
 #include "rfindlst.hxx"
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 61f9bab3ac28..bbc2657cc7c8 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -32,7 +32,7 @@
 #include "pagedata.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
-#include "dpoutput.hxx"     // ScDPPositionData
+#include "dpoutput.hxx"
 #include "dpshttab.hxx"
 #include "dbdocfun.hxx"
 #include "checklistmenu.hxx"
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 5ef56322ad5a..6d5c84037697 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -36,11 +36,11 @@
 #include "output.hxx"
 #include "document.hxx"
 #include "attrib.hxx"
-#include "patattr.hxx"          // InvertSimple
+#include "patattr.hxx"
 #include "dbdata.hxx"
 #include "docoptio.hxx"
 #include "notemark.hxx"
-#include "dbfunc.hxx"           // oder GetPageBreakData an die ViewData
+#include "dbfunc.hxx"
 #include "scmod.hxx"
 #include "inputhdl.hxx"
 #include "rfindlst.hxx"
@@ -48,7 +48,7 @@
 #include "pagedata.hxx"
 #include "docpool.hxx"
 #include "globstr.hrc"
-#include "docsh.hxx"            // oder GetSfxInPlaceObject
+#include "docsh.hxx"
 #include "cbutton.hxx"
 #include "invmerge.hxx"
 #include "editutil.hxx"
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 37ac42387c2f..2acfd9511d3d 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -26,8 +26,8 @@
 #include "sc.hrc"
 #include "tabvwsh.hxx"
 #include "hdrcont.hxx"
-#include "scmod.hxx"        // Optionen
-#include "inputopt.hxx"     // Optionen
+#include "scmod.hxx"
+#include "inputopt.hxx"
 #include "gridmerg.hxx"
 #include "document.hxx"
 #include "markdata.hxx"
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 8261cd365618..a5f77ea955fa 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -46,7 +46,7 @@
 #include "scmod.hxx"
 #include "markdata.hxx"
 #include "globstr.hrc"
-#include "sc.hrc"           // for ShellInvalidate
+#include "sc.hrc"
 #include "AccessibleDocumentPagePreview.hxx"
 #include <vcl/lineinfo.hxx>
 #include <svx/algitem.hxx>
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 3a1bac8e4058..814a6ceb6cbe 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -27,7 +27,7 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <editeng/editstat.hxx>     // EE_CNTRL_RTFSTYLESHEETS
+#include <editeng/editstat.hxx>
 #include <svx/fmview.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index ef34191f8a1b..681fcc62d68e 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -41,7 +41,7 @@
 #include "hiranges.hxx"
 #include "drawview.hxx"
 #include "drwlayer.hxx"
-#include "fusel.hxx"                // Start-Function
+#include "fusel.hxx"
 #include "seltrans.hxx"
 #include "scmod.hxx"
 #include "AccessibilityHints.hxx"
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index dde0afd8fa1c..1bc0e52b4bf1 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -34,8 +34,8 @@
 #include "reffact.hxx"
 #include "scresid.hxx"
 #include "dwfunctr.hxx"
-#include "sc.hrc"       // -> SID_TOOL_xxx
-#include "drawattr.hxx" // -> SvxDrawToolItem
+#include "sc.hrc"
+#include "drawattr.hxx"
 #include "spelldialog.hxx"
 
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index aed5251ab522..1c73dbe79fee 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -57,7 +57,7 @@
 #include "inputopt.hxx"
 #include "inputwin.hxx"
 #include "scresid.hxx"
-#include "dbdata.hxx"       // fuer ReImport
+#include "dbdata.hxx"
 #include "reffact.hxx"
 #include "viewuno.hxx"
 #include "dispuno.hxx"
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index e819b2c10d1e..c8917fac9599 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -35,7 +35,7 @@
 #include "attrib.hxx"
 #include "patattr.hxx"
 #include "document.hxx"
-#include "formulacell.hxx"             // Input Status Edit-Zellen
+#include "formulacell.hxx"
 #include "globstr.hrc"
 #include "scmod.hxx"
 #include "inputhdl.hxx"
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 1bc5dc4ae992..642a4bdc5014 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -38,8 +38,8 @@
 #include "solvrdlg.hxx"
 #include "optsolver.hxx"
 #include "tabopdlg.hxx"
-#include "autoform.hxx"         // Core
-#include "autofmt.hxx"          // Dialog
+#include "autoform.hxx"
+#include "autofmt.hxx"
 #include "consdlg.hxx"
 #include "filtdlg.hxx"
 #include "dbnamdlg.hxx"
@@ -50,7 +50,7 @@
 #include "rangeutl.hxx"
 #include "crnrdlg.hxx"
 #include "formula.hxx"
-#include "formulacell.hxx"             // Input Status Edit-Zellen
+#include "formulacell.hxx"
 #include "acredlin.hxx"
 #include "highred.hxx"
 #include "simpref.hxx"
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index 74505f003e2e..84e805bfba9b 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -32,7 +32,7 @@
 #include "document.hxx"
 #include "docsh.hxx"
 #include "sc.hrc"
-#include "drwlayer.hxx"     // GetVisibleName
+#include "drwlayer.hxx"
 #include "retypepassdlg.hxx"
 #include "tabprotection.hxx"
 
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 8ee0da43db1d..637c7f3f3d06 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -49,7 +49,7 @@
 
 #include "attrib.hxx"
 #include "autoform.hxx"
-#include "formulacell.hxx"                 // EnterAutoSum
+#include "formulacell.hxx"
 #include "cellmergeoption.hxx"
 #include "compiler.hxx"
 #include "docfunc.hxx"
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 5f4dac21e73e..942826e71528 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -53,7 +53,7 @@
 #include "drwtrans.hxx"
 #include "rangenam.hxx"
 #include "dbdata.hxx"
-#include "impex.hxx"            // Sylk-ID fuer CB
+#include "impex.hxx"
 #include "chgtrack.hxx"
 #include "waitoff.hxx"
 #include "scmod.hxx"
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 34f1e1fc0bc3..0d4c1311d8b5 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -59,7 +59,7 @@
 #include "sc.hrc"
 #include "filter.hxx"
 #include "scextopt.hxx"
-#include "tabvwsh.hxx"      //  wegen GetViewFrame
+#include "tabvwsh.hxx"
 #include "compiler.hxx"
 
 #include "asciiopt.hxx"
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index e70d1b220dfa..ebcbaeb10062 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -33,7 +33,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/embed/Aspects.hpp>
 
-#include "document.hxx"     // for MapMode init in PasteDraw
+#include "document.hxx"
 #include "viewfunc.hxx"
 #include "tabvwsh.hxx"
 #include "drawview.hxx"
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 92f72dfcf2c2..fcf4fec85c6a 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -37,7 +37,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/wrkwin.hxx>
-#include <stdlib.h>             // qsort
+#include <stdlib.h>
 
 #include "viewfunc.hxx"
 #include "tabvwsh.hxx"
diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx
index 4d54de38921b..6312ba96bf55 100644
--- a/sc/workben/addin.hxx
+++ b/sc/workben/addin.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <stardiv/starcalc/test/XTestAddIn.hpp>
 
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx>
 
 
 com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScTestAddIn_CreateInstance(
diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx
index 835ae47c1c32..6a6ce1e1a222 100644
--- a/sc/workben/result.hxx
+++ b/sc/workben/result.hxx
@@ -27,7 +27,7 @@
 
 #include <com/sun/star/sheet/XVolatileResult.hpp>
 
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 
 
 typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >* XResultListenerPtr;
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index c46e7757639f..0f781b335962 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/NoConvergenceException.hpp>
 
-#include <cppuhelper/implbase5.hxx> // helper for implementations
+#include <cppuhelper/implbase5.hxx>
 
 #include "analysisdefs.hxx"
 #include "analysishelper.hxx"
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 9569138482af..dfc86e882365 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/addin/XDateFunctions.hpp>
 #include <com/sun/star/sheet/addin/XMiscFunctions.hpp>
-#include <cppuhelper/implbase6.hxx>             // helper for implementations
+#include <cppuhelper/implbase6.hxx>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 #include <tools/resary.hxx>
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index dd76f647345a..7a5673efa8cc 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/sheet/XAddIn.hpp>
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/addin/XPricingFunctions.hpp>
-#include <cppuhelper/implbase5.hxx>             // helper for implementations
+#include <cppuhelper/implbase5.hxx>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 #include <tools/resary.hxx>
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index 04c1e677f013..59ee550322f8 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -20,7 +20,7 @@
 #ifndef _FRAMEWORK_SCRIPT_PROVIDER_FUNCTIONIMPL_HXX_
 #define  _FRAMEWORK_SCRIPT_PROVIDER_FUNCTIONIMPL_HXX_
 
-#include <cppuhelper/implbase1.hxx> // helper for XInterface, XTypeProvider etc.
+#include <cppuhelper/implbase1.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 655934f5b5bc..4a77d2a949f7 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <editeng/editdata.hxx>
 #include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>                  // SVX_RESSTR
+#include <svx/dialmgr.hxx>
 
 #include <editeng/outliner.hxx>
 #include <svx/svditer.hxx>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index ab8064c1cc73..453b616e49ee 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -41,7 +41,7 @@
 #include <editeng/adjustitem.hxx>
 #include <editeng/numdef.hxx>
 #include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>                  // SVX_RESSTR
+#include <svx/dialmgr.hxx>
 #include <editeng/bulletitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/sxmsuitm.hxx>
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index aea4a9286ee9..5d90facdce2c 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -45,7 +45,7 @@
 
 #include <svx/svdattr.hxx>
 #include <editeng/outliner.hxx>
-#include <svx/xtable.hxx>           // for RGB_Color
+#include <svx/xtable.hxx>
 #include <editeng/bulletitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/adjustitem.hxx>
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 3942e797ed7d..0199ad0cdf57 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -43,7 +43,7 @@
 #include <i18nutil/scripttypedetector.hxx>
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>
-#include <oox/export/drawingml.hxx> // for SubstituteBullet
+#include <oox/export/drawingml.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 356a56d8ba29..013d50d43031 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -62,7 +62,7 @@
 #include <svl/style.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <svx/svdoutl.hxx>
-#include <tools/urlobj.hxx>               // INetURLObject
+#include <tools/urlobj.hxx>
 #include <vcl/bmpacc.hxx>
 #include <svtools/sfxecode.hxx>
 #include <com/sun/star/beans/PropertyState.hpp>
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 85a32e7e8c34..279e59d3f7fe 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <vcl/gdimtf.hxx>
 #include <svl/itemset.hxx>
-#include "resltn.hxx"       // enum PublishingResolution
+#include "resltn.hxx"
 #include <svtools/colrdlg.hxx>
 #include <svtools/ehdl.hxx>
 
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 40db29168aa4..0c8fb7c14ef5 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -33,7 +33,7 @@
 #include <svx/svdview.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <editeng/editstat.hxx> //EditEngine flags
+#include <editeng/editstat.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editobj.hxx>
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 963a88a32f95..00ffe8778488 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -37,8 +37,8 @@
 #include "drawdoc.hxx"
 #include "ViewShell.hxx"
 #include "anminfo.hxx"
-#include "unoaprms.hxx"                 // Undo-Action
-#include "sdundogr.hxx"                 // Undo Group
+#include "unoaprms.hxx"
+#include "sdundogr.hxx"
 #include "View.hxx"
 #include "sdabstdlg.hxx"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index c1f259f4bfc4..abc7c2052473 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -35,7 +35,7 @@
 #include "ViewShell.hxx"
 #include "OutlineViewShell.hxx"
 
-#include <stdio.h>          // for SlotFilter listing
+#include <stdio.h>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 59f67d7038ca..a63a16f5ceea 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -29,7 +29,7 @@
 #include "drawdoc.hxx"
 #include "DrawViewShell.hxx"
 #include "ViewShell.hxx"
-#include "fuzoom.hxx" // because of SidArrayZoom[]
+#include "fuzoom.hxx"
 
 #include <vcl/msgbox.hxx>
 #include <svx/svdpagv.hxx>
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 125dc5f10074..6b5aeaa241f5 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -25,7 +25,7 @@
 
 #include <editeng/editdata.hxx>
 #include <editeng/bulletitem.hxx>
-#include <svx/svxids.hrc>   // fuer SID_OBJECT_SELECT
+#include <svx/svxids.hrc>
 #include <sfx2/bindings.hxx>
 #include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
@@ -57,8 +57,8 @@
 #include "ViewShell.hxx"
 #include "res_bmp.hrc"
 #include "glob.hrc"
-#include "prlayout.hxx"         // enum PresentationObjects
-#include "prltempl.hrc"         // TAB_PRES_LAYOUT_TEMPLATE_x
+#include "prlayout.hxx"
+#include "prltempl.hrc"
 #include <svx/xfillit.hxx>
 #include "sdresid.hxx"
 #include "OutlineViewShell.hxx"
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index 7904b1ddeaf0..761c9b4a8604 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -25,7 +25,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <svx/tabarea.hxx>
 
-#include "prlayout.hxx" // for enum PresentationObjects
+#include "prlayout.hxx"
 
 
 class SfxObjectShell;
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index e4b21fe9ed83..0fe5bffed278 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -26,7 +26,7 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/dialog.hxx>
-#include "resltn.hxx"       // enum PublishingResolution
+#include "resltn.hxx"
 #include "pres.hxx"
 #include "assclass.hxx"
 
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index 43bb74bf90d7..2a595f314d20 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -21,7 +21,7 @@
 #define _SD_UNPRLOUT_HXX
 
 #include "sdundo.hxx"
-#include "pres.hxx"                 // enum AutoLayout
+#include "pres.hxx"
 
 class SdDrawDocument;
 class SdPage;
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 1deab3c6668b..9797f3953906 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef MACOSX
-  #include <osl/conditn.hxx> // Include this early to avoid error as check() gets defined by some SDK header to empty
+  #include <osl/conditn.hxx>
   #include <premac.h>
   #if MACOSX_SDK_VERSION == 1070 || MACOSX_SDK_VERSION == 1080
     #import <IOBluetooth/IOBluetooth.h>
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 94252f7f4603..f72c3b861339 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -39,7 +39,7 @@
 #endif
 
 #ifdef MACOSX
-  #include <osl/conditn.hxx> // Include this early to avoid error as check() gets defined by some SDK header to empty
+  #include <osl/conditn.hxx>
   #include <premac.h>
   #import <CoreFoundation/CoreFoundation.h>
   #include <postmac.h>
diff --git a/sd/source/ui/remotecontrol/OSXBluetooth.mm b/sd/source/ui/remotecontrol/OSXBluetooth.mm
index f364389df78e..93415f712629 100644
--- a/sd/source/ui/remotecontrol/OSXBluetooth.mm
+++ b/sd/source/ui/remotecontrol/OSXBluetooth.mm
@@ -6,7 +6,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#include <osl/conditn.hxx> // Include this early to avoid error as check() gets defined by some SDK header to empty
+#include <osl/conditn.hxx>
 
 #include <premac.h>
 #import <IOBluetooth/objc/IOBluetoothRFCOMMChannel.h>
diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.hxx b/sd/source/ui/remotecontrol/OSXNetworkService.hxx
index e9be573811b0..81edff37218b 100644
--- a/sd/source/ui/remotecontrol/OSXNetworkService.hxx
+++ b/sd/source/ui/remotecontrol/OSXNetworkService.hxx
@@ -17,7 +17,7 @@
 #include <vector>
 #include <iostream>
 
-#include <osl/conditn.hxx> // Include this early to avoid error as check() gets defined by some SDK header to empty
+#include <osl/conditn.hxx>
 #include <premac.h>
 #import <CoreFoundation/CoreFoundation.h>
 #include <postmac.h>
diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.mm b/sd/source/ui/remotecontrol/OSXNetworkService.mm
index ef8c32f5678d..a03c1d5e7998 100644
--- a/sd/source/ui/remotecontrol/OSXNetworkService.mm
+++ b/sd/source/ui/remotecontrol/OSXNetworkService.mm
@@ -6,7 +6,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#include <osl/conditn.hxx> // Include this early to avoid error as check() gets defined by some SDK header to empty
+#include <osl/conditn.hxx>
 
 #include <premac.h>
  #import <CoreFoundation/CoreFoundation.h>
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
index 5dcc196c65ad..63e8f6326e1b 100755
--- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
+++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
@@ -79,7 +79,7 @@ static void syslog( int priority, const char * message, ...)
 }
 #else
 
-    #include <sys/fcntl.h>      // For O_RDWR etc.
+    #include <sys/fcntl.h>
     #include <sys/time.h>
     #include <sys/socket.h>
     #include <syslog.h>
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index 6a92a7491f3b..049eb3b131db 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -43,8 +43,8 @@
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
 #include "anminfo.hxx"
-#include "unoaprms.hxx"                 // Undo-Action
-#include "sdundogr.hxx"                 // Undo Gruppe
+#include "unoaprms.hxx"
+#include "sdundogr.hxx"
 #include "drawview.hxx"
 #include "Window.hxx"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 13df39611912..a59efad935c0 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -23,8 +23,8 @@
 
 #include "strings.hrc"
 #include "glob.hxx"
-#include "glob.hrc"         // STR_BCKGRND, STR_BCKGRNDOBJ
-#include "app.hrc"          // SID_SWITCHPAGE
+#include "glob.hrc"
+#include "app.hrc"
 
 #include "unmodpg.hxx"
 #include "sdpage.hxx"
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 643550c5d464..3c2b5d0ae5a5 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -61,8 +61,8 @@
 #include "sdattr.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
-#include "unoaprms.hxx"                 // Undo-Action
-#include "sdundogr.hxx"                 // Undo Gruppe
+#include "unoaprms.hxx"
+#include "sdundogr.hxx"
 #include "Window.hxx"
 #include "DrawDocShell.hxx"
 #include "FrameView.hxx"
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index f2c97388ace7..f2e9dc2ab7ec 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -65,7 +65,7 @@
 
 #include "rtl/bootstrap.h"
 
-#include <string.h> // memcmp
+#include <string.h>
 
 using namespace com::sun::star;
 
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index 6d1d8886668d..1c67492a8483 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -19,7 +19,7 @@
 #ifndef _SFXIDPOOL_HXX
 #define _SFXIDPOOL_HXX
 
-#include <limits.h>     // USHRT_MAX
+#include <limits.h>
 #include "bitset.hxx"
 
 // class IdPool ----------------------------------------------------------
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 56c0833ac9c4..be93509b931c 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -68,7 +68,7 @@
 #include <sfx2/evntconf.hxx>
 #include "appdata.hxx"
 #include "workwin.hxx"
-#include "helper.hxx"   // SfxContentHelper::...
+#include "helper.hxx"
 #include "app.hrc"
 #include "sfx2/sfxresid.hxx"
 #include "shutdownicon.hxx"
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index e0f40c92b559..f3db89b98d99 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -63,7 +63,7 @@
 #include <sfx2/viewsh.hxx>
 #include "nochaos.hxx"
 #include <sfx2/fcontnr.hxx>
-#include "helper.hxx"   // SfxContentHelper::Kill()
+#include "helper.hxx"
 #include "sfxpicklist.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 4409769533aa..76931a00496e 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -75,7 +75,7 @@
 #include "openflag.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objface.hxx>
-#include "helper.hxx"   // SfxContentHelper::Kill()
+#include "helper.hxx"
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index a3cdaec71979..3caef24bcb10 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -20,7 +20,7 @@
 #ifndef SFX_PANELIST_HXX
 #define SFX_PANELIST_HXX
 
-#include <vcl/taskpanelist.hxx>     // includes also vcl/window.hxx
+#include <vcl/taskpanelist.hxx>
 
 namespace sfx2
 {
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 123cb8b2c236..9ca2087c7c5f 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -35,7 +35,7 @@
 #include "splitwin.hxx"
 #include <sfx2/msgpool.hxx>
 #include "sfx2/sfxresid.hxx"
-#include <sfx2/request.hxx>      // SFX_ITEMSET_SET
+#include <sfx2/request.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/toolbox.hxx>
 #include <tools/rcid.h>
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index f1798f515d81..d1d195d432b3 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -21,8 +21,8 @@
 
 #include "bitset.hxx"
 
-#include <string.h>     // memset(), memcpy()
-#include <limits.h>     // USHRT_MAX
+#include <string.h>
+#include <limits.h>
 #include <algorithm>
 
 //====================================================================
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index e3d71f9cc823..489d5c7416af 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -47,7 +47,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/XmlIdRegistry.hxx>
 
-#include <libxml/tree.h>    // for xmlValidateNCName
+#include <libxml/tree.h>
 
 #include <boost/bind.hpp>
 #include <boost/shared_array.hpp>
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index ae4a72368658..996ce8089449 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/XmlIdRegistry.hxx>
 
 #include <osl/mutex.hxx>
-#include <vcl/svapp.hxx> // solarmutex
+#include <vcl/svapp.hxx>
 
 #include <rtl/random.h>
 
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 63bbb437ab25..a82ebe52543e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -79,7 +79,7 @@
 #include <svtools/sfxecode.hxx>
 #include <svl/itemset.hxx>
 #include <svl/intitem.hxx>
-#include <svtools/svparser.hxx> // SvKeyValue
+#include <svtools/svparser.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <unotools/streamwrap.hxx>
@@ -107,15 +107,15 @@
 #include <com/sun/star/document/DocumentRevisionListPersistence.hpp>
 
 #include "helper.hxx"
-#include <sfx2/request.hxx>      // SFX_ITEMSET_SET
-#include <sfx2/app.hxx>          // GetFilterMatcher
-#include <sfx2/frame.hxx>        // LoadTargetFrame
-#include <sfx2/fcontnr.hxx>      // SfxFilterMatcher
-#include <sfx2/docfilt.hxx>      // SfxFilter
-#include <sfx2/objsh.hxx>        // CheckOpenMode
-#include <sfx2/docfac.hxx>       // GetFilterContainer
+#include <sfx2/request.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/frame.hxx>
+#include <sfx2/fcontnr.hxx>
+#include <sfx2/docfilt.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/docfac.hxx>
 #include "doc.hrc"
-#include "openflag.hxx"     // SFX_STREAM_READONLY etc.
+#include "openflag.hxx"
 #include "sfx2/sfxresid.hxx"
 #include <sfx2/appuno.hxx>
 #include "sfxacldetect.hxx"
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 7b134384b1dc..81b8d5ddc221 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -25,7 +25,7 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
-#include <svtools/svparser.hxx> // SvKeyValue
+#include <svtools/svparser.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
@@ -129,7 +129,7 @@ using namespace ::com::sun::star::container;
 #include "../appl/app.hrc"
 #include <sfx2/sfxdlg.hxx>
 #include "appbaslib.hxx"
-#include <openflag.hxx>                 // SFX_STREAM_READWRITE
+#include <openflag.hxx>
 
 // class SfxHeaderAttributes_Impl ----------------------------------------
 
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index e7888a4c6069..2448cae5d207 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -51,11 +51,11 @@
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <comphelper/enumhelper.hxx>  // can be removed when this is a "real" service
+#include <comphelper/enumhelper.hxx>
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <comphelper/processfactory.hxx>  // can be removed when this is a "real" service
+#include <comphelper/processfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index a1b318667286..5906ab57308d 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -26,7 +26,7 @@
 #endif
 
 #include <string>
-#include <cstdarg>  // std::va_list
+#include <cstdarg>
 
 #include <vcl/pointr.hxx>
 
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 928b77158ea2..1ac1784538d1 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -22,7 +22,7 @@
 #include <ctime>
 #endif
 
-#include <string>           // prevent conflict with STL includes
+#include <string>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/awt/XPopupMenu.hpp>
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index da05e3ee8e77..56584c87eb31 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -21,7 +21,7 @@
 #define _SFX_IMPFRAME_HXX
 
 #include <sfx2/frame.hxx>
-#include <sfx2/viewfrm.hxx>                  // SvBorder
+#include <sfx2/viewfrm.hxx>
 
 class SfxViewFrame;
 #include <com/sun/star/frame/XController.hpp>
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index a5c750af3062..827c21da22cb 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -22,7 +22,7 @@
 
 #include <basic/sbxobj.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>                  // SvBorder
+#include <sfx2/viewfrm.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 530a8fef224a..db0b2a9e1638 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -40,7 +40,7 @@
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <cmath> // for modf
+#include <cmath>
 #include <vector>
 #include <algorithm>
 
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index 06ce617d0ef9..967ff39a1a7c 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -23,7 +23,7 @@
 
 #include <basegfx/numeric/ftools.hxx>
 
-#include <cmath> // for fmod
+#include <cmath>
 #include <algorithm>
 
 
diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx
index 706f312d8f54..aa30184ee187 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -23,7 +23,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
-#include <boost/utility.hpp> // for noncopyable
+#include <boost/utility.hpp>
 #include <vector>
 
 using namespace com::sun::star;
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index 61568b498aab..79b3817ac1f8 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -32,7 +32,7 @@
 
 #include <boost/bind.hpp>
 
-#include <cmath> // for trigonometry and fabs
+#include <cmath>
 #include <algorithm>
 #include <functional>
 #include <limits>
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 75435695ec23..2a8b6f03db3f 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -49,7 +49,7 @@
 #include <comphelper/scopeguard.hxx>
 #include <canvas/canvastools.hxx>
 
-#include <cmath> // for trigonometry and fabs
+#include <cmath>
 #include <algorithm>
 #include <functional>
 #include <limits>
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index 655ceb108f2c..927a37dae709 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -30,7 +30,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
-#include <boost/utility.hpp> // for noncopyable
+#include <boost/utility.hpp>
 #include <vector>
 
 namespace slideshow {
diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx
index 7e25eebfa40b..0ba0ee53b80c 100644
--- a/slideshow/source/inc/activitiesqueue.hxx
+++ b/slideshow/source/inc/activitiesqueue.hxx
@@ -28,7 +28,7 @@
 #include <canvas/elapsedtime.hxx>
 
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp> // for boost::noncopyable
+#include <boost/utility.hpp>
 
 
 /* Definition of ActivitiesQueue class */
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index d0ee0b751e2f..d9b82d4a6c0d 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -35,7 +35,7 @@
 
 #include <functional>
 #include <cstdlib>
-#include <string.h> // for strcmp
+#include <string.h>
 #include <algorithm>
 
 
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index e9860b980a78..cec23162effa 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <string.h>     // memcpy()
+#include <string.h>
 
 #include "sot/stg.hxx"
 #include "stgelem.hxx"
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index a4a2485bf898..4299994acc72 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <string.h> // memset(), memcpy()
+#include <string.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <unotools/charclass.hxx>
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index b2f092fb845a..1825b357615c 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -19,7 +19,7 @@
 
 #include "rtl/string.h"
 #include "stgole.hxx"
-#include "sot/storinfo.hxx"     // Read/WriteClipboardFormat()
+#include "sot/storinfo.hxx"
 
 #ifdef _MSC_VER
 #pragma warning(disable: 4342)
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index c5e7a5f2ab5a..eadb7e86436f 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -20,7 +20,7 @@
 #ifndef _SDSTOR_STGOLE_HXX
 #define _SDSTOR_STGOLE_HXX
 
-#include <string.h> // memset()
+#include <string.h>
 
 #include "sot/stg.hxx"
 #include "stgelem.hxx"
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 16deea9168ba..fd9d1d1a513f 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include <string.h>     // memcpy()
+#include <string.h>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 4614ae13251c..736606ebc824 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -39,7 +39,7 @@
 #include <svl/brdcst.hxx>
 
 #include <editeng/editeng.hxx>
-#include <editeng/unoedsrc.hxx> // SvxEditSource, SvxTextForwarder, SvxViewForwarder, SvxEditViewForwarder
+#include <editeng/unoedsrc.hxx>
 #include <svx/AccessibleTextHelper.hxx>
 #include <edit.hxx>
 
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index baeb10c0771a..d4f3986e4e1e 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <functional> // needed under Solaris when including <algorithm>...
+#include <functional>
 
 #include <algorithm>
 #include <limits>
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 3004211a3071..9cd3362ae393 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/i18n/LocaleCalendar.hpp>
 #include <unotools/digitgroupingiterator.hxx>
 
-#include <svl/zforlist.hxx> // NUMBERFORMAT_XXX
+#include <svl/zforlist.hxx>
 #include "zforscan.hxx"
 #include <svl/zformat.hxx>
 
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index f2d53cb51355..96cf5f38be4e 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -19,7 +19,7 @@
 
 
 #define UNICODE
-#include <string.h> // memset
+#include <string.h>
 #include <algorithm>
 #include "ddeimp.hxx"
 #include <svl/svdde.hxx>
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index f2dbec06358c..850bd93868a4 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -26,7 +26,7 @@
 #include <unotools/configitem.hxx>
 #include <unotools/configpaths.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <svl/poolitem.hxx> //Any2Bool
+#include <svl/poolitem.hxx>
 #include <svl/smplhint.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index eee51dd35c26..34a534efa0b7 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -26,7 +26,7 @@
 #include <unotools/configitem.hxx>
 #include <unotools/configpaths.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <svl/poolitem.hxx> //Any2Bool
+#include <svl/poolitem.hxx>
 #include <svl/smplhint.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index ac8215013fdc..c0b791567dc8 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include <limits.h>                     // for USHRT_MAX
-#include <sal/types.h>                  // for sal_Char, sal_Unicode, etc
-#include <stdlib.h>                     // for bsearch, qsort
-#include <string.h>                     // for strcmp
+#include <limits.h>
+#include <sal/types.h>
+#include <stdlib.h>
+#include <string.h>
 #include <rtl/ustring.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 6ed6871e9a91..a6d974d3d7de 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <stdio.h>                      // for EOF
+#include <stdio.h>
 #include <rtl/tencinfo.h>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index cd34d60adfb3..4d6cbdfd4213 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "EnhancedCustomShapeFontWork.hxx"
-#include <tools/solar.h>               // UINTXX
+#include <tools/solar.h>
 #include <svx/svddef.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index a8c9cadc06a4..89a5b682c410 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -40,7 +40,7 @@
 #include <algorithm>
 #include <stack>
 
-#include <math.h> // fabs, sqrt, sin, cos, tan, atan, atan2
+#include <math.h>
 using namespace EnhancedCustomShape;
 using namespace com::sun::star;
 using namespace com::sun::star::drawing;
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index fa38393787ad..2d83858177cd 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -27,7 +27,7 @@
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/svdoedge.hxx>
-#include <svx/svdpage.hxx> // SdrObjList
+#include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sxelditm.hxx>
 #include <svx/sxmkitm.hxx>
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index fc0e096048be..13105c54918a 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <sfx2/dialoghelper.hxx>
-#include <sfx2/viewsh.hxx>      // SfxViewShell
-#include <sfx2/printer.hxx>     // Printer
+#include <sfx2/viewsh.hxx>
+#include <sfx2/printer.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
@@ -43,31 +43,31 @@
 // Item set includes
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
-#include <svl/stritem.hxx>                  // SfxStringItem
+#include <svl/stritem.hxx>
 #include <svl/languageoptions.hxx>
 
 #include <editeng/colritem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/editids.hrc>      // #define SID_ATTR_*
-#include <editeng/fontitem.hxx>     // SvxFontItem
-#include <editeng/postitem.hxx>     // SvxPostureItem
-#include <editeng/udlnitem.hxx>     // SvxUnderlineItem
-#include <editeng/crossedoutitem.hxx>     // SvxCrossedOutItem
-#include <editeng/contouritem.hxx>     // SvxContourItem
-#include <editeng/wghtitem.hxx>     // SvxWeightItem
-#include <editeng/fhgtitem.hxx>     // SvxFontHeightItem
-#include <editeng/shdditem.hxx>     // SvxShadowedItem
-#include <editeng/escapementitem.hxx>     // SvxEscapementItem
-#include <editeng/wrlmitem.hxx>     // SvxWordLineModeItem
-#include <editeng/cmapitem.hxx>     // SvxWordLineModeItem
-#include <editeng/kernitem.hxx>     // SvxKerningItem
-#include <editeng/brushitem.hxx>     // SvxBrushItem
-#include <editeng/colritem.hxx>     // SvxColorItem
-#include <editeng/emphasismarkitem.hxx>     // SvxEmphasisMarkItem
-#include <editeng/charreliefitem.hxx>       // SvxCharReliefItem
-#include <editeng/twolinesitem.hxx>         // SvxTwoLinesItem
-#include <editeng/charscaleitem.hxx>        // SvxCharScaleWidthItem
-#include <editeng/langitem.hxx>     // SvxLanguageItem
+#include <editeng/editids.hrc>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <editeng/contouritem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escapementitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/brushitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/emphasismarkitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/langitem.hxx>
 
 // define ----------------------------------------------------------------
 
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index f583be678e1e..a5881ed2b2e0 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -20,7 +20,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
-#include <sfx2/sfxsids.hrc>     // SID_ATTR_MACROITEM
+#include <sfx2/sfxsids.hrc>
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index b38b45de9310..bfa69a5f6352 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -19,7 +19,7 @@
 
 #include <tools/shl.hxx>
 
-#include <svx/dialogs.hrc> // -> RID_SVXSTR_LANGUAGE_TABLE
+#include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strarray.hxx>
 
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index f2bc3a880a59..8a36e72eccc1 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE
+#include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/txenctab.hxx"
 #include <tools/shl.hxx>
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 7d9bc2b73775..486a1cf8809c 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -41,7 +41,7 @@
 #include <svx/dlgutil.hxx>
 
 #include <svx/dialmgr.hxx>
-#include <svx/viewpt3d.hxx> // Projection Type
+#include <svx/viewpt3d.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index b9cf4c6a4877..a5384b3d8377 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -27,7 +27,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svx/fntszctl.hxx>     //
+#include <svx/fntszctl.hxx>
 #include <svx/dialogs.hrc>
 #include <editeng/fhgtitem.hxx>
 #include "editeng/fontitem.hxx"
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 68251fcd7e8c..0e0360f05a2f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -44,13 +44,13 @@
 #include <unotools/intlwrapper.hxx>
 #include <vcl/svapp.hxx>
 
-#include "svx/svdglob.hxx"  // string cache
+#include "svx/svdglob.hxx"
 #include "svx/svdstr.hrc"
 
 #include <svx/sdgcpitm.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdmodel.hxx>  // for DEGREE_CHAR
+#include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svx3ditems.hxx>
@@ -99,7 +99,7 @@
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlineit0.hxx>
-#include <svx/xtable.hxx>    // for RGB_Color()
+#include <svx/xtable.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 05b13f59482a..1068cf55d5af 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -21,7 +21,7 @@
 #include <svx/svdcrtv.hxx>
 #include "svx/xattr.hxx"
 #include <svx/svdundo.hxx>
-#include <svx/svdocapt.hxx> // special case: transparent filling after Create
+#include <svx/svdocapt.hxx>
 #include <svx/svdoedge.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index a2c4e79abd86..73d13ea33781 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -30,8 +30,8 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svddrgv.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index d8ea1f46a452..99db00d20a6d 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -20,7 +20,7 @@
 #include <vcl/metaact.hxx>
 #include <svx/svdedtv.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdograf.hxx>  // for Possibilities
+#include <svx/svdograf.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdopage.hxx>
@@ -28,9 +28,9 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svdpoev.hxx>  // for the PolyPossiblities
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdpoev.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/e3dsceneupdater.hxx>
 #include <rtl/strbuf.hxx>
 
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index edd1eec4be36..746ea47f13dd 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -28,9 +28,9 @@
 #include <tools/bigint.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdglob.hxx"
 #include "svx/svditer.hxx"
-#include "svx/svdstr.hrc"   // names taken from the resource
+#include "svx/svdstr.hrc"
 
 #include <svx/AffineMatrixItem.hxx>
 #include <svx/e3dsceneupdater.hxx>
@@ -38,16 +38,16 @@
 #include <svx/rectenum.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
-#include <svx/svdattr.hxx>  // for Get/SetGeoAttr
+#include <svx/svdattr.hxx>
 #include <svx/svdedtv.hxx>
-#include <svx/svdetc.hxx>   // for SearchOutlinerItems
-#include <svx/svdlayer.hxx> // for MergeNotPersistAttr
-#include <svx/svdopath.hxx>  // for Crook
+#include <svx/svdetc.hxx>
+#include <svx/svdlayer.hxx>
+#include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svxids.hrc>   // for SID_ATTR_TRANSFORM_...
+#include <svx/svxids.hrc>
 #include <svx/sxallitm.hxx>
 #include <svx/sxmovitm.hxx>
 #include <svx/sxreaitm.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index b54e96162535..490a69847e9e 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -20,16 +20,16 @@
 #include <svx/svdedtv.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdogrp.hxx>   // for grouping objects
-#include <svx/svdovirt.hxx>  // for VirtualObject bundling (Writer)
-#include <svx/svdopath.hxx>  // for CombineObjects
+#include <svx/svdogrp.hxx>
+#include <svx/svdovirt.hxx>
+#include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include "svx/svditer.hxx"
-#include <svx/svdograf.hxx>  // for Possibilities
-#include <svx/svdoole2.hxx>  // and Mtf-Import
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdograf.hxx>
+#include <svx/svdoole2.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 83db1668d397..0260e6954c26 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -22,8 +22,8 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdtrans.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index fad91e91fe74..350c15b60568 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -20,9 +20,9 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <svx/svdlayer.hxx>
-#include <svx/svdmodel.hxx> // for Broadcasting
-#include "svx/svdglob.hxx"  // StringCache
-#include "svx/svdstr.hrc"   // names taken from the resource
+#include <svx/svdmodel.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 sal_Bool SetOfByte::IsEmpty() const
 {
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 13f8c74fcd03..33f93082dfbd 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -26,11 +26,11 @@
 #include <svx/svdpage.hxx>
 #include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
-#include <svx/svdopath.hxx> // To turn off
-#include <svx/svdogrp.hxx>  // the cache at
-#include <svx/svdorect.hxx> // GetMarkDescription.
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdopath.hxx>
+#include <svx/svdogrp.hxx>
+#include <svx/svdorect.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #include <svx/obj3d.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index d874644df991..1693d49c583c 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -42,7 +42,7 @@
 #include <svx/xlnstit.hxx>
 
 #include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>   // for EditEngine::CreatePool()
+#include <editeng/editeng.hxx>
 
 #include <svx/xtable.hxx>
 
@@ -53,12 +53,12 @@
 #include <svx/svdundo.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdotext.hxx>  // for ReformatAllTextObjects and CalcFieldValue
+#include <svx/svdotext.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
-#include "svx/svdglob.hxx"  // StringCache
-#include "svx/svdstr.hrc"   // object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include "svdoutlinercache.hxx"
 
 #include "svx/xflclit.hxx"
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index cdfd07048ab5..91207cb1655c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -43,9 +43,9 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdoedge.hxx>  // for broadcasting connectors to Move
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include <svx/svdoedge.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <editeng/eeitem.hxx>
 #include "editeng/editstat.hxx"
 #include <svx/svdoutl.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 37b93ca6359c..bfd1d4b81f98 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -46,12 +46,12 @@
 #include <tools/line.hxx>
 #include <vcl/cvtsvm.hxx>
 #include <vcl/graphictools.hxx>
-#include <vcl/metaact.hxx>   // for TakeContour
+#include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vector>
 
 #include "svx/shapepropertynotifier.hxx"
-#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdglob.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/xlinjoit.hxx"
 
@@ -71,26 +71,26 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdocapt.hxx>  // Factory
-#include <svx/svdocirc.hxx>  // Factory
-#include <svx/svdoedge.hxx>  // Factory
-#include <svx/svdograf.hxx>  // Factory
-#include <svx/svdogrp.hxx>   // Factory
-#include <svx/svdomeas.hxx>  // Factory
+#include <svx/svdocapt.hxx>
+#include <svx/svdocirc.hxx>
+#include <svx/svdoedge.hxx>
+#include <svx/svdograf.hxx>
+#include <svx/svdogrp.hxx>
+#include <svx/svdomeas.hxx>
 #include <svx/svdomedia.hxx>
-#include <svx/svdoole2.hxx>  // Factory
-#include <svx/svdopage.hxx>  // Factory
-#include <svx/svdopath.hxx>  // Factory
-#include <svx/svdorect.hxx>  // Factory
-#include <svx/svdotext.hxx>  // Factory
-#include <svx/svdouno.hxx>   // Factory
-#include <svx/svdovirt.hxx>  // for Add/Del Ref
+#include <svx/svdoole2.hxx>
+#include <svx/svdopage.hxx>
+#include <svx/svdopath.hxx>
+#include <svx/svdorect.hxx>
+#include <svx/svdotext.hxx>
+#include <svx/svdouno.hxx>
+#include <svx/svdovirt.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/svdstr.hrc>    // the object's name
+#include <svx/svdstr.hrc>
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdview.hxx>   // for Dragging (check Ortho)
+#include <svx/svdview.hxx>
 #include <svx/sxlayitm.hxx>
 #include <svx/sxlogitm.hxx>
 #include <svx/sxmovitm.hxx>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index a41833ccf520..8e56d5b624af 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -28,8 +28,8 @@
 #include <tools/helpers.hxx>
 
 #include "svdconv.hxx"
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx>
 #include <svx/sdr/properties/captionproperties.hxx>
@@ -43,7 +43,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdtrans.hxx>
-#include <svx/svdview.hxx>   // for RectSnap
+#include <svx/svdview.hxx>
 #include <svx/sxcaitm.hxx>
 #include <svx/sxcecitm.hxx>
 #include <svx/sxcgitm.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index e7b1dd8981e8..7414c9d0aa06 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -26,8 +26,8 @@
 #include <math.h>
 #include <svl/style.hxx>
 
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
 #include <svx/sdr/properties/circleproperties.hxx>
@@ -36,11 +36,11 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdocirc.hxx>
-#include <svx/svdopath.hxx> // for the object conversion
+#include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdtrans.hxx>
-#include <svx/svdview.hxx>  // for dragging (Ortho)
+#include <svx/svdview.hxx>
 #include <svx/sxciaitm.hxx>
 #include <svx/sxcikitm.hxx>
 #include <svx/xlnedit.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index ebeea351cf5b..9e0b0ccf71a7 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "svddrgm1.hxx"
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 826d7f174da9..610f4d14a0df 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -36,9 +36,9 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdoedge.hxx>  // broadcast connectors to Move
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include <svx/svdoedge.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 0a69261a1a0b..4ba62076774e 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "svdconv.hxx"
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a4cf0c1d9a5d..0c30e7ac9039 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -66,8 +66,8 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/svdmodel.hxx>
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index c80bdf6e055f..8157b2d2a21c 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -19,8 +19,8 @@
 
 
 #include <svx/svdopage.hxx>
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index a9a6fe5e9568..11e551b8a5cd 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -30,9 +30,9 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdhdl.hxx>
-#include <svx/svdview.hxx>  // for MovCreate when using curves
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include <svx/svdview.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnclit.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 1fb7b322fbe7..0d83e8c15db4 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -29,13 +29,13 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svdocapt.hxx> // for Import of SdrFileVersion 2
-#include <svx/svdpagv.hxx> // for
-#include <svx/svdview.hxx> // the
-#include <svx/svdundo.hxx> // macro example
+#include <svx/svdocapt.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdview.hxx>
+#include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index feefd80e7ecb..35dd1cb2571e 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -20,14 +20,14 @@
 
 #include <comphelper/string.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/svdpagv.hxx>  // for the request in Paint to see whether
-#include <svx/svdview.hxx>  // the object is currently being edited
-#include <svx/svdpage.hxx>  // and for AnimationHandler (ticker text)
+#include <svx/svdpagv.hxx>
+#include <svx/svdview.hxx>
+#include <svx/svdpage.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svdmodel.hxx>  // OutlinerDefaults
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include <svx/svdmodel.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 912340fd2d3e..e4dc26966cd5 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -20,10 +20,10 @@
 #include <comphelper/string.hxx>
 #include <svl/style.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/svdmodel.hxx> // for GetMaxObjSize and GetStyleSheetPool
+#include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svdorect.hxx> // for SetDirty at NbcAdjustTextFrameWidthAndHeight
-#include <svx/svdocapt.hxx> // for SetDirty at NbcAdjustTextFrameWidthAndHeight
+#include <svx/svdorect.hxx>
+#include <svx/svdocapt.hxx>
 #include <svx/svdetc.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <editeng/editdata.hxx>
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 22a220825360..1feda4eb3ee7 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -22,9 +22,9 @@
 #include <svx/svdhdl.hxx>
 #include <svx/svddrag.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svdorect.hxx> // for SetXPolyDirty in MovCreate at SolidDragging
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include <svx/svdorect.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index f135b8707f7f..5d742461d0e0 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -19,7 +19,7 @@
 
 
 #include <svx/svdotext.hxx>
-#include <svx/svdmodel.hxx> // for GetMaxObjSize
+#include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 3269efa00883..1fc5466ba64d 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -23,8 +23,8 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svdpage.hxx>   // for Convert
-#include <svx/svdmodel.hxx>  // for Convert
+#include <svx/svdpage.hxx>
+#include <svx/svdmodel.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/sdr/properties/itemsettools.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 3cb7d905c49b..1d15439dea13 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -37,8 +37,8 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/svdglob.hxx"  // string cache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 58943d2e30b7..addf15824787 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -34,9 +34,9 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdogrp.hxx>
-#include <svx/svdograf.hxx> // for SwapInAll()
-#include <svx/svdoedge.hxx> // for copying the connectors
-#include <svx/svdoole2.hxx> // special case OLE at SdrExchangeFormat
+#include <svx/svdograf.hxx>
+#include <svx/svdoedge.hxx>
+#include <svx/svdoole2.hxx>
 #include "svx/svditer.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdlayer.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 8ff5f021bdfd..8dc10a78695e 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -24,8 +24,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 5ec3adaebef9..bc78d6b6727b 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -27,8 +27,8 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/scene3d.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outlobj.hxx>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 45505090e8b9..c2b303230909 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -19,16 +19,16 @@
 
 #include <editeng/eeitem.hxx>
 
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdedxv.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdopath.hxx> // for GetContext
-#include <svx/svdograf.hxx> // for GetContext
-#include <svx/svdomedia.hxx> // for GetContext
-#include <svx/svdetc.hxx>   // for SdrEngineDefaults
+#include <svx/svdopath.hxx>
+#include <svx/svdograf.hxx>
+#include <svx/svdomedia.hxx>
+#include <svx/svdetc.hxx>
 
 #ifdef DBG_UTIL
 #include <svdibrow.hxx>
@@ -36,8 +36,8 @@
 
 #include "svx/svdoutl.hxx"
 #include "svx/svdview.hxx"
-#include "editeng/editview.hxx" // for GetField
-#include "editeng/flditem.hxx"  // for URLField
+#include "editeng/editview.hxx"
+#include "editeng/flditem.hxx"
 #include "svx/obj3d.hxx"
 #include "svx/svddrgmt.hxx"
 #include "svx/svdotable.hxx"
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f756f6057445..147637da393d 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -28,15 +28,15 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdoole2.hxx> // to not have OLE in SdrClipboardFormat
+#include <svx/svdoole2.hxx>
 #include <svx/svdorect.hxx>
-#include <svx/svdoedge.hxx> // for connectors via the clipboard
-#include <svx/svdopage.hxx> // for connectors via the clipboard
+#include <svx/svdoedge.hxx>
+#include <svx/svdopage.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/svdtrans.hxx> // for GetMapFactor, to rescale at PasteModel
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdtrans.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svx/xoutbmp.hxx"
 #include <vcl/metaact.hxx>
 #include <svl/poolitem.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 50330d4778f2..f5f14a43e0f0 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -56,16 +56,16 @@
 #include "svx/unoshtxt.hxx"
 #include "svx/svdpage.hxx"
 #include "svx/unoshprp.hxx"
-#include "svx/sxciaitm.hxx" // todo: remove
+#include "svx/sxciaitm.hxx"
 #include "svx/svdograf.hxx"
 #include "svx/unoapi.hxx"
 #include "svx/svdomeas.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpool.hxx"
 #include <tools/gen.hxx>
-#include <tools/shl.hxx>    //
-#include "svx/dialmgr.hxx"      // not nice, we need our own resources some day
-#include "svx/dialogs.hrc"      //
+#include <tools/shl.hxx>
+#include "svx/dialmgr.hxx"
+#include "svx/dialogs.hrc"
 #include "svx/svdocapt.hxx"
 #include <svx/obj3d.hxx>
 #include <tools/diagnose_ex.h>
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>
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 74f0e3ac05d5..5d3934adfb6e 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -21,7 +21,7 @@
 #include <toolkit/helper/macros.hxx>
 #include <osl/mutex.hxx>
 
-#include <stdlib.h> // qsort/bsearch
+#include <stdlib.h>
 #include <tools/debug.hxx>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index ceea7803ee7e..7c3616ba5190 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -25,7 +25,7 @@
 
 #include <errno.h>
 #include <time.h>
-#include <cstdarg>  // combinations
+#include <cstdarg>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index f5306447c346..ec412bd01a4d 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -23,7 +23,7 @@
 #include <tools/inetmsg.hxx>
 #include <tools/inetstrm.hxx>
 
-#include <ctype.h> // toupper
+#include <ctype.h>
 
 inline bool SAL_CALL ascii_isWhitespace( sal_Unicode ch )
 {
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 92745880ec0f..b688de1ec756 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -23,8 +23,8 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <ctype.h>  // isspace
-#include <stdlib.h> // strtol, _crotl
+#include <ctype.h>
+#include <stdlib.h>
 
 #include "boost/static_assert.hpp"
 
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index d3b44dfdd436..cf9fa9dbc776 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -30,7 +30,7 @@
 #include <vector>
 
 #include <osl/mutex.hxx>
-#include <osl/thread.h> // osl_getThreadTextEncoding
+#include <osl/thread.h>
 
 // class FileBase
 #include <osl/file.hxx>
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 1d656527e937..e2ef902d64b0 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -24,9 +24,9 @@
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include "ucbhelper/providerhelper.hxx"
-#include "tdoc_uri.hxx" // for TDOC_URL_SCHEME
+#include "tdoc_uri.hxx"
 #include "tdoc_docmgr.hxx"
-#include "tdoc_storage.hxx" // for StorageAccessMode
+#include "tdoc_storage.hxx"
 
 namespace com { namespace sun { namespace star { namespace embed {
     class XStorage;
diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx
index f9daee369b1d..660276d67dff 100644
--- a/ucb/workben/cachemap/cachemaptest.cxx
+++ b/ucb/workben/cachemap/cachemaptest.cxx
@@ -28,7 +28,7 @@
 
 #include <cstdlib>
 #include <memory>
-#include <stdio.h> // <iostream> or <cstdio> do not work well on all platforms
+#include <stdio.h>
 
 using ucb::cachemap::Object1;
 using ucb::cachemap::Object2;
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index e83eb4f92c99..fb213a35ff31 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -32,7 +32,7 @@
 // ---------------------------------------------------------------------------------------
 #include <rtl/bootstrap.hxx>
 #include <rtl/instance.hxx>
-#include <osl/process.h> // for osl_getExecutableFile
+#include <osl/process.h>
 #include "tools/getprocessworkingdir.hxx"
 
 // ---------------------------------------------------------------------------------------
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 4597cc1fd634..4119983f8e68 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -48,7 +48,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 using namespace com::sun::star::configuration;
 
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
 
 #ifdef DBG_UTIL
 static inline void lcl_CFG_DBG_EXCEPTION(const sal_Char* cText, const Exception& rEx)
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index a0c800cdf176..09a230ece38b 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include <string.h>      // memcpy()
-#include <stdio.h>       // fprintf(), stderr
+#include <string.h>
+#include <stdio.h>
 #include <string>
 
 #include <unotools/localedatawrapper.hxx>
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 3b3d0ad983cb..136f5fbb67b4 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -28,8 +28,8 @@
 #include "com/sun/star/task/XInteractionDisapprove.hpp"
 #include "com/sun/star/task/XInteractionRetry.hpp"
 
-#include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ...
-#include "svtools/svtools.hrc" // RID_ERRHDL
+#include "tools/errinf.hxx"
+#include "svtools/svtools.hrc"
 
 #include "ids.hrc"
 #include "getcontinuations.hxx"
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 742ae970d6bd..6b16f8a9ea60 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -62,13 +62,13 @@
 
 #include <rtl/strbuf.hxx>
 #include "osl/conditn.hxx"
-#include "tools/rcid.h" // RSC_STRING
-#include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ...
+#include "tools/rcid.h"
+#include "tools/errinf.hxx"
 #include "osl/mutex.hxx"
 #include "osl/thread.hxx"
 #include "tools/diagnose_ex.h"
-#include "comphelper/documentconstants.hxx" // ODFVER_012_TEXT
-#include "svtools/sfxecode.hxx" // ERRCODE_SFX_*
+#include "comphelper/documentconstants.hxx"
+#include "svtools/sfxecode.hxx"
 #include "vcl/msgbox.hxx"
 #include "vcl/svapp.hxx"
 #include "unotools/configmgr.hxx"
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index d1c553df1802..4ab9c36915cc 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -32,10 +32,10 @@
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/task/InteractionClassification.hpp"
 
-#include "tools/solar.h" // sal_uInt16
-#include "tools/errcode.hxx" // ErrCode
-#include "tools/rc.hxx" // Resource
-#include "tools/wintypes.hxx" // WinBits
+#include "tools/solar.h"
+#include "tools/errcode.hxx"
+#include "tools/rc.hxx"
+#include "tools/wintypes.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace awt {
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index d9029ecfcf9f..dc5a7cc6549b 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
-#include <com/sun/star/document/XEmbeddedScripts.hpp> //Michael E. Bohn
+#include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <ooo/vba/XApplicationBase.hpp>
 
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 7d2710fd7a22..91e638a592d6 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -65,7 +65,7 @@
 #include <boost/unordered_set.hpp>
 #include <algorithm>
 
-#include "adobeenc.tab" // get encoding table for AFM metrics
+#include "adobeenc.tab"
 
 #ifdef CALLGRIND_COMPILE
 #include <valgrind/callgrind.h>
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 39cccd377d1d..2cda76f442f3 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -32,7 +32,7 @@
 #include <graphite_features.hxx>
 #endif
 
-#include <rtl/ustring.hxx>      // used only for string=>hashvalue
+#include <rtl/ustring.hxx>
 #include <osl/file.hxx>
 #include <tools/debug.hxx>
 
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index ea60b6977900..d1464d5958ee 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -27,7 +27,7 @@
 
 #include <win/wincomp.hxx>
 
-#include <set>  // for hMenu validation
+#include <set>
 #include <map>
 
 class AutoTimer;
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index f6e1f5c13453..b42eeea45e45 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -35,8 +35,8 @@
 #include "vcl/svapp.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/msgbox.hxx"
-#include "vcl/button.hxx" // for Button::GetStandardText
-#include "vcl/dockwin.hxx"  // for DockingManager
+#include "vcl/button.hxx"
+#include "vcl/dockwin.hxx"
 #include "salinst.hxx"
 #include "salframe.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 5bae2dfd2e8e..8203952fd9c4 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -44,8 +44,8 @@
 
 #ifdef WNT
 #include <svsys.h>
-#include <process.h>    // for _beginthreadex
-#include <ole2.h>   // for _beginthreadex
+#include <process.h>
+#include <ole2.h>
 #endif
 
 #ifdef ANDROID
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 5218c28efe7b..c078f510bd2b 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -19,8 +19,8 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <uno/dispatcher.h> // declaration of generic uno interface
-#include <uno/mapping.hxx> // mapping stuff
+#include <uno/dispatcher.h>
+#include <uno/mapping.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/dllapi.h>
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index a59071c554d2..709b61b040db 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -26,7 +26,7 @@
 #include <vcl/textdata.hxx>
 #include <textdoc.hxx>
 #include <textdat2.hxx>
-#include <svdata.hxx> // ImplGetResMgr()
+#include <svdata.hxx>
 #include <tools/resid.hxx>
 
 TYPEINIT1( TextUndo, SfxUndoAction );
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index 8de09acad655..26ad204368fa 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -19,7 +19,7 @@
 
 
 #include <vcl/xtextedt.hxx>
-#include <vcl/svapp.hxx>  // International
+#include <vcl/svapp.hxx>
 #include <unotools/textsearch.hxx>
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 04795df9cae8..85b4915064d1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -35,7 +35,7 @@
 using namespace com::sun::star;
 
 #ifdef DISABLE_DYNLOADING
-#include <dlfcn.h>              //  For RTLD_DEFAULT
+#include <dlfcn.h>
 #endif
 
 namespace
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 7f460a239506..49933496f349 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -23,7 +23,7 @@
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>
-#include <stdio.h> // snprintf, seems not to be in namespace std on every platform
+#include <stdio.h>
 #include <limits.h>
 #include <errno.h>
 #include <pthread.h>
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index e7f3ece6a147..10863b26f470 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -26,8 +26,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include <uno/dispatcher.h> // declaration of generic uno interface
-#include <uno/mapping.hxx> // mapping stuff
+#include <uno/dispatcher.h>
+#include <uno/mapping.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/tencinfo.h>
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 59d7e450adee..d99347b9d9ca 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include <uno/dispatcher.h> // declaration of generic uno interface
-#include <uno/mapping.hxx> // mapping stuff
+#include <uno/dispatcher.h>
+#include <uno/mapping.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/compbase1.hxx>
 
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 3850d8456052..f0e150975e89 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -19,7 +19,7 @@
 
 
 #include <svsys.h>
-#include <vcl/bitmap.hxx> // for BitmapSystemData
+#include <vcl/bitmap.hxx>
 #include <vcl/salbtype.hxx>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <win/wincomp.hxx>
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 8e9dee61a163..b729fc3161bc 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -34,7 +34,7 @@
 #include "basegfx/polygon/b2dpolygon.hxx"
 #include "basegfx/matrix/b2dhommatrixtools.hxx"
 
-#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
+#include "unotools/fontcfg.hxx"
 
 #include "tools/stream.hxx"
 #include "tools/helpers.hxx"
@@ -45,7 +45,7 @@
 #include "win/salgdi.h"
 
 #include "fontsubset.hxx"
-#include "outdev.h"         // for ImplGlyphFallbackFontSubstitution
+#include "outdev.h"
 #include "sft.hxx"
 
 #include <algorithm>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index cedf5cef31ba..2e288d1e7d2c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -39,11 +39,11 @@
 #include <sfx2/sfxbasemodel.hxx>
 
 #include <oox/mathml/import.hxx>
-#include <doctok/sprmids.hxx> // NS_sprm namespace
-#include <doctok/resourceids.hxx> // NS_rtf namespace
-#include <ooxml/resourceids.hxx> // NS_ooxml namespace
-#include <ooxml/OOXMLFastTokens.hxx> // ooxml namespace
-#include <oox/token/namespaces.hxx> // oox namespace
+#include <doctok/sprmids.hxx>
+#include <doctok/resourceids.hxx>
+#include <ooxml/resourceids.hxx>
+#include <ooxml/OOXMLFastTokens.hxx>
+#include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <dmapper/GraphicHelpers.hxx>
 
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 23f2820c0fed..aaaa4eee36d8 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 
-#include <ooxml/resourceids.hxx> // NS_ooxml namespace
+#include <ooxml/resourceids.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <svx/svdtrans.hxx>
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 7d09563c80f6..ace6735faad3 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -11,7 +11,7 @@
 #include <rtl/strbuf.hxx>
 
 #include <resourcemodel/QNameToString.hxx>
-#include <doctok/resourceids.hxx> // NS_rtf namespace
+#include <doctok/resourceids.hxx>
 
 
 namespace writerfilter {
diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx
index 1a870decc4db..3b0bfa8931f6 100644
--- a/xmloff/source/core/SvXMLAttr.cxx
+++ b/xmloff/source/core/SvXMLAttr.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <limits.h>    //USHRT_MAX
+#include <limits.h>
 #include "SvXMLAttr.hxx"
 
 SvXMLAttr::SvXMLAttr( const OUString& rLName,
diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx
index 08db830c6cfd..0a60075e5088 100644
--- a/xmloff/source/core/SvXMLAttr.hxx
+++ b/xmloff/source/core/SvXMLAttr.hxx
@@ -10,7 +10,7 @@
 #ifndef _XMLOFF_SVXMLATTR_HXX
 #define _XMLOFF_SVXMLATTR_HXX
 
-#include <rtl/ustring.hxx>   //OUString
+#include <rtl/ustring.hxx>
 
 class SvXMLAttr {
 private:
diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx
index d52793a87e86..c0aa7a0b1ac5 100644
--- a/xmloff/source/core/SvXMLAttrCollection.cxx
+++ b/xmloff/source/core/SvXMLAttrCollection.cxx
@@ -8,7 +8,7 @@
  */
 
 #include "SvXMLAttrCollection.hxx"
-#include <limits.h>   //USHRT_MAX
+#include <limits.h>
 
 bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const
 {
diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx
index 644908de85b0..f9627c950e2f 100644
--- a/xmloff/source/core/SvXMLAttrCollection.hxx
+++ b/xmloff/source/core/SvXMLAttrCollection.hxx
@@ -12,9 +12,9 @@
 
 #include "SvXMLAttr.hxx"
 
-#include <xmloff/nmspmap.hxx>  //SvXMLNamespaceMap
-#include <rtl/ustring.hxx>     //OUString
-#include <sal/types.h>         //sal_uInt16 and sal_Bool
+#include <xmloff/nmspmap.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <vector>
 
 class SvXMLAttrCollection
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 749e64dcf846..3cc3229e1c1d 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/awt/ImagePosition.hpp>
 
 #include <sax/tools/converter.hxx>
-#include <tools/wintypes.hxx>       // for check states
+#include <tools/wintypes.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index a6b7564b4752..4969efe07ce7 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
-#include <tools/wintypes.hxx>       // for check states
+#include <tools/wintypes.hxx>
 #include <xmloff/xmltoken.hxx>
 
 namespace xmloff
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 5387c2c73dd1..d115e5ba571a 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/form/ListSourceType.hpp>
-#include <tools/wintypes.hxx>       // for check states
+#include <tools/wintypes.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <xmloff/controlpropertyhdl.hxx>
 #include "controlpropertymap.hxx"
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 466331671809..66816393f26b 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/families.hxx>
-#include <xmloff/xmlnumfi.hxx>      // SvXMLNumFmtDefaults
+#include <xmloff/xmlnumfi.hxx>
 
 #include <svl/nfsymbol.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 7807dc73b82e..796009710f82 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 #include "XMLPropertyBackpatcher.hxx"
-#include <xmloff/txtimp.hxx>    // XMLTextImportHelper partially implemented here
+#include <xmloff/txtimp.hxx>
 
 
 using ::std::vector;
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 236f0f7951b1..3d4718937834 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/text/BibliographyDataField.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
-#include <com/sun/star/text/ChapterFormat.hpp> //i90246
+#include <com/sun/star/text/ChapterFormat.hpp>
 
 #include <sax/tools/converter.hxx>
 
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 033b026fa46e..6f6963ac65db 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -54,7 +54,7 @@
 #include "helpids.hrc"
 #include "resourcemanager.hxx"
 
-#include <vcl/msgbox.hxx> // Until encrypted docs work...
+#include <vcl/msgbox.hxx>
 #include <unotools/configitem.hxx>
 
 
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 5157b24e3ced..42202d4bc9c4 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "nssrenam.h" // rename problematic symbols
+#include "nssrenam.h"
 #include "cert.h"
 #include "secerr.h"
 #include "ocsp.h"
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 72d4831cbf6a..02836e315e40 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "nssrenam.h" // rename problematic symbols
+#include "nssrenam.h"
 #include "nspr.h"
 #include "nss.h"
 #include "secder.h"