diff --git a/3rdparty/taglib/ape/apefile.h b/3rdparty/taglib/ape/apefile.h
index 66ba13499..4975b1e45 100644
--- a/3rdparty/taglib/ape/apefile.h
+++ b/3rdparty/taglib/ape/apefile.h
@@ -38,7 +38,8 @@
 #include "taglib_export.h"
 #include "apeproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
 
@@ -231,5 +232,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ape/apefooter.h b/3rdparty/taglib/ape/apefooter.h
index 233a21145..4f91d1e90 100644
--- a/3rdparty/taglib/ape/apefooter.h
+++ b/3rdparty/taglib/ape/apefooter.h
@@ -29,7 +29,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace APE {
 
@@ -169,5 +170,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ape/apeitem.h b/3rdparty/taglib/ape/apeitem.h
index f39776f18..c3f6acb8f 100644
--- a/3rdparty/taglib/ape/apeitem.h
+++ b/3rdparty/taglib/ape/apeitem.h
@@ -30,7 +30,8 @@
 #include "tstring.h"
 #include "tstringlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace APE {
 
@@ -218,6 +219,7 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/ape/apeproperties.h b/3rdparty/taglib/ape/apeproperties.h
index 092b4ed72..20b7a0dc3 100644
--- a/3rdparty/taglib/ape/apeproperties.h
+++ b/3rdparty/taglib/ape/apeproperties.h
@@ -33,7 +33,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace APE {
 
@@ -139,5 +140,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ape/apetag.h b/3rdparty/taglib/ape/apetag.h
index 67bf35582..f107b845f 100644
--- a/3rdparty/taglib/ape/apetag.h
+++ b/3rdparty/taglib/ape/apetag.h
@@ -34,7 +34,8 @@
 
 #include "apeitem.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class File;
 
@@ -204,5 +205,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/asf/asfattribute.h b/3rdparty/taglib/asf/asfattribute.h
index 69938dd52..6c79618bc 100644
--- a/3rdparty/taglib/asf/asfattribute.h
+++ b/3rdparty/taglib/asf/asfattribute.h
@@ -31,7 +31,8 @@
 #include "taglib_export.h"
 #include "asfpicture.h"
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
 
   namespace ASF
@@ -204,5 +205,6 @@ namespace Strawberry_TagLib::TagLib
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/asf/asffile.h b/3rdparty/taglib/asf/asffile.h
index 5f9357fdb..f5f9fe784 100644
--- a/3rdparty/taglib/asf/asffile.h
+++ b/3rdparty/taglib/asf/asffile.h
@@ -32,7 +32,8 @@
 #include "asfproperties.h"
 #include "asftag.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! An implementation of ASF (WMA) metadata
   namespace ASF {
@@ -134,5 +135,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/asf/asfpicture.h b/3rdparty/taglib/asf/asfpicture.h
index a69ec8f79..c41f4289a 100644
--- a/3rdparty/taglib/asf/asfpicture.h
+++ b/3rdparty/taglib/asf/asfpicture.h
@@ -31,7 +31,8 @@
 #include "taglib_export.h"
 #include "attachedpictureframe.h"
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   namespace ASF
   {
@@ -218,5 +219,6 @@ namespace Strawberry_TagLib::TagLib
       };
   }
 }
+}
 
 #endif // ASFPICTURE_H
diff --git a/3rdparty/taglib/asf/asfproperties.h b/3rdparty/taglib/asf/asfproperties.h
index 7737fdde4..74ac529fa 100644
--- a/3rdparty/taglib/asf/asfproperties.h
+++ b/3rdparty/taglib/asf/asfproperties.h
@@ -30,7 +30,8 @@
 #include "tstring.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ASF {
 
@@ -182,5 +183,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/asf/asftag.h b/3rdparty/taglib/asf/asftag.h
index 5269f8404..3c43ae5f9 100644
--- a/3rdparty/taglib/asf/asftag.h
+++ b/3rdparty/taglib/asf/asftag.h
@@ -32,7 +32,8 @@
 #include "taglib_export.h"
 #include "asfattribute.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ASF {
 
@@ -206,4 +207,5 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/asf/asfutils.h b/3rdparty/taglib/asf/asfutils.h
index a0308a592..7cc409b66 100644
--- a/3rdparty/taglib/asf/asfutils.h
+++ b/3rdparty/taglib/asf/asfutils.h
@@ -30,7 +30,8 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   namespace ASF
   {
@@ -98,6 +99,7 @@ namespace Strawberry_TagLib::TagLib
     }
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/audioproperties.h b/3rdparty/taglib/audioproperties.h
index ab1029280..d07f2f9c3 100644
--- a/3rdparty/taglib/audioproperties.h
+++ b/3rdparty/taglib/audioproperties.h
@@ -28,7 +28,8 @@
 
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A simple, abstract interface to common audio properties
 
@@ -123,5 +124,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/dsdiff/dsdiffdiintag.h b/3rdparty/taglib/dsdiff/dsdiffdiintag.h
index 0596ad50e..fb1506bbf 100644
--- a/3rdparty/taglib/dsdiff/dsdiffdiintag.h
+++ b/3rdparty/taglib/dsdiff/dsdiffdiintag.h
@@ -28,7 +28,8 @@
 
 #include "tag.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace DSDIFF {
 
@@ -145,6 +146,7 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/dsdiff/dsdifffile.h b/3rdparty/taglib/dsdiff/dsdifffile.h
index fee3fe746..eb60c1632 100644
--- a/3rdparty/taglib/dsdiff/dsdifffile.h
+++ b/3rdparty/taglib/dsdiff/dsdifffile.h
@@ -31,7 +31,8 @@
 #include "dsdiffproperties.h"
 #include "dsdiffdiintag.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! An implementation of DSDIFF metadata
 
