[TagLib] Completely overhaul import paths

Change most, if not all, possible import paths to use the full header
directory paths instead of relative or "assume include paths" settings.
This should fix building with the CI.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>

Frameworks/TagLib/taglib/taglib/ape/apefile.cpp

@@ -31,18 +31,18 @@
  *   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 <taglib/toolkit/tbytevector.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/tagunion.h>
+#include <taglib/mpeg/id3v1/id3v1tag.h>
+#include <taglib/mpeg/id3v2/id3v2header.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/tagutils.h>
 
-#include "apefile.h"
-#include "apetag.h"
-#include "apefooter.h"
+#include <taglib/ape/apefile.h>
+#include <taglib/ape/apetag.h>
+#include <taglib/ape/apefooter.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/ape/apefile.h

@@ -34,9 +34,9 @@
 #ifndef TAGLIB_APEFILE_H
 #define TAGLIB_APEFILE_H
 
-#include "tfile.h"
-#include "taglib_export.h"
-#include "apeproperties.h"
+#include <taglib/toolkit/tfile.h>
+#include <taglib/taglib_export.h>
+#include <taglib/ape/apeproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/ape/apefooter.cpp

@@ -27,10 +27,10 @@
 #include <iostream>
 #include <bitset>
 
-#include <tstring.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tdebug.h>
 
-#include "apefooter.h"
+#include <taglib/ape/apefooter.h>
 
 using namespace TagLib;
 using namespace APE;

Frameworks/TagLib/taglib/taglib/ape/apefooter.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_APEFOOTER_H
 #define TAGLIB_APEFOOTER_H
 
-#include "tbytevector.h"
-#include "taglib_export.h"
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/ape/apegenfile.cpp

@@ -31,18 +31,18 @@
  *   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 <taglib/toolkit/tbytevector.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/tagunion.h>
+#include <taglib/mpeg/id3v1/id3v1tag.h>
+#include <taglib/mpeg/id3v2/id3v2header.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/tagutils.h>
 
-#include "apegenfile.h"
-#include "apetag.h"
-#include "apefooter.h"
+#include <taglib/ape/apegenfile.h>
+#include <taglib/ape/apetag.h>
+#include <taglib/ape/apefooter.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/ape/apegenfile.h

@@ -34,9 +34,9 @@
 #ifndef TAGLIB_APEGENFILE_H
 #define TAGLIB_APEGENFILE_H
 
-#include "tfile.h"
-#include "taglib_export.h"
-#include "apeproperties.h"
+#include <taglib/toolkit/tfile.h>
+#include <taglib/taglib_export.h>
+#include <taglib/ape/apeproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/ape/apeitem.cpp

@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/toolkit/tdebug.h>
 
-#include "apeitem.h"
+#include <taglib/ape/apeitem.h>
 
 using namespace TagLib;
 using namespace APE;

Frameworks/TagLib/taglib/taglib/ape/apeitem.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_APEITEM_H
 #define TAGLIB_APEITEM_H
 
-#include "tbytevector.h"
-#include "tstring.h"
-#include "tstringlist.h"
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tstringlist.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/ape/apeproperties.cpp

@@ -27,14 +27,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tdebug.h>
 #include <bitset>
-#include "id3v2tag.h"
-#include "apeproperties.h"
-#include "apefile.h"
-#include "apetag.h"
-#include "apefooter.h"
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/ape/apeproperties.h>
+#include <taglib/ape/apefile.h>
+#include <taglib/ape/apetag.h>
+#include <taglib/ape/apefooter.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/ape/apeproperties.h

@@ -30,8 +30,8 @@
 #ifndef TAGLIB_APEPROPERTIES_H
 #define TAGLIB_APEPROPERTIES_H
 
-#include "taglib_export.h"
-#include "audioproperties.h"
+#include <taglib/taglib_export.h>
+#include <taglib/audioproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/ape/apetag.cpp

@@ -31,16 +31,16 @@
 #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 <taglib/toolkit/tfile.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tmap.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tutils.h>
 
