diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index 04c54956..da037589 100644
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -69,7 +69,7 @@ namespace
   {
     return String(s, unicodeStrings ? String::UTF8 : String::Latin1);
   }
-}
+}  // namespace
 
 void taglib_set_strings_unicode(BOOL unicode)
 {
diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp
index dc224c60..97a3fb53 100644
--- a/taglib/ape/apetag.cpp
+++ b/taglib/ape/apetag.cpp
@@ -70,7 +70,7 @@ namespace
 
     return true;
   }
-}
+}  // namespace
 
 class APE::Tag::TagPrivate
 {
@@ -217,7 +217,7 @@ namespace
                                       {"RELEASESTATUS", "MUSICBRAINZ_ALBUMSTATUS" },
                                       {"RELEASETYPE", "MUSICBRAINZ_ALBUMTYPE" }};
   const size_t keyConversionsSize = sizeof(keyConversions) / sizeof(keyConversions[0]);
-}
+}  // namespace
 
 PropertyMap APE::Tag::properties() const
 {
diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp
index 0e845d8a..ff2f623a 100644
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -97,7 +97,7 @@ namespace
   const ByteVector contentEncryptionGuid("\xFB\xB3\x11\x22\x23\xBD\xD2\x11\xB4\xB7\x00\xA0\xC9\x55\xFC\x6E", 16);
   const ByteVector extendedContentEncryptionGuid("\x14\xE6\x8A\x29\x22\x26 \x17\x4C\xB9\x35\xDA\xE0\x7E\xE9\x28\x9C", 16);
   const ByteVector advancedContentEncryptionGuid("\xB6\x9B\x07\x7A\xA4\xDA\x12\x4E\xA5\xCA\x91\xD3\x8D\xC1\x1A\x8D", 16);
-}
+}  // namespace
 
 class ASF::File::FilePrivate::BaseObject
 {
diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp
index a4831d62..84357e0c 100644
--- a/taglib/asf/asftag.cpp
+++ b/taglib/asf/asftag.cpp
@@ -269,7 +269,7 @@ namespace
 
     return String();
   }
-}
+}  // namespace
 
 PropertyMap ASF::Tag::properties() const
 {
diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index 0749e019..4ba5776b 100644
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -278,7 +278,7 @@ namespace
 
     return 0;
   }
-}
+}  // namespace
 
 class FileRef::FileRefPrivate : public RefCounter
 {
diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index 6ecd3bad..a71d688b 100644
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -55,7 +55,7 @@ namespace
   const long MaxPaddingLegnth = 1024 * 1024;
 
   const char LastBlockFlag = '\x80';
-}
+}  // namespace
 
 class FLAC::File::FilePrivate
 {
diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp
index 5ad8396d..a7b8eee1 100644
--- a/taglib/mp4/mp4file.cpp
+++ b/taglib/mp4/mp4file.cpp
@@ -49,7 +49,7 @@ namespace
 
     return true;
   }
-}
+}  // namespace
 
 class MP4::File::FilePrivate
 {
diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp
index 6c6976fa..391cc4c7 100644
--- a/taglib/mp4/mp4properties.cpp
+++ b/taglib/mp4/mp4properties.cpp
@@ -50,7 +50,7 @@ namespace
 
     return totalLength;
   }
-}
+}  // namespace
 
 class MP4::Properties::PropertiesPrivate
 {
diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index a99b7101..8bf46b8e 100644
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -953,7 +953,7 @@ namespace
 
     return String();
   }
-}
+}  // namespace
 
 PropertyMap MP4::Tag::properties() const
 {
diff --git a/taglib/mpc/mpcproperties.cpp b/taglib/mpc/mpcproperties.cpp
index 1e1e4b7c..85a355bb 100644
--- a/taglib/mpc/mpcproperties.cpp
+++ b/taglib/mpc/mpcproperties.cpp
@@ -201,7 +201,7 @@ namespace
   // This array looks weird, but the same as original MusePack code found at:
   // https://www.musepack.net/index.php?pg=src
   const unsigned short sftable [8] = { 44100, 48000, 37800, 32000, 0, 0, 0, 0 };
-}
+}  // namespace
 
 void MPC::Properties::readSV8(File *file, long streamLength)
 {
diff --git a/taglib/mpeg/id3v1/id3v1genres.cpp b/taglib/mpeg/id3v1/id3v1genres.cpp
index d72a2a75..581eb573 100644
--- a/taglib/mpeg/id3v1/id3v1genres.cpp
+++ b/taglib/mpeg/id3v1/id3v1genres.cpp
@@ -224,7 +224,7 @@ namespace
     L"Psybient"
   };
   const int genresSize = sizeof(genres) / sizeof(genres[0]);
-}
+}  // namespace
 
 StringList ID3v1::genreList()
 {
diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index 36016c71..5510ccf1 100644
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -75,7 +75,7 @@ namespace {
     }
     return l;
   }
-}
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // public methods
diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
index 39019e61..af161f27 100644
--- a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
+++ b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -133,7 +133,7 @@ namespace
       {"MIX", "MIXER"},
   };
   const size_t involvedPeopleSize = sizeof(involvedPeople) / sizeof(involvedPeople[0]);