@@ -255,6 +256,7 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/dsdiff/dsdiffproperties.h b/3rdparty/taglib/dsdiff/dsdiffproperties.h
index f8f94e241..d2d852338 100644
--- a/3rdparty/taglib/dsdiff/dsdiffproperties.h
+++ b/3rdparty/taglib/dsdiff/dsdiffproperties.h
@@ -28,7 +28,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace DSDIFF {
 
@@ -78,6 +79,7 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/dsf/dsffile.h b/3rdparty/taglib/dsf/dsffile.h
index 6e4ac39a2..456358024 100644
--- a/3rdparty/taglib/dsf/dsffile.h
+++ b/3rdparty/taglib/dsf/dsffile.h
@@ -30,7 +30,8 @@
 #include "id3v2tag.h"
 #include "dsfproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! An implementation of DSF metadata
 
@@ -123,6 +124,7 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/dsf/dsfproperties.h b/3rdparty/taglib/dsf/dsfproperties.h
index 256fb74af..26ae36a2f 100644
--- a/3rdparty/taglib/dsf/dsfproperties.h
+++ b/3rdparty/taglib/dsf/dsfproperties.h
@@ -28,7 +28,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace DSF {
 
@@ -87,6 +88,7 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/fileref.h b/3rdparty/taglib/fileref.h
index 468aaa030..fa104a74b 100644
--- a/3rdparty/taglib/fileref.h
+++ b/3rdparty/taglib/fileref.h
@@ -32,7 +32,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
 
@@ -282,6 +283,7 @@ namespace Strawberry_TagLib::TagLib {
     FileRefPrivate *d;
   };
 
+}
 } // namespace Strawberry_TagLib::TagLib
 
 #endif
diff --git a/3rdparty/taglib/flac/flacfile.h b/3rdparty/taglib/flac/flacfile.h
index 6edd6dd26..00b995b0c 100644
--- a/3rdparty/taglib/flac/flacfile.h
+++ b/3rdparty/taglib/flac/flacfile.h
@@ -34,7 +34,8 @@
 #include "flacpicture.h"
 #include "flacproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
   namespace ID3v2 { class FrameFactory; class Tag; }
