diff --git a/3rdparty/taglib/audioproperties.cpp b/3rdparty/taglib/audioproperties.cpp
index 9163dbe0a..3a9575bd3 100644
--- a/3rdparty/taglib/audioproperties.cpp
+++ b/3rdparty/taglib/audioproperties.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstringlist.h>
+#include "tstringlist.h"
 
 #include "audioproperties.h"
 
diff --git a/3rdparty/taglib/fileref.cpp b/3rdparty/taglib/fileref.cpp
index 507209db0..6923d535f 100644
--- a/3rdparty/taglib/fileref.cpp
+++ b/3rdparty/taglib/fileref.cpp
@@ -29,10 +29,10 @@
 
 #include <memory>
 
-#include <tfile.h>
-#include <tfilestream.h>
-#include <tstring.h>
-#include <tdebug.h>
+#include "tfile.h"
+#include "tfilestream.h"
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "fileref.h"
 #include "asffile.h"
diff --git a/3rdparty/taglib/ogg/flac/oggflacfile.cpp b/3rdparty/taglib/ogg/flac/oggflacfile.cpp
index 7d8113b92..8477525d6 100644
--- a/3rdparty/taglib/ogg/flac/oggflacfile.cpp
+++ b/3rdparty/taglib/ogg/flac/oggflacfile.cpp
@@ -29,7 +29,7 @@
 #include "tpropertymap.h"
 #include "tagutils.h"
 
-#include <xiphcomment.h>
+#include "xiphcomment.h"
 #include "oggflacfile.h"
 
 using namespace Strawberry_TagLib::TagLib;
diff --git a/3rdparty/taglib/ogg/opus/opusproperties.cpp b/3rdparty/taglib/ogg/opus/opusproperties.cpp
index 0c293238e..1436f0b47 100644
--- a/3rdparty/taglib/ogg/opus/opusproperties.cpp
+++ b/3rdparty/taglib/ogg/opus/opusproperties.cpp
@@ -30,7 +30,7 @@
 #include "tstring.h"
 #include "tdebug.h"
 
-#include <oggpageheader.h>
+#include "oggpageheader.h"
 
 #include "opusproperties.h"
 #include "opusfile.h"
diff --git a/3rdparty/taglib/ogg/xiphcomment.cpp b/3rdparty/taglib/ogg/xiphcomment.cpp
index 859ec62eb..babbe6850 100644
--- a/3rdparty/taglib/ogg/xiphcomment.cpp
+++ b/3rdparty/taglib/ogg/xiphcomment.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tdebug.h>
+#include "tbytevector.h"
+#include "tdebug.h"
 
 #include "flacpicture.h"
 #include "xiphcomment.h"
diff --git a/3rdparty/taglib/tagunion.cpp b/3rdparty/taglib/tagunion.cpp
index 962e9ba78..5b4fa140c 100644
--- a/3rdparty/taglib/tagunion.cpp
+++ b/3rdparty/taglib/tagunion.cpp
@@ -25,10 +25,10 @@
 
 #include <memory>
 
-#include <tagunion.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
-#include <tpicturemap.h>
+#include "tagunion.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
+#include "tpicturemap.h"
 
 #define stringUnion(method)                                    \
   for (size_t j = 0; j < COUNT; ++j) {                         \
diff --git a/3rdparty/taglib/tagutils.h b/3rdparty/taglib/tagutils.h
index 9d51b8cd0..5d00cc3b2 100644
--- a/3rdparty/taglib/tagutils.h
+++ b/3rdparty/taglib/tagutils.h
@@ -30,7 +30,7 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-#  include <tbytevector.h>
+#include "tbytevector.h"
 
 namespace Strawberry_TagLib {
 namespace TagLib {
diff --git a/3rdparty/taglib/toolkit/tbytevectorstream.cpp b/3rdparty/taglib/toolkit/tbytevectorstream.cpp
index 7a4d2f41f..e700b1455 100644
--- a/3rdparty/taglib/toolkit/tbytevectorstream.cpp
+++ b/3rdparty/taglib/toolkit/tbytevectorstream.cpp
@@ -26,6 +26,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+#include <cstddef>
 
 #include "tbytevectorstream.h"
 #include "tstring.h"
diff --git a/3rdparty/taglib/toolkit/tutils.h b/3rdparty/taglib/toolkit/tutils.h
index 19e8800ee..15da228ef 100644
--- a/3rdparty/taglib/toolkit/tutils.h
+++ b/3rdparty/taglib/toolkit/tutils.h
@@ -32,20 +32,20 @@
 
 #include "taglib-config.h"
 
-#  if defined(HAVE_MSC_BYTESWAP)
-#    include <cstdlib>
-#  elif defined(HAVE_GLIBC_BYTESWAP)
-#    include <byteswap.h>
-#  elif defined(HAVE_MAC_BYTESWAP)
-#    include <libkern/OSByteOrder.h>
-#  elif defined(HAVE_OPENBSD_BYTESWAP)
-#    include <sys/endian.h>
-#  endif
+#if defined(HAVE_MSC_BYTESWAP)
+#  include <cstdlib>
+#elif defined(HAVE_GLIBC_BYTESWAP)
+#  include <byteswap.h>
+#elif defined(HAVE_MAC_BYTESWAP)
+#  include <libkern/OSByteOrder.h>
+#elif defined(HAVE_OPENBSD_BYTESWAP)
+#  include <sys/endian.h>
+#endif
 
-#  include <tstring.h>
-#  include <cstdio>
-#  include <cstdarg>
-#  include <cstring>
+#include "tstring.h"
+#include <cstdio>
+#include <cstdarg>
+#include <cstring>
 
 namespace Strawberry_TagLib {
 namespace TagLib {
diff --git a/3rdparty/taglib/toolkit/tzlib.h b/3rdparty/taglib/toolkit/tzlib.h
index 0006d5aaa..892eb36be 100644
--- a/3rdparty/taglib/toolkit/tzlib.h
+++ b/3rdparty/taglib/toolkit/tzlib.h
@@ -26,7 +26,7 @@
 #ifndef TAGLIB_TZLIB_H
 #define TAGLIB_TZLIB_H
 
-#include <tbytevector.h>
+#include "tbytevector.h"
 
 // THIS FILE IS NOT A PART OF THE TAGLIB API