From 4dc6bdcd28f4cf7787e7aca1856212751099b249 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 26 Nov 2022 21:59:06 -0800
Subject: [PATCH] clang-tidy: add ending namespace comments

Found with google-readability-namespace-comments

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 taglib/ape/apefile.cpp                                   | 2 +-
 taglib/ape/apefile.h                                     | 4 ++--
 taglib/ape/apefooter.h                                   | 4 ++--
 taglib/ape/apeitem.h                                     | 9 ++-------
 taglib/ape/apeproperties.cpp                             | 2 +-
 taglib/ape/apeproperties.h                               | 4 ++--
 taglib/ape/apetag.h                                      | 4 ++--
 taglib/asf/asfattribute.h                                | 7 ++-----
 taglib/asf/asffile.h                                     | 8 ++------
 taglib/asf/asfpicture.h                                  | 4 ++--
 taglib/asf/asfproperties.h                               | 9 ++-------
 taglib/asf/asftag.h                                      | 4 ++--
 taglib/asf/asfutils.h                                    | 6 +++---
 taglib/audioproperties.h                                 | 2 +-
 taglib/flac/flacfile.h                                   | 4 ++--
 taglib/flac/flacmetadatablock.h                          | 9 ++-------
 taglib/flac/flacpicture.h                                | 9 ++-------
 taglib/flac/flacproperties.h                             | 4 ++--
 taglib/flac/flacunknownmetadatablock.h                   | 9 ++-------
 taglib/it/itfile.h                                       | 4 ++--
 taglib/it/itproperties.h                                 | 4 ++--
 taglib/mod/modfile.h                                     | 9 ++-------
 taglib/mod/modfilebase.h                                 | 9 ++-------
 taglib/mod/modproperties.h                               | 9 ++-------
 taglib/mod/modtag.h                                      | 9 ++-------
 taglib/mp4/mp4atom.h                                     | 8 ++------
 taglib/mp4/mp4coverart.h                                 | 9 ++-------
 taglib/mp4/mp4file.h                                     | 9 ++-------
 taglib/mp4/mp4item.h                                     | 9 ++-------
 taglib/mp4/mp4properties.h                               | 9 ++-------
 taglib/mp4/mp4tag.h                                      | 9 ++-------
 taglib/mpc/mpcfile.cpp                                   | 2 +-
 taglib/mpc/mpcfile.h                                     | 4 ++--
 taglib/mpc/mpcproperties.h                               | 4 ++--
 taglib/mpeg/id3v1/id3v1genres.h                          | 4 ++--
 taglib/mpeg/id3v1/id3v1tag.cpp                           | 2 +-
 taglib/mpeg/id3v1/id3v1tag.h                             | 4 ++--
 taglib/mpeg/id3v2/frames/attachedpictureframe.h          | 4 ++--
 taglib/mpeg/id3v2/frames/chapterframe.h                  | 4 ++--
 taglib/mpeg/id3v2/frames/commentsframe.h                 | 4 ++--
 taglib/mpeg/id3v2/frames/eventtimingcodesframe.h         | 4 ++--
 .../mpeg/id3v2/frames/generalencapsulatedobjectframe.h   | 4 ++--
 taglib/mpeg/id3v2/frames/ownershipframe.h                | 4 ++--
 taglib/mpeg/id3v2/frames/podcastframe.h                  | 4 ++--
 taglib/mpeg/id3v2/frames/popularimeterframe.h            | 4 ++--
 taglib/mpeg/id3v2/frames/privateframe.h                  | 4 ++--
 taglib/mpeg/id3v2/frames/relativevolumeframe.h           | 4 ++--
 taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h       | 4 ++--
 taglib/mpeg/id3v2/frames/tableofcontentsframe.h          | 4 ++--
 taglib/mpeg/id3v2/frames/textidentificationframe.h       | 4 ++--
 taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h     | 4 ++--
 taglib/mpeg/id3v2/frames/unknownframe.h                  | 4 ++--
 taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h     | 4 ++--
 taglib/mpeg/id3v2/frames/urllinkframe.h                  | 4 ++--
 taglib/mpeg/id3v2/id3v2.h                                | 4 ++--
 taglib/mpeg/id3v2/id3v2extendedheader.h                  | 4 ++--
 taglib/mpeg/id3v2/id3v2footer.h                          | 4 ++--
 taglib/mpeg/id3v2/id3v2frame.h                           | 4 ++--
 taglib/mpeg/id3v2/id3v2framefactory.h                    | 4 ++--
 taglib/mpeg/id3v2/id3v2header.h                          | 4 ++--
 taglib/mpeg/id3v2/id3v2synchdata.h                       | 6 +++---
 taglib/mpeg/id3v2/id3v2tag.h                             | 4 ++--
 taglib/mpeg/mpegfile.cpp                                 | 2 +-
 taglib/mpeg/mpegfile.h                                   | 4 ++--
 taglib/mpeg/mpegheader.h                                 | 4 ++--
 taglib/mpeg/mpegproperties.h                             | 4 ++--
 taglib/mpeg/mpegutils.h                                  | 6 +++---
 taglib/mpeg/xingheader.h                                 | 4 ++--
 taglib/ogg/oggfile.h                                     | 4 ++--
 taglib/ogg/oggpage.h                                     | 4 ++--
 taglib/ogg/oggpageheader.h                               | 4 ++--
 taglib/ogg/opus/opusfile.h                               | 6 +++---
 taglib/ogg/opus/opusproperties.h                         | 6 +++---
 taglib/ogg/speex/speexfile.h                             | 6 +++---
 taglib/ogg/speex/speexproperties.h                       | 6 +++---
 taglib/ogg/vorbis/vorbisfile.cpp                         | 2 +-
 taglib/ogg/vorbis/vorbisfile.h                           | 4 ++--
 taglib/ogg/vorbis/vorbisproperties.cpp                   | 2 +-
 taglib/ogg/vorbis/vorbisproperties.h                     | 4 ++--
 taglib/ogg/xiphcomment.cpp                               | 2 +-
 taglib/ogg/xiphcomment.h                                 | 4 ++--
 taglib/riff/aiff/aifffile.h                              | 6 +++---
 taglib/riff/aiff/aiffproperties.h                        | 6 +++---
 taglib/riff/rifffile.h                                   | 4 ++--
 taglib/riff/riffutils.h                                  | 6 +++---
 taglib/riff/wav/infotag.cpp                              | 2 +-
 taglib/riff/wav/infotag.h                                | 5 +++--
 taglib/riff/wav/wavfile.cpp                              | 2 +-
 taglib/riff/wav/wavfile.h                                | 6 +++---
 taglib/riff/wav/wavproperties.cpp                        | 2 +-
 taglib/riff/wav/wavproperties.h                          | 6 +++---
 taglib/s3m/s3mfile.h                                     | 4 ++--
 taglib/s3m/s3mproperties.h                               | 4 ++--
 taglib/tag.h                                             | 2 +-
 taglib/tagunion.h                                        | 2 +-
 taglib/tagutils.h                                        | 4 ++--
 taglib/toolkit/taglib.h                                  | 2 +-
 taglib/toolkit/tbytevector.h                             | 2 +-
 taglib/toolkit/tbytevectorlist.h                         | 2 +-
 taglib/toolkit/tbytevectorstream.h                       | 2 +-
 taglib/toolkit/tdebug.h                                  | 2 +-
 taglib/toolkit/tdebuglistener.h                          | 2 +-
 taglib/toolkit/tfile.h                                   | 2 +-
 taglib/toolkit/tfilestream.h                             | 2 +-
 taglib/toolkit/tiostream.h                               | 2 +-
 taglib/toolkit/tlist.h                                   | 2 +-
 taglib/toolkit/tmap.h                                    | 2 +-
 taglib/toolkit/tpropertymap.h                            | 2 +-
 taglib/toolkit/trefcounter.h                             | 2 +-
 taglib/toolkit/tstring.h                                 | 2 +-
 taglib/toolkit/tstringlist.h                             | 2 +-
 taglib/toolkit/tutils.h                                  | 6 +++---
 taglib/toolkit/tzlib.h                                   | 4 ++--
 taglib/trueaudio/trueaudiofile.cpp                       | 2 +-
 taglib/trueaudio/trueaudiofile.h                         | 4 ++--
 taglib/trueaudio/trueaudioproperties.h                   | 4 ++--
 taglib/wavpack/wavpackfile.cpp                           | 2 +-
 taglib/wavpack/wavpackfile.h                             | 4 ++--
 taglib/wavpack/wavpackproperties.h                       | 4 ++--
 taglib/xm/xmfile.h                                       | 4 ++--
 taglib/xm/xmproperties.h                                 | 4 ++--
 121 files changed, 225 insertions(+), 305 deletions(-)

diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp
index a10c1f64..07057054 100644
--- a/taglib/ape/apefile.cpp
+++ b/taglib/ape/apefile.cpp
@@ -49,7 +49,7 @@ using namespace TagLib;
 namespace
 {
   enum { ApeAPEIndex = 0, ApeID3v1Index = 1 };
-}
+} // namespace
 
 class APE::File::FilePrivate
 {
diff --git a/taglib/ape/apefile.h b/taglib/ape/apefile.h
index 267778ba..754e05fd 100644
--- a/taglib/ape/apefile.h
+++ b/taglib/ape/apefile.h
@@ -229,7 +229,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
-}
+  }  // namespace APE
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ape/apefooter.h b/taglib/ape/apefooter.h
index 47741d0d..38d83a3a 100644
--- a/taglib/ape/apefooter.h
+++ b/taglib/ape/apefooter.h
@@ -167,7 +167,7 @@ namespace TagLib {
       FooterPrivate *d;
     };
 
-  }
-}
+  }  // namespace APE
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ape/apeitem.h b/taglib/ape/apeitem.h
index cfd157c3..2445b506 100644
--- a/taglib/ape/apeitem.h
+++ b/taglib/ape/apeitem.h
@@ -31,9 +31,7 @@
 #include "tstringlist.h"
 
 namespace TagLib {
-
   namespace APE {
-
     //! An implementation of APE-items
 
     /*!
@@ -215,10 +213,7 @@ namespace TagLib {
       class ItemPrivate;
       ItemPrivate *d;
     };
-  }
-
-}
+  }  // namespace APE
+}  // namespace TagLib
 
 #endif
-
-
diff --git a/taglib/ape/apeproperties.cpp b/taglib/ape/apeproperties.cpp
index dee7e8c0..ef99ad04 100644
--- a/taglib/ape/apeproperties.cpp
+++ b/taglib/ape/apeproperties.cpp
@@ -140,7 +140,7 @@ namespace
 
     return header.toUShort(4, false);
   }
-}
+} // namespace
 
 void APE::Properties::read(File *file, long streamLength)
 {
diff --git a/taglib/ape/apeproperties.h b/taglib/ape/apeproperties.h
index c279b59b..8c67481a 100644
--- a/taglib/ape/apeproperties.h
+++ b/taglib/ape/apeproperties.h
@@ -137,7 +137,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace APE
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ape/apetag.h b/taglib/ape/apetag.h
index f4d4fba6..01504291 100644
--- a/taglib/ape/apetag.h
+++ b/taglib/ape/apetag.h
@@ -202,7 +202,7 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
-  }
-}
+  }  // namespace APE
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/asf/asfattribute.h b/taglib/asf/asfattribute.h
index 1738eb45..5952fbdf 100644
--- a/taglib/asf/asfattribute.h
+++ b/taglib/asf/asfattribute.h
@@ -33,10 +33,8 @@
 
 namespace TagLib
 {
-
   namespace ASF
   {
-
     class File;
     class Picture;
 
@@ -201,8 +199,7 @@ namespace TagLib
       class AttributePrivate;
       AttributePrivate *d;
     };
-  }
-
-}
+  }  // namespace ASF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/asf/asffile.h b/taglib/asf/asffile.h
index 05cf4ee2..5cabc38f 100644
--- a/taglib/asf/asffile.h
+++ b/taglib/asf/asffile.h
@@ -33,10 +33,8 @@
 #include "asftag.h"
 
 namespace TagLib {
-
   //! An implementation of ASF (WMA) metadata
   namespace ASF {
-
     /*!
      * This implements and provides an interface for ASF files to the
      * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
@@ -130,9 +128,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-
-  }
-
-}
+  }  // namespace ASF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/asf/asfpicture.h b/taglib/asf/asfpicture.h
index 17233ba9..f1b0ad44 100644
--- a/taglib/asf/asfpicture.h
+++ b/taglib/asf/asfpicture.h
@@ -216,7 +216,7 @@ namespace TagLib
         class PicturePrivate;
         PicturePrivate *d;
       };
-  }
-}
+  }  // namespace ASF
+}  // namespace TagLib
 
 #endif // ASFPICTURE_H
diff --git a/taglib/asf/asfproperties.h b/taglib/asf/asfproperties.h
index 5aa453f8..d17b11d7 100644
--- a/taglib/asf/asfproperties.h
+++ b/taglib/asf/asfproperties.h
@@ -31,9 +31,7 @@
 #include "taglib_export.h"
 
 namespace TagLib {
-
   namespace ASF {
-
     //! An implementation of ASF audio properties
     class TAGLIB_EXPORT Properties : public AudioProperties
     {
@@ -178,9 +176,6 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace ASF
+}  // namespace TagLib
 #endif
diff --git a/taglib/asf/asftag.h b/taglib/asf/asftag.h
index ca06868e..7f2e355a 100644
--- a/taglib/asf/asftag.h
+++ b/taglib/asf/asftag.h
@@ -206,6 +206,6 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
-  }
-}
+  }  // namespace ASF
+}  // namespace TagLib
 #endif
diff --git a/taglib/asf/asfutils.h b/taglib/asf/asfutils.h
index a8ecd70d..acadaa1e 100644
--- a/taglib/asf/asfutils.h
+++ b/taglib/asf/asfutils.h
@@ -95,9 +95,9 @@ namespace TagLib
         return data;
       }
 
-    }
-  }
-}
+    }  // namespace
+  }  // namespace ASF
+}  // namespace TagLib
 
 #endif
 
diff --git a/taglib/audioproperties.h b/taglib/audioproperties.h
index f27aefca..9ef8210e 100644
--- a/taglib/audioproperties.h
+++ b/taglib/audioproperties.h
@@ -122,6 +122,6 @@ namespace TagLib {
     AudioPropertiesPrivate *d;
   };
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/flac/flacfile.h b/taglib/flac/flacfile.h
index 9346d9b4..a43c68c6 100644
--- a/taglib/flac/flacfile.h
+++ b/taglib/flac/flacfile.h
@@ -337,7 +337,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
-}
+  }  // namespace FLAC
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/flac/flacmetadatablock.h b/taglib/flac/flacmetadatablock.h
index 41bca318..45c7971d 100644
--- a/taglib/flac/flacmetadatablock.h
+++ b/taglib/flac/flacmetadatablock.h
@@ -31,9 +31,7 @@
 #include "taglib_export.h"
 
 namespace TagLib {
-
   namespace FLAC {
-
     class TAGLIB_EXPORT MetadataBlock
     {
     public:
@@ -67,9 +65,6 @@ namespace TagLib {
       class MetadataBlockPrivate;
       MetadataBlockPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace FLAC
+}  // namespace TagLib
 #endif
diff --git a/taglib/flac/flacpicture.h b/taglib/flac/flacpicture.h
index b6def57a..2cde3aa1 100644
--- a/taglib/flac/flacpicture.h
+++ b/taglib/flac/flacpicture.h
@@ -33,9 +33,7 @@
 #include "flacmetadatablock.h"
 
 namespace TagLib {
-
   namespace FLAC {
-
     class TAGLIB_EXPORT Picture : public MetadataBlock
     {
     public:
@@ -200,9 +198,6 @@ namespace TagLib {
     };
 
     typedef List<Picture> PictureList;
-
-  }
-
-}
-
+  }  // namespace FLAC
+}  // namespace TagLib
 #endif
diff --git a/taglib/flac/flacproperties.h b/taglib/flac/flacproperties.h
index 17e00425..e58f9aea 100644
--- a/taglib/flac/flacproperties.h
+++ b/taglib/flac/flacproperties.h
@@ -142,7 +142,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace FLAC
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/flac/flacunknownmetadatablock.h b/taglib/flac/flacunknownmetadatablock.h
index 3030254e..25e66c90 100644
--- a/taglib/flac/flacunknownmetadatablock.h
+++ b/taglib/flac/flacunknownmetadatablock.h
@@ -32,9 +32,7 @@
 #include "flacmetadatablock.h"
 
 namespace TagLib {
-
   namespace FLAC {
-
     class TAGLIB_EXPORT UnknownMetadataBlock : public MetadataBlock
     {
     public:
@@ -73,9 +71,6 @@ namespace TagLib {
       class UnknownMetadataBlockPrivate;
       UnknownMetadataBlockPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace FLAC
+}  // namespace TagLib
 #endif
diff --git a/taglib/it/itfile.h b/taglib/it/itfile.h
index 19327dc6..29e575f7 100644
--- a/taglib/it/itfile.h
+++ b/taglib/it/itfile.h
@@ -103,7 +103,7 @@ namespace TagLib {
         class FilePrivate;
         FilePrivate *d;
     };
-  }
-}
+  }  // namespace IT
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/it/itproperties.h b/taglib/it/itproperties.h
index be1c9d26..d4bce6de 100644
--- a/taglib/it/itproperties.h
+++ b/taglib/it/itproperties.h
@@ -101,7 +101,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace IT
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mod/modfile.h b/taglib/mod/modfile.h
index b66452d7..2d17dbef 100644
--- a/taglib/mod/modfile.h
+++ b/taglib/mod/modfile.h
@@ -34,9 +34,7 @@
 #include "modproperties.h"
 
 namespace TagLib {
-
   namespace Mod {
-
     class TAGLIB_EXPORT File : public TagLib::Mod::FileBase
     {
     public:
@@ -106,9 +104,6 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace Mod
+}  // namespace TagLib
 #endif
diff --git a/taglib/mod/modfilebase.h b/taglib/mod/modfilebase.h
index bae97167..d452b2bb 100644
--- a/taglib/mod/modfilebase.h
+++ b/taglib/mod/modfilebase.h
@@ -35,9 +35,7 @@
 #include <algorithm>
 
 namespace TagLib {
-
   namespace Mod {
-
     class TAGLIB_EXPORT FileBase : public TagLib::File
     {
     protected:
@@ -58,9 +56,6 @@ namespace TagLib {
       bool readU16B(unsigned short &number);
       bool readU32B(unsigned long &number);
     };
-
-  }
-
-}
-
+  }  // namespace Mod
+}  // namespace TagLib
 #endif
diff --git a/taglib/mod/modproperties.h b/taglib/mod/modproperties.h
index 47122943..51bd924b 100644
--- a/taglib/mod/modproperties.h
+++ b/taglib/mod/modproperties.h
@@ -30,9 +30,7 @@
 #include "audioproperties.h"
 
 namespace TagLib {
-
   namespace Mod {
-
     class TAGLIB_EXPORT Properties : public AudioProperties
     {
     public:
@@ -63,9 +61,6 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace Mod
+}  // namespace TagLib
 #endif
diff --git a/taglib/mod/modtag.h b/taglib/mod/modtag.h
index dee06617..f51a2e42 100644
--- a/taglib/mod/modtag.h
+++ b/taglib/mod/modtag.h
@@ -29,9 +29,7 @@
 #include "tag.h"
 
 namespace TagLib {
-
   namespace Mod {
-
     /*!
      * Tags for module files (Mod, S3M, IT, XM).
      *
@@ -186,9 +184,6 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace Mod
+}  // namespace TagLib
 #endif
diff --git a/taglib/mp4/mp4atom.h b/taglib/mp4/mp4atom.h
index 5e234cce..0a0669e4 100644
--- a/taglib/mp4/mp4atom.h
+++ b/taglib/mp4/mp4atom.h
@@ -34,9 +34,7 @@
 #include "tlist.h"
 
 namespace TagLib {
-
   namespace MP4 {
-
     class Atom;
     typedef TagLib::List<Atom *> AtomList;
 
@@ -101,10 +99,8 @@ namespace TagLib {
       AtomList path(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
       AtomList atoms;
     };
-
-  }
-
-}
+  }  // namespace MP4
+}  // namespace TagLib
 
 #endif
 
diff --git a/taglib/mp4/mp4coverart.h b/taglib/mp4/mp4coverart.h
index ebfb3f94..63684803 100644
--- a/taglib/mp4/mp4coverart.h
+++ b/taglib/mp4/mp4coverart.h
@@ -32,9 +32,7 @@
 #include "mp4atom.h"
 
 namespace TagLib {
-
   namespace MP4 {
-
     class TAGLIB_EXPORT CoverArt
     {
     public:
@@ -76,9 +74,6 @@ namespace TagLib {
     };
 
     typedef List<CoverArt> CoverArtList;
-
-  }
-
-}
-
+  }  // namespace MP4
+}  // namespace TagLib
 #endif
diff --git a/taglib/mp4/mp4file.h b/taglib/mp4/mp4file.h
index a8bb4880..b8f0a7c2 100644
--- a/taglib/mp4/mp4file.h
+++ b/taglib/mp4/mp4file.h
@@ -33,10 +33,8 @@
 #include "mp4tag.h"
 
 namespace TagLib {
-
   //! An implementation of MP4 (AAC, ALAC, ...) metadata
   namespace MP4 {
-
     class Atoms;
 
     /*!
@@ -157,9 +155,6 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace MP4
+}  // namespace TagLib
 #endif
diff --git a/taglib/mp4/mp4item.h b/taglib/mp4/mp4item.h
index 3821135b..526c3a64 100644
--- a/taglib/mp4/mp4item.h
+++ b/taglib/mp4/mp4item.h
@@ -31,9 +31,7 @@
 #include "taglib_export.h"
 
 namespace TagLib {
-
   namespace MP4 {
-
     class TAGLIB_EXPORT Item
     {
     public:
@@ -85,9 +83,6 @@ namespace TagLib {
       class ItemPrivate;
       ItemPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace MP4
+}  // namespace TagLib
 #endif
diff --git a/taglib/mp4/mp4properties.h b/taglib/mp4/mp4properties.h
index d4a1f263..5ad3f21f 100644
--- a/taglib/mp4/mp4properties.h
+++ b/taglib/mp4/mp4properties.h
@@ -30,9 +30,7 @@
 #include "audioproperties.h"
 
 namespace TagLib {
-
   namespace MP4 {
-
     class Atoms;
     class File;
 
@@ -112,9 +110,6 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace MP4
+}  // namespace TagLib
 #endif
diff --git a/taglib/mp4/mp4tag.h b/taglib/mp4/mp4tag.h
index ab70e84b..42b3d4b3 100644
--- a/taglib/mp4/mp4tag.h
+++ b/taglib/mp4/mp4tag.h
@@ -36,9 +36,7 @@
 #include "mp4item.h"
 
 namespace TagLib {
-
   namespace MP4 {
-
     /*!
      * \deprecated Use ItemMap.
      */
@@ -161,9 +159,6 @@ namespace TagLib {
         class TagPrivate;
         TagPrivate *d;
     };
-
-  }
-
-}
-
+  }  // namespace MP4
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp
index 0ffaf893..4e955875 100644
--- a/taglib/mpc/mpcfile.cpp
+++ b/taglib/mpc/mpcfile.cpp
@@ -41,7 +41,7 @@ using namespace TagLib;
 namespace
 {
   enum { MPCAPEIndex = 0, MPCID3v1Index = 1 };
-}
+} // namespace
 
 class MPC::File::FilePrivate
 {
diff --git a/taglib/mpc/mpcfile.h b/taglib/mpc/mpcfile.h
index cc62262a..c9836738 100644
--- a/taglib/mpc/mpcfile.h
+++ b/taglib/mpc/mpcfile.h
@@ -232,7 +232,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
-}
+  }  // namespace MPC
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpc/mpcproperties.h b/taglib/mpc/mpcproperties.h
index b7143ee8..1db925d6 100644
--- a/taglib/mpc/mpcproperties.h
+++ b/taglib/mpc/mpcproperties.h
@@ -152,7 +152,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace MPC
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v1/id3v1genres.h b/taglib/mpeg/id3v1/id3v1genres.h
index 0a0dd970..92feb340 100644
--- a/taglib/mpeg/id3v1/id3v1genres.h
+++ b/taglib/mpeg/id3v1/id3v1genres.h
@@ -60,7 +60,7 @@ namespace TagLib {
      * will be returned.
      */
     int TAGLIB_EXPORT genreIndex(const String &name);
-  }
-}
+  }  // namespace ID3v1
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp
index 358a9595..9c91e3cc 100644
--- a/taglib/mpeg/id3v1/id3v1tag.cpp
+++ b/taglib/mpeg/id3v1/id3v1tag.cpp
@@ -36,7 +36,7 @@ namespace
 {
   const ID3v1::StringHandler defaultStringHandler;
   const ID3v1::StringHandler *stringHandler = &defaultStringHandler;
-}
+} // namespace
 
 class ID3v1::Tag::TagPrivate
 {
diff --git a/taglib/mpeg/id3v1/id3v1tag.h b/taglib/mpeg/id3v1/id3v1tag.h
index b61f06af..5803312f 100644
--- a/taglib/mpeg/id3v1/id3v1tag.h
+++ b/taglib/mpeg/id3v1/id3v1tag.h
@@ -196,7 +196,7 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
-  }
-}
+  }  // namespace ID3v1
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/taglib/mpeg/id3v2/frames/attachedpictureframe.h
index 55067bd2..18755f39 100644
--- a/taglib/mpeg/id3v2/frames/attachedpictureframe.h
+++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.h
@@ -224,7 +224,7 @@ namespace TagLib {
       AttachedPictureFrameV22(const ByteVector &data, Header *h);
       friend class FrameFactory;
     };
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/frames/chapterframe.h b/taglib/mpeg/id3v2/frames/chapterframe.h
index 0eaa140f..90c3fc79 100644
--- a/taglib/mpeg/id3v2/frames/chapterframe.h
+++ b/taglib/mpeg/id3v2/frames/chapterframe.h
@@ -243,7 +243,7 @@ namespace TagLib {
       class ChapterFramePrivate;
       ChapterFramePrivate *d;
     };
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/frames/commentsframe.h b/taglib/mpeg/id3v2/frames/commentsframe.h
index 4da9d535..e29f8eb1 100644
--- a/taglib/mpeg/id3v2/frames/commentsframe.h
+++ b/taglib/mpeg/id3v2/frames/commentsframe.h
@@ -174,6 +174,6 @@ namespace TagLib {
       CommentsFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
index 3dcedb9e..9146bdc9 100644
--- a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
+++ b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
@@ -180,6 +180,6 @@ namespace TagLib {
       EventTimingCodesFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
index 769dfb02..cb797b88 100644
--- a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
+++ b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
@@ -173,7 +173,7 @@ namespace TagLib {
       class GeneralEncapsulatedObjectFramePrivate;
       GeneralEncapsulatedObjectFramePrivate *d;
     };
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/frames/ownershipframe.h b/taglib/mpeg/id3v2/frames/ownershipframe.h
index 06a1e233..24113b18 100644
--- a/taglib/mpeg/id3v2/frames/ownershipframe.h
+++ b/taglib/mpeg/id3v2/frames/ownershipframe.h
@@ -146,6 +146,6 @@ namespace TagLib {
       OwnershipFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/podcastframe.h b/taglib/mpeg/id3v2/frames/podcastframe.h
index a71278c3..a4a02f40 100644
--- a/taglib/mpeg/id3v2/frames/podcastframe.h
+++ b/taglib/mpeg/id3v2/frames/podcastframe.h
@@ -77,6 +77,6 @@ namespace TagLib {
       PodcastFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/popularimeterframe.h b/taglib/mpeg/id3v2/frames/popularimeterframe.h
index 405ca69e..59860b42 100644
--- a/taglib/mpeg/id3v2/frames/popularimeterframe.h
+++ b/taglib/mpeg/id3v2/frames/popularimeterframe.h
@@ -127,6 +127,6 @@ namespace TagLib {
       PopularimeterFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/privateframe.h b/taglib/mpeg/id3v2/frames/privateframe.h
index 06f82f32..eeed521c 100644
--- a/taglib/mpeg/id3v2/frames/privateframe.h
+++ b/taglib/mpeg/id3v2/frames/privateframe.h
@@ -106,6 +106,6 @@ namespace TagLib {
       PrivateFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/taglib/mpeg/id3v2/frames/relativevolumeframe.h
index 55f13fce..a3ff9bdd 100644
--- a/taglib/mpeg/id3v2/frames/relativevolumeframe.h
+++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.h
@@ -269,6 +269,6 @@ namespace TagLib {
       RelativeVolumeFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
index f520c593..a701d215 100644
--- a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
+++ b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
@@ -226,6 +226,6 @@ namespace TagLib {
       SynchronizedLyricsFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.h b/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
index 2e5401e8..1f327e91 100644
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
@@ -254,7 +254,7 @@ namespace TagLib {
       class TableOfContentsFramePrivate;
       TableOfContentsFramePrivate *d;
     };
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.h b/taglib/mpeg/id3v2/frames/textidentificationframe.h
index e49aa897..cc73f59a 100644
--- a/taglib/mpeg/id3v2/frames/textidentificationframe.h
+++ b/taglib/mpeg/id3v2/frames/textidentificationframe.h
@@ -308,6 +308,6 @@ namespace TagLib {
       UserTextIdentificationFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
index decf1b0d..cdbf1eb1 100644
--- a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
+++ b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
@@ -117,7 +117,7 @@ namespace TagLib {
       class UniqueFileIdentifierFramePrivate;
       UniqueFileIdentifierFramePrivate *d;
     };
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/frames/unknownframe.h b/taglib/mpeg/id3v2/frames/unknownframe.h
index 6559f4ed..22237021 100644
--- a/taglib/mpeg/id3v2/frames/unknownframe.h
+++ b/taglib/mpeg/id3v2/frames/unknownframe.h
@@ -74,6 +74,6 @@ namespace TagLib {
       UnknownFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
index dad67c7a..8ee378b6 100644
--- a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
+++ b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
@@ -174,6 +174,6 @@ namespace TagLib {
       UnsynchronizedLyricsFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.h b/taglib/mpeg/id3v2/frames/urllinkframe.h
index d9ac1093..c9f75ab5 100644
--- a/taglib/mpeg/id3v2/frames/urllinkframe.h
+++ b/taglib/mpeg/id3v2/frames/urllinkframe.h
@@ -185,6 +185,6 @@ namespace TagLib {
       UserUrlLinkFramePrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2.h b/taglib/mpeg/id3v2/id3v2.h
index bef82519..36e76429 100644
--- a/taglib/mpeg/id3v2/id3v2.h
+++ b/taglib/mpeg/id3v2/id3v2.h
@@ -18,7 +18,7 @@ namespace TagLib {
       v3 = 3, //<! ID3v2.3
       v4 = 4  //<! ID3v2.4
     };
-  }
-}
+  } // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2extendedheader.h b/taglib/mpeg/id3v2/id3v2extendedheader.h
index 64662338..a9054d56 100644
--- a/taglib/mpeg/id3v2/id3v2extendedheader.h
+++ b/taglib/mpeg/id3v2/id3v2extendedheader.h
@@ -88,6 +88,6 @@ namespace TagLib {
       ExtendedHeaderPrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2footer.h b/taglib/mpeg/id3v2/id3v2footer.h
index 5eb38007..12c51c31 100644
--- a/taglib/mpeg/id3v2/id3v2footer.h
+++ b/taglib/mpeg/id3v2/id3v2footer.h
@@ -77,6 +77,6 @@ namespace TagLib {
       FooterPrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2frame.h b/taglib/mpeg/id3v2/id3v2frame.h
index e3a3db32..5beeddbb 100644
--- a/taglib/mpeg/id3v2/id3v2frame.h
+++ b/taglib/mpeg/id3v2/id3v2frame.h
@@ -517,7 +517,7 @@ namespace TagLib {
       HeaderPrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h
index 706f9da5..95e08d52 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.h
+++ b/taglib/mpeg/id3v2/id3v2framefactory.h
@@ -163,7 +163,7 @@ namespace TagLib {
       FrameFactoryPrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2header.h b/taglib/mpeg/id3v2/id3v2header.h
index a1f2985e..edfe417b 100644
--- a/taglib/mpeg/id3v2/id3v2header.h
+++ b/taglib/mpeg/id3v2/id3v2header.h
@@ -170,7 +170,7 @@ namespace TagLib {
       HeaderPrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2synchdata.h b/taglib/mpeg/id3v2/id3v2synchdata.h
index 13e07161..0edce13b 100644
--- a/taglib/mpeg/id3v2/id3v2synchdata.h
+++ b/taglib/mpeg/id3v2/id3v2synchdata.h
@@ -62,9 +62,9 @@ namespace TagLib {
        * Convert the data from unsynchronized data to its original format.
        */
       TAGLIB_EXPORT ByteVector decode(const ByteVector &input);
-    }
+    }  // namespace SynchData
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/id3v2/id3v2tag.h b/taglib/mpeg/id3v2/id3v2tag.h
index 7b0f8367..b0b61749 100644
--- a/taglib/mpeg/id3v2/id3v2tag.h
+++ b/taglib/mpeg/id3v2/id3v2tag.h
@@ -405,7 +405,7 @@ namespace TagLib {
       TagPrivate *d;
     };
 
-  }
-}
+  }  // namespace ID3v2
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
index fb31a278..efe8af2a 100644
--- a/taglib/mpeg/mpegfile.cpp
+++ b/taglib/mpeg/mpegfile.cpp
@@ -42,7 +42,7 @@ using namespace TagLib;
 namespace
 {
   enum { ID3v2Index = 0, APEIndex = 1, ID3v1Index = 2 };
-}
+} // namespace
 
 class MPEG::File::FilePrivate
 {
diff --git a/taglib/mpeg/mpegfile.h b/taglib/mpeg/mpegfile.h
index 31cf34ce..381d89a0 100644
--- a/taglib/mpeg/mpegfile.h
+++ b/taglib/mpeg/mpegfile.h
@@ -381,7 +381,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
-}
+  }  // namespace MPEG
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/mpegheader.h b/taglib/mpeg/mpegheader.h
index 35902cf2..cb8eb251 100644
--- a/taglib/mpeg/mpegheader.h
+++ b/taglib/mpeg/mpegheader.h
@@ -172,7 +172,7 @@ namespace TagLib {
       class HeaderPrivate;
       HeaderPrivate *d;
     };
-  }
-}
+  }  // namespace MPEG
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/mpegproperties.h b/taglib/mpeg/mpegproperties.h
index 0b7f0c16..18e7ca1a 100644
--- a/taglib/mpeg/mpegproperties.h
+++ b/taglib/mpeg/mpegproperties.h
@@ -146,7 +146,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace MPEG
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/mpeg/mpegutils.h b/taglib/mpeg/mpegutils.h
index 31b45a43..51943328 100644
--- a/taglib/mpeg/mpegutils.h
+++ b/taglib/mpeg/mpegutils.h
@@ -54,9 +54,9 @@ namespace TagLib
         return (b1 == 0xFF && b2 != 0xFF && (b2 & 0xE0) == 0xE0);
       }
 
-    }
-  }
-}
+    }  // namespace
+  }  // namespace MPEG
+}  // namespace TagLib
 
 #endif
 