@@ -339,5 +340,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/flac/flacmetadatablock.h b/3rdparty/taglib/flac/flacmetadatablock.h
index 28643042f..c264ad54f 100644
--- a/3rdparty/taglib/flac/flacmetadatablock.h
+++ b/3rdparty/taglib/flac/flacmetadatablock.h
@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace FLAC {
 
@@ -71,5 +72,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/flac/flacpicture.h b/3rdparty/taglib/flac/flacpicture.h
index b6faefe3b..4cb2bf5b1 100644
--- a/3rdparty/taglib/flac/flacpicture.h
+++ b/3rdparty/taglib/flac/flacpicture.h
@@ -32,7 +32,8 @@
 #include "taglib_export.h"
 #include "flacmetadatablock.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace FLAC {
 
@@ -204,5 +205,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/flac/flacproperties.h b/3rdparty/taglib/flac/flacproperties.h
index 966d480a6..4019115d0 100644
--- a/3rdparty/taglib/flac/flacproperties.h
+++ b/3rdparty/taglib/flac/flacproperties.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace FLAC {
 
@@ -144,5 +145,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/flac/flacunknownmetadatablock.h b/3rdparty/taglib/flac/flacunknownmetadatablock.h
index b5c70eca2..010f983f6 100644
--- a/3rdparty/taglib/flac/flacunknownmetadatablock.h
+++ b/3rdparty/taglib/flac/flacunknownmetadatablock.h
@@ -31,7 +31,8 @@
 #include "taglib_export.h"
 #include "flacmetadatablock.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace FLAC {
 
@@ -77,5 +78,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/it/itfile.h b/3rdparty/taglib/it/itfile.h
index 9954f8ac2..d47d609f2 100644
--- a/3rdparty/taglib/it/itfile.h
+++ b/3rdparty/taglib/it/itfile.h
@@ -29,7 +29,8 @@
 #include "modtag.h"
 #include "itproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace IT {
 
@@ -105,5 +106,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/it/itproperties.h b/3rdparty/taglib/it/itproperties.h
index 4b0fb79e1..47701c8c4 100644
--- a/3rdparty/taglib/it/itproperties.h
+++ b/3rdparty/taglib/it/itproperties.h
@@ -29,7 +29,8 @@
 #include "taglib.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   namespace IT {
     class TAGLIB_EXPORT Properties : public AudioProperties {
       friend class File;
@@ -103,5 +104,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mod/modfile.h b/3rdparty/taglib/mod/modfile.h
index b66dcdf59..68fbdc872 100644
--- a/3rdparty/taglib/mod/modfile.h
+++ b/3rdparty/taglib/mod/modfile.h
@@ -33,7 +33,8 @@
 #include "modtag.h"
 #include "modproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Mod {
 
@@ -110,5 +111,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mod/modfilebase.h b/3rdparty/taglib/mod/modfilebase.h
index 7f0607c6d..88cf21004 100644
--- a/3rdparty/taglib/mod/modfilebase.h
+++ b/3rdparty/taglib/mod/modfilebase.h
@@ -34,7 +34,8 @@
 
 #include <algorithm>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Mod {
 
@@ -62,5 +63,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mod/modproperties.h b/3rdparty/taglib/mod/modproperties.h
index 188eab219..0ed2592ec 100644
--- a/3rdparty/taglib/mod/modproperties.h
+++ b/3rdparty/taglib/mod/modproperties.h
@@ -29,7 +29,8 @@
 #include "taglib.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Mod {
 
@@ -67,5 +68,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mod/modtag.h b/3rdparty/taglib/mod/modtag.h
index d72ebbe3e..b2a761d18 100644
--- a/3rdparty/taglib/mod/modtag.h
+++ b/3rdparty/taglib/mod/modtag.h
@@ -28,7 +28,8 @@
 
 #include "tag.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Mod {
 
@@ -190,5 +191,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mp4/mp4atom.h b/3rdparty/taglib/mp4/mp4atom.h
index e0b62b19e..f04cd2681 100644
--- a/3rdparty/taglib/mp4/mp4atom.h
+++ b/3rdparty/taglib/mp4/mp4atom.h
@@ -33,7 +33,8 @@
 #include "tfile.h"
 #include "tlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace MP4 {
 
@@ -105,6 +106,7 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/mp4/mp4coverart.h b/3rdparty/taglib/mp4/mp4coverart.h
index 116fa9034..6bba79774 100644
--- a/3rdparty/taglib/mp4/mp4coverart.h
+++ b/3rdparty/taglib/mp4/mp4coverart.h
@@ -31,7 +31,8 @@
 #include "taglib_export.h"
 #include "mp4atom.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace MP4 {
 
@@ -80,5 +81,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mp4/mp4file.h b/3rdparty/taglib/mp4/mp4file.h
index 7076e0f15..40e3ffd97 100644
--- a/3rdparty/taglib/mp4/mp4file.h
+++ b/3rdparty/taglib/mp4/mp4file.h
@@ -32,7 +32,8 @@
 #include "mp4properties.h"
 #include "mp4tag.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! An implementation of MP4 (AAC, ALAC, ...) metadata
   namespace MP4 {
@@ -139,5 +140,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mp4/mp4item.h b/3rdparty/taglib/mp4/mp4item.h
index cfaab379f..fbdd95ae7 100644
--- a/3rdparty/taglib/mp4/mp4item.h
+++ b/3rdparty/taglib/mp4/mp4item.h
@@ -30,7 +30,8 @@
 #include "mp4coverart.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace MP4 {
 
@@ -89,5 +90,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mp4/mp4properties.h b/3rdparty/taglib/mp4/mp4properties.h
index c3b8ac979..8f552666f 100644
--- a/3rdparty/taglib/mp4/mp4properties.h
+++ b/3rdparty/taglib/mp4/mp4properties.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace MP4 {
 
@@ -116,5 +117,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mp4/mp4tag.h b/3rdparty/taglib/mp4/mp4tag.h
index 0697e7a01..b5f146ab2 100644
--- a/3rdparty/taglib/mp4/mp4tag.h
+++ b/3rdparty/taglib/mp4/mp4tag.h
@@ -35,7 +35,8 @@
 #include "mp4atom.h"
 #include "mp4item.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace MP4 {
 
@@ -153,5 +154,6 @@ namespace Strawberry_TagLib::TagLib {
   }
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpc/mpcfile.h b/3rdparty/taglib/mpc/mpcfile.h
index c82e1f1b2..9f5e29b0e 100644
--- a/3rdparty/taglib/mpc/mpcfile.h
+++ b/3rdparty/taglib/mpc/mpcfile.h
@@ -34,7 +34,8 @@
 
 #include "tlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
 
@@ -234,5 +235,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpc/mpcproperties.h b/3rdparty/taglib/mpc/mpcproperties.h
index c366101f3..7dd4bc67b 100644
--- a/3rdparty/taglib/mpc/mpcproperties.h
+++ b/3rdparty/taglib/mpc/mpcproperties.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace MPC {
 
@@ -154,5 +155,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v1/id3v1genres.h b/3rdparty/taglib/mpeg/id3v1/id3v1genres.h
index 33259dae2..81d26bcf5 100644
--- a/3rdparty/taglib/mpeg/id3v1/id3v1genres.h
+++ b/3rdparty/taglib/mpeg/id3v1/id3v1genres.h
@@ -30,7 +30,8 @@
 #include "tstringlist.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   namespace ID3v1 {
 
     typedef Map<String, int> GenreMap;
@@ -62,5 +63,6 @@ namespace Strawberry_TagLib::TagLib {
     int TAGLIB_EXPORT genreIndex(const String &name);
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v1/id3v1tag.h b/3rdparty/taglib/mpeg/id3v1/id3v1tag.h
index 25e296a44..3b56021b8 100644
--- a/3rdparty/taglib/mpeg/id3v1/id3v1tag.h
+++ b/3rdparty/taglib/mpeg/id3v1/id3v1tag.h
@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class File;
 
@@ -198,5 +199,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h
index 1bbab70c2..f7396c8d2 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h
@@ -30,7 +30,8 @@
 #include "id3v2header.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -226,5 +227,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h
index 78ca551b3..6bf7ab415 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h
@@ -30,7 +30,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -245,5 +246,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h
index f6ebfe6cf..02add8b75 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h
@@ -29,7 +29,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -176,4 +177,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h b/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
index 3e605b89a..a5f9035fb 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
@@ -29,7 +29,8 @@
 #include "id3v2frame.h"
 #include "tlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -182,4 +183,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
index 495b09771..66de31b74 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
@@ -33,7 +33,8 @@
 #include "id3v2header.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -175,5 +176,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h b/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h
index efc62c7e3..e55bdbac7 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h
@@ -29,7 +29,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -148,4 +149,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h b/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h
index d846e8b1e..9bb865631 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h
@@ -29,7 +29,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -77,4 +78,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h b/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h
index e8eb7332b..1dd9fa7ef 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h
@@ -29,7 +29,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -129,4 +130,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h b/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h
index a3fc8979c..dcaea11ce 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h
@@ -30,7 +30,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -108,4 +109,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h
index 1f238ac45..cd7897932 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h
@@ -30,7 +30,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -271,4 +272,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
index 7f7909175..0bb1832a1 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
@@ -29,7 +29,8 @@
 #include "id3v2frame.h"
 #include "tlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -228,4 +229,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
index 7811806e9..ba21eda0a 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
@@ -31,7 +31,8 @@
 
 #include "tbytevectorlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -256,5 +257,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h
index fa748c5ba..bd1a8d6db 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h
@@ -32,7 +32,8 @@
 
 #include "id3v2frame.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -310,4 +311,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
index 0c9f47959..5e06872ff 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
@@ -28,7 +28,8 @@
 
 #include "id3v2frame.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -119,5 +120,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h b/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h
index 1243ff698..48a35bceb 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h
@@ -29,7 +29,8 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -76,4 +77,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
index 26447602a..c70afe7d7 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
@@ -30,7 +30,8 @@
 
 #include "id3v2frame.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -176,4 +177,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h
index d0bf7c658..fba1b9d56 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h
@@ -31,7 +31,8 @@
 
 #include "id3v2frame.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -187,4 +188,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h
index b023c4a21..e10ad3ce3 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h
@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "taglib.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -90,4 +91,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2footer.h b/3rdparty/taglib/mpeg/id3v2/id3v2footer.h
index 746ad95c7..d17f70024 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2footer.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2footer.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "tbytevector.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -79,4 +80,5 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h
index dba2a4707..511708385 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h
@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class StringList;
   class PropertyMap;
@@ -514,5 +515,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h
index 98afcf1ac..bd9d3c353 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h
@@ -31,7 +31,8 @@
 #include "id3v2frame.h"
 #include "id3v2header.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -160,5 +161,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2header.h b/3rdparty/taglib/mpeg/id3v2/id3v2header.h
index 877c2219a..c8db6e19f 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2header.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2header.h
@@ -29,7 +29,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -171,5 +172,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h b/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h
index e0bd4f265..87f4b1c5a 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h
@@ -29,7 +29,8 @@
 #include "tbytevector.h"
 #include "taglib.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 {
 
@@ -66,5 +67,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2tag.h b/3rdparty/taglib/mpeg/id3v2/id3v2tag.h
index 81084dfba..6bad40347 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2tag.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2tag.h
@@ -35,7 +35,8 @@
 
 #include "id3v2framefactory.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class File;
 
@@ -408,5 +409,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/mpegfile.h b/3rdparty/taglib/mpeg/mpegfile.h
index ebf06bf01..77446c49a 100644
--- a/3rdparty/taglib/mpeg/mpegfile.h
+++ b/3rdparty/taglib/mpeg/mpegfile.h
@@ -32,7 +32,8 @@
 
 #include "mpegproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace ID3v2 { class Tag; class FrameFactory; }
   namespace ID3v1 { class Tag; }
@@ -391,5 +392,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/mpegheader.h b/3rdparty/taglib/mpeg/mpegheader.h
index ba5477e32..38378c9b3 100644
--- a/3rdparty/taglib/mpeg/mpegheader.h
+++ b/3rdparty/taglib/mpeg/mpegheader.h
@@ -28,7 +28,8 @@
 
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class ByteVector;
   class File;
@@ -174,5 +175,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/mpegproperties.h b/3rdparty/taglib/mpeg/mpegproperties.h
index 233368417..48c8aa620 100644
--- a/3rdparty/taglib/mpeg/mpegproperties.h
+++ b/3rdparty/taglib/mpeg/mpegproperties.h
@@ -31,7 +31,8 @@
 
 #include "mpegheader.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace MPEG {
 
@@ -148,5 +149,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/mpeg/mpegutils.h b/3rdparty/taglib/mpeg/mpegutils.h
index ae9a4e5ea..60a70bea6 100644
--- a/3rdparty/taglib/mpeg/mpegutils.h
+++ b/3rdparty/taglib/mpeg/mpegutils.h
@@ -30,7 +30,8 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   namespace MPEG
   {
@@ -57,6 +58,7 @@ namespace Strawberry_TagLib::TagLib
     }
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/mpeg/xingheader.h b/3rdparty/taglib/mpeg/xingheader.h
index 63d39db3a..96c312a66 100644
--- a/3rdparty/taglib/mpeg/xingheader.h
+++ b/3rdparty/taglib/mpeg/xingheader.h
@@ -29,7 +29,8 @@
 #include "mpegheader.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class ByteVector;
 
@@ -125,5 +126,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ogg/flac/oggflacfile.h b/3rdparty/taglib/ogg/flac/oggflacfile.h
index 8e9ecf1f7..af72567a7 100644
--- a/3rdparty/taglib/ogg/flac/oggflacfile.h
+++ b/3rdparty/taglib/ogg/flac/oggflacfile.h
@@ -32,7 +32,8 @@
 
 #include "flacproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
 
@@ -165,6 +166,7 @@ namespace Strawberry_TagLib::TagLib {
     };
   } // namespace FLAC
   } // namespace Ogg
-} // namespace Strawberry_TagLib::TagLib
+} // namespace TagLib
+} // namespace Strawberry_TagLib
 
 #endif
diff --git a/3rdparty/taglib/ogg/oggfile.h b/3rdparty/taglib/ogg/oggfile.h
index b6ad53a31..49259ed4f 100644
--- a/3rdparty/taglib/ogg/oggfile.h
+++ b/3rdparty/taglib/ogg/oggfile.h
@@ -30,7 +30,8 @@
 #ifndef TAGLIB_OGGFILE_H
 #define TAGLIB_OGGFILE_H
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A namespace for the classes used by Ogg-based metadata files
 
@@ -123,5 +124,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ogg/oggpage.h b/3rdparty/taglib/ogg/oggpage.h
index af0f6c659..c01948ea4 100644
--- a/3rdparty/taglib/ogg/oggpage.h
+++ b/3rdparty/taglib/ogg/oggpage.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "tbytevectorlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -225,4 +226,5 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 #endif
diff --git a/3rdparty/taglib/ogg/oggpageheader.h b/3rdparty/taglib/ogg/oggpageheader.h
index e5942031b..c308185c5 100644
--- a/3rdparty/taglib/ogg/oggpageheader.h
+++ b/3rdparty/taglib/ogg/oggpageheader.h
@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -228,5 +229,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ogg/opus/opusfile.h b/3rdparty/taglib/ogg/opus/opusfile.h
index 622c43c82..cb858084f 100644
--- a/3rdparty/taglib/ogg/opus/opusfile.h
+++ b/3rdparty/taglib/ogg/opus/opusfile.h
@@ -35,7 +35,8 @@
 
 #include "opusproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -134,5 +135,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ogg/opus/opusproperties.h b/3rdparty/taglib/ogg/opus/opusproperties.h
index cc0b899fc..1e2807017 100644
--- a/3rdparty/taglib/ogg/opus/opusproperties.h
+++ b/3rdparty/taglib/ogg/opus/opusproperties.h
@@ -32,7 +32,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -130,5 +131,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ogg/speex/speexfile.h b/3rdparty/taglib/ogg/speex/speexfile.h
index bb61566bd..7e30abf39 100644
--- a/3rdparty/taglib/ogg/speex/speexfile.h
+++ b/3rdparty/taglib/ogg/speex/speexfile.h
@@ -35,7 +35,8 @@
 
 #include "speexproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -134,5 +135,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ogg/speex/speexproperties.h b/3rdparty/taglib/ogg/speex/speexproperties.h
index d602385fd..be8870ae7 100644
--- a/3rdparty/taglib/ogg/speex/speexproperties.h
+++ b/3rdparty/taglib/ogg/speex/speexproperties.h
@@ -32,7 +32,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -125,5 +126,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp b/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp
index d63b5f79a..87f235fad 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp
+++ b/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp
@@ -51,13 +51,15 @@ public:
   Properties *properties;
 };
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   /*!
    * Vorbis headers can be found with one type ID byte and the string "vorbis" in
    * an Ogg stream.  0x03 indicates the comment header.
    */
   static const char vorbisCommentHeaderID[] = { 0x03, 'v', 'o', 'r', 'b', 'i', 's', 0 };
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisfile.h b/3rdparty/taglib/ogg/vorbis/vorbisfile.h
index 7f6463911..18ec84739 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisfile.h
+++ b/3rdparty/taglib/ogg/vorbis/vorbisfile.h
@@ -32,7 +32,8 @@
 
 #include "vorbisproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 /*
  * This is just to make this appear to be in the Ogg namespace in the
@@ -152,6 +153,7 @@ namespace Strawberry_TagLib::TagLib {
   namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::Vorbis::File File; } }
 #endif
 