-}
+}  // namespace
 
 const KeyConversionMap &TextIdentificationFrame::involvedPeopleMap() // static
 {
diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index 81f351ef..74b4c9d8 100644
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -74,7 +74,7 @@ namespace
     }
     return true;
   }
-}
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // static methods
@@ -426,7 +426,7 @@ namespace
     {"TIME", "TDRC"}, // 2.3 -> 2.4
   };
   const size_t deprecatedFramesSize = sizeof(deprecatedFrames) / sizeof(deprecatedFrames[0]);
-}
+}  // namespace
 
 String Frame::frameIDToKey(const ByteVector &id)
 {
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index cc276d44..9fa4d113 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -85,7 +85,7 @@ namespace
 
     frame->setText(newfields);
   }
-}
+}  // namespace
 
 class FrameFactory::FrameFactoryPrivate
 {
@@ -477,7 +477,7 @@ namespace
     { "IPLS", "TIPL" },
   };
   const size_t frameConversion3Size = sizeof(frameConversion3) / sizeof(frameConversion3[0]);
-}
+}  // namespace
 
 bool FrameFactory::updateFrame(Frame::Header *header) const
 {
diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
index a8d483fe..aa37bda7 100644
--- a/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -64,7 +64,7 @@ namespace
     }
     return false;
   }
-}
+}  // namespace
 
 class ID3v2::Tag::TagPrivate
 {
diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
index a2ce02a7..5f14e49d 100644
--- a/taglib/mpeg/mpegfile.cpp
+++ b/taglib/mpeg/mpegfile.cpp
@@ -93,7 +93,7 @@ namespace
     AudioProperties *audioProperties() const { return 0; }
     bool save() { return false; }
   };
-}
+}  // namespace
 
 bool MPEG::File::isSupported(IOStream *stream)
 {
diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp
index c36e4d46..1311b5df 100644
--- a/taglib/ogg/oggfile.cpp
+++ b/taglib/ogg/oggfile.cpp
@@ -44,7 +44,7 @@ namespace
     else
       return page->firstPacketIndex() + page->packetCount() - 1;
   }
-}
+}  // namespace
 
 class Ogg::File::FilePrivate
 {
diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index d272057f..19acc9f0 100644
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -1030,7 +1030,7 @@ void ByteVector::detach()
       ByteVector().swap(*this);
   }
 }
-}
+}  // namespace TagLib
 
 ////////////////////////////////////////////////////////////////////////////////
 // related functions
diff --git a/taglib/toolkit/tdebug.cpp b/taglib/toolkit/tdebug.cpp
index b2efc4cb..ca35f718 100644
--- a/taglib/toolkit/tdebug.cpp
+++ b/taglib/toolkit/tdebug.cpp
@@ -59,6 +59,6 @@ namespace TagLib
       debugListener->printMessage(msg);
     }
   }
-}
+}  // namespace TagLib
 
 #endif
diff --git a/taglib/toolkit/tdebuglistener.cpp b/taglib/toolkit/tdebuglistener.cpp
index 48912222..bf5c2608 100644
--- a/taglib/toolkit/tdebuglistener.cpp
+++ b/taglib/toolkit/tdebuglistener.cpp
@@ -61,7 +61,7 @@ namespace
   };
 
   DefaultListener defaultListener;
-}
+}  // namespace
 
 namespace TagLib
 {
@@ -82,4 +82,4 @@ namespace TagLib
     else
       debugListener = &defaultListener;
   }
-}
+}  // namespace TagLib
diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp
index 0ea3be5b..81883066 100644
--- a/taglib/toolkit/tfilestream.cpp
+++ b/taglib/toolkit/tfilestream.cpp
@@ -124,7 +124,7 @@ namespace
   }
 
 #endif  // _WIN32
-}
+}  // namespace
 
 class FileStream::FileStreamPrivate
 {
diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp
index 5b089abf..bbbac0ba 100644
--- a/taglib/toolkit/trefcounter.cpp
+++ b/taglib/toolkit/trefcounter.cpp
@@ -93,4 +93,4 @@ namespace TagLib
   {
     return static_cast<int>(d->refCount);
   }
-}
+}  // namespace TagLib
diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 80337e24..15258e74 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -134,7 +134,7 @@ namespace
         data[i] = c;
     }
   }
-}
+}  // namespace
 
 namespace TagLib {
 
@@ -712,7 +712,7 @@ void String::detach()
 ////////////////////////////////////////////////////////////////////////////////
 
 const String::Type String::WCharByteOrder = wcharByteOrder();
-}
+}  // namespace TagLib
 
 ////////////////////////////////////////////////////////////////////////////////
 // related non-member functions
diff --git a/taglib/wavpack/wavpackproperties.cpp b/taglib/wavpack/wavpackproperties.cpp
index d5808be5..1dd2a054 100644
--- a/taglib/wavpack/wavpackproperties.cpp
+++ b/taglib/wavpack/wavpackproperties.cpp
@@ -255,7 +255,7 @@ namespace
     return getMetaDataChunk(block, ID_DSD_BLOCK);
   }
 
-}
+}  // namespace
 
 void WavPack::Properties::read(File *file, long streamLength)
 {