diff --git a/taglib/mpeg/xingheader.h b/taglib/mpeg/xingheader.h
index ce756190..4854168a 100644
--- a/taglib/mpeg/xingheader.h
+++ b/taglib/mpeg/xingheader.h
@@ -123,7 +123,7 @@ namespace TagLib {
       class XingHeaderPrivate;
       XingHeaderPrivate *d;
     };
-  }
-}
+  }  // namespace MPEG
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/oggfile.h b/taglib/ogg/oggfile.h
index 7d889c2f..a5d20c26 100644
--- a/taglib/ogg/oggfile.h
+++ b/taglib/ogg/oggfile.h
@@ -121,7 +121,7 @@ namespace TagLib {
       FilePrivate *d;
     };
 
-  }
-}
+  }  // namespace Ogg
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/oggpage.h b/taglib/ogg/oggpage.h
index af3fe2c9..4829b070 100644
--- a/taglib/ogg/oggpage.h
+++ b/taglib/ogg/oggpage.h
@@ -223,6 +223,6 @@ namespace TagLib {
       class PagePrivate;
       PagePrivate *d;
     };
-  }
-}
+  }  // namespace Ogg
+}  // namespace TagLib
 #endif
diff --git a/taglib/ogg/oggpageheader.h b/taglib/ogg/oggpageheader.h
index 571155fc..d62feb3d 100644
--- a/taglib/ogg/oggpageheader.h
+++ b/taglib/ogg/oggpageheader.h
@@ -226,7 +226,7 @@ namespace TagLib {
       PageHeaderPrivate *d;
     };
 