+}
 }
 
 #endif
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp b/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp
index 1b2b82f57..b72e4be9f 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp
+++ b/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp
@@ -56,13 +56,15 @@ public:
   int bitrateMinimum;
 };
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   /*!
    * Vorbis headers can be found with one type ID byte and the string "vorbis" in
    * an Ogg stream.  0x01 indicates the setup header.
    */
   static const char vorbisSetupHeaderID[] = { 0x01, 'v', 'o', 'r', 'b', 'i', 's', 0 };
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisproperties.h b/3rdparty/taglib/ogg/vorbis/vorbisproperties.h
index e6c731708..c30787e6d 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisproperties.h
+++ b/3rdparty/taglib/ogg/vorbis/vorbisproperties.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 /*
  * This is just to make this appear to be in the Ogg namespace in the
@@ -155,6 +156,7 @@ namespace Strawberry_TagLib::TagLib {
   namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::AudioProperties AudioProperties; } }
 #endif
 
+}
 }
 
 #endif
diff --git a/3rdparty/taglib/ogg/xiphcomment.h b/3rdparty/taglib/ogg/xiphcomment.h
index c22596bd9..c636e96a0 100644
--- a/3rdparty/taglib/ogg/xiphcomment.h
+++ b/3rdparty/taglib/ogg/xiphcomment.h
@@ -35,7 +35,8 @@
 #include "flacpicture.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -271,5 +272,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/riff/aiff/aifffile.h b/3rdparty/taglib/riff/aiff/aifffile.h
index 8195a5084..6cf5e9437 100644
--- a/3rdparty/taglib/riff/aiff/aifffile.h
+++ b/3rdparty/taglib/riff/aiff/aifffile.h
@@ -30,7 +30,8 @@
 #include "id3v2tag.h"
 #include "aiffproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace RIFF {
 
@@ -148,5 +149,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/riff/aiff/aiffproperties.h b/3rdparty/taglib/riff/aiff/aiffproperties.h
index f3242997c..44d892f36 100644
--- a/3rdparty/taglib/riff/aiff/aiffproperties.h
+++ b/3rdparty/taglib/riff/aiff/aiffproperties.h
@@ -28,7 +28,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace RIFF {
 
@@ -162,5 +163,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/riff/rifffile.h b/3rdparty/taglib/riff/rifffile.h
index d19966f2b..68f0fe5f2 100644
--- a/3rdparty/taglib/riff/rifffile.h
+++ b/3rdparty/taglib/riff/rifffile.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "tfile.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! An implementation of Strawberry_TagLib::TagLib::File with RIFF specific methods
 
@@ -157,5 +158,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/riff/riffutils.h b/3rdparty/taglib/riff/riffutils.h
index 211a8f17c..c297b6f7b 100644
--- a/3rdparty/taglib/riff/riffutils.h
+++ b/3rdparty/taglib/riff/riffutils.h
@@ -30,7 +30,8 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   namespace RIFF
   {
@@ -54,6 +55,7 @@ namespace Strawberry_TagLib::TagLib
     }
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/riff/wav/infotag.h b/3rdparty/taglib/riff/wav/infotag.h
index 7f4d63239..1a0e61c47 100644
--- a/3rdparty/taglib/riff/wav/infotag.h
+++ b/3rdparty/taglib/riff/wav/infotag.h
@@ -33,7 +33,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class File;
 
@@ -188,5 +189,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }}
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/riff/wav/wavfile.h b/3rdparty/taglib/riff/wav/wavfile.h
index d3f81fc2b..ab21da23e 100644
--- a/3rdparty/taglib/riff/wav/wavfile.h
+++ b/3rdparty/taglib/riff/wav/wavfile.h
@@ -31,7 +31,8 @@
 #include "infotag.h"
 #include "wavproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace RIFF {
 
@@ -199,5 +200,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/riff/wav/wavproperties.h b/3rdparty/taglib/riff/wav/wavproperties.h
index 8e9fee0e3..87a72b5a1 100644
--- a/3rdparty/taglib/riff/wav/wavproperties.h
+++ b/3rdparty/taglib/riff/wav/wavproperties.h
@@ -29,7 +29,8 @@
 #include "taglib.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class ByteVector;
 
@@ -159,5 +160,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/s3m/s3mfile.h b/3rdparty/taglib/s3m/s3mfile.h
index 2e4be1138..7112a1471 100644
--- a/3rdparty/taglib/s3m/s3mfile.h
+++ b/3rdparty/taglib/s3m/s3mfile.h
@@ -33,7 +33,8 @@
 #include "modtag.h"
 #include "s3mproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace S3M {
 
@@ -108,5 +109,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/s3m/s3mproperties.h b/3rdparty/taglib/s3m/s3mproperties.h
index 886adc21f..d4b8154f3 100644
--- a/3rdparty/taglib/s3m/s3mproperties.h
+++ b/3rdparty/taglib/s3m/s3mproperties.h
@@ -29,7 +29,8 @@
 #include "taglib.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   namespace S3M {
     class TAGLIB_EXPORT Properties : public AudioProperties {
       friend class File;
@@ -90,5 +91,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/tag.h b/3rdparty/taglib/tag.h
index 2ecf6c3b5..452babe36 100644
--- a/3rdparty/taglib/tag.h
+++ b/3rdparty/taglib/tag.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "tstring.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A simple, generic interface to common audio meta data fields
 
@@ -197,5 +198,6 @@ namespace Strawberry_TagLib::TagLib {
     TagPrivate *d;
   };
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/tagunion.h b/3rdparty/taglib/tagunion.h
index 151f19e2a..257ce1580 100644
--- a/3rdparty/taglib/tagunion.h
+++ b/3rdparty/taglib/tagunion.h
@@ -30,7 +30,8 @@
 
 #ifndef DO_NOT_DOCUMENT
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   /*!
    * \internal
@@ -93,6 +94,7 @@ namespace Strawberry_TagLib::TagLib {
     TagUnionPrivate *d;
   };
 }
+}
 
 #endif
 #endif
diff --git a/3rdparty/taglib/tagutils.h b/3rdparty/taglib/tagutils.h
index 6dc9fc9a2..e43a2fd60 100644
--- a/3rdparty/taglib/tagutils.h
+++ b/3rdparty/taglib/tagutils.h
@@ -32,7 +32,8 @@
 
 #include <tbytevector.h>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class File;
   class IOStream;
@@ -49,6 +50,7 @@ namespace Strawberry_TagLib::TagLib {
                           long *headerOffset = 0);
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/toolkit/taglib.h b/3rdparty/taglib/toolkit/taglib.h
index cebfee40d..570389612 100644
--- a/3rdparty/taglib/toolkit/taglib.h
+++ b/3rdparty/taglib/toolkit/taglib.h
@@ -56,7 +56,8 @@
  * \endcode
  */
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
 