-#include "apetag.h"
-#include "apefooter.h"
-#include "apeitem.h"
+#include <taglib/ape/apetag.h>
+#include <taglib/ape/apefooter.h>
+#include <taglib/ape/apeitem.h>
 
 using namespace TagLib;
 using namespace APE;

Frameworks/TagLib/taglib/taglib/ape/apetag.h

@@ -26,13 +26,13 @@
 #ifndef TAGLIB_APETAG_H
 #define TAGLIB_APETAG_H
 
-#include "tag.h"
-#include "tbytevector.h"
-#include "tmap.h"
-#include "tstring.h"
-#include "taglib_export.h"
+#include <taglib/tag.h>
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/toolkit/tmap.h>
+#include <taglib/tstring.h>
+#include <taglib/taglib_export.h>
 
-#include "apeitem.h"
+#include <taglib/ape/apeitem.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/asf/asfattribute.cpp

@@ -23,13 +23,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/trefcounter.h>
 
-#include "asfattribute.h"
-#include "asffile.h"
-#include "asfutils.h"
+#include <taglib/asf/asfattribute.h>
+#include <taglib/asf/asffile.h>
+#include <taglib/asf/asfutils.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/asf/asfattribute.h

@@ -26,10 +26,10 @@
 #ifndef TAGLIB_ASFATTRIBUTE_H
 #define TAGLIB_ASFATTRIBUTE_H
 