-  }
-}
+  }  // namespace Ogg
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/opus/opusfile.h b/taglib/ogg/opus/opusfile.h
index 0e094eae..bc785144 100644
--- a/taglib/ogg/opus/opusfile.h
+++ b/taglib/ogg/opus/opusfile.h
@@ -131,8 +131,8 @@ namespace TagLib {
         class FilePrivate;
         FilePrivate *d;
       };
-    }
-  }
-}
+    }  // namespace Opus
+  }  // namespace Ogg
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/opus/opusproperties.h b/taglib/ogg/opus/opusproperties.h
index 8ec291ea..2624fe1a 100644
--- a/taglib/ogg/opus/opusproperties.h
+++ b/taglib/ogg/opus/opusproperties.h
@@ -127,8 +127,8 @@ namespace TagLib {
         class PropertiesPrivate;
         PropertiesPrivate *d;
       };
-    }
-  }
-}
+    }  // namespace Opus
+  }  // namespace Ogg
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/speex/speexfile.h b/taglib/ogg/speex/speexfile.h
index 1be7113c..f8c002ac 100644
--- a/taglib/ogg/speex/speexfile.h
+++ b/taglib/ogg/speex/speexfile.h
@@ -131,8 +131,8 @@ namespace TagLib {
         class FilePrivate;
         FilePrivate *d;
       };