@@ -75,6 +76,7 @@ namespace Strawberry_TagLib::TagLib {
    */
   typedef std::basic_string<wchar_t> wstring;
 }
+}
 
 /*!
  * \mainpage TagLib
diff --git a/3rdparty/taglib/toolkit/tbytevector.cpp b/3rdparty/taglib/toolkit/tbytevector.cpp
index 3bc6fa476..79bf85f29 100644
--- a/3rdparty/taglib/toolkit/tbytevector.cpp
+++ b/3rdparty/taglib/toolkit/tbytevector.cpp
@@ -44,7 +44,8 @@
 //
 // http://www.informit.com/isapi/product_id~{9C84DAB4-FE6E-49C5-BB0A-FB50331233EA}/content/index.asp
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 template <class TIterator>
 int findChar(
@@ -1031,6 +1032,7 @@ void ByteVector::detach()
   }
 }
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // related functions
diff --git a/3rdparty/taglib/toolkit/tbytevector.h b/3rdparty/taglib/toolkit/tbytevector.h
index 908fbcd0e..f8291419c 100644
--- a/3rdparty/taglib/toolkit/tbytevector.h
+++ b/3rdparty/taglib/toolkit/tbytevector.h
@@ -32,7 +32,8 @@
 #include <vector>
 #include <iostream>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A byte vector
 
@@ -625,6 +626,7 @@ namespace Strawberry_TagLib::TagLib {
     ByteVectorPrivate *d;
   };
 }
+}
 
 /*!
  * \relates Strawberry_TagLib::TagLib::ByteVector
diff --git a/3rdparty/taglib/toolkit/tbytevectorlist.h b/3rdparty/taglib/toolkit/tbytevectorlist.h
index 04c419b48..bdec64470 100644
--- a/3rdparty/taglib/toolkit/tbytevectorlist.h
+++ b/3rdparty/taglib/toolkit/tbytevectorlist.h
@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "tlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A list of ByteVectors
 
@@ -87,5 +88,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/toolkit/tbytevectorstream.h b/3rdparty/taglib/toolkit/tbytevectorstream.h
index c3948f56a..68a120b34 100644
--- a/3rdparty/taglib/toolkit/tbytevectorstream.h
+++ b/3rdparty/taglib/toolkit/tbytevectorstream.h
@@ -31,7 +31,8 @@
 #include "tbytevector.h"
 #include "tiostream.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class Tag;
@@ -141,5 +142,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/toolkit/tdebug.cpp b/3rdparty/taglib/toolkit/tdebug.cpp
index fbf00b111..055469bf6 100644
--- a/3rdparty/taglib/toolkit/tdebug.cpp
+++ b/3rdparty/taglib/toolkit/tdebug.cpp
@@ -38,7 +38,8 @@
 #include <cstdio>
 #include <cstdarg>
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   // The instance is defined in tdebuglistener.cpp.
   extern DebugListener *debugListener;
@@ -60,5 +61,6 @@ namespace Strawberry_TagLib::TagLib
     }
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/toolkit/tdebug.h b/3rdparty/taglib/toolkit/tdebug.h
index 0561401a5..74b694ee0 100644
--- a/3rdparty/taglib/toolkit/tdebug.h
+++ b/3rdparty/taglib/toolkit/tdebug.h
@@ -26,7 +26,8 @@
 #ifndef TAGLIB_DEBUG_H
 #define TAGLIB_DEBUG_H
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class ByteVector;
@@ -65,6 +66,7 @@ namespace Strawberry_TagLib::TagLib {
 
 #endif
 }
+}
 
 #endif
 #endif
diff --git a/3rdparty/taglib/toolkit/tdebuglistener.cpp b/3rdparty/taglib/toolkit/tdebuglistener.cpp
index 76a314b30..20e1be307 100644
--- a/3rdparty/taglib/toolkit/tdebuglistener.cpp
+++ b/3rdparty/taglib/toolkit/tdebuglistener.cpp
@@ -63,7 +63,8 @@ namespace
   DefaultListener defaultListener;
 }
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   DebugListener *debugListener = &defaultListener;
 
@@ -83,3 +84,4 @@ namespace Strawberry_TagLib::TagLib
       debugListener = &defaultListener;
   }
 }
+}
diff --git a/3rdparty/taglib/toolkit/tdebuglistener.h b/3rdparty/taglib/toolkit/tdebuglistener.h
index 49b9f08b7..4f7dad7a8 100644
--- a/3rdparty/taglib/toolkit/tdebuglistener.h
+++ b/3rdparty/taglib/toolkit/tdebuglistener.h
@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "tstring.h"
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   //! An abstraction for the listener to the debug messages.
 
@@ -70,5 +71,6 @@ namespace Strawberry_TagLib::TagLib
    */
   TAGLIB_EXPORT void setDebugListener(DebugListener *listener);
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/toolkit/tfile.h b/3rdparty/taglib/toolkit/tfile.h
index ed0d5d20b..55274234c 100644
--- a/3rdparty/taglib/toolkit/tfile.h
+++ b/3rdparty/taglib/toolkit/tfile.h
@@ -32,7 +32,8 @@
 #include "tbytevector.h"
 #include "tiostream.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class Tag;
