diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp
index 786bf296..74d0ffae 100644
--- a/src/makernote_int.cpp
+++ b/src/makernote_int.cpp
@@ -84,7 +84,7 @@ namespace {
     std::string getExifModel(Exiv2::Internal::TiffComponent* pRoot);
     //! Nikon en/decryption function
     void ncrypt(Exiv2::byte* pData, uint32_t size, uint32_t count, uint32_t serial);
-}
+}  // namespace
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/tiffcomposite_int.cpp b/src/tiffcomposite_int.cpp
index c3bddac8..bab127c5 100644
--- a/src/tiffcomposite_int.cpp
+++ b/src/tiffcomposite_int.cpp
@@ -41,7 +41,7 @@
 namespace {
     //! Add \em tobe - \em curr 0x00 filler bytes if necessary
     uint32_t fillGap(Exiv2::Internal::IoWrapper& ioWrapper, uint32_t curr, uint32_t tobe);
-}
+}  // namespace
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 300edd5f..d4675de9 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -52,11 +52,6 @@
 
 // *****************************************************************************
 // class member definitions
-namespace Exiv2 {
-    namespace Internal {
-
-    }}                                      // namespace Internal, Exiv2
-
 namespace Exiv2 {
     using namespace Exiv2::Internal;
 
diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp
index d732d675..0ebbbd9e 100644
--- a/src/xmpsidecar.cpp
+++ b/src/xmpsidecar.cpp
@@ -39,7 +39,7 @@ namespace {
     const char* xmlHeader = "<?xpacket begin=\"\xef\xbb\xbf\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n";
     const long xmlHdrCnt = static_cast<long>(std::strlen(xmlHeader));  // without the trailing 0-character
     const char* xmlFooter = "<?xpacket end=\"w\"?>";
-}
+}  // namespace
 
 // class member definitions
 namespace Exiv2 {
diff --git a/unitTests/test_XmpKey.cpp b/unitTests/test_XmpKey.cpp
index 0b7a20d1..55599f26 100644
--- a/unitTests/test_XmpKey.cpp
+++ b/unitTests/test_XmpKey.cpp
@@ -31,7 +31,7 @@ namespace
     const std::string expectedProperty("prop");
     const std::string expectedKey(expectedFamily + "." + expectedPrefix + "." + expectedProperty);
     const std::string notRegisteredValidKey("Xmp.noregistered.prop");
-}
+}  // namespace
 
 // Test Fixture which register a namespace with a prefix. This is needed to test the correct
 // behavior of the XmpKey class