-    }
-  }
-}
+    }  // namespace Speex
+  }  // namespace Ogg
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/speex/speexproperties.h b/taglib/ogg/speex/speexproperties.h
index ad1ba90f..12f09e0d 100644
--- a/taglib/ogg/speex/speexproperties.h
+++ b/taglib/ogg/speex/speexproperties.h
@@ -122,8 +122,8 @@ namespace TagLib {
         class PropertiesPrivate;
         PropertiesPrivate *d;
       };
-    }
-  }
-}
+    }  // namespace Speex
+  }  // namespace Ogg
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/vorbis/vorbisfile.cpp b/taglib/ogg/vorbis/vorbisfile.cpp
index b4f221ab..a7512bec 100644
--- a/taglib/ogg/vorbis/vorbisfile.cpp
+++ b/taglib/ogg/vorbis/vorbisfile.cpp
@@ -57,7 +57,7 @@ namespace TagLib {
    * an Ogg stream.  0x03 indicates the comment header.
    */
   static const char vorbisCommentHeaderID[] = { 0x03, 'v', 'o', 'r', 'b', 'i', 's', 0 };
-}
+} // namespace TagLib
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members
diff --git a/taglib/ogg/vorbis/vorbisfile.h b/taglib/ogg/vorbis/vorbisfile.h
index 04c0c04e..a166db4d 100644
--- a/taglib/ogg/vorbis/vorbisfile.h
+++ b/taglib/ogg/vorbis/vorbisfile.h
@@ -138,7 +138,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
+  }  // namespace Vorbis
 
 /*
  * To keep compatibility with the current version put Vorbis in the Ogg namespace
@@ -152,6 +152,6 @@ namespace TagLib {
   namespace Ogg { namespace Vorbis { typedef TagLib::Vorbis::File File; } }
 #endif
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/vorbis/vorbisproperties.cpp b/taglib/ogg/vorbis/vorbisproperties.cpp
index 4000c254..c2909204 100644
--- a/taglib/ogg/vorbis/vorbisproperties.cpp
+++ b/taglib/ogg/vorbis/vorbisproperties.cpp
@@ -62,7 +62,7 @@ namespace TagLib {
    * an Ogg stream.  0x01 indicates the setup header.
    */
   static const char vorbisSetupHeaderID[] = { 0x01, 'v', 'o', 'r', 'b', 'i', 's', 0 };