@@ -302,5 +303,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/toolkit/tfilestream.h b/3rdparty/taglib/toolkit/tfilestream.h
index 80188d48d..392a9701d 100644
--- a/3rdparty/taglib/toolkit/tfilestream.h
+++ b/3rdparty/taglib/toolkit/tfilestream.h
@@ -31,7 +31,8 @@
 #include "tbytevector.h"
 #include "tiostream.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class Tag;
@@ -155,5 +156,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/toolkit/tiostream.h b/3rdparty/taglib/toolkit/tiostream.h
index 943be432c..7f9511e43 100644
--- a/3rdparty/taglib/toolkit/tiostream.h
+++ b/3rdparty/taglib/toolkit/tiostream.h
@@ -30,7 +30,8 @@
 #include "taglib.h"
 #include "tbytevector.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 #ifdef _WIN32
   class TAGLIB_EXPORT FileName
@@ -166,5 +167,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/toolkit/tlist.h b/3rdparty/taglib/toolkit/tlist.h
index 9cc356f79..c2abac95e 100644
--- a/3rdparty/taglib/toolkit/tlist.h
+++ b/3rdparty/taglib/toolkit/tlist.h
@@ -30,7 +30,8 @@
 
 #include <list>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A generic, implicitly shared list.
 
@@ -261,6 +262,7 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 // Since GCC doesn't support the "export" keyword, we have to include the
 // implementation.
