diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index f3f03e61..5dc70deb 100644
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -20,26 +20,26 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include  "config.h"
 #endif
 
 #include <cstdlib>
-#include <fileref.h>
-#include <tfile.h>
-#include <asffile.h>
-#include <vorbisfile.h>
-#include <mpegfile.h>
-#include <flacfile.h>
-#include <oggflacfile.h>
-#include <mpcfile.h>
-#include <wavpackfile.h>
-#include <speexfile.h>
-#include <trueaudiofile.h>
-#include <mp4file.h>
-#include <tag.h>
+#include "fileref.h"
+#include "tfile.h"
+#include "asffile.h"
+#include "vorbisfile.h"
+#include "mpegfile.h"
+#include "flacfile.h"
+#include "oggflacfile.h"
+#include "mpcfile.h"
+#include "wavpackfile.h"
+#include "speexfile.h"
+#include "trueaudiofile.h"
+#include "mp4file.h"
+#include "tag.h"
 #include <cstring>
-#include <id3v2framefactory.h>
-#include <tpropertymap.h>
+#include "id3v2framefactory.h"
+#include "tpropertymap.h"
 
 #include "tag_c.h"
 
diff --git a/examples/framelist.cpp b/examples/framelist.cpp
index 9c837800..e176b604 100644
--- a/examples/framelist.cpp
+++ b/examples/framelist.cpp
@@ -25,18 +25,18 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <tbytevector.h>
+#include "tbytevector.h"
 
-#include <mpegfile.h>
+#include "mpegfile.h"
 
-#include <id3v2tag.h>
-#include <id3v2frame.h>
-#include <id3v2header.h>
-#include <commentsframe.h>
+#include "id3v2tag.h"
+#include "id3v2frame.h"
+#include "id3v2header.h"
+#include "commentsframe.h"
 
-#include <id3v1tag.h>
+#include "id3v1tag.h"
 
-#include <apetag.h>
+#include "apetag.h"
 
 using namespace std;
 using namespace TagLib;
diff --git a/examples/strip-id3v1.cpp b/examples/strip-id3v1.cpp
index ab36d711..36171cdd 100644
--- a/examples/strip-id3v1.cpp
+++ b/examples/strip-id3v1.cpp
@@ -23,8 +23,8 @@
  */
 
 #include <iostream>
-#include <mpegfile.h>
-#include <tstring.h>
+#include "mpegfile.h"
+#include "tstring.h"
 
 using namespace TagLib;
 
diff --git a/examples/tagreader.cpp b/examples/tagreader.cpp
index e7289497..7ba0220e 100644
--- a/examples/tagreader.cpp
+++ b/examples/tagreader.cpp
@@ -26,9 +26,9 @@
 #include <iomanip>
 #include <cstdio>
 
-#include <fileref.h>
-#include <tag.h>
-#include <tpropertymap.h>
+#include "fileref.h"
+#include "tag.h"
+#include "tpropertymap.h"
 
 using namespace std;
 
diff --git a/examples/tagreader_c.c b/examples/tagreader_c.c
index f67b53e7..546652d9 100644
--- a/examples/tagreader_c.c
+++ b/examples/tagreader_c.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <tag_c.h>
+#include "tag_c.h"
 
 #ifndef FALSE
 #define FALSE 0
diff --git a/examples/tagwriter.cpp b/examples/tagwriter.cpp
index 32303f06..9810b720 100644
--- a/examples/tagwriter.cpp
+++ b/examples/tagwriter.cpp
@@ -31,11 +31,11 @@
 #include <sys/stat.h>
 #include <cstdlib>
 
-#include <tlist.h>
-#include <fileref.h>
-#include <tfile.h>
-#include <tag.h>
-#include <tpropertymap.h>
+#include "tlist.h"
+#include "fileref.h"
+#include "tfile.h"
+#include "tag.h"
+#include "tpropertymap.h"
 
 using namespace std;
 
diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp
index c0c9724b..532521c5 100644
--- a/taglib/ape/apefile.cpp
+++ b/taglib/ape/apefile.cpp
@@ -31,14 +31,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <tagunion.h>
-#include <id3v1tag.h>
-#include <id3v2header.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tdebug.h"
+#include "tagunion.h"
+#include "id3v1tag.h"
+#include "id3v2header.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "apefile.h"
 #include "apetag.h"
diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp
index e9aefee7..f0eeab82 100644
--- a/taglib/ape/apefooter.cpp
+++ b/taglib/ape/apefooter.cpp
@@ -27,8 +27,8 @@
 #include <iostream>
 #include <bitset>
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "apefooter.h"
 
diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp
index e1422996..697c7f78 100644
--- a/taglib/ape/apeitem.cpp
+++ b/taglib/ape/apeitem.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tdebug.h>
+#include "tbytevectorlist.h"
+#include "tdebug.h"
 
 #include "apeitem.h"
 
diff --git a/taglib/ape/apeproperties.cpp b/taglib/ape/apeproperties.cpp
index 5256a5f3..4607cfa2 100644
--- a/taglib/ape/apeproperties.cpp
+++ b/taglib/ape/apeproperties.cpp
@@ -27,8 +27,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 #include <bitset>
 #include "id3v2tag.h"
 #include "apeproperties.h"
diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp
index ab1e69ef..509bae36 100644
--- a/taglib/ape/apetag.cpp
+++ b/taglib/ape/apetag.cpp
@@ -31,12 +31,12 @@
 #define WANT_CLASS_INSTANTIATION_OF_MAP (1)
 #endif
 
-#include <tfile.h>
-#include <tstring.h>
-#include <tmap.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
-#include <tutils.h>
+#include "tfile.h"
+#include "tstring.h"
+#include "tmap.h"
+#include "tpropertymap.h"
+#include "tdebug.h"
+#include "tutils.h"
 
 #include "apetag.h"
 #include "apefooter.h"
diff --git a/taglib/asf/asfattribute.cpp b/taglib/asf/asfattribute.cpp
index 6b4a12f4..37c584d3 100644
--- a/taglib/asf/asfattribute.cpp
+++ b/taglib/asf/asfattribute.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include "taglib.h"
+#include "tdebug.h"
+#include "trefcounter.h"
 
 #include "asfattribute.h"
 #include "asffile.h"
diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp
index 9432502a..ef5ce41e 100644
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tstring.h>
-#include <tagutils.h>
+#include "tdebug.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "tstring.h"
+#include "tagutils.h"
 
 #include "asffile.h"
 #include "asftag.h"