-}
+} // namespace TagLib
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
diff --git a/taglib/ogg/vorbis/vorbisproperties.h b/taglib/ogg/vorbis/vorbisproperties.h
index b1cd5f0a..4ca2bfe0 100644
--- a/taglib/ogg/vorbis/vorbisproperties.h
+++ b/taglib/ogg/vorbis/vorbisproperties.h
@@ -141,7 +141,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
+  }  // namespace Vorbis
 
 /*
  * To keep compatibility with the current version put Vorbis in the Ogg namespace
@@ -155,6 +155,6 @@ namespace TagLib {
   namespace Ogg { namespace Vorbis { typedef TagLib::AudioProperties AudioProperties; } }
 #endif
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp
index b53098f3..2b0e8995 100644
--- a/taglib/ogg/xiphcomment.cpp
+++ b/taglib/ogg/xiphcomment.cpp
@@ -40,7 +40,7 @@ namespace
   typedef List<FLAC::Picture *> PictureList;
   typedef PictureList::Iterator PictureIterator;
   typedef PictureList::Iterator PictureConstIterator;
-}
+} // namespace
 
 class Ogg::XiphComment::XiphCommentPrivate
 {
diff --git a/taglib/ogg/xiphcomment.h b/taglib/ogg/xiphcomment.h
index 7925fa03..cb4742ba 100644
--- a/taglib/ogg/xiphcomment.h
+++ b/taglib/ogg/xiphcomment.h
@@ -274,7 +274,7 @@ namespace TagLib {
       class XiphCommentPrivate;
       XiphCommentPrivate *d;
     };
-  }
-}
+  }  // namespace Ogg
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/riff/aiff/aifffile.h b/taglib/riff/aiff/aifffile.h
index ceac5769..1e2d9d54 100644
--- a/taglib/riff/aiff/aifffile.h
+++ b/taglib/riff/aiff/aifffile.h
@@ -150,8 +150,8 @@ namespace TagLib {
         class FilePrivate;
         FilePrivate *d;
       };
-    }
-  }
-}
+    }  // namespace AIFF
+  }  // namespace RIFF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/riff/aiff/aiffproperties.h b/taglib/riff/aiff/aiffproperties.h
index 9ebd86ca..0324b858 100644
--- a/taglib/riff/aiff/aiffproperties.h
+++ b/taglib/riff/aiff/aiffproperties.h
@@ -159,8 +159,8 @@ namespace TagLib {
         class PropertiesPrivate;
         PropertiesPrivate *d;
       };
-    }
-  }
-}
+    }  // namespace AIFF
+  }  // namespace RIFF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/riff/rifffile.h b/taglib/riff/rifffile.h
index 5c606b4a..1ed49503 100644
--- a/taglib/riff/rifffile.h
+++ b/taglib/riff/rifffile.h
@@ -155,7 +155,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
-}
+  }  // namespace RIFF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/riff/riffutils.h b/taglib/riff/riffutils.h
index ecb985a4..c913e019 100644
--- a/taglib/riff/riffutils.h
+++ b/taglib/riff/riffutils.h
@@ -51,9 +51,9 @@ namespace TagLib
         return true;
       }
 
-    }
-  }
-}
+    }  // namespace
+  }  // namespace RIFF
+}  // namespace TagLib
 
 #endif
 
diff --git a/taglib/riff/wav/infotag.cpp b/taglib/riff/wav/infotag.cpp
index 716701df..94944626 100644
--- a/taglib/riff/wav/infotag.cpp
+++ b/taglib/riff/wav/infotag.cpp
@@ -36,7 +36,7 @@ namespace
 {
   const RIFF::Info::StringHandler defaultStringHandler;
   const RIFF::Info::StringHandler *stringHandler = &defaultStringHandler;
-}
+} // namespace
 
 class RIFF::Info::Tag::TagPrivate
 {
diff --git a/taglib/riff/wav/infotag.h b/taglib/riff/wav/infotag.h
index d1f0297d..431d86cb 100644
--- a/taglib/riff/wav/infotag.h
+++ b/taglib/riff/wav/infotag.h
@@ -186,7 +186,8 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
-  }}
-}
+  }  // namespace Info
+}  // namespace RIFF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp
index 3dce70b1..63ce1562 100644
--- a/taglib/riff/wav/wavfile.cpp
+++ b/taglib/riff/wav/wavfile.cpp
@@ -39,7 +39,7 @@ using namespace TagLib;
 namespace
 {
   enum { ID3v2Index = 0, InfoIndex = 1 };
-}
+} // namespace
 
 class RIFF::WAV::File::FilePrivate
 {
diff --git a/taglib/riff/wav/wavfile.h b/taglib/riff/wav/wavfile.h
index 02db890c..bcd28410 100644
--- a/taglib/riff/wav/wavfile.h
+++ b/taglib/riff/wav/wavfile.h
@@ -208,8 +208,8 @@ namespace TagLib {
         class FilePrivate;
         FilePrivate *d;
       };
-    }
-  }
-}
+    }  // namespace WAV
+  }  // namespace RIFF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/riff/wav/wavproperties.cpp b/taglib/riff/wav/wavproperties.cpp
index 7c97501b..4a704e6c 100644
--- a/taglib/riff/wav/wavproperties.cpp
+++ b/taglib/riff/wav/wavproperties.cpp
@@ -38,7 +38,7 @@ namespace
     FORMAT_PCM     = 0x0001,
     FORMAT_IEEE_FLOAT = 0x0003
   };
-}
+} // namespace
 
 class RIFF::WAV::Properties::PropertiesPrivate
 {
diff --git a/taglib/riff/wav/wavproperties.h b/taglib/riff/wav/wavproperties.h
index 1d9401f5..2b3c0beb 100644
--- a/taglib/riff/wav/wavproperties.h
+++ b/taglib/riff/wav/wavproperties.h
@@ -156,8 +156,8 @@ namespace TagLib {
         class PropertiesPrivate;
         PropertiesPrivate *d;
       };
-    }
-  }
-}
+    }  // namespace WAV
+  }  // namespace RIFF
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/s3m/s3mfile.h b/taglib/s3m/s3mfile.h
index 4011bd14..f9ff6058 100644
--- a/taglib/s3m/s3mfile.h
+++ b/taglib/s3m/s3mfile.h
@@ -106,7 +106,7 @@ namespace TagLib {
         class FilePrivate;
         FilePrivate *d;
     };
-  }
-}
+  }  // namespace S3M
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/s3m/s3mproperties.h b/taglib/s3m/s3mproperties.h
index 92b2a274..fda5952f 100644
--- a/taglib/s3m/s3mproperties.h
+++ b/taglib/s3m/s3mproperties.h
@@ -88,7 +88,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace S3M
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/tag.h b/taglib/tag.h
index be9628c8..a4458800 100644
--- a/taglib/tag.h
+++ b/taglib/tag.h
@@ -196,6 +196,6 @@ namespace TagLib {
     class TagPrivate;
     TagPrivate *d;
   };
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/tagunion.h b/taglib/tagunion.h
index 1eb38a01..b8b361ac 100644
--- a/taglib/tagunion.h
+++ b/taglib/tagunion.h
@@ -92,7 +92,7 @@ namespace TagLib {
     class TagUnionPrivate;
     TagUnionPrivate *d;
   };
-}
+}  // namespace TagLib
 
 #endif
 #endif
diff --git a/taglib/tagutils.h b/taglib/tagutils.h
index 4488a32b..b7863494 100644
--- a/taglib/tagutils.h
+++ b/taglib/tagutils.h
@@ -47,8 +47,8 @@ namespace TagLib {
 
     ByteVector readHeader(IOStream *stream, unsigned int length, bool skipID3v2,
                           long *headerOffset = 0);
-  }
-}
+  }  // namespace Utils
+}  // namespace TagLib
 
 #endif
 
diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
index 8ea0b99b..64ccf0a8 100644
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -84,7 +84,7 @@ namespace TagLib {
    * so I'm providing something here that should be constant.
    */
   typedef std::basic_string<wchar_t> wstring;