diff --git a/3rdparty/taglib/toolkit/tlist.tcc b/3rdparty/taglib/toolkit/tlist.tcc
index dd22af15e..9d9d0ea72 100644
--- a/3rdparty/taglib/toolkit/tlist.tcc
+++ b/3rdparty/taglib/toolkit/tlist.tcc
@@ -26,7 +26,8 @@
 #include <algorithm>
 #include "trefcounter.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
@@ -319,5 +320,5 @@ void List<T>::detach()
     d = new ListPrivate<T>(d->list);
   }
 }
-
+}
 } // namespace Strawberry_TagLib::TagLib
diff --git a/3rdparty/taglib/toolkit/tmap.h b/3rdparty/taglib/toolkit/tmap.h
index 8cc6e878c..2f6918dbb 100644
--- a/3rdparty/taglib/toolkit/tmap.h
+++ b/3rdparty/taglib/toolkit/tmap.h
@@ -30,7 +30,8 @@
 
 #include "taglib.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A generic, implicitly shared map.
 
@@ -195,6 +196,7 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 // Since GCC doesn't support the "export" keyword, we have to include the
 // implementation.
diff --git a/3rdparty/taglib/toolkit/tmap.tcc b/3rdparty/taglib/toolkit/tmap.tcc
index 1252c27df..f9fe55c28 100644
--- a/3rdparty/taglib/toolkit/tmap.tcc
+++ b/3rdparty/taglib/toolkit/tmap.tcc
@@ -25,7 +25,8 @@
 
 #include "trefcounter.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
@@ -195,5 +196,5 @@ void Map<Key, T>::detach()
     d = new MapPrivate<Key, T>(d->map);
   }
 }
-
+}
 } // namespace Strawberry_TagLib::TagLib
diff --git a/3rdparty/taglib/toolkit/tpropertymap.h b/3rdparty/taglib/toolkit/tpropertymap.h
index 16ae6df96..942539dc4 100644
--- a/3rdparty/taglib/toolkit/tpropertymap.h
+++ b/3rdparty/taglib/toolkit/tpropertymap.h
@@ -29,7 +29,8 @@
 #include "tmap.h"
 #include "tstringlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   typedef Map<String,StringList> SimplePropertyMap;
 
@@ -233,5 +234,6 @@ namespace Strawberry_TagLib::TagLib {
     StringList unsupported;
   };
 
+}
 }
 #endif /* TAGLIB_PROPERTYMAP_H_ */
diff --git a/3rdparty/taglib/toolkit/trefcounter.cpp b/3rdparty/taglib/toolkit/trefcounter.cpp
index 52b7ae75c..101908b29 100644
--- a/3rdparty/taglib/toolkit/trefcounter.cpp
+++ b/3rdparty/taglib/toolkit/trefcounter.cpp
@@ -62,7 +62,8 @@
 # define ATOMIC_DEC(x) (--x)
 #endif
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
 
   class RefCounter::RefCounterPrivate
@@ -99,3 +100,4 @@ namespace Strawberry_TagLib::TagLib
     return static_cast<int>(d->refCount);
   }
 }
+}
diff --git a/3rdparty/taglib/toolkit/trefcounter.h b/3rdparty/taglib/toolkit/trefcounter.h
index 44446dc60..bedbb0e0f 100644
--- a/3rdparty/taglib/toolkit/trefcounter.h
+++ b/3rdparty/taglib/toolkit/trefcounter.h
@@ -56,7 +56,8 @@
   *
   * \warning This <b>is not</b> part of the TagLib public API!
   */
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
 
   class TAGLIB_EXPORT RefCounter
@@ -108,6 +109,7 @@ namespace Strawberry_TagLib::TagLib
   };
 
 }
+}
 
 #endif // DO_NOT_DOCUMENT
 #endif
