6 files changed, 8 insertions, 33 deletions
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index ba0da718eec6..30b51f3062e1 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -46,8 +46,6 @@
 
 using namespace psp;
 
-// forward declaration
-
 #define nBLOCKSIZE 0x2000
 
 namespace psp
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index a5e18d67ba41..8c08b4ae6b5a 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -42,14 +42,14 @@
  *  friends are PostScript afm style, that is they are 1/1000 font height
  */
 
-// forward declarations
-namespace utl { class MultiAtomProvider; } // see unotools/atom.hxx
+namespace utl { class MultiAtomProvider; }
+
 class FontSubsetInfo;
 class ImplFontOptions;
 class FontSelectPattern;
 
 namespace psp {
-class PPDParser; // see ppdparser.hxx
+class PPDParser;
 
 namespace fonttype
 {
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 348b44c9a4ed..77ae365076b2 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -30,7 +30,6 @@
 
 namespace psp {
 
-// forwards
 struct JobData;
 
 /*
@@ -115,10 +114,6 @@ public:
     }
 };
 
-/*
- * forward declarations
- */
-
 class Font2;
 class GlyphSet;
 class PrinterJob;
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index 686c890a2d34..5282a3751771 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -28,13 +28,11 @@
 
 namespace psp {
 
-// forward declarations
 class PrinterGfx;
 
 class PrinterJob
 {
-private:            // private data
-
+private:
     OUString           maSpoolDirName;
     OUString           maFileName; // empty: spool to command, else spool to named file
     OUString           maJobTitle;
@@ -70,8 +68,7 @@ private:            // private data
 
     bool            m_bQuickJob;
 
-private:            // private methods
-
+private:
     osl::File*      CreateSpoolFile (const OUString& rName,
                                      const OUString& rExtension);
     void            InitPaperSize (const JobData& rJobSetup);
@@ -83,7 +80,6 @@ private:            // private methods
     static bool     writeProlog (osl::File* pFile, const JobData& );
 
 public:             // for usage in PrinterGfx
-
     sal_uInt32      GetResolution () const { return mnResolution; }
     void            GetScale (double &rXScale, double &rYScale) const;
     sal_uInt16      GetDepth () const;
@@ -129,7 +125,7 @@ public:
     bool        EndPage ();
 };
 
-}  /* namespace psp */
+}  // namespace psp
 
 #endif // INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
 
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 7ccbe150e588..55d0d676091d 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -25,28 +25,22 @@
 // We need this to enable namespace support in libgrengine headers.
 #define GR_NAMESPACE
 
-// Standard Library
 #include <memory>
 #include <vector>
 #include <map>
 #include <utility>
-// Libraries
+
 #include <graphite_static.hxx>
 #include <graphite2/Font.h>
 #include <graphite2/Segment.h>
-// Platform
+
 #include <vcl/dllapi.h>
 
 #include "sallayout.hxx"
 
-// Module
-
-// Module type definitions and forward declarations.
-// SAL/VCL types
 class ServerFont;
 class PhysicalFontFace;
 
-// Graphite types
 namespace grutils { class GrFeatureParser; }
 
 class GraphiteFaceWrapper
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index d26a15f31b03..e7d54f48c219 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -29,9 +29,6 @@
 
 // #define GRLAYOUT_DEBUG 1
 
-// Header files
-
-// Standard Library
 #include <algorithm>
 #include <cassert>
 #include <functional>
@@ -39,7 +36,6 @@
 #include <numeric>
 #include <deque>
 
-// Platform
 #include <config_global.h>
 
 #include <svsys.h>
@@ -61,10 +57,6 @@
 #include <graphite_layout.hxx>
 #include <graphite_features.hxx>
 
-// Module private type definitions and forward declarations.
-
-// Module private names.
-
 #ifdef GRLAYOUT_DEBUG
 static FILE * grLog()
 {