-}
+}  // namespace TagLib
 
 /*!
  * \mainpage TagLib
diff --git a/taglib/toolkit/tbytevector.h b/taglib/toolkit/tbytevector.h
index 22cf625d..bc8eda76 100644
--- a/taglib/toolkit/tbytevector.h
+++ b/taglib/toolkit/tbytevector.h
@@ -624,7 +624,7 @@ namespace TagLib {
     class ByteVectorPrivate;
     ByteVectorPrivate *d;
   };
-}
+}  // namespace TagLib
 
 /*!
  * \relates TagLib::ByteVector
diff --git a/taglib/toolkit/tbytevectorlist.h b/taglib/toolkit/tbytevectorlist.h
index 5852583a..27fc64ab 100644
--- a/taglib/toolkit/tbytevectorlist.h
+++ b/taglib/toolkit/tbytevectorlist.h
@@ -86,6 +86,6 @@ namespace TagLib {
     ByteVectorListPrivate *d;
   };
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/toolkit/tbytevectorstream.h b/taglib/toolkit/tbytevectorstream.h
index 84327c46..5aa8fcfd 100644
--- a/taglib/toolkit/tbytevectorstream.h
+++ b/taglib/toolkit/tbytevectorstream.h
@@ -140,6 +140,6 @@ namespace TagLib {
     ByteVectorStreamPrivate *d;
   };
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/toolkit/tdebug.h b/taglib/toolkit/tdebug.h
index 80d00d39..78115d25 100644
--- a/taglib/toolkit/tdebug.h
+++ b/taglib/toolkit/tdebug.h
@@ -64,7 +64,7 @@ namespace TagLib {
   #define debugData(x)  ((void)0)
 
 #endif
-}
+}  // namespace TagLib
 
 #endif
 #endif
diff --git a/taglib/toolkit/tdebuglistener.h b/taglib/toolkit/tdebuglistener.h
index 3c8e1185..e4e42797 100644
--- a/taglib/toolkit/tdebuglistener.h
+++ b/taglib/toolkit/tdebuglistener.h
@@ -69,6 +69,6 @@ namespace TagLib
    * \see DebugListener
    */
   TAGLIB_EXPORT void setDebugListener(DebugListener *listener);
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/toolkit/tfile.h b/taglib/toolkit/tfile.h
index b9ac95ad..bb8c2b30 100644
--- a/taglib/toolkit/tfile.h
+++ b/taglib/toolkit/tfile.h
@@ -318,6 +318,6 @@ namespace TagLib {
     FilePrivate *d;
   };
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/toolkit/tfilestream.h b/taglib/toolkit/tfilestream.h
index aa4d71b3..dd3b8652 100644
--- a/taglib/toolkit/tfilestream.h
+++ b/taglib/toolkit/tfilestream.h
@@ -154,6 +154,6 @@ namespace TagLib {
     FileStreamPrivate *d;
   };
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/toolkit/tiostream.h b/taglib/toolkit/tiostream.h
index 11053164..1972d935 100644
--- a/taglib/toolkit/tiostream.h
+++ b/taglib/toolkit/tiostream.h
@@ -165,6 +165,6 @@ namespace TagLib {
     IOStream &operator=(const IOStream &);
   };
 
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/toolkit/tlist.h b/taglib/toolkit/tlist.h
index 377b8248..b4bd0fe7 100644
--- a/taglib/toolkit/tlist.h
+++ b/taglib/toolkit/tlist.h
@@ -260,7 +260,7 @@ namespace TagLib {
 #endif
   };
 