diff --git a/3rdparty/taglib/toolkit/tstring.cpp b/3rdparty/taglib/toolkit/tstring.cpp
index 3dc9f7623..127c0be69 100644
--- a/3rdparty/taglib/toolkit/tstring.cpp
+++ b/3rdparty/taglib/toolkit/tstring.cpp
@@ -136,7 +136,8 @@ namespace
   }
 }
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 class String::StringPrivate : public RefCounter
 {
@@ -713,6 +714,7 @@ void String::detach()
 
 const String::Type String::WCharByteOrder = wcharByteOrder();
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // related non-member functions
diff --git a/3rdparty/taglib/toolkit/tstring.h b/3rdparty/taglib/toolkit/tstring.h
index 7be908a03..7c673a7d1 100644
--- a/3rdparty/taglib/toolkit/tstring.h
+++ b/3rdparty/taglib/toolkit/tstring.h
@@ -60,7 +60,8 @@
 
 #define TStringToQString(s) QString::fromUtf8(s.toCString(true))
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class StringList;
 
@@ -546,6 +547,8 @@ namespace Strawberry_TagLib::TagLib {
     class StringPrivate;
     StringPrivate *d;
   };
+
+}
 }
 
 /*!
diff --git a/3rdparty/taglib/toolkit/tstringlist.h b/3rdparty/taglib/toolkit/tstringlist.h
index dbd4321fe..b3dab8086 100644
--- a/3rdparty/taglib/toolkit/tstringlist.h
+++ b/3rdparty/taglib/toolkit/tstringlist.h
@@ -33,7 +33,8 @@
 
 #include <iostream>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A list of strings
 
@@ -105,6 +106,7 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 /*!
  * \related Strawberry_TagLib::TagLib::StringList
diff --git a/3rdparty/taglib/toolkit/tutils.h b/3rdparty/taglib/toolkit/tutils.h
index bf109758e..55ae3447d 100644
--- a/3rdparty/taglib/toolkit/tutils.h
+++ b/3rdparty/taglib/toolkit/tutils.h
@@ -49,7 +49,8 @@
 #include <cstdarg>
 #include <cstring>
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   namespace Utils
   {
@@ -237,6 +238,7 @@ namespace Strawberry_TagLib::TagLib
     }
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/toolkit/tzlib.h b/3rdparty/taglib/toolkit/tzlib.h
index b23c3f547..a378bd201 100644
--- a/3rdparty/taglib/toolkit/tzlib.h
+++ b/3rdparty/taglib/toolkit/tzlib.h
@@ -32,7 +32,8 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace zlib {
 
@@ -48,6 +49,7 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif
 
diff --git a/3rdparty/taglib/trueaudio/trueaudiofile.h b/3rdparty/taglib/trueaudio/trueaudiofile.h
index c8a416d2f..eae4bddfe 100644
--- a/3rdparty/taglib/trueaudio/trueaudiofile.h
+++ b/3rdparty/taglib/trueaudio/trueaudiofile.h
@@ -33,7 +33,8 @@
 #include "tfile.h"
 #include "trueaudioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
 
@@ -255,5 +256,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/trueaudio/trueaudioproperties.h b/3rdparty/taglib/trueaudio/trueaudioproperties.h
index a922e7eca..4e7705e37 100644
--- a/3rdparty/taglib/trueaudio/trueaudioproperties.h
+++ b/3rdparty/taglib/trueaudio/trueaudioproperties.h
@@ -32,7 +32,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace TrueAudio {
 
@@ -129,5 +130,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/wavpack/wavpackfile.h b/3rdparty/taglib/wavpack/wavpackfile.h
index e3730d2f7..a9c20e643 100644
--- a/3rdparty/taglib/wavpack/wavpackfile.h
+++ b/3rdparty/taglib/wavpack/wavpackfile.h
@@ -34,7 +34,8 @@
 #include "taglib_export.h"
 #include "wavpackproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
 
@@ -219,5 +220,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/wavpack/wavpackproperties.h b/3rdparty/taglib/wavpack/wavpackproperties.h
index 60202c9c3..e4df91a64 100644
--- a/3rdparty/taglib/wavpack/wavpackproperties.h
+++ b/3rdparty/taglib/wavpack/wavpackproperties.h
@@ -33,7 +33,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace WavPack {
 
@@ -145,5 +146,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/xm/xmfile.h b/3rdparty/taglib/xm/xmfile.h
index fc4dc320a..603d26db9 100644
--- a/3rdparty/taglib/xm/xmfile.h
+++ b/3rdparty/taglib/xm/xmfile.h
@@ -33,7 +33,8 @@
 #include "modtag.h"
 #include "xmproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace XM {
 
@@ -108,5 +109,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/3rdparty/taglib/xm/xmproperties.h b/3rdparty/taglib/xm/xmproperties.h
index 1f8e4cc8e..9370901dd 100644
--- a/3rdparty/taglib/xm/xmproperties.h
+++ b/3rdparty/taglib/xm/xmproperties.h
@@ -30,7 +30,8 @@
 #include "tstring.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   namespace XM {
     class TAGLIB_EXPORT Properties : public AudioProperties {
       friend class File;
@@ -81,5 +82,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif
diff --git a/ext/libstrawberry-tagreader/tagreader.h b/ext/libstrawberry-tagreader/tagreader.h
index 3e2c937fe..49937899e 100644
--- a/ext/libstrawberry-tagreader/tagreader.h
+++ b/ext/libstrawberry-tagreader/tagreader.h
@@ -35,11 +35,9 @@
 #include "tagreadermessages.pb.h"
 
 #ifndef USE_SYSTEM_TAGLIB
-using namespace Strawberry_TagLib;
-namespace Strawberry_TagLib::TagLib {
-#else
-namespace TagLib {
+namespace Strawberry_TagLib {
 #endif
+namespace TagLib {
   class FileRef;
   class String;
 
@@ -48,6 +46,10 @@ namespace TagLib {
     class PopularimeterFrame;
   }
 }
+#ifndef USE_SYSTEM_TAGLIB
+}
+using namespace Strawberry_TagLib;
+#endif
 
 class FileRefFactory;