diff --git a/taglib/asf/asfpicture.cpp b/taglib/asf/asfpicture.cpp
index 526b2fd0..1677b7f5 100644
--- a/taglib/asf/asfpicture.cpp
+++ b/taglib/asf/asfpicture.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include "taglib.h"
+#include "tdebug.h"
+#include "trefcounter.h"
 
 #include "asfattribute.h"
 #include "asffile.h"
diff --git a/taglib/asf/asfproperties.cpp b/taglib/asf/asfproperties.cpp
index 20aa2974..70ffa6c5 100644
--- a/taglib/asf/asfproperties.cpp
+++ b/taglib/asf/asfproperties.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 #include "asfproperties.h"
 
 using namespace TagLib;
diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp
index a445cf03..c6fed1be 100644
--- a/taglib/asf/asftag.cpp
+++ b/taglib/asf/asftag.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tpropertymap.h>
+#include "tpropertymap.h"
 #include "asftag.h"
 
 using namespace TagLib;
diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index 20d54062..d116feed 100644
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -29,11 +29,11 @@
 
 #include <cstring>
 
-#include <tfile.h>
-#include <tfilestream.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include "tfile.h"
+#include "tfilestream.h"
+#include "tstring.h"
+#include "tdebug.h"
+#include "trefcounter.h"
 
 #include "fileref.h"
 #include "asffile.h"
diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index 990a2276..f2b7fe96 100644
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -23,18 +23,18 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tlist.h>
-#include <tdebug.h>
-#include <tagunion.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tlist.h"
+#include "tdebug.h"
+#include "tagunion.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
-#include <id3v2header.h>
-#include <id3v2tag.h>
-#include <id3v1tag.h>
-#include <xiphcomment.h>
+#include "id3v2header.h"
+#include "id3v2tag.h"
+#include "id3v1tag.h"
+#include "xiphcomment.h"
 
 #include "flacpicture.h"
 #include "flacfile.h"
diff --git a/taglib/flac/flacmetadatablock.cpp b/taglib/flac/flacmetadatablock.cpp
index 21efde4f..62fc0d5a 100644
--- a/taglib/flac/flacmetadatablock.cpp
+++ b/taglib/flac/flacmetadatablock.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
+#include "taglib.h"
+#include "tdebug.h"
 #include "flacmetadatablock.h"
 
 using namespace TagLib;
diff --git a/taglib/flac/flacpicture.cpp b/taglib/flac/flacpicture.cpp
index 6005bbb7..b4c0989a 100644
--- a/taglib/flac/flacpicture.cpp
+++ b/taglib/flac/flacpicture.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
+#include "taglib.h"
+#include "tdebug.h"
 #include "flacpicture.h"
 
 using namespace TagLib;
@@ -214,4 +214,3 @@ void FLAC::Picture::setData(const ByteVector &data)
 {
   d->data = data;
 }
-
diff --git a/taglib/flac/flacproperties.cpp b/taglib/flac/flacproperties.cpp
index c494211c..6da59350 100644
--- a/taglib/flac/flacproperties.cpp
+++ b/taglib/flac/flacproperties.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "flacproperties.h"
 #include "flacfile.h"
diff --git a/taglib/flac/flacunknownmetadatablock.cpp b/taglib/flac/flacunknownmetadatablock.cpp
index f9cf6e65..c9295d74 100644
--- a/taglib/flac/flacunknownmetadatablock.cpp
+++ b/taglib/flac/flacunknownmetadatablock.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <tstring.h>
+#include "taglib.h"
+#include "tdebug.h"
+#include "tstring.h"
 #include "flacunknownmetadatablock.h"
 
 using namespace TagLib;
@@ -75,4 +75,3 @@ ByteVector FLAC::UnknownMetadataBlock::render() const
 {
   return d->data;
 }
-
diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp
index 8ac60761..5d8c3702 100644
--- a/taglib/mp4/mp4atom.cpp
+++ b/taglib/mp4/mp4atom.cpp
@@ -25,8 +25,8 @@
 
 #include <climits>
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 #include "mp4atom.h"
 
 using namespace TagLib;
diff --git a/taglib/mp4/mp4coverart.cpp b/taglib/mp4/mp4coverart.cpp
index b12392e8..055183b1 100644
--- a/taglib/mp4/mp4coverart.cpp
+++ b/taglib/mp4/mp4coverart.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
+#include "taglib.h"
+#include "tdebug.h"
 #include "trefcounter.h"
 #include "mp4coverart.h"
 
diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp
index 968c487f..c6efe3a5 100644
--- a/taglib/mp4/mp4file.cpp
+++ b/taglib/mp4/mp4file.cpp
@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tdebug.h"
+#include "tstring.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "mp4atom.h"
 #include "mp4tag.h"
diff --git a/taglib/mp4/mp4item.cpp b/taglib/mp4/mp4item.cpp
index eee8480a..65fa20f9 100644
--- a/taglib/mp4/mp4item.cpp
+++ b/taglib/mp4/mp4item.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
+#include "taglib.h"
+#include "tdebug.h"
 #include "trefcounter.h"
 #include "mp4item.h"
 
diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp
index b93ae117..6cbb9f66 100644
--- a/taglib/mp4/mp4properties.cpp
+++ b/taglib/mp4/mp4properties.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 #include "mp4file.h"
 #include "mp4atom.h"
 #include "mp4properties.h"
diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index 63e044e5..32f6b9b3 100644
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
-#include <tpropertymap.h>
+#include "tdebug.h"
+#include "tstring.h"
+#include "tpropertymap.h"
 #include "mp4atom.h"
 #include "mp4tag.h"
 #include "id3v1genres.h"
diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp
index ab067999..512d273c 100644
--- a/taglib/mpc/mpcfile.cpp
+++ b/taglib/mpc/mpcfile.cpp
@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tagunion.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tagunion.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "mpcfile.h"
 #include "id3v1tag.h"
diff --git a/taglib/mpc/mpcproperties.cpp b/taglib/mpc/mpcproperties.cpp
index b24c4099..774e4790 100644
--- a/taglib/mpc/mpcproperties.cpp
+++ b/taglib/mpc/mpcproperties.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 #include <bitset>
 #include <cmath>
 
diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp
index 8b21162d..ed2610f2 100644
--- a/taglib/mpeg/id3v1/id3v1tag.cpp
+++ b/taglib/mpeg/id3v1/id3v1tag.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tfile.h>
+#include "tdebug.h"
+#include "tfile.h"
 
 #include "id3v1tag.h"
 #include "id3v1genres.h"
diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
index 931b522a..2e32f4c4 100644
--- a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
+++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
@@ -25,8 +25,8 @@
 
 #include "attachedpictureframe.h"
 
-#include <tstringlist.h>
-#include <tdebug.h>
+#include "tstringlist.h"
+#include "tdebug.h"
 
 using namespace TagLib;
 using namespace ID3v2;
diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp
index 55719676..f98c695b 100644
--- a/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "tdebug.h"
 #include <cstdio>
 
 #include "chapterframe.h"
diff --git a/taglib/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp
index 9b703338..1ca81566 100644
--- a/taglib/mpeg/id3v2/frames/commentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/commentsframe.cpp
@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tstringlist.h>
+#include "tbytevectorlist.h"
+#include "id3v2tag.h"
+#include "tdebug.h"
+#include "tstringlist.h"
 
 #include "commentsframe.h"
 #include "tpropertymap.h"
diff --git a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
index d09b6c97..c0423f90 100644
--- a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
+++ b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
@@ -24,10 +24,10 @@
  ***************************************************************************/
 
 #include "eventtimingcodesframe.h"
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
+#include "tbytevectorlist.h"
+#include "id3v2tag.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace ID3v2;
diff --git a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
index 219b275a..1ae6fc09 100644
--- a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
+++ b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
@@ -26,8 +26,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstringlist.h>
+#include "tdebug.h"
+#include "tstringlist.h"
 
 #include "generalencapsulatedobjectframe.h"
 
diff --git a/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/taglib/mpeg/id3v2/frames/ownershipframe.cpp
index e318d74d..7b585b78 100644
--- a/taglib/mpeg/id3v2/frames/ownershipframe.cpp
+++ b/taglib/mpeg/id3v2/frames/ownershipframe.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <id3v2tag.h>
+#include "tdebug.h"
+#include "tstringlist.h"
+#include "id3v2tag.h"
 
 #include "ownershipframe.h"
 
diff --git a/taglib/mpeg/id3v2/frames/podcastframe.cpp b/taglib/mpeg/id3v2/frames/podcastframe.cpp
index 7dfe471d..8241e6aa 100644
--- a/taglib/mpeg/id3v2/frames/podcastframe.cpp
+++ b/taglib/mpeg/id3v2/frames/podcastframe.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #include "podcastframe.h"
-#include <tpropertymap.h>
+#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace ID3v2;
diff --git a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
index c819c8c2..9fd2d0b4 100644
--- a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
+++ b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
+#include "tdebug.h"
 
 #include "popularimeterframe.h"
 
diff --git a/taglib/mpeg/id3v2/frames/privateframe.cpp b/taglib/mpeg/id3v2/frames/privateframe.cpp
index 4f55a3ca..32d04332 100644
--- a/taglib/mpeg/id3v2/frames/privateframe.cpp
+++ b/taglib/mpeg/id3v2/frames/privateframe.cpp
@@ -24,9 +24,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
+#include "tbytevectorlist.h"
+#include "id3v2tag.h"
+#include "tdebug.h"
 
 #include "privateframe.h"
 
diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
index 85fade44..2f70ed92 100644
--- a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
+++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tmap.h>
+#include "tdebug.h"
+#include "tmap.h"
 
 #include "relativevolumeframe.h"
 
diff --git a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
index 481b39d3..bf7e3ab2 100644
--- a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
@@ -24,10 +24,10 @@
  ***************************************************************************/
 
 #include "synchronizedlyricsframe.h"
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
+#include "tbytevectorlist.h"
+#include "id3v2tag.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace ID3v2;
diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index 32e1f826..8d5efdec 100644
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "tdebug.h"
 
 #include "tableofcontentsframe.h"
 
diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
index ed9362e4..4a8c11e4 100644
--- a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
+++ b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
+#include "tbytevectorlist.h"
+#include "id3v2tag.h"
 #include "textidentificationframe.h"
 #include "tpropertymap.h"
 #include "id3v1genres.h"
diff --git a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
index 44ad20ce..d09496ad 100644
--- a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
+++ b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "tdebug.h"
 
 #include "id3v2tag.h"
 #include "uniquefileidentifierframe.h"
diff --git a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
index b3f3e6da..c3b7204f 100644
--- a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
@@ -27,10 +27,10 @@
  ***************************************************************************/
 
 #include "unsynchronizedlyricsframe.h"
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
+#include "tbytevectorlist.h"
+#include "id3v2tag.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace ID3v2;
diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/taglib/mpeg/id3v2/frames/urllinkframe.cpp
index a7700a72..ea502caa 100644
--- a/taglib/mpeg/id3v2/frames/urllinkframe.cpp
+++ b/taglib/mpeg/id3v2/frames/urllinkframe.cpp
@@ -28,9 +28,9 @@
 
 #include "urllinkframe.h"
 #include "id3v2tag.h"
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
+#include "tdebug.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace ID3v2;
diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index 046196e0..574b941f 100644
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -25,9 +25,9 @@
 
 #include <bitset>
 
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <tzlib.h>
+#include "tdebug.h"
+#include "tstringlist.h"
+#include "tzlib.h"
 
 #include "id3v2tag.h"
 #include "id3v2frame.h"
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index 6c194c1b..a241e859 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tzlib.h>
+#include "tdebug.h"
+#include "tzlib.h"
 
 #include "id3v2framefactory.h"
 #include "id3v2synchdata.h"
diff --git a/taglib/mpeg/id3v2/id3v2header.cpp b/taglib/mpeg/id3v2/id3v2header.cpp
index bf5af676..b8e80e88 100644
--- a/taglib/mpeg/id3v2/id3v2header.cpp
+++ b/taglib/mpeg/id3v2/id3v2header.cpp
@@ -26,8 +26,8 @@
 #include <iostream>
 #include <bitset>
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "id3v2header.h"
 #include "id3v2footer.h"
diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
index 4a631d51..0b222f1b 100644
--- a/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -25,10 +25,10 @@
 
 #include <algorithm>
 
-#include <tfile.h>
-#include <tbytevector.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include "tfile.h"
+#include "tbytevector.h"
+#include "tpropertymap.h"
+#include "tdebug.h"
 
 #include "id3v2tag.h"
 #include "id3v2header.h"
diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
index 3d3d4b29..7510f446 100644
--- a/taglib/mpeg/mpegfile.cpp
+++ b/taglib/mpeg/mpegfile.cpp
@@ -23,14 +23,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tagunion.h>
-#include <tagutils.h>
-#include <id3v2tag.h>
-#include <id3v2header.h>
-#include <id3v1tag.h>
-#include <apefooter.h>
-#include <apetag.h>
-#include <tdebug.h>
+#include "tagunion.h"
+#include "tagutils.h"
+#include "id3v2tag.h"
+#include "id3v2header.h"
+#include "id3v1tag.h"
+#include "apefooter.h"
+#include "apetag.h"
+#include "tdebug.h"
 
 #include "mpegfile.h"
 #include "mpegheader.h"
diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp
index d6b9c6e2..276a8f30 100644
--- a/taglib/mpeg/mpegheader.cpp
+++ b/taglib/mpeg/mpegheader.cpp
@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tfile.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tfile.h"
+#include "tdebug.h"
+#include "trefcounter.h"
 
 #include "mpegheader.h"
 #include "mpegutils.h"
diff --git a/taglib/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp
index 8d586c70..7701f219 100644
--- a/taglib/mpeg/mpegproperties.cpp
+++ b/taglib/mpeg/mpegproperties.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 
 #include "mpegproperties.h"
 #include "mpegfile.h"
diff --git a/taglib/mpeg/xingheader.cpp b/taglib/mpeg/xingheader.cpp
index 92200f89..31578250 100644
--- a/taglib/mpeg/xingheader.cpp
+++ b/taglib/mpeg/xingheader.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tdebug.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "xingheader.h"
 #include "mpegfile.h"
diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp
index b6527e96..8f95ff50 100644
--- a/taglib/ogg/flac/oggflacfile.cpp
+++ b/taglib/ogg/flac/oggflacfile.cpp
@@ -23,13 +23,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
-#include <xiphcomment.h>
+#include "xiphcomment.h"
 #include "oggflacfile.h"
 
 using namespace TagLib;
diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp
index 0ec0eaa9..9da999cf 100644
--- a/taglib/ogg/oggfile.cpp
+++ b/taglib/ogg/oggfile.cpp
@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tmap.h>
-#include <tstring.h>
-#include <tdebug.h>
+#include "tbytevectorlist.h"
+#include "tmap.h"
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "oggfile.h"
 #include "oggpage.h"
diff --git a/taglib/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp
index 9774c1e2..28482cb0 100644
--- a/taglib/ogg/oggpage.cpp
+++ b/taglib/ogg/oggpage.cpp
@@ -25,8 +25,8 @@
 
 #include <algorithm>
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "oggpage.h"
 #include "oggpageheader.h"
diff --git a/taglib/ogg/oggpageheader.cpp b/taglib/ogg/oggpageheader.cpp
index 983f7be6..d93ca86a 100644
--- a/taglib/ogg/oggpageheader.cpp
+++ b/taglib/ogg/oggpageheader.cpp
@@ -25,9 +25,9 @@
 
 #include <bitset>
 
-#include <tstring.h>
-#include <tdebug.h>
-#include <taglib.h>
+#include "tstring.h"
+#include "tdebug.h"
+#include "taglib.h"
 
 #include "oggpageheader.h"
 #include "oggfile.h"
diff --git a/taglib/ogg/opus/opusfile.cpp b/taglib/ogg/opus/opusfile.cpp
index 9b181660..b8a80ade 100644
--- a/taglib/ogg/opus/opusfile.cpp
+++ b/taglib/ogg/opus/opusfile.cpp
@@ -27,10 +27,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tstring.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "opusfile.h"
 
diff --git a/taglib/ogg/opus/opusproperties.cpp b/taglib/ogg/opus/opusproperties.cpp
index 4cd3f7af..1d237053 100644
--- a/taglib/ogg/opus/opusproperties.cpp
+++ b/taglib/ogg/opus/opusproperties.cpp
@@ -27,10 +27,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
-#include <oggpageheader.h>
+#include "oggpageheader.h"
 
 #include "opusproperties.h"
 #include "opusfile.h"
diff --git a/taglib/ogg/speex/speexfile.cpp b/taglib/ogg/speex/speexfile.cpp
index bb883a31..ad0b8aca 100644
--- a/taglib/ogg/speex/speexfile.cpp
+++ b/taglib/ogg/speex/speexfile.cpp
@@ -27,10 +27,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tstring.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "speexfile.h"
 
diff --git a/taglib/ogg/speex/speexproperties.cpp b/taglib/ogg/speex/speexproperties.cpp
index 0464c3c7..cc01767c 100644
--- a/taglib/ogg/speex/speexproperties.cpp
+++ b/taglib/ogg/speex/speexproperties.cpp
@@ -27,10 +27,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
-#include <oggpageheader.h>
+#include "oggpageheader.h"
 
 #include "speexproperties.h"
 #include "speexfile.h"
diff --git a/taglib/ogg/vorbis/vorbisfile.cpp b/taglib/ogg/vorbis/vorbisfile.cpp
index 5b527b85..eaaf9852 100644
--- a/taglib/ogg/vorbis/vorbisfile.cpp
+++ b/taglib/ogg/vorbis/vorbisfile.cpp
@@ -25,10 +25,10 @@
 
 #include <bitset>
 
-#include <tstring.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tstring.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "vorbisfile.h"
 
diff --git a/taglib/ogg/vorbis/vorbisproperties.cpp b/taglib/ogg/vorbis/vorbisproperties.cpp
index 88f2230f..8cfa5340 100644
--- a/taglib/ogg/vorbis/vorbisproperties.cpp
+++ b/taglib/ogg/vorbis/vorbisproperties.cpp
@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
-#include <oggpageheader.h>
+#include "oggpageheader.h"
 
 #include "vorbisproperties.h"
 #include "vorbisfile.h"
diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp
index e0da5d3e..b5d1c438 100644
--- a/taglib/ogg/xiphcomment.cpp
+++ b/taglib/ogg/xiphcomment.cpp
@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tdebug.h>
+#include "tbytevector.h"
+#include "tdebug.h"
 
-#include <flacpicture.h>
-#include <xiphcomment.h>
-#include <tpropertymap.h>
+#include "flacpicture.h"
+#include "xiphcomment.h"
+#include "tpropertymap.h"
 
 using namespace TagLib;
 
diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp
index 081df55d..395b1c5f 100644
--- a/taglib/riff/aiff/aifffile.cpp
+++ b/taglib/riff/aiff/aifffile.cpp
@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tdebug.h>
-#include <id3v2tag.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tdebug.h"
+#include "id3v2tag.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "aifffile.h"
 
diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp
index 20e4c992..ac040ecd 100644
--- a/taglib/riff/aiff/aiffproperties.cpp
+++ b/taglib/riff/aiff/aiffproperties.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 #include "aifffile.h"
 #include "aiffproperties.h"
 
diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp
index a1055761..7e44ac34 100644
--- a/taglib/riff/rifffile.cpp
+++ b/taglib/riff/rifffile.cpp
@@ -26,9 +26,9 @@
 #include <algorithm>
 #include <vector>
 
-#include <tbytevector.h>
-#include <tdebug.h>
-#include <tstring.h>
+#include "tbytevector.h"
+#include "tdebug.h"
+#include "tstring.h"
 
 #include "rifffile.h"
 #include "riffutils.h"
diff --git a/taglib/riff/wav/infotag.cpp b/taglib/riff/wav/infotag.cpp
index a82b4ca6..a78c670a 100644
--- a/taglib/riff/wav/infotag.cpp
+++ b/taglib/riff/wav/infotag.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tfile.h>
+#include "tdebug.h"
+#include "tfile.h"
 
 #include "infotag.h"
 #include "riffutils.h"
diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp
index e829c5ec..a5ecad3c 100644
--- a/taglib/riff/wav/wavfile.cpp
+++ b/taglib/riff/wav/wavfile.cpp
@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tdebug.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "wavfile.h"
 #include "id3v2tag.h"
diff --git a/taglib/riff/wav/wavproperties.cpp b/taglib/riff/wav/wavproperties.cpp
index 926951f0..395ebe6c 100644
--- a/taglib/riff/wav/wavproperties.cpp
+++ b/taglib/riff/wav/wavproperties.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
+#include "tdebug.h"
 #include "wavfile.h"
 #include "wavproperties.h"
 
diff --git a/taglib/tagunion.cpp b/taglib/tagunion.cpp
index cf42bd7b..751d3d45 100644
--- a/taglib/tagunion.cpp
+++ b/taglib/tagunion.cpp
@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tagunion.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
+#include "tagunion.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
 
 #include "id3v1tag.h"
 #include "id3v2tag.h"
diff --git a/taglib/tagutils.cpp b/taglib/tagutils.cpp
index 27154dc3..4904f736 100644
--- a/taglib/tagutils.cpp
+++ b/taglib/tagutils.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tfile.h>
+#include "tfile.h"
 
 #include "id3v1tag.h"
 #include "id3v2header.h"
diff --git a/taglib/tagutils.h b/taglib/tagutils.h
index d21edef3..4532a18c 100644
--- a/taglib/tagutils.h
+++ b/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 TagLib {
 
diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index 6b5423b5..dfa0f364 100644
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -30,10 +30,10 @@
 #include <cstdio>
 #include <cstring>
 
-#include <tstring.h>
-#include <tdebug.h>
-#include <trefcounter.h>
-#include <tutils.h>
+#include "tstring.h"
+#include "tdebug.h"
+#include "trefcounter.h"
+#include "tutils.h"
 
 #include "tbytevector.h"
 
diff --git a/taglib/toolkit/tdebug.cpp b/taglib/toolkit/tdebug.cpp
index ca35f718..62ff0b9e 100644
--- a/taglib/toolkit/tdebug.cpp
+++ b/taglib/toolkit/tdebug.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #if !defined(NDEBUG) || defined(TRACE_IN_RELEASE)
diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp
index 0a918793..87647414 100644
--- a/taglib/toolkit/tiostream.cpp
+++ b/taglib/toolkit/tiostream.cpp
@@ -25,7 +25,7 @@
 
 #ifdef _WIN32
 # include <windows.h>
-# include <tstring.h>
+# include "tstring.h"
 #endif
 
 #include "tiostream.h"
diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp
index e61d24c6..67a6642e 100644
--- a/taglib/toolkit/trefcounter.cpp
+++ b/taglib/toolkit/trefcounter.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "trefcounter.h"
diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 1f75207d..ce5aafca 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -28,10 +28,10 @@
 
 #include <utf8-cpp/checked.h>
 
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <trefcounter.h>
-#include <tutils.h>
+#include "tdebug.h"
+#include "tstringlist.h"
+#include "trefcounter.h"
+#include "tutils.h"
 
 #include "tstring.h"
 
diff --git a/taglib/toolkit/tutils.h b/taglib/toolkit/tutils.h
index 14cdd435..762358e5 100644
--- a/taglib/toolkit/tutils.h
+++ b/taglib/toolkit/tutils.h
@@ -31,20 +31,20 @@
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #if defined(HAVE_MSC_BYTESWAP)
-# include <stdlib.h>
+# include "stdlib.h"
 #elif defined(HAVE_GLIBC_BYTESWAP)
-# include <byteswap.h>
+# 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 "tstring.h"
 #include <cstdio>
 #include <cstdarg>
 #include <cstring>
diff --git a/taglib/toolkit/tzlib.cpp b/taglib/toolkit/tzlib.cpp
index 4b348df5..2c6bd5e6 100644
--- a/taglib/toolkit/tzlib.cpp
+++ b/taglib/toolkit/tzlib.cpp
@@ -24,13 +24,13 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #ifdef HAVE_ZLIB
 # include <zlib.h>
-# include <tstring.h>
-# include <tdebug.h>
+# include "tstring.h"
+# include "tdebug.h"
 #endif
 
 #include "tzlib.h"
diff --git a/taglib/toolkit/tzlib.h b/taglib/toolkit/tzlib.h
index ac6b9cf8..38df4c73 100644
--- a/taglib/toolkit/tzlib.h
+++ b/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
 
diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp
index 4f2975bd..db3b814f 100644
--- a/taglib/trueaudio/trueaudiofile.cpp
+++ b/taglib/trueaudio/trueaudiofile.cpp
@@ -27,13 +27,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <tagunion.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tdebug.h"
+#include "tagunion.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "trueaudiofile.h"
 #include "id3v1tag.h"
diff --git a/taglib/trueaudio/trueaudioproperties.cpp b/taglib/trueaudio/trueaudioproperties.cpp
index 20aa5db6..99b783a9 100644
--- a/taglib/trueaudio/trueaudioproperties.cpp
+++ b/taglib/trueaudio/trueaudioproperties.cpp
@@ -27,8 +27,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 #include <bitset>
 
 #include "trueaudioproperties.h"
diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp
index 9da4c935..4cb97503 100644
--- a/taglib/wavpack/wavpackfile.cpp
+++ b/taglib/wavpack/wavpackfile.cpp
@@ -27,12 +27,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <tagunion.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tdebug.h"
+#include "tagunion.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "wavpackfile.h"
 #include "id3v1tag.h"
diff --git a/taglib/wavpack/wavpackproperties.cpp b/taglib/wavpack/wavpackproperties.cpp
index bb245799..b881a16f 100644
--- a/taglib/wavpack/wavpackproperties.cpp
+++ b/taglib/wavpack/wavpackproperties.cpp
@@ -28,8 +28,8 @@
  ***************************************************************************/
 
 #include <cstdint>
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "wavpackproperties.h"
 #include "wavpackfile.h"
diff --git a/tests/plainfile.h b/tests/plainfile.h
index dc808277..9af5b06b 100644
--- a/tests/plainfile.h
+++ b/tests/plainfile.h
@@ -26,7 +26,7 @@
 #ifndef TAGLIB_PLAINFILE_H
 #define TAGLIB_PLAINFILE_H
 
-#include <tfile.h>
+#include "tfile.h"
 
 using namespace TagLib;
 
diff --git a/tests/test_aiff.cpp b/tests/test_aiff.cpp
index 01887602..08301463 100644
--- a/tests/test_aiff.cpp
+++ b/tests/test_aiff.cpp
@@ -25,9 +25,9 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tbytevectorlist.h>
-#include <aifffile.h>
+#include "tag.h"
+#include "tbytevectorlist.h"
+#include "aifffile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_ape.cpp b/tests/test_ape.cpp
index f2ecbf66..a4ceb02d 100644
--- a/tests/test_ape.cpp
+++ b/tests/test_ape.cpp
@@ -25,12 +25,12 @@
 
 #include <string>
 #include <cstdio>
-#include <apetag.h>
-#include <id3v1tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <apefile.h>
+#include "apetag.h"
+#include "id3v1tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "apefile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_apetag.cpp b/tests/test_apetag.cpp
index 13936e7c..a0cc7671 100644
--- a/tests/test_apetag.cpp
+++ b/tests/test_apetag.cpp
@@ -25,13 +25,13 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <apefile.h>
-#include <apetag.h>
-#include <tdebug.h>
+#include "tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "apefile.h"
+#include "apetag.h"
+#include "tdebug.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_asf.cpp b/tests/test_asf.cpp
index 335caeff..bac00e77 100644
--- a/tests/test_asf.cpp
+++ b/tests/test_asf.cpp
@@ -25,11 +25,11 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <asffile.h>
+#include "tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "asffile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
index add8980f..0efd53ce 100644
--- a/tests/test_bytevector.cpp
+++ b/tests/test_bytevector.cpp
@@ -25,8 +25,8 @@
 
 #define _USE_MATH_DEFINES
 #include <cmath>
-#include <tbytevector.h>
-#include <tbytevectorlist.h>
+#include "tbytevector.h"
+#include "tbytevectorlist.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
@@ -596,4 +596,3 @@ public:
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestByteVector);
-
diff --git a/tests/test_bytevectorlist.cpp b/tests/test_bytevectorlist.cpp
index 6fe325b8..cb47b6a4 100644
--- a/tests/test_bytevectorlist.cpp
+++ b/tests/test_bytevectorlist.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tbytevectorlist.h>
+#include "tbytevector.h"
+#include "tbytevectorlist.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
diff --git a/tests/test_bytevectorstream.cpp b/tests/test_bytevectorstream.cpp
index b13ca61b..f531e3bd 100644
--- a/tests/test_bytevectorstream.cpp
+++ b/tests/test_bytevectorstream.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorstream.h>
+#include "tbytevectorstream.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
diff --git a/tests/test_file.cpp b/tests/test_file.cpp
index a30ae4e2..dd532206 100644
--- a/tests/test_file.cpp
+++ b/tests/test_file.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tfile.h>
+#include "tfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
 #include "utils.h"
diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp
index 77fb4ea2..e9a1ebe6 100644
--- a/tests/test_fileref.cpp
+++ b/tests/test_fileref.cpp
@@ -25,25 +25,25 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <fileref.h>
-#include <oggflacfile.h>
-#include <vorbisfile.h>
-#include <mpegfile.h>
-#include <mpcfile.h>
-#include <asffile.h>
-#include <speexfile.h>
-#include <flacfile.h>
-#include <trueaudiofile.h>
-#include <mp4file.h>
-#include <wavfile.h>
-#include <apefile.h>
-#include <aifffile.h>
-#include <wavpackfile.h>
-#include <opusfile.h>
-#include <xmfile.h>
-#include <tfilestream.h>
-#include <tbytevectorstream.h>
+#include "tag.h"
+#include "fileref.h"
+#include "oggflacfile.h"
+#include "vorbisfile.h"
+#include "mpegfile.h"
+#include "mpcfile.h"
+#include "asffile.h"
+#include "speexfile.h"
+#include "flacfile.h"
+#include "trueaudiofile.h"
+#include "mp4file.h"
+#include "wavfile.h"
+#include "apefile.h"
+#include "aifffile.h"
+#include "wavpackfile.h"
+#include "opusfile.h"
+#include "xmfile.h"
+#include "tfilestream.h"
+#include "tbytevectorstream.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
index e508025a..e0ff81e5 100644
--- a/tests/test_flac.cpp
+++ b/tests/test_flac.cpp
@@ -25,14 +25,14 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <flacfile.h>
-#include <xiphcomment.h>
-#include <id3v1tag.h>
-#include <id3v2tag.h>
+#include "tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "flacfile.h"
+#include "xiphcomment.h"
+#include "id3v1tag.h"
+#include "id3v2tag.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
 #include "utils.h"
diff --git a/tests/test_flacpicture.cpp b/tests/test_flacpicture.cpp
index a71f7d59..5c1c42b2 100644
--- a/tests/test_flacpicture.cpp
+++ b/tests/test_flacpicture.cpp
@@ -25,11 +25,11 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <flacfile.h>
-#include <flacmetadatablock.h>
+#include "tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "flacfile.h"
+#include "flacmetadatablock.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_flacunknownmetadatablock.cpp b/tests/test_flacunknownmetadatablock.cpp
index 114c244c..0c7162d5 100644
--- a/tests/test_flacunknownmetadatablock.cpp
+++ b/tests/test_flacunknownmetadatablock.cpp
@@ -25,10 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <flacunknownmetadatablock.h>
+#include "tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "flacunknownmetadatablock.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_id3v1.cpp b/tests/test_id3v1.cpp
index 2b93b6b8..fac48385 100644
--- a/tests/test_id3v1.cpp
+++ b/tests/test_id3v1.cpp
@@ -25,10 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include <tstring.h>
-#include <mpegfile.h>
-#include <id3v1tag.h>
-#include <id3v1genres.h>
+#include "tstring.h"
+#include "mpegfile.h"
+#include "id3v1tag.h"
+#include "id3v1genres.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp
index 93b454e6..ccd7d7ef 100644
--- a/tests/test_id3v2.cpp
+++ b/tests/test_id3v2.cpp
@@ -25,29 +25,29 @@
 
 #include <string>
 #include <cstdio>
-#include <id3v2tag.h>
-#include <mpegfile.h>
-#include <id3v2frame.h>
-#include <uniquefileidentifierframe.h>
-#include <textidentificationframe.h>
-#include <attachedpictureframe.h>
-#include <unsynchronizedlyricsframe.h>
-#include <synchronizedlyricsframe.h>
-#include <eventtimingcodesframe.h>
-#include <generalencapsulatedobjectframe.h>
-#include <relativevolumeframe.h>
-#include <popularimeterframe.h>
-#include <urllinkframe.h>
-#include <ownershipframe.h>
-#include <unknownframe.h>
-#include <chapterframe.h>
-#include <tableofcontentsframe.h>
-#include <commentsframe.h>
-#include <podcastframe.h>
-#include <privateframe.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-#include <tzlib.h>
+#include "id3v2tag.h"
+#include "mpegfile.h"
+#include "id3v2frame.h"
+#include "uniquefileidentifierframe.h"
+#include "textidentificationframe.h"
+#include "attachedpictureframe.h"
+#include "unsynchronizedlyricsframe.h"
+#include "synchronizedlyricsframe.h"
+#include "eventtimingcodesframe.h"
+#include "generalencapsulatedobjectframe.h"
+#include "relativevolumeframe.h"
+#include "popularimeterframe.h"
+#include "urllinkframe.h"
+#include "ownershipframe.h"
+#include "unknownframe.h"
+#include "chapterframe.h"
+#include "tableofcontentsframe.h"
+#include "commentsframe.h"
+#include "podcastframe.h"
+#include "privateframe.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tzlib.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
 #include "utils.h"
diff --git a/tests/test_info.cpp b/tests/test_info.cpp
index 449d04af..8d7fd433 100644
--- a/tests/test_info.cpp
+++ b/tests/test_info.cpp
@@ -25,7 +25,7 @@
 
 #include <string>
 #include <cstdio>
-#include <infotag.h>
+#include "infotag.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_it.cpp b/tests/test_it.cpp
index 9ea64f52..f461116d 100644
--- a/tests/test_it.cpp
+++ b/tests/test_it.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <itfile.h>
-#include <tstringlist.h>
+#include "itfile.h"
+#include "tstringlist.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_list.cpp b/tests/test_list.cpp
index 1af9a6f7..6b622637 100644
--- a/tests/test_list.cpp
+++ b/tests/test_list.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tlist.h>
+#include "tlist.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
diff --git a/tests/test_map.cpp b/tests/test_map.cpp
index e8012a3f..a5f46e78 100644
--- a/tests/test_map.cpp
+++ b/tests/test_map.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tmap.h>
+#include "tstring.h"
+#include "tmap.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
diff --git a/tests/test_mod.cpp b/tests/test_mod.cpp
index 7a1279ce..507ada5e 100644
--- a/tests/test_mod.cpp
+++ b/tests/test_mod.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <modfile.h>
-#include <tpropertymap.h>
+#include "modfile.h"
+#include "tpropertymap.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_mp4.cpp b/tests/test_mp4.cpp
index 34a4da49..29e6a8e4 100644
--- a/tests/test_mp4.cpp
+++ b/tests/test_mp4.cpp
@@ -25,13 +25,13 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <mp4tag.h>
-#include <tbytevectorlist.h>
-#include <tbytevectorstream.h>
-#include <tpropertymap.h>
-#include <mp4atom.h>
-#include <mp4file.h>
+#include "tag.h"
+#include "mp4tag.h"
+#include "tbytevectorlist.h"
+#include "tbytevectorstream.h"
+#include "tpropertymap.h"
+#include "mp4atom.h"
+#include "mp4file.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
 #include "utils.h"
diff --git a/tests/test_mp4coverart.cpp b/tests/test_mp4coverart.cpp
index ea0ed36d..de65c861 100644
--- a/tests/test_mp4coverart.cpp
+++ b/tests/test_mp4coverart.cpp
@@ -25,8 +25,8 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <mp4coverart.h>
+#include "tag.h"
+#include "mp4coverart.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_mp4item.cpp b/tests/test_mp4item.cpp
index 52bdfec4..b518bf88 100644
--- a/tests/test_mp4item.cpp
+++ b/tests/test_mp4item.cpp
@@ -25,9 +25,9 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <mp4coverart.h>
-#include <mp4item.h>
+#include "tag.h"
+#include "mp4coverart.h"
+#include "mp4item.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_mpc.cpp b/tests/test_mpc.cpp
index 24277c6d..aa94aa73 100644
--- a/tests/test_mpc.cpp
+++ b/tests/test_mpc.cpp
@@ -25,12 +25,12 @@
 
 #include <string>
 #include <cstdio>
-#include <apetag.h>
-#include <id3v1tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <mpcfile.h>
+#include "apetag.h"
+#include "id3v1tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "mpcfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp
index 0a27f2ac..b8311849 100644
--- a/tests/test_mpeg.cpp
+++ b/tests/test_mpeg.cpp
@@ -25,16 +25,16 @@
 
 #include <string>
 #include <cstdio>