-#include "tstring.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "asfpicture.h"
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/taglib_export.h>
+#include <taglib/asf/asfpicture.h>
 
 namespace TagLib
 {

Frameworks/TagLib/taglib/taglib/asf/asffile.cpp

@@ -23,16 +23,16 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tstring.h>
-#include <tagutils.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/tagutils.h>
 
-#include "asffile.h"
-#include "asftag.h"
-#include "asfproperties.h"
-#include "asfutils.h"
+#include <taglib/asf/asffile.h>
+#include <taglib/asf/asftag.h>
+#include <taglib/asf/asfproperties.h>
+#include <taglib/asf/asfutils.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/asf/asffile.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_ASFFILE_H
 #define TAGLIB_ASFFILE_H
 
-#include "tag.h"
-#include "tfile.h"
-#include "taglib_export.h"
-#include "asfproperties.h"
-#include "asftag.h"
+#include <taglib/tag.h>
+#include <taglib/toolkit/tfile.h>
+#include <taglib/taglib_export.h>
+#include <taglib/asf/asfproperties.h>
+#include <taglib/asf/asftag.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/asf/asfpicture.cpp

@@ -23,14 +23,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/trefcounter.h>
 
-#include "asfattribute.h"
-#include "asffile.h"
-#include "asfpicture.h"
-#include "asfutils.h"
+#include <taglib/asf/asfattribute.h>
+#include <taglib/asf/asffile.h>
+#include <taglib/asf/asfpicture.h>
+#include <taglib/asf/asfutils.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/asf/asfpicture.h

@@ -26,10 +26,10 @@
 #ifndef ASFPICTURE_H
 #define ASFPICTURE_H
 
-#include "tstring.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "attachedpictureframe.h"
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/taglib_export.h>
+#include <taglib/mpeg/id3v2/frames/attachedpictureframe.h>
 
 namespace TagLib
 {

Frameworks/TagLib/taglib/taglib/asf/asfproperties.cpp

@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
-#include "asfproperties.h"
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/asf/asfproperties.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/asf/asfproperties.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_ASFPROPERTIES_H
 #define TAGLIB_ASFPROPERTIES_H
 
-#include "audioproperties.h"
-#include "tstring.h"
-#include "taglib_export.h"
+#include <taglib/audioproperties.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/asf/asftag.cpp

@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tpropertymap.h>
-#include "asftag.h"
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/asf/asftag.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/asf/asftag.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_ASFTAG_H
 #define TAGLIB_ASFTAG_H
 
-#include "tag.h"
-#include "tlist.h"
-#include "tmap.h"
-#include "taglib_export.h"
-#include "asfattribute.h"
+#include <taglib/tag.h>
+#include <taglib/toolkit/tlist.h>
+#include <taglib/toolkit/tmap.h>
+#include <taglib/taglib_export.h>
+#include <taglib/asf/asfattribute.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/audioproperties.cpp

@@ -23,23 +23,23 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
+#include <taglib/toolkit/tbytevector.h>
 
-#include "aiffproperties.h"
-#include "apeproperties.h"
-#include "asfproperties.h"
-#include "flacproperties.h"
-#include "mp4properties.h"
-#include "mpcproperties.h"
-#include "mpegproperties.h"
-#include "opusproperties.h"
-#include "speexproperties.h"
-#include "trueaudioproperties.h"
-#include "vorbisproperties.h"
-#include "wavproperties.h"
-#include "wavpackproperties.h"
+#include <taglib/riff/aiff/aiffproperties.h>
+#include <taglib/ape/apeproperties.h>
+#include <taglib/asf/asfproperties.h>
+#include <taglib/flac/flacproperties.h>
+#include <taglib/mp4/mp4properties.h>
+#include <taglib/mpc/mpcproperties.h>
+#include <taglib/mpeg/mpegproperties.h>
+#include <taglib/ogg/opus/opusproperties.h>
+#include <taglib/ogg/speex/speexproperties.h>
+#include <taglib/trueaudio/trueaudioproperties.h>
+#include <taglib/ogg/vorbis/vorbisproperties.h>
+#include <taglib/riff/wav/wavproperties.h>
+#include <taglib/wavpack/wavpackproperties.h>
 
-#include "audioproperties.h"
+#include <taglib/audioproperties.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/audioproperties.h

@@ -26,7 +26,7 @@
 #ifndef TAGLIB_AUDIOPROPERTIES_H
 #define TAGLIB_AUDIOPROPERTIES_H
 
-#include "taglib_export.h"
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/fileref.cpp

@@ -29,32 +29,32 @@
 
 #include <cstring>
 
-#include <tfile.h>
-#include <tfilestream.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include <taglib/toolkit/tfile.h>
+#include <taglib/toolkit/tfilestream.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/trefcounter.h>
 
-#include "fileref.h"
-#include "asffile.h"
-#include "mpegfile.h"
-#include "vorbisfile.h"
-#include "flacfile.h"
-#include "oggflacfile.h"
-#include "mpcfile.h"
-#include "mp4file.h"
-#include "wavpackfile.h"
-#include "speexfile.h"
-#include "opusfile.h"
-#include "trueaudiofile.h"
-#include "aifffile.h"
-#include "wavfile.h"
-#include "apefile.h"
-#include "apegenfile.h"
-#include "modfile.h"
-#include "s3mfile.h"
-#include "itfile.h"
-#include "xmfile.h"
+#include <taglib/fileref.h>
+#include <taglib/asf/asffile.h>
+#include <taglib/mpeg/mpegfile.h>
+#include <taglib/ogg/vorbis/vorbisfile.h>
+#include <taglib/flac/flacfile.h>
+#include <taglib/ogg/flac/oggflacfile.h>
+#include <taglib/mpc/mpcfile.h>
+#include <taglib/mp4/mp4file.h>
+#include <taglib/wavpack/wavpackfile.h>
+#include <taglib/ogg/speex/speexfile.h>
+#include <taglib/ogg/opus/opusfile.h>
+#include <taglib/trueaudio/trueaudiofile.h>
+#include <taglib/riff/aiff/aifffile.h>
+#include <taglib/riff/wav/wavfile.h>
+#include <taglib/ape/apefile.h>
+#include <taglib/ape/apegenfile.h>
+#include <taglib/mod/modfile.h>
+#include <taglib/s3m/s3mfile.h>
+#include <taglib/it/itfile.h>
+#include <taglib/xm/xmfile.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/fileref.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_FILEREF_H
 #define TAGLIB_FILEREF_H
 
-#include "tfile.h"
-#include "tstringlist.h"
+#include <taglib/toolkit/tfile.h>
+#include <taglib/toolkit/tstringlist.h>
 
-#include "taglib_export.h"
-#include "audioproperties.h"
+#include <taglib/taglib_export.h>
+#include <taglib/audioproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/flac/flacfile.cpp

@@ -23,23 +23,23 @@
  *   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 <taglib/toolkit/tbytevector.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tlist.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/tagunion.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/tagutils.h>
 
-#include <id3v2header.h>
-#include <id3v2tag.h>
-#include <id3v1tag.h>
-#include <xiphcomment.h>
+#include <taglib/mpeg/id3v2/id3v2header.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/mpeg/id3v1/id3v1tag.h>
+#include <taglib/ogg/xiphcomment.h>
 
-#include "flacpicture.h"
-#include "flacfile.h"
-#include "flacmetadatablock.h"
-#include "flacunknownmetadatablock.h"
+#include <taglib/flac/flacpicture.h>
+#include <taglib/flac/flacfile.h>
+#include <taglib/flac/flacmetadatablock.h>
+#include <taglib/flac/flacunknownmetadatablock.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/flac/flacfile.h

@@ -26,13 +26,13 @@
 #ifndef TAGLIB_FLACFILE_H
 #define TAGLIB_FLACFILE_H
 
-#include "taglib_export.h"
-#include "tfile.h"
-#include "tlist.h"
-#include "tag.h"
+#include <taglib/taglib_export.h>
+#include <taglib/toolkit/tfile.h>
+#include <taglib/toolkit/tlist.h>
+#include <taglib/tag.h>
 
-#include "flacpicture.h"
-#include "flacproperties.h"
+#include <taglib/flac/flacpicture.h>
+#include <taglib/flac/flacproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.cpp

@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include "flacmetadatablock.h"
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/flac/flacmetadatablock.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_FLACMETADATABLOCK_H
 #define TAGLIB_FLACMETADATABLOCK_H
 
-#include <taglib/tlist.h>
-#include <taglib/tbytevector.h>
+#include <taglib/toolkit/tlist.h>
+#include <taglib/toolkit/tbytevector.h>
 #include <taglib/taglib_export.h>
 
 namespace TagLib {

Frameworks/TagLib/taglib/taglib/flac/flacpicture.cpp

@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include "flacpicture.h"
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/flac/flacpicture.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/flac/flacpicture.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_FLACPICTURE_H
 #define TAGLIB_FLACPICTURE_H
 
-#include <TagLib/tlist.h>
-#include <TagLib/tstring.h>
-#include <TagLib/tbytevector.h>
+#include <taglib/toolkit/tlist.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tbytevector.h>
 #include <taglib/taglib_export.h>
-#include <TagLib/flacmetadatablock.h>
+#include <taglib/flac/flacmetadatablock.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/flac/flacproperties.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tdebug.h>
 
-#include "flacproperties.h"
-#include "flacfile.h"
+#include <taglib/flac/flacproperties.h>
+#include <taglib/flac/flacfile.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/flac/flacproperties.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_FLACPROPERTIES_H
 #define TAGLIB_FLACPROPERTIES_H
 
-#include "taglib_export.h"
-#include "audioproperties.h"
+#include <taglib/taglib_export.h>
+#include <taglib/audioproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.cpp

@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <tstring.h>
-#include "flacunknownmetadatablock.h"
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/flac/flacunknownmetadatablock.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.h

@@ -26,10 +26,10 @@
 #ifndef TAGLIB_FLACUNKNOWNMETADATABLOCK_H
 #define TAGLIB_FLACUNKNOWNMETADATABLOCK_H
 
-#include "tlist.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "flacmetadatablock.h"
+#include <taglib/toolkit/tlist.h>
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/taglib_export.h>
+#include <taglib/flac/flacmetadatablock.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/it/itfile.cpp

@@ -24,11 +24,11 @@
  ***************************************************************************/
 
 
-#include "tstringlist.h"
-#include "itfile.h"
-#include "tdebug.h"
-#include "modfileprivate.h"
-#include "tpropertymap.h"
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/it/itfile.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/mod/modfileprivate.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace IT;

Frameworks/TagLib/taglib/taglib/it/itproperties.cpp

@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 
-#include "itproperties.h"
+#include <taglib/it/itproperties.h>
 
 using namespace TagLib;
 using namespace IT;

Frameworks/TagLib/taglib/taglib/mod/modfile.cpp

@@ -24,11 +24,11 @@
  ***************************************************************************/
 
 
-#include "modfile.h"
-#include "tstringlist.h"
-#include "tdebug.h"
-#include "modfileprivate.h"
-#include "tpropertymap.h"
+#include <taglib/mod/modfile.h>
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/mod/modfileprivate.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace Mod;

Frameworks/TagLib/taglib/taglib/mod/modfile.h

@@ -26,12 +26,12 @@
 #ifndef TAGLIB_MODFILE_H
 #define TAGLIB_MODFILE_H
 
-#include "tfile.h"
-#include "audioproperties.h"
-#include "taglib_export.h"
-#include "modfilebase.h"
-#include "modtag.h"
-#include "modproperties.h"
+#include <taglib/toolkit/tfile.h>
+#include <taglib/audioproperties.h>
+#include <taglib/taglib_export.h>
+#include <taglib/mod/modfilebase.h>
+#include <taglib/mod/modtag.h>
+#include <taglib/mod/modproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mod/modfilebase.cpp

@@ -24,8 +24,8 @@
  ***************************************************************************/
 
 
-#include "tdebug.h"
-#include "modfilebase.h"
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/mod/modfilebase.h>
 
 using namespace TagLib;
 using namespace Mod;

Frameworks/TagLib/taglib/taglib/mod/modfilebase.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_MODFILEBASE_H
 #define TAGLIB_MODFILEBASE_H
 
-#include "taglib.h"
-#include "tfile.h"
-#include "tstring.h"
-#include "tlist.h"
-#include "taglib_export.h"
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tfile.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tlist.h>
+#include <taglib/taglib_export.h>
 
 #include <algorithm>
 

Frameworks/TagLib/taglib/taglib/mod/modproperties.cpp

@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 
-#include "modproperties.h"
+#include <taglib/mod/modproperties.h>
 
 using namespace TagLib;
 using namespace Mod;

Frameworks/TagLib/taglib/taglib/mod/modproperties.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_MODPROPERTIES_H
 #define TAGLIB_MODPROPERTIES_H
 
-#include "taglib.h"
-#include "audioproperties.h"
+#include <taglib/toolkit/taglib.h>
+#include <taglib/audioproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mod/modtag.cpp

@@ -24,9 +24,9 @@
  ***************************************************************************/
 
 
-#include "modtag.h"
-#include "tstringlist.h"
-#include "tpropertymap.h"
+#include <taglib/mod/modtag.h>
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace Mod;

Frameworks/TagLib/taglib/taglib/mod/modtag.h

@@ -26,7 +26,7 @@
 #ifndef TAGLIB_MODTAG_H
 #define TAGLIB_MODTAG_H
 
-#include "tag.h"
+#include <taglib/tag.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mp4/mp4atom.cpp

@@ -25,9 +25,9 @@
 
 #include <climits>
 
-#include <tdebug.h>
-#include <tstring.h>
-#include "mp4atom.h"
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/mp4/mp4atom.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mp4/mp4atom.h

@@ -30,8 +30,8 @@
 #ifndef TAGLIB_MP4ATOM_H
 #define TAGLIB_MP4ATOM_H
 
-#include "tfile.h"
-#include "tlist.h"
+#include <taglib/toolkit/tfile.h>
+#include <taglib/toolkit/tlist.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.cpp

@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include "trefcounter.h"
-#include "mp4coverart.h"
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/trefcounter.h>
+#include <taglib/mp4/mp4coverart.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.h

@@ -26,10 +26,10 @@
 #ifndef TAGLIB_MP4COVERART_H
 #define TAGLIB_MP4COVERART_H
 
-#include "tlist.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "mp4atom.h"
+#include <taglib/toolkit/tlist.h>
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/taglib_export.h>
+#include <taglib/mp4/mp4atom.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mp4/mp4file.cpp

@@ -23,14 +23,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/tagutils.h>
 
-#include "mp4atom.h"
-#include "mp4tag.h"
-#include "mp4file.h"
+#include <taglib/mp4/mp4atom.h>
+#include <taglib/mp4/mp4tag.h>
+#include <taglib/mp4/mp4file.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mp4/mp4file.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_MP4FILE_H
 #define TAGLIB_MP4FILE_H
 
-#include "tag.h"
-#include "tfile.h"
-#include "taglib_export.h"
-#include "mp4properties.h"
-#include "mp4tag.h"
+#include <taglib/tag.h>
+#include <taglib/toolkit/tfile.h>
+#include <taglib/taglib_export.h>
+#include <taglib/mp4/mp4properties.h>
+#include <taglib/mp4/mp4tag.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mp4/mp4item.cpp

@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include "trefcounter.h"
-#include "mp4item.h"
+#include <taglib/toolkit/taglib.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/trefcounter.h>
+#include <taglib/mp4/mp4item.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mp4/mp4item.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_MP4ITEM_H
 #define TAGLIB_MP4ITEM_H
 
-#include "tstringlist.h"
-#include "mp4coverart.h"
-#include "taglib_export.h"
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/mp4/mp4coverart.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mp4/mp4properties.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
-#include "mp4file.h"
-#include "mp4atom.h"
-#include "mp4properties.h"
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/mp4/mp4file.h>
+#include <taglib/mp4/mp4atom.h>
+#include <taglib/mp4/mp4properties.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mp4/mp4properties.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_MP4PROPERTIES_H
 #define TAGLIB_MP4PROPERTIES_H
 
-#include "taglib_export.h"
-#include "audioproperties.h"
+#include <taglib/taglib_export.h>
+#include <taglib/audioproperties.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mp4/mp4tag.cpp

@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
-#include <tpropertymap.h>
-#include "mp4atom.h"
-#include "mp4tag.h"
-#include "id3v1genres.h"
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/mp4/mp4atom.h>
+#include <taglib/mp4/mp4tag.h>
+#include <taglib/mpeg/id3v1/id3v1genres.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mp4/mp4tag.h

@@ -26,14 +26,14 @@
 #ifndef TAGLIB_MP4TAG_H
 #define TAGLIB_MP4TAG_H
 
-#include "tag.h"
-#include "tbytevectorlist.h"
-#include "tfile.h"
-#include "tmap.h"
-#include "tstringlist.h"
-#include "taglib_export.h"
-#include "mp4atom.h"
-#include "mp4item.h"
+#include <taglib/tag.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/toolkit/tfile.h>
+#include <taglib/toolkit/tmap.h>
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/taglib_export.h>
+#include <taglib/mp4/mp4atom.h>
+#include <taglib/mp4/mp4item.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpc/mpcfile.cpp

@@ -23,18 +23,18 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tagunion.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/tagunion.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/tagutils.h>
 
-#include "mpcfile.h"
-#include "id3v1tag.h"
-#include "id3v2header.h"
-#include "apetag.h"
-#include "apefooter.h"
+#include <taglib/mpc/mpcfile.h>
+#include <taglib/mpeg/id3v1/id3v1tag.h>
+#include <taglib/mpeg/id3v2/id3v2header.h>
+#include <taglib/ape/apetag.h>
+#include <taglib/ape/apefooter.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mpc/mpcfile.h

@@ -26,13 +26,13 @@
 #ifndef TAGLIB_MPCFILE_H
 #define TAGLIB_MPCFILE_H
 
-#include "taglib_export.h"
-#include "tfile.h"
-#include "tag.h"
+#include <taglib/taglib_export.h>
+#include <taglib/toolkit/tfile.h>
+#include <taglib/tag.h>
 
-#include "mpcproperties.h"
+#include <taglib/mpc/mpcproperties.h>
 
-#include "tlist.h"
+#include <taglib/toolkit/tlist.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.cpp

@@ -23,13 +23,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tstring.h>
+#include <taglib/toolkit/tdebug.h>
 #include <bitset>
 #include <math.h>
 
-#include "mpcproperties.h"
-#include "mpcfile.h"
+#include <taglib/mpc/mpcproperties.h>
+#include <taglib/mpc/mpcfile.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.cpp

@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "id3v1genres.h"
+#include <taglib/mpeg/id3v1/id3v1genres.h>
 
 using namespace TagLib;
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_ID3V1GENRE_H
 #define TAGLIB_ID3V1GENRE_H
 
-#include "tmap.h"
-#include "tstringlist.h"
-#include "taglib_export.h"
+#include <taglib/toolkit/tmap.h>
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
   namespace ID3v1 {

Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tfile.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tfile.h>
 
-#include "id3v1tag.h"
-#include "id3v1genres.h"
+#include <taglib/mpeg/id3v1/id3v1tag.h>
+#include <taglib/mpeg/id3v1/id3v1genres.h>
 
 using namespace TagLib;
 using namespace ID3v1;

Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_ID3V1TAG_H
 #define TAGLIB_ID3V1TAG_H
 
-#include "tag.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
+#include <taglib/tag.h>
+#include <taglib/toolkit/tbytevector.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp

@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "attachedpictureframe.h"
+#include <taglib/mpeg/id3v2/frames/attachedpictureframe.h>
 
-#include <tstringlist.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/toolkit/tdebug.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_ATTACHEDPICTUREFRAME_H
 #define TAGLIB_ATTACHEDPICTUREFRAME_H
 
-#include "id3v2frame.h"
-#include "id3v2header.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/mpeg/id3v2/id3v2header.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.cpp

@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/toolkit/tdebug.h>
 #include <stdio.h>
 
-#include "chapterframe.h"
+#include <taglib/mpeg/id3v2/frames/chapterframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_CHAPTERFRAME
 #define TAGLIB_CHAPTERFRAME
 
-#include "id3v2tag.h"
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.cpp

@@ -23,13 +23,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tstringlist.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstringlist.h>
 
-#include "commentsframe.h"
-#include "tpropertymap.h"
+#include <taglib/mpeg/id3v2/frames/commentsframe.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_COMMENTSFRAME_H
 #define TAGLIB_COMMENTSFRAME_H
 
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "eventtimingcodesframe.h"
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
+#include <taglib/mpeg/id3v2/frames/eventtimingcodesframe.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_EVENTTIMINGCODESFRAME_H
 #define TAGLIB_EVENTTIMINGCODESFRAME_H
 
-#include "id3v2frame.h"
-#include "tlist.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/toolkit/tlist.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp

@@ -26,10 +26,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstringlist.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstringlist.h>
 
-#include "generalencapsulatedobjectframe.h"
+#include <taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h

@@ -29,9 +29,9 @@
 #ifndef TAGLIB_GENERALENCAPSULATEDOBJECT_H
 #define TAGLIB_GENERALENCAPSULATEDOBJECT_H
 
-#include "id3v2frame.h"
-#include "id3v2header.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/mpeg/id3v2/id3v2header.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <id3v2tag.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
 
-#include "ownershipframe.h"
+#include <taglib/mpeg/id3v2/frames/ownershipframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_OWNERSHIPFRAME_H
 #define TAGLIB_OWNERSHIPFRAME_H
 
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.cpp

@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "podcastframe.h"
-#include <tpropertymap.h>
+#include <taglib/mpeg/id3v2/frames/podcastframe.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_PODCASTFRAME_H
 #define TAGLIB_PODCASTFRAME_H
 
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp

@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
+#include <taglib/toolkit/tdebug.h>
 
-#include "popularimeterframe.h"
+#include <taglib/mpeg/id3v2/frames/popularimeterframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_POPULARIMETERFRAME_H
 #define TAGLIB_POPULARIMETERFRAME_H
 
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.cpp

@@ -24,11 +24,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/toolkit/tdebug.h>
 
-#include "privateframe.h"
+#include <taglib/mpeg/id3v2/frames/privateframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.h

@@ -27,8 +27,8 @@
 #ifndef TAGLIB_PRIVATEFRAME_H
 #define TAGLIB_PRIVATEFRAME_H
 
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp

@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tmap.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tmap.h>
 
-#include "relativevolumeframe.h"
+#include <taglib/mpeg/id3v2/frames/relativevolumeframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_RELATIVEVOLUMEFRAME_H
 #define TAGLIB_RELATIVEVOLUMEFRAME_H
 
-#include "tlist.h"
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/toolkit/tlist.h>
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "synchronizedlyricsframe.h"
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
+#include <taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_SYNCHRONIZEDLYRICSFRAME_H
 #define TAGLIB_SYNCHRONIZEDLYRICSFRAME_H
 
-#include "id3v2frame.h"
-#include "tlist.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/toolkit/tlist.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/toolkit/tdebug.h>
 
-#include "tableofcontentsframe.h"
+#include <taglib/mpeg/id3v2/frames/tableofcontentsframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.h

@@ -26,10 +26,10 @@
 #ifndef TAGLIB_TABLEOFCONTENTSFRAME
 #define TAGLIB_TABLEOFCONTENTSFRAME
 
-#include "id3v2tag.h"
-#include "id3v2frame.h"
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/mpeg/id3v2/id3v2frame.h>
 
-#include "tbytevectorlist.h"
+#include <taglib/toolkit/tbytevectorlist.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.cpp

@@ -23,11 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include "textidentificationframe.h"
-#include "tpropertymap.h"
-#include "id3v1genres.h"
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/mpeg/id3v2/frames/textidentificationframe.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/mpeg/id3v1/id3v1genres.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_TEXTIDENTIFICATIONFRAME_H
 #define TAGLIB_TEXTIDENTIFICATIONFRAME_H
 
-#include "tstringlist.h"
-#include "tmap.h"
-#include "taglib_export.h"
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/toolkit/tmap.h>
+#include <taglib/taglib_export.h>
 
-#include "id3v2frame.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp

@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/toolkit/tpropertymap.h>
+#include <taglib/toolkit/tdebug.h>
 
-#include "id3v2tag.h"
-#include "uniquefileidentifierframe.h"
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h

@@ -26,7 +26,7 @@
 #ifndef TAGLIB_UNIQUEFILEIDENTIFIERFRAME
 #define TAGLIB_UNIQUEFILEIDENTIFIERFRAME
 
-#include "id3v2frame.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.cpp

@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "unknownframe.h"
+#include <taglib/mpeg/id3v2/frames/unknownframe.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_UNKNOWNFRAME_H
 #define TAGLIB_UNKNOWNFRAME_H
 
-#include "id3v2frame.h"
-#include "taglib_export.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
+#include <taglib/taglib_export.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp

@@ -26,11 +26,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "unsynchronizedlyricsframe.h"
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
+#include <taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h>
+#include <taglib/toolkit/tbytevectorlist.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h

@@ -28,7 +28,7 @@
 #ifndef TAGLIB_UNSYNCHRONIZEDLYRICSFRAME_H
 #define TAGLIB_UNSYNCHRONIZEDLYRICSFRAME_H
 
-#include "id3v2frame.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.cpp

@@ -26,11 +26,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "urllinkframe.h"
-#include "id3v2tag.h"
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
+#include <taglib/mpeg/id3v2/frames/urllinkframe.h>
+#include <taglib/mpeg/id3v2/id3v2tag.h>
+#include <taglib/toolkit/tdebug.h>
+#include <taglib/toolkit/tstringlist.h>
+#include <taglib/toolkit/tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.h

@@ -29,7 +29,7 @@
 #ifndef TAGLIB_URLLINKFRAME_H
 #define TAGLIB_URLLINKFRAME_H
 
-#include "id3v2frame.h"
+#include <taglib/mpeg/id3v2/id3v2frame.h>
 
 namespace TagLib {
 

Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.cpp

@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "id3v2extendedheader.h"
-#include "id3v2synchdata.h"
+#include <taglib/mpeg/id3v2/id3v2extendedheader.h>
+#include <taglib/mpeg/id3v2/id3v2synchdata.h>
 
 using namespace TagLib;
 using namespace ID3v2;