diff -Naur diff_taglib_include_before/ape/apefooter.cpp taglib/ape/apefooter.cpp --- diff_taglib_include_before/ape/apefooter.cpp 2004-09-09 02:28:58.000000000 +0200 +++ taglib/ape/apefooter.cpp 2006-07-25 20:17:50.000000000 +0200 @@ -23,8 +23,8 @@ #include #include -#include -#include +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include "apefooter.h" diff -Naur diff_taglib_include_before/ape/apefooter.h taglib/ape/apefooter.h --- diff_taglib_include_before/ape/apefooter.h 2004-07-26 21:03:28.000000000 +0200 +++ taglib/ape/apefooter.h 2006-07-25 20:27:24.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_APEFOOTER_H #define TAGLIB_APEFOOTER_H -#include +#include "../toolkit/tbytevector.h" namespace TagLib { diff -Naur diff_taglib_include_before/ape/apeitem.cpp taglib/ape/apeitem.cpp --- diff_taglib_include_before/ape/apeitem.cpp 2006-01-28 16:18:32.000000000 +0100 +++ taglib/ape/apeitem.cpp 2006-07-25 20:18:00.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../toolkit/tbytevectorlist.h" +#include "../toolkit/tdebug.h" #include "apeitem.h" diff -Naur diff_taglib_include_before/ape/apeitem.h taglib/ape/apeitem.h --- diff_taglib_include_before/ape/apeitem.h 2006-01-28 16:18:32.000000000 +0100 +++ taglib/ape/apeitem.h 2006-07-25 20:27:36.000000000 +0200 @@ -22,9 +22,9 @@ #ifndef TAGLIB_APEITEM_H #define TAGLIB_APEITEM_H -#include -#include -#include +#include "../toolkit/tbytevector.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tstringlist.h" namespace TagLib { diff -Naur diff_taglib_include_before/ape/apetag.cpp taglib/ape/apetag.cpp --- diff_taglib_include_before/ape/apetag.cpp 2006-01-28 16:18:32.000000000 +0100 +++ taglib/ape/apetag.cpp 2006-07-25 20:18:10.000000000 +0200 @@ -19,10 +19,10 @@ * USA * ***************************************************************************/ -#include -#include -#include -#include +#include "../toolkit/tdebug.h" +#include "../toolkit/tfile.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tmap.h" #include "apetag.h" #include "apefooter.h" diff -Naur diff_taglib_include_before/ape/apetag.h taglib/ape/apetag.h --- diff_taglib_include_before/ape/apetag.h 2004-11-06 15:31:56.000000000 +0100 +++ taglib/ape/apetag.h 2006-07-25 20:27:52.000000000 +0200 @@ -22,10 +22,10 @@ #ifndef TAGLIB_APETAG_H #define TAGLIB_APETAG_H -#include -#include -#include -#include +#include "../tag.h" +#include "../toolkit/tbytevector.h" +#include "../toolkit/tmap.h" +#include "../toolkit/tstring.h" #include "apeitem.h" diff -Naur diff_taglib_include_before/fileref.cpp taglib/fileref.cpp --- diff_taglib_include_before/fileref.cpp 2005-07-27 02:25:42.000000000 +0200 +++ taglib/fileref.cpp 2006-07-25 20:28:54.000000000 +0200 @@ -19,14 +19,14 @@ * USA * ***************************************************************************/ -#include -#include +#include "toolkit/tfile.h" +#include "toolkit/tstring.h" #include "fileref.h" -#include "mpegfile.h" -#include "vorbisfile.h" -#include "flacfile.h" -#include "mpcfile.h" +#include "mpeg/mpegfile.h" +#include "ogg/vorbis/vorbisfile.h" +#include "flac/flacfile.h" +#include "mpc/mpcfile.h" using namespace TagLib; diff -Naur diff_taglib_include_before/fileref.h taglib/fileref.h --- diff_taglib_include_before/fileref.h 2005-09-04 22:06:28.000000000 +0200 +++ taglib/fileref.h 2006-07-25 20:28:06.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_FILEREF_H #define TAGLIB_FILEREF_H -#include +#include "toolkit/tstringlist.h" #include "audioproperties.h" diff -Naur diff_taglib_include_before/flac/flacfile.cpp taglib/flac/flacfile.cpp --- diff_taglib_include_before/flac/flacfile.cpp 2006-05-14 21:18:48.000000000 +0200 +++ taglib/flac/flacfile.cpp 2006-07-25 20:16:16.000000000 +0200 @@ -19,14 +19,14 @@ * USA * ***************************************************************************/ -#include -#include -#include -#include - -#include -#include -#include +#include "../toolkit/tbytevector.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tlist.h" +#include "../toolkit/tdebug.h" + +#include "../mpeg/id3v2/id3v2header.h" +#include "../mpeg/id3v2/id3v2tag.h" +#include "../mpeg/id3v1/id3v1tag.h" #include "flacfile.h" #include "flactag.h" diff -Naur diff_taglib_include_before/flac/flacfile.h taglib/flac/flacfile.h --- diff_taglib_include_before/flac/flacfile.h 2004-06-23 20:45:26.000000000 +0200 +++ taglib/flac/flacfile.h 2006-07-25 20:25:22.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_FLACFILE_H #define TAGLIB_FLACFILE_H -#include +#include "../toolkit/tfile.h" #include "flacproperties.h" diff -Naur diff_taglib_include_before/flac/flacproperties.cpp taglib/flac/flacproperties.cpp --- diff_taglib_include_before/flac/flacproperties.cpp 2004-08-02 14:51:14.000000000 +0200 +++ taglib/flac/flacproperties.cpp 2006-07-25 20:16:30.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include "flacproperties.h" #include "flacfile.h" diff -Naur diff_taglib_include_before/flac/flacproperties.h taglib/flac/flacproperties.h --- diff_taglib_include_before/flac/flacproperties.h 2004-06-24 17:48:58.000000000 +0200 +++ taglib/flac/flacproperties.h 2006-07-25 20:25:34.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_FLACPROPERTIES_H #define TAGLIB_FLACPROPERTIES_H -#include +#include "../audioproperties.h" namespace TagLib { diff -Naur diff_taglib_include_before/flac/flactag.h taglib/flac/flactag.h --- diff_taglib_include_before/flac/flactag.h 2003-11-11 23:41:40.000000000 +0100 +++ taglib/flac/flactag.h 2006-07-25 20:27:10.000000000 +0200 @@ -28,9 +28,9 @@ // Note that this header is not installed. //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include "../ogg/xiphcomment.h" +#include "../mpeg/id3v2/id3v2tag.h" +#include "../mpeg/id3v1/id3v1tag.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpc/combinedtag.h taglib/mpc/combinedtag.h --- diff_taglib_include_before/mpc/combinedtag.h 2004-08-02 01:29:42.000000000 +0200 +++ taglib/mpc/combinedtag.h 2006-07-25 20:24:52.000000000 +0200 @@ -28,7 +28,7 @@ // Note that this header is not installed. //////////////////////////////////////////////////////////////////////////////// -#include +#include "../tag.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpc/mpcfile.cpp taglib/mpc/mpcfile.cpp --- diff_taglib_include_before/mpc/mpcfile.cpp 2005-04-03 18:41:18.000000000 +0200 +++ taglib/mpc/mpcfile.cpp 2006-07-25 20:15:04.000000000 +0200 @@ -19,15 +19,15 @@ * USA * ***************************************************************************/ -#include -#include -#include +#include "../toolkit/tbytevector.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include "mpcfile.h" -#include "id3v1tag.h" -#include "id3v2header.h" -#include "apetag.h" -#include "apefooter.h" +#include "../mpeg/id3v1/id3v1tag.h" +#include "../mpeg/id3v2/id3v2header.h" +#include "../ape/apetag.h" +#include "../ape/apefooter.h" #include "combinedtag.h" using namespace TagLib; diff -Naur diff_taglib_include_before/mpc/mpcfile.h taglib/mpc/mpcfile.h --- diff_taglib_include_before/mpc/mpcfile.h 2004-08-02 01:29:42.000000000 +0200 +++ taglib/mpc/mpcfile.h 2006-07-25 20:25:06.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_MPCFILE_H #define TAGLIB_MPCFILE_H -#include "tfile.h" +#include "../toolkit/tfile.h" #include "mpcproperties.h" diff -Naur diff_taglib_include_before/mpc/mpcproperties.cpp taglib/mpc/mpcproperties.cpp --- diff_taglib_include_before/mpc/mpcproperties.cpp 2005-04-02 22:53:12.000000000 +0200 +++ taglib/mpc/mpcproperties.cpp 2006-07-25 20:15:28.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include #include "mpcproperties.h" diff -Naur diff_taglib_include_before/mpc/mpcproperties.h taglib/mpc/mpcproperties.h --- diff_taglib_include_before/mpc/mpcproperties.h 2004-07-21 00:30:00.000000000 +0200 +++ taglib/mpc/mpcproperties.h 2006-07-25 20:25:14.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_MPCPROPERTIES_H #define TAGLIB_MPCPROPERTIES_H -#include "audioproperties.h" +#include "../audioproperties.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v1/id3v1genres.h taglib/mpeg/id3v1/id3v1genres.h --- diff_taglib_include_before/mpeg/id3v1/id3v1genres.h 2003-10-26 16:19:28.000000000 +0100 +++ taglib/mpeg/id3v1/id3v1genres.h 2006-07-25 20:22:12.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_ID3V1GENRE_H #define TAGLIB_ID3V1GENRE_H -#include -#include +#include "../../toolkit/tmap.h" +#include "../../toolkit/tstringlist.h" namespace TagLib { namespace ID3v1 { diff -Naur diff_taglib_include_before/mpeg/id3v1/id3v1tag.cpp taglib/mpeg/id3v1/id3v1tag.cpp --- diff_taglib_include_before/mpeg/id3v1/id3v1tag.cpp 2005-08-10 10:33:30.000000000 +0200 +++ taglib/mpeg/id3v1/id3v1tag.cpp 2006-07-25 20:07:10.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../../toolkit/tdebug.h" +#include "../../toolkit/tfile.h" #include "id3v1tag.h" #include "id3v1genres.h" diff -Naur diff_taglib_include_before/mpeg/id3v1/id3v1tag.h taglib/mpeg/id3v1/id3v1tag.h --- diff_taglib_include_before/mpeg/id3v1/id3v1tag.h 2004-10-21 01:15:08.000000000 +0200 +++ taglib/mpeg/id3v1/id3v1tag.h 2006-07-25 20:22:16.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_ID3V1TAG_H #define TAGLIB_ID3V1TAG_H -#include -#include +#include "../../tag.h" +#include "../../toolkit/tbytevector.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/attachedpictureframe.cpp taglib/mpeg/id3v2/frames/attachedpictureframe.cpp --- diff_taglib_include_before/mpeg/id3v2/frames/attachedpictureframe.cpp 2005-07-21 19:27:38.000000000 +0200 +++ taglib/mpeg/id3v2/frames/attachedpictureframe.cpp 2006-07-25 20:07:42.000000000 +0200 @@ -19,7 +19,7 @@ * USA * ***************************************************************************/ -#include +#include "../../../toolkit/tdebug.h" #include "attachedpictureframe.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/attachedpictureframe.h taglib/mpeg/id3v2/frames/attachedpictureframe.h --- diff_taglib_include_before/mpeg/id3v2/frames/attachedpictureframe.h 2005-07-21 19:27:38.000000000 +0200 +++ taglib/mpeg/id3v2/frames/attachedpictureframe.h 2006-07-25 20:22:28.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_ATTACHEDPICTUREFRAME_H #define TAGLIB_ATTACHEDPICTUREFRAME_H -#include -#include +#include "../id3v2frame.h" +#include "../id3v2header.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/commentsframe.cpp taglib/mpeg/id3v2/frames/commentsframe.cpp --- diff_taglib_include_before/mpeg/id3v2/frames/commentsframe.cpp 2006-03-02 16:02:28.000000000 +0100 +++ taglib/mpeg/id3v2/frames/commentsframe.cpp 2006-07-25 20:08:02.000000000 +0200 @@ -19,9 +19,9 @@ * USA * ***************************************************************************/ -#include -#include -#include +#include "../../../toolkit/tbytevectorlist.h" +#include "../id3v2tag.h" +#include "../../../toolkit/tdebug.h" #include "commentsframe.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/commentsframe.h taglib/mpeg/id3v2/frames/commentsframe.h --- diff_taglib_include_before/mpeg/id3v2/frames/commentsframe.h 2006-03-02 16:13:56.000000000 +0100 +++ taglib/mpeg/id3v2/frames/commentsframe.h 2006-07-25 20:22:38.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_COMMENTSFRAME_H #define TAGLIB_COMMENTSFRAME_H -#include +#include "../id3v2frame.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/relativevolumeframe.cpp taglib/mpeg/id3v2/frames/relativevolumeframe.cpp --- diff_taglib_include_before/mpeg/id3v2/frames/relativevolumeframe.cpp 2005-11-23 11:36:08.000000000 +0100 +++ taglib/mpeg/id3v2/frames/relativevolumeframe.cpp 2006-07-25 20:08:12.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../../../toolkit/tdebug.h" +#include "../../../toolkit/tmap.h" #include "relativevolumeframe.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/relativevolumeframe.h taglib/mpeg/id3v2/frames/relativevolumeframe.h --- diff_taglib_include_before/mpeg/id3v2/frames/relativevolumeframe.h 2005-07-21 02:10:58.000000000 +0200 +++ taglib/mpeg/id3v2/frames/relativevolumeframe.h 2006-07-25 20:22:58.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_RELATIVEVOLUMEFRAME_H #define TAGLIB_RELATIVEVOLUMEFRAME_H -#include -#include +#include "../../../toolkit/tlist.h" +#include "../id3v2frame.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/textidentificationframe.cpp taglib/mpeg/id3v2/frames/textidentificationframe.cpp --- diff_taglib_include_before/mpeg/id3v2/frames/textidentificationframe.cpp 2005-11-23 11:27:34.000000000 +0100 +++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2006-07-25 20:08:24.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../../../toolkit/tbytevectorlist.h" +#include "../id3v2tag.h" #include "textidentificationframe.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/textidentificationframe.h taglib/mpeg/id3v2/frames/textidentificationframe.h --- diff_taglib_include_before/mpeg/id3v2/frames/textidentificationframe.h 2004-08-07 03:39:26.000000000 +0200 +++ taglib/mpeg/id3v2/frames/textidentificationframe.h 2006-07-25 20:23:10.000000000 +0200 @@ -22,9 +22,9 @@ #ifndef TAGLIB_TEXTIDENTIFICATIONFRAME_H #define TAGLIB_TEXTIDENTIFICATIONFRAME_H -#include +#include "../../../toolkit/tstringlist.h" -#include +#include "../id3v2frame.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/uniquefileidentifierframe.cpp taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp --- diff_taglib_include_before/mpeg/id3v2/frames/uniquefileidentifierframe.cpp 2004-09-09 02:28:58.000000000 +0200 +++ taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp 2006-07-25 20:08:30.000000000 +0200 @@ -19,7 +19,7 @@ * USA * ***************************************************************************/ -#include +#include "../../../toolkit/tbytevectorlist.h" #include "uniquefileidentifierframe.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/uniquefileidentifierframe.h taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h --- diff_taglib_include_before/mpeg/id3v2/frames/uniquefileidentifierframe.h 2004-08-08 08:04:42.000000000 +0200 +++ taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h 2006-07-25 20:23:14.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_UNIQUEFILEIDENTIFIERFRAME #define TAGLIB_UNIQUEFILEIDENTIFIERFRAME -#include +#include "../id3v2frame.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/frames/unknownframe.h taglib/mpeg/id3v2/frames/unknownframe.h --- diff_taglib_include_before/mpeg/id3v2/frames/unknownframe.h 2003-11-04 03:48:26.000000000 +0100 +++ taglib/mpeg/id3v2/frames/unknownframe.h 2006-07-25 20:23:18.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_UNKNOWNFRAME_H #define TAGLIB_UNKNOWNFRAME_H -#include +#include "../id3v2frame.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2extendedheader.h taglib/mpeg/id3v2/id3v2extendedheader.h --- diff_taglib_include_before/mpeg/id3v2/id3v2extendedheader.h 2003-11-04 03:48:26.000000000 +0100 +++ taglib/mpeg/id3v2/id3v2extendedheader.h 2006-07-25 20:23:32.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_ID3V2EXTENDEDHEADER_H #define TAGLIB_ID3V2EXTENDEDHEADER_H -#include -#include +#include "../../toolkit/tbytevector.h" +#include "../../toolkit/taglib.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2footer.h taglib/mpeg/id3v2/id3v2footer.h --- diff_taglib_include_before/mpeg/id3v2/id3v2footer.h 2003-11-04 03:48:26.000000000 +0100 +++ taglib/mpeg/id3v2/id3v2footer.h 2006-07-25 20:23:36.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_ID3V2FOOTER_H #define TAGLIB_ID3V2FOOTER_H -#include +#include "../../toolkit/tbytevector.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2frame.cpp taglib/mpeg/id3v2/id3v2frame.cpp --- diff_taglib_include_before/mpeg/id3v2/id3v2frame.cpp 2006-01-28 15:00:50.000000000 +0100 +++ taglib/mpeg/id3v2/id3v2frame.cpp 2006-07-25 20:11:04.000000000 +0200 @@ -27,7 +27,7 @@ #include #endif -#include +#include "../../toolkit/tdebug.h" #include "id3v2frame.h" #include "id3v2synchdata.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2frame.h taglib/mpeg/id3v2/id3v2frame.h --- diff_taglib_include_before/mpeg/id3v2/id3v2frame.h 2005-05-18 01:57:24.000000000 +0200 +++ taglib/mpeg/id3v2/id3v2frame.h 2006-07-25 20:23:42.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_ID3V2FRAME_H #define TAGLIB_ID3V2FRAME_H -#include -#include +#include "../../toolkit/tstring.h" +#include "../../toolkit/tbytevector.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2framefactory.cpp taglib/mpeg/id3v2/id3v2framefactory.cpp --- diff_taglib_include_before/mpeg/id3v2/id3v2framefactory.cpp 2005-05-18 01:57:24.000000000 +0200 +++ taglib/mpeg/id3v2/id3v2framefactory.cpp 2006-07-25 20:11:16.000000000 +0200 @@ -21,7 +21,7 @@ #include -#include +#include "../../toolkit/tdebug.h" #include "id3v2framefactory.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2framefactory.h taglib/mpeg/id3v2/id3v2framefactory.h --- diff_taglib_include_before/mpeg/id3v2/id3v2framefactory.h 2004-08-06 03:54:28.000000000 +0200 +++ taglib/mpeg/id3v2/id3v2framefactory.h 2006-07-25 20:23:46.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_ID3V2FRAMEFACTORY_H #define TAGLIB_ID3V2FRAMEFACTORY_H -#include +#include "../../toolkit/tbytevector.h" #include "id3v2frame.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2header.cpp taglib/mpeg/id3v2/id3v2header.cpp --- diff_taglib_include_before/mpeg/id3v2/id3v2header.cpp 2006-06-25 22:27:18.000000000 +0200 +++ taglib/mpeg/id3v2/id3v2header.cpp 2006-07-25 20:11:26.000000000 +0200 @@ -22,8 +22,8 @@ #include #include -#include -#include +#include "../../toolkit/tstring.h" +#include "../../toolkit/tdebug.h" #include "id3v2header.h" #include "id3v2footer.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2header.h taglib/mpeg/id3v2/id3v2header.h --- diff_taglib_include_before/mpeg/id3v2/id3v2header.h 2003-11-04 03:48:26.000000000 +0100 +++ taglib/mpeg/id3v2/id3v2header.h 2006-07-25 20:23:50.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_ID3V2HEADER_H #define TAGLIB_ID3V2HEADER_H -#include +#include "../../toolkit/tbytevector.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2synchdata.h taglib/mpeg/id3v2/id3v2synchdata.h --- diff_taglib_include_before/mpeg/id3v2/id3v2synchdata.h 2003-10-25 02:13:06.000000000 +0200 +++ taglib/mpeg/id3v2/id3v2synchdata.h 2006-07-25 20:23:58.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_ID3V2SYNCHDATA_H #define TAGLIB_ID3V2SYNCHDATA_H -#include -#include +#include "../../toolkit/tbytevector.h" +#include "../../toolkit/taglib.h" namespace TagLib { diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2tag.cpp taglib/mpeg/id3v2/id3v2tag.cpp --- diff_taglib_include_before/mpeg/id3v2/id3v2tag.cpp 2005-05-18 01:57:24.000000000 +0200 +++ taglib/mpeg/id3v2/id3v2tag.cpp 2006-07-25 20:11:58.000000000 +0200 @@ -19,15 +19,15 @@ * USA * ***************************************************************************/ -#include -#include +#include "../../toolkit/tfile.h" +#include "../../toolkit/tdebug.h" #include "id3v2tag.h" #include "id3v2header.h" #include "id3v2extendedheader.h" #include "id3v2footer.h" -#include "id3v1genres.h" +#include "../id3v1/id3v1genres.h" #include "frames/textidentificationframe.h" #include "frames/commentsframe.h" diff -Naur diff_taglib_include_before/mpeg/id3v2/id3v2tag.h taglib/mpeg/id3v2/id3v2tag.h --- diff_taglib_include_before/mpeg/id3v2/id3v2tag.h 2006-04-20 22:31:26.000000000 +0200 +++ taglib/mpeg/id3v2/id3v2tag.h 2006-07-25 20:24:18.000000000 +0200 @@ -22,11 +22,11 @@ #ifndef TAGLIB_ID3V2TAG_H #define TAGLIB_ID3V2TAG_H -#include -#include -#include -#include -#include +#include "../../tag.h" +#include "../../toolkit/tbytevector.h" +#include "../../toolkit/tstring.h" +#include "../../toolkit/tlist.h" +#include "../../toolkit/tmap.h" #include "id3v2framefactory.h" diff -Naur diff_taglib_include_before/mpeg/mpegfile.cpp taglib/mpeg/mpegfile.cpp --- diff_taglib_include_before/mpeg/mpegfile.cpp 2006-06-20 22:41:32.000000000 +0200 +++ taglib/mpeg/mpegfile.cpp 2006-07-25 20:31:30.000000000 +0200 @@ -19,12 +19,12 @@ * USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "id3v2/id3v2tag.h" +#include "id3v2/id3v2header.h" +#include "id3v1/id3v1tag.h" +#include "../ape/apefooter.h" +#include "../ape/apetag.h" +#include "../toolkit/tdebug.h" #include diff -Naur diff_taglib_include_before/mpeg/mpegfile.h taglib/mpeg/mpegfile.h --- diff_taglib_include_before/mpeg/mpegfile.h 2005-07-21 19:33:38.000000000 +0200 +++ taglib/mpeg/mpegfile.h 2006-07-25 20:28:36.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_MPEGFILE_H #define TAGLIB_MPEGFILE_H -#include +#include "../toolkit/tfile.h" #include "mpegproperties.h" diff -Naur diff_taglib_include_before/mpeg/mpegheader.cpp taglib/mpeg/mpegheader.cpp --- diff_taglib_include_before/mpeg/mpegheader.cpp 2006-03-02 16:02:28.000000000 +0100 +++ taglib/mpeg/mpegheader.cpp 2006-07-25 20:31:44.000000000 +0200 @@ -21,9 +21,9 @@ #include -#include -#include -#include +#include "../toolkit/tbytevector.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include "mpegheader.h" diff -Naur diff_taglib_include_before/mpeg/mpegproperties.cpp taglib/mpeg/mpegproperties.cpp --- diff_taglib_include_before/mpeg/mpegproperties.cpp 2005-11-24 11:27:46.000000000 +0100 +++ taglib/mpeg/mpegproperties.cpp 2006-07-25 20:31:52.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../toolkit/tdebug.h" +#include "../toolkit/tstring.h" #include "mpegproperties.h" #include "mpegfile.h" diff -Naur diff_taglib_include_before/mpeg/mpegproperties.h taglib/mpeg/mpegproperties.h --- diff_taglib_include_before/mpeg/mpegproperties.h 2003-11-05 05:29:06.000000000 +0100 +++ taglib/mpeg/mpegproperties.h 2006-07-25 20:24:40.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_MPEGPROPERTIES_H #define TAGLIB_MPEGPROPERTIES_H -#include +#include "../audioproperties.h" #include "mpegheader.h" diff -Naur diff_taglib_include_before/mpeg/xingheader.cpp taglib/mpeg/xingheader.cpp --- diff_taglib_include_before/mpeg/xingheader.cpp 2006-05-08 22:08:34.000000000 +0200 +++ taglib/mpeg/xingheader.cpp 2006-07-25 20:32:00.000000000 +0200 @@ -19,9 +19,9 @@ * USA * ***************************************************************************/ -#include -#include -#include +#include "../toolkit/tbytevector.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include "xingheader.h" diff -Naur diff_taglib_include_before/ogg/flac/oggflacfile.cpp taglib/ogg/flac/oggflacfile.cpp --- diff_taglib_include_before/ogg/flac/oggflacfile.cpp 2006-06-09 11:48:30.000000000 +0200 +++ taglib/ogg/flac/oggflacfile.cpp 2006-07-25 20:04:30.000000000 +0200 @@ -19,11 +19,11 @@ * USA * ***************************************************************************/ -#include -#include -#include +#include "../../toolkit/tbytevector.h" +#include "../../toolkit/tstring.h" +#include "../../toolkit/tdebug.h" -#include +#include "../xiphcomment.h" #include "oggflacfile.h" using namespace TagLib; diff -Naur diff_taglib_include_before/ogg/flac/oggflacfile.h taglib/ogg/flac/oggflacfile.h --- diff_taglib_include_before/ogg/flac/oggflacfile.h 2004-08-02 14:51:14.000000000 +0200 +++ taglib/ogg/flac/oggflacfile.h 2006-07-25 20:20:20.000000000 +0200 @@ -22,10 +22,10 @@ #ifndef TAGLIB_OGGFLACFILE_H #define TAGLIB_OGGFLACFILE_H -#include -#include +#include "../oggfile.h" +#include "../xiphcomment.h" -#include +#include "../../flac/flacproperties.h" namespace TagLib { diff -Naur diff_taglib_include_before/ogg/oggfile.cpp taglib/ogg/oggfile.cpp --- diff_taglib_include_before/ogg/oggfile.cpp 2004-06-23 20:35:52.000000000 +0200 +++ taglib/ogg/oggfile.cpp 2006-07-25 20:05:02.000000000 +0200 @@ -19,10 +19,10 @@ * USA * ***************************************************************************/ -#include -#include -#include -#include +#include "../toolkit/tbytevectorlist.h" +#include "../toolkit/tmap.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include "oggfile.h" #include "oggpage.h" diff -Naur diff_taglib_include_before/ogg/oggfile.h taglib/ogg/oggfile.h --- diff_taglib_include_before/ogg/oggfile.h 2004-06-23 20:35:52.000000000 +0200 +++ taglib/ogg/oggfile.h 2006-07-25 20:20:40.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../toolkit/tfile.h" +#include "../toolkit/tbytevectorlist.h" #ifndef TAGLIB_OGGFILE_H #define TAGLIB_OGGFILE_H diff -Naur diff_taglib_include_before/ogg/oggpage.cpp taglib/ogg/oggpage.cpp --- diff_taglib_include_before/ogg/oggpage.cpp 2005-07-25 21:26:02.000000000 +0200 +++ taglib/ogg/oggpage.cpp 2006-07-25 20:05:10.000000000 +0200 @@ -19,8 +19,8 @@ * USA * ***************************************************************************/ -#include -#include +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" #include "oggpage.h" #include "oggpageheader.h" diff -Naur diff_taglib_include_before/ogg/oggpage.h taglib/ogg/oggpage.h --- diff_taglib_include_before/ogg/oggpage.h 2003-11-25 20:35:08.000000000 +0100 +++ taglib/ogg/oggpage.h 2006-07-25 20:20:56.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_OGGPAGE_H #define TAGLIB_OGGPAGE_H -#include +#include "../toolkit/tbytevectorlist.h" namespace TagLib { diff -Naur diff_taglib_include_before/ogg/oggpageheader.cpp taglib/ogg/oggpageheader.cpp --- diff_taglib_include_before/ogg/oggpageheader.cpp 2004-12-19 06:45:34.000000000 +0100 +++ taglib/ogg/oggpageheader.cpp 2006-07-25 20:06:30.000000000 +0200 @@ -21,9 +21,9 @@ #include -#include -#include -#include +#include "../toolkit/tstring.h" +#include "../toolkit/tdebug.h" +#include "../toolkit/taglib.h" #include "oggpageheader.h" #include "oggfile.h" diff -Naur diff_taglib_include_before/ogg/oggpageheader.h taglib/ogg/oggpageheader.h --- diff_taglib_include_before/ogg/oggpageheader.h 2003-12-02 06:00:24.000000000 +0100 +++ taglib/ogg/oggpageheader.h 2006-07-25 20:21:02.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_OGGPAGEHEADER_H #define TAGLIB_OGGPAGEHEADER_H -#include -#include +#include "../toolkit/tlist.h" +#include "../toolkit/tbytevector.h" namespace TagLib { diff -Naur diff_taglib_include_before/ogg/vorbis/vorbisfile.cpp taglib/ogg/vorbis/vorbisfile.cpp --- diff_taglib_include_before/ogg/vorbis/vorbisfile.cpp 2004-06-23 20:35:52.000000000 +0200 +++ taglib/ogg/vorbis/vorbisfile.cpp 2006-07-25 20:02:06.000000000 +0200 @@ -21,8 +21,8 @@ #include -#include -#include +#include "../../toolkit/tstring.h" +#include "../../toolkit/tdebug.h" #include "vorbisfile.h" diff -Naur diff_taglib_include_before/ogg/vorbis/vorbisfile.h taglib/ogg/vorbis/vorbisfile.h --- diff_taglib_include_before/ogg/vorbis/vorbisfile.h 2004-06-23 20:35:52.000000000 +0200 +++ taglib/ogg/vorbis/vorbisfile.h 2006-07-25 20:19:40.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef TAGLIB_VORBISFILE_H #define TAGLIB_VORBISFILE_H -#include -#include +#include "../oggfile.h" +#include "../xiphcomment.h" #include "vorbisproperties.h" diff -Naur diff_taglib_include_before/ogg/vorbis/vorbisproperties.cpp taglib/ogg/vorbis/vorbisproperties.cpp --- diff_taglib_include_before/ogg/vorbis/vorbisproperties.cpp 2003-12-02 06:00:24.000000000 +0100 +++ taglib/ogg/vorbis/vorbisproperties.cpp 2006-07-25 20:03:12.000000000 +0200 @@ -19,10 +19,10 @@ * USA * ***************************************************************************/ -#include -#include +#include "../../toolkit/tstring.h" +#include "../../toolkit/tdebug.h" -#include +#include "../oggpageheader.h" #include "vorbisproperties.h" #include "vorbisfile.h" diff -Naur diff_taglib_include_before/ogg/vorbis/vorbisproperties.h taglib/ogg/vorbis/vorbisproperties.h --- diff_taglib_include_before/ogg/vorbis/vorbisproperties.h 2004-05-06 18:59:14.000000000 +0200 +++ taglib/ogg/vorbis/vorbisproperties.h 2006-07-25 20:19:56.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_VORBISPROPERTIES_H #define TAGLIB_VORBISPROPERTIES_H -#include +#include "../../audioproperties.h" namespace TagLib { diff -Naur diff_taglib_include_before/ogg/xiphcomment.cpp taglib/ogg/xiphcomment.cpp --- diff_taglib_include_before/ogg/xiphcomment.cpp 2005-07-21 19:30:04.000000000 +0200 +++ taglib/ogg/xiphcomment.cpp 2006-07-25 20:32:28.000000000 +0200 @@ -19,10 +19,10 @@ * USA * ***************************************************************************/ -#include -#include +#include "../toolkit/tbytevector.h" +#include "../toolkit/tdebug.h" -#include +#include "xiphcomment.h" using namespace TagLib; diff -Naur diff_taglib_include_before/ogg/xiphcomment.h taglib/ogg/xiphcomment.h --- diff_taglib_include_before/ogg/xiphcomment.h 2004-05-04 03:47:02.000000000 +0200 +++ taglib/ogg/xiphcomment.h 2006-07-25 20:21:34.000000000 +0200 @@ -22,12 +22,12 @@ #ifndef TAGLIB_VORBISCOMMENT_H #define TAGLIB_VORBISCOMMENT_H -#include -#include -#include -#include -#include -#include +#include "../tag.h" +#include "../toolkit/tlist.h" +#include "../toolkit/tmap.h" +#include "../toolkit/tstring.h" +#include "../toolkit/tstringlist.h" +#include "../toolkit/tbytevector.h" namespace TagLib { diff -Naur diff_taglib_include_before/tag.h taglib/tag.h --- diff_taglib_include_before/tag.h 2004-02-17 03:11:06.000000000 +0100 +++ taglib/tag.h 2006-07-25 20:28:12.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TAGLIB_TAG_H #define TAGLIB_TAG_H -#include +#include "toolkit/tstring.h" namespace TagLib { diff -Naur diff_taglib_include_before/toolkit/tbytevector.cpp taglib/toolkit/tbytevector.cpp --- diff_taglib_include_before/toolkit/tbytevector.cpp 2006-06-17 01:26:26.000000000 +0200 +++ taglib/toolkit/tbytevector.cpp 2006-07-25 19:59:18.000000000 +0200 @@ -21,8 +21,8 @@ #include -#include -#include +#include "tstring.h" +#include "tdebug.h" #include "tbytevector.h"