-#include <tstring.h>
-#include <tpropertymap.h>
-#include <mpegfile.h>
-#include <id3v2tag.h>
-#include <id3v1tag.h>
-#include <apetag.h>
-#include <mpegproperties.h>
-#include <xingheader.h>
-#include <mpegheader.h>
-#include <id3v2extendedheader.h>
+#include "tstring.h"
+#include "tpropertymap.h"
+#include "mpegfile.h"
+#include "id3v2tag.h"
+#include "id3v1tag.h"
+#include "apetag.h"
+#include "mpegproperties.h"
+#include "xingheader.h"
+#include "mpegheader.h"
+#include "id3v2extendedheader.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_ogg.cpp b/tests/test_ogg.cpp
index 62a64ea2..d0ce730c 100644
--- a/tests/test_ogg.cpp
+++ b/tests/test_ogg.cpp
@@ -25,13 +25,13 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <oggfile.h>
-#include <vorbisfile.h>
-#include <oggpageheader.h>
+#include "tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "oggfile.h"
+#include "vorbisfile.h"
+#include "oggpageheader.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_oggflac.cpp b/tests/test_oggflac.cpp
index 46faf9f7..becccfea 100644
--- a/tests/test_oggflac.cpp
+++ b/tests/test_oggflac.cpp
@@ -25,12 +25,12 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tstringlist.h>
-#include <tbytevectorlist.h>
-#include <oggfile.h>
-#include <oggflacfile.h>
-#include <oggpageheader.h>
+#include "tag.h"
+#include "tstringlist.h"
+#include "tbytevectorlist.h"
+#include "oggfile.h"
+#include "oggflacfile.h"
+#include "oggpageheader.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_opus.cpp b/tests/test_opus.cpp
index b6235c0f..e12b1459 100644
--- a/tests/test_opus.cpp
+++ b/tests/test_opus.cpp
@@ -25,10 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tbytevectorlist.h>
-#include <opusfile.h>
-#include <oggpageheader.h>
+#include "tag.h"
+#include "tbytevectorlist.h"
+#include "opusfile.h"
+#include "oggpageheader.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_propertymap.cpp b/tests/test_propertymap.cpp
index 819b3715..e7de4b89 100644
--- a/tests/test_propertymap.cpp
+++ b/tests/test_propertymap.cpp
@@ -23,15 +23,15 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tpropertymap.h>
-#include <tag.h>
-#include <apetag.h>
-#include <asftag.h>
-#include <id3v1tag.h>
-#include <id3v2tag.h>
-#include <infotag.h>
-#include <mp4tag.h>
-#include <xiphcomment.h>
+#include "tpropertymap.h"
+#include "tag.h"
+#include "apetag.h"
+#include "asftag.h"
+#include "id3v1tag.h"
+#include "id3v2tag.h"
+#include "infotag.h"
+#include "mp4tag.h"
+#include "xiphcomment.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_riff.cpp b/tests/test_riff.cpp
index 7e6a2bb5..5855cdce 100644
--- a/tests/test_riff.cpp
+++ b/tests/test_riff.cpp
@@ -25,9 +25,9 @@
 
 #include <string>
 #include <cstdio>
-#include <tag.h>
-#include <tbytevectorlist.h>
-#include <rifffile.h>
+#include "tag.h"
+#include "tbytevectorlist.h"
+#include "rifffile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_s3m.cpp b/tests/test_s3m.cpp
index c4451ada..f481687e 100644
--- a/tests/test_s3m.cpp
+++ b/tests/test_s3m.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <s3mfile.h>
+#include "s3mfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_speex.cpp b/tests/test_speex.cpp
index c8268c21..8d4e5935 100644
--- a/tests/test_speex.cpp
+++ b/tests/test_speex.cpp
@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <speexfile.h>
-#include <oggpageheader.h>
+#include "speexfile.h"
+#include "oggpageheader.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_string.cpp b/tests/test_string.cpp
index 376e4ae4..182e7687 100644
--- a/tests/test_string.cpp
+++ b/tests/test_string.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
+#include "tstring.h"
 #include <cstring>
 #include <cppunit/extensions/HelperMacros.h>
 
diff --git a/tests/test_synchdata.cpp b/tests/test_synchdata.cpp
index 08d65079..7787d4bd 100644
--- a/tests/test_synchdata.cpp
+++ b/tests/test_synchdata.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 
-#include <id3v2synchdata.h>
+#include "id3v2synchdata.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
diff --git a/tests/test_trueaudio.cpp b/tests/test_trueaudio.cpp
index 381b4423..dba6d8f4 100644
--- a/tests/test_trueaudio.cpp
+++ b/tests/test_trueaudio.cpp
@@ -25,10 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include <id3v1tag.h>
-#include <id3v2tag.h>
-#include <tpropertymap.h>
-#include <trueaudiofile.h>
+#include "id3v1tag.h"
+#include "id3v2tag.h"
+#include "tpropertymap.h"
+#include "trueaudiofile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_wav.cpp b/tests/test_wav.cpp
index 67d56ead..dc537ae6 100644
--- a/tests/test_wav.cpp
+++ b/tests/test_wav.cpp
@@ -25,13 +25,13 @@
 
 #include <string>
 #include <cstdio>
-#include <id3v2tag.h>
-#include <infotag.h>
-#include <tbytevectorlist.h>
-#include <tbytevectorstream.h>
-#include <tfilestream.h>
-#include <tpropertymap.h>
-#include <wavfile.h>
+#include "id3v2tag.h"
+#include "infotag.h"
+#include "tbytevectorlist.h"
+#include "tbytevectorstream.h"
+#include "tfilestream.h"
+#include "tpropertymap.h"
+#include "wavfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
 #include "utils.h"
diff --git a/tests/test_wavpack.cpp b/tests/test_wavpack.cpp
index b8fa16eb..80a3f1e6 100644
--- a/tests/test_wavpack.cpp
+++ b/tests/test_wavpack.cpp
@@ -25,11 +25,11 @@
 
 #include <string>
 #include <cstdio>
-#include <apetag.h>
-#include <id3v1tag.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <wavpackfile.h>
+#include "apetag.h"
+#include "id3v1tag.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "wavpackfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_xiphcomment.cpp b/tests/test_xiphcomment.cpp
index e4a6091f..53608e40 100644
--- a/tests/test_xiphcomment.cpp
+++ b/tests/test_xiphcomment.cpp
@@ -25,10 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include <xiphcomment.h>
-#include <vorbisfile.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include "xiphcomment.h"
+#include "vorbisfile.h"
+#include "tpropertymap.h"
+#include "tdebug.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_xm.cpp b/tests/test_xm.cpp
index 5c65a3af..514202f5 100644
--- a/tests/test_xm.cpp
+++ b/tests/test_xm.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <xmfile.h>
+#include "xmfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/utils.h b/tests/utils.h
index ac45a1f6..cacf4b01 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef _WIN32