-}
+}  // namespace TagLib
 
 // Since GCC doesn't support the "export" keyword, we have to include the
 // implementation.
diff --git a/taglib/toolkit/tmap.h b/taglib/toolkit/tmap.h
index 2f920d2f..ed0e5684 100644
--- a/taglib/toolkit/tmap.h
+++ b/taglib/toolkit/tmap.h
@@ -202,7 +202,7 @@ namespace TagLib {
 #endif
   };
 
-}
+}  // namespace TagLib
 
 // Since GCC doesn't support the "export" keyword, we have to include the
 // implementation.
diff --git a/taglib/toolkit/tpropertymap.h b/taglib/toolkit/tpropertymap.h
index de497869..ece3dc9d 100644
--- a/taglib/toolkit/tpropertymap.h
+++ b/taglib/toolkit/tpropertymap.h
@@ -252,5 +252,5 @@ namespace TagLib {
     StringList unsupported;
   };
 
-}
+}  // namespace TagLib
 #endif /* TAGLIB_PROPERTYMAP_H_ */
diff --git a/taglib/toolkit/trefcounter.h b/taglib/toolkit/trefcounter.h
index db97c538..b3ce8833 100644
--- a/taglib/toolkit/trefcounter.h
+++ b/taglib/toolkit/trefcounter.h
@@ -107,7 +107,7 @@ namespace TagLib
 #endif
   };
 
-}
+}  // namespace TagLib
 
 #endif // DO_NOT_DOCUMENT
 #endif
diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
index e6bbbe7b..d34b2012 100644
--- a/taglib/toolkit/tstring.h
+++ b/taglib/toolkit/tstring.h
@@ -546,7 +546,7 @@ namespace TagLib {
     class StringPrivate;
     StringPrivate *d;
   };
-}
+}  // namespace TagLib
 
 /*!
  * \relates TagLib::String
diff --git a/taglib/toolkit/tstringlist.h b/taglib/toolkit/tstringlist.h
index ddf0f04d..e18a54b1 100644
--- a/taglib/toolkit/tstringlist.h
+++ b/taglib/toolkit/tstringlist.h
@@ -104,7 +104,7 @@ namespace TagLib {
     StringListPrivate *d;
   };
 
-}
+}  // namespace TagLib
 
 /*!
  * \related TagLib::StringList
diff --git a/taglib/toolkit/tutils.h b/taglib/toolkit/tutils.h
index fab31529..14cdd435 100644
--- a/taglib/toolkit/tutils.h
+++ b/taglib/toolkit/tutils.h
@@ -232,9 +232,9 @@ namespace TagLib
           return LittleEndian;
         return BigEndian;
       }
-    }
-  }
-}
+    }  // namespace
+  }  // namespace Utils
+}  // namespace TagLib
 
 #endif
 
diff --git a/taglib/toolkit/tzlib.h b/taglib/toolkit/tzlib.h
index dab78280..ac6b9cf8 100644
--- a/taglib/toolkit/tzlib.h
+++ b/taglib/toolkit/tzlib.h
@@ -46,8 +46,8 @@ namespace TagLib {
       */
      ByteVector decompress(const ByteVector &data);
 
-  }
-}
+  }  // namespace zlib
+}  // namespace TagLib
 
 #endif
 
diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp
index e4de436e..e1dd7b99 100644
--- a/taglib/trueaudio/trueaudiofile.cpp
+++ b/taglib/trueaudio/trueaudiofile.cpp
@@ -45,7 +45,7 @@ using namespace TagLib;
 namespace
 {
   enum { TrueAudioID3v2Index = 0, TrueAudioID3v1Index = 1 };
-}
+} // namespace
 
 class TrueAudio::File::FilePrivate
 {
diff --git a/taglib/trueaudio/trueaudiofile.h b/taglib/trueaudio/trueaudiofile.h
index 0f883c86..1019bfc4 100644
--- a/taglib/trueaudio/trueaudiofile.h
+++ b/taglib/trueaudio/trueaudiofile.h
@@ -253,7 +253,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
-}
+  }  // namespace TrueAudio
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/trueaudio/trueaudioproperties.h b/taglib/trueaudio/trueaudioproperties.h
index bfef2bbe..5b736081 100644
--- a/taglib/trueaudio/trueaudioproperties.h
+++ b/taglib/trueaudio/trueaudioproperties.h
@@ -127,7 +127,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace TrueAudio
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp
index 56b99393..291e9b88 100644
--- a/taglib/wavpack/wavpackfile.cpp
+++ b/taglib/wavpack/wavpackfile.cpp
@@ -45,7 +45,7 @@ using namespace TagLib;
 namespace
 {
   enum { WavAPEIndex, WavID3v1Index };
-}
+} // namespace
 
 class WavPack::File::FilePrivate
 {
diff --git a/taglib/wavpack/wavpackfile.h b/taglib/wavpack/wavpackfile.h
index ccc4ef6e..ffece732 100644
--- a/taglib/wavpack/wavpackfile.h
+++ b/taglib/wavpack/wavpackfile.h
@@ -217,7 +217,7 @@ namespace TagLib {
       class FilePrivate;
       FilePrivate *d;
     };
-  }
-}
+  }  // namespace WavPack
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/wavpack/wavpackproperties.h b/taglib/wavpack/wavpackproperties.h
index fee714d0..e1a481df 100644
--- a/taglib/wavpack/wavpackproperties.h
+++ b/taglib/wavpack/wavpackproperties.h
@@ -143,7 +143,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace WavPack
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/xm/xmfile.h b/taglib/xm/xmfile.h
index 9211078a..e72c92c4 100644
--- a/taglib/xm/xmfile.h
+++ b/taglib/xm/xmfile.h
@@ -106,7 +106,7 @@ namespace TagLib {
         class FilePrivate;
         FilePrivate *d;
     };
-  }
-}
+  }  // namespace XM
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/xm/xmproperties.h b/taglib/xm/xmproperties.h
index 24a52217..8d953f28 100644
--- a/taglib/xm/xmproperties.h
+++ b/taglib/xm/xmproperties.h
@@ -79,7 +79,7 @@ namespace TagLib {
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-  }
-}
+  }  // namespace XM
+}  // namespace TagLib
 
 #endif