unused includes (#1133)

* unused includes

Signed-off-by: Rosen Penev <rosenp@gmail.com>

* Use consistent order of includes

Always include in the following order:
- Own header files
- Standard header files
- System header files
- Project header files (toolkit first)

Exceptions:
- cppunit/extensions/HelperMacros.h must be included after
  header files declaring stream operators
- config.h must be included before its definitions are used

---------

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Co-authored-by: Urs Fleisch <ufleisch@users.sourceforge.net>

bindings/c/tag_c.cpp

@@ -19,13 +19,18 @@
  *   USA                                                                   *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-# include  "config.h"
-#endif
+#include "tag_c.h"
 
 #include <cstdlib>
-#include "fileref.h"
+#include <cstring>
+#include <utility>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include "tfile.h"
+#include "tpropertymap.h"
+#include "fileref.h"
 #include "asffile.h"
 #include "vorbisfile.h"
 #include "mpegfile.h"
@@ -37,12 +42,7 @@
 #include "trueaudiofile.h"
 #include "mp4file.h"
 #include "tag.h"
-#include <cstring>
-#include <utility>
 #include "id3v2framefactory.h"
-#include "tpropertymap.h"
-
-#include "tag_c.h"
 
 using namespace TagLib;
 

examples/framelist.cpp

@@ -26,16 +26,12 @@
 #include <cstdlib>
 
 #include "tbytevector.h"
-
 #include "mpegfile.h"
-
 #include "id3v2tag.h"
 #include "id3v2frame.h"
 #include "id3v2header.h"
 #include "commentsframe.h"
-
 #include "id3v1tag.h"
-
 #include "apetag.h"
 
 using namespace std;

examples/strip-id3v1.cpp

@@ -23,8 +23,9 @@
  */
 
 #include <iostream>
-#include "mpegfile.h"
+
 #include "tstring.h"
+#include "mpegfile.h"
 
 using namespace TagLib;
 

examples/tagreader.cpp

@@ -26,9 +26,9 @@
 #include <iomanip>
 #include <cstdio>
 
+#include "tpropertymap.h"
 #include "fileref.h"
 #include "tag.h"
-#include "tpropertymap.h"
 
 using namespace std;
 

examples/tagreader_c.c

@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include "tag_c.h"
 
 #ifndef FALSE

examples/tagwriter.cpp

@@ -25,17 +25,16 @@
 #include <iostream>
 #include <iomanip>
 #include <cstring>
-
 #include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <cstdlib>
 
 #include "tlist.h"
-#include "fileref.h"
 #include "tfile.h"
-#include "tag.h"
 #include "tpropertymap.h"
+#include "fileref.h"
+#include "tag.h"
 
 using namespace std;
 

taglib/ape/apefile.cpp

@@ -33,15 +33,12 @@
 
 #include "apefile.h"
 
-#include "tbytevector.h"
-#include "tstring.h"
 #include "tdebug.h"
-#include "tagunion.h"
+#include "tpropertymap.h"
 #include "id3v1tag.h"
 #include "id3v2header.h"
-#include "tpropertymap.h"
+#include "tagunion.h"
 #include "tagutils.h"
-
 #include "apetag.h"
 #include "apefooter.h"
 

taglib/ape/apefooter.cpp

@@ -26,12 +26,8 @@
 
 #include "apefooter.h"
 
-#include <iostream>
 #include <bitset>
 
-#include "tstring.h"
-#include "tdebug.h"
-
 using namespace TagLib;
 using namespace APE;
 

taglib/ape/apeitem.cpp

@@ -25,11 +25,10 @@
 
 #include "apeitem.h"
 
-#include "tbytevectorlist.h"
-#include "tdebug.h"
-
 #include <utility>
 
+#include "tdebug.h"
+
 using namespace TagLib;
 using namespace APE;
 

taglib/ape/apeproperties.cpp

@@ -28,13 +28,11 @@
  ***************************************************************************/
 
 #include "apeproperties.h"
-#include "tstring.h"
+
 #include "tdebug.h"
-#include <bitset>
-#include "id3v2tag.h"
 #include "apefile.h"
-#include "apetag.h"
 #include "apefooter.h"
+#include "apetag.h"
 
 using namespace TagLib;
 

taglib/ape/apetag.cpp

@@ -33,19 +33,15 @@
 
 #include "apetag.h"
 
-#include "tfile.h"
-#include "tstring.h"
-#include "tmap.h"
-#include "tpropertymap.h"
-#include "tdebug.h"
-#include "tutils.h"
-
-#include "apefooter.h"
-#include "apeitem.h"
-
 #include <array>
 #include <utility>
 
+#include "tdebug.h"
+#include "tfile.h"
+#include "tpropertymap.h"
+#include "apefooter.h"
+#include "apeitem.h"
+
 using namespace TagLib;
 using namespace APE;
 

taglib/ape/apetag.h

@@ -26,12 +26,11 @@
 #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 "tag.h"
 #include "apeitem.h"
 
 namespace TagLib {

taglib/asf/asfattribute.cpp

@@ -25,7 +25,6 @@
 
 #include "asfattribute.h"
 
-#include "taglib.h"
 #include "tdebug.h"
 
 #include "asffile.h"

taglib/asf/asffile.cpp

@@ -25,18 +25,16 @@
 
 #include "asffile.h"
 
-#include "tdebug.h"
-#include "tbytevectorlist.h"
-#include "tpropertymap.h"
-#include "tstring.h"
-#include "tagutils.h"
+#include <utility>
 
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tbytevectorlist.h"
+#include "tagutils.h"
 #include "asftag.h"
 #include "asfproperties.h"
 #include "asfutils.h"
 
-#include <utility>
-
 using namespace TagLib;
 
 class ASF::File::FilePrivate

taglib/asf/asffile.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_ASFFILE_H
 #define TAGLIB_ASFFILE_H
 
-#include "tag.h"
 #include "tfile.h"
 #include "taglib_export.h"
+#include "tag.h"
 #include "asfproperties.h"
 #include "asftag.h"
 

taglib/asf/asfpicture.cpp

@@ -25,10 +25,6 @@
 
 #include "asfpicture.h"
 
-#include "taglib.h"
-#include "tdebug.h"
-
-#include "asfattribute.h"
 #include "asffile.h"
 #include "asfutils.h"
 

taglib/asf/asfproperties.cpp

@@ -24,8 +24,6 @@
  ***************************************************************************/
 
 #include "asfproperties.h"
-#include "tdebug.h"
-#include "tstring.h"
 
 using namespace 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 "audioproperties.h"
 
 namespace TagLib {
   namespace ASF {

taglib/asf/asftag.cpp

@@ -24,11 +24,12 @@
  ***************************************************************************/
 
 #include "asftag.h"
-#include "tpropertymap.h"
 
 #include <array>
 #include <utility>
 
+#include "tpropertymap.h"
+
 using namespace TagLib;
 
 class ASF::Tag::TagPrivate

taglib/asf/asftag.h

@@ -26,10 +26,10 @@
 #ifndef TAGLIB_ASFTAG_H
 #define TAGLIB_ASFTAG_H
 
-#include "tag.h"
 #include "tlist.h"
 #include "tmap.h"
 #include "taglib_export.h"
+#include "tag.h"
 #include "asfattribute.h"
 
 namespace TagLib {

taglib/audioproperties.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_AUDIOPROPERTIES_H
 #define TAGLIB_AUDIOPROPERTIES_H
 
+#include <memory>
+
 #include "taglib.h"
 #include "taglib_export.h"
 
-#include <memory>
-
 namespace TagLib {
 
   //! A simple, abstract interface to common audio properties

taglib/fileref.cpp

@@ -32,28 +32,25 @@
 #include <cstring>
 #include <utility>
 
-#include "tdebug.h"
-#include "tfile.h"
 #include "tfilestream.h"
-#include "tstring.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 "tdebug.h"
 #include "aifffile.h"
-#include "wavfile.h"
 #include "apefile.h"
-#include "modfile.h"
-#include "s3mfile.h"
+#include "asffile.h"
+#include "flacfile.h"
 #include "itfile.h"
+#include "modfile.h"
+#include "mp4file.h"
+#include "mpcfile.h"
+#include "mpegfile.h"
+#include "oggflacfile.h"
+#include "opusfile.h"
+#include "s3mfile.h"
+#include "speexfile.h"
+#include "trueaudiofile.h"
+#include "vorbisfile.h"
+#include "wavfile.h"
+#include "wavpackfile.h"
 #include "xmfile.h"
 
 using namespace TagLib;

taglib/flac/flacfile.cpp

@@ -25,25 +25,19 @@
 
 #include "flacfile.h"
 
-#include "tbytevector.h"
-#include "tstring.h"
-#include "tlist.h"
-#include "tdebug.h"
-#include "tagunion.h"
-#include "tpropertymap.h"
-#include "tagutils.h"
+#include <utility>
 
-#include "id3v2header.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tagunion.h"
+#include "tagutils.h"
 #include "id3v2tag.h"
 #include "id3v1tag.h"
 #include "xiphcomment.h"
-
 #include "flacpicture.h"
 #include "flacmetadatablock.h"
 #include "flacunknownmetadatablock.h"
 
-#include <utility>
-
 using namespace TagLib;
 
 namespace

taglib/flac/flacfile.h

@@ -26,11 +26,10 @@
 #ifndef TAGLIB_FLACFILE_H
 #define TAGLIB_FLACFILE_H
 
-#include "taglib_export.h"
 #include "tfile.h"
 #include "tlist.h"
+#include "taglib_export.h"
 #include "tag.h"
-
 #include "flacpicture.h"
 #include "flacproperties.h"
 

taglib/flac/flacmetadatablock.cpp

@@ -24,8 +24,6 @@
  ***************************************************************************/
 
 #include "flacmetadatablock.h"
-#include "taglib.h"
-#include "tdebug.h"
 
 using namespace TagLib;
 

taglib/flac/flacpicture.cpp

@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #include "flacpicture.h"
-#include "taglib.h"
+
 #include "tdebug.h"
 
 using namespace TagLib;

taglib/flac/flacunknownmetadatablock.cpp

@@ -24,9 +24,6 @@
  ***************************************************************************/
 
 #include "flacunknownmetadatablock.h"
-#include "taglib.h"
-#include "tdebug.h"
-#include "tstring.h"
 
 using namespace TagLib;
 

taglib/it/itfile.cpp

@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-
 #include "itfile.h"
+
 #include "tstringlist.h"
 #include "tdebug.h"
-#include "modfileprivate.h"
 #include "tpropertymap.h"
+#include "modfileprivate.h"
 
 using namespace TagLib;
 using namespace IT;

taglib/it/itfile.h

@@ -23,8 +23,8 @@
 #define TAGLIB_ITFILE_H
 
 #include "tfile.h"
-#include "audioproperties.h"
 #include "taglib_export.h"
+#include "audioproperties.h"
 #include "modfilebase.h"
 #include "modtag.h"
 #include "itproperties.h"

taglib/it/itproperties.cpp

@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-
 #include "itproperties.h"
 
 using namespace TagLib;

taglib/mod/modfile.cpp

@@ -23,12 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-
 #include "modfile.h"
+
 #include "tstringlist.h"
 #include "tdebug.h"
-#include "modfileprivate.h"
 #include "tpropertymap.h"
+#include "modfileprivate.h"
 
 using namespace TagLib;
 using namespace Mod;

taglib/mod/modfile.h

@@ -27,8 +27,8 @@
 #define TAGLIB_MODFILE_H
 
 #include "tfile.h"
-#include "audioproperties.h"
 #include "taglib_export.h"
+#include "audioproperties.h"
 #include "modfilebase.h"
 #include "modtag.h"
 #include "modproperties.h"

taglib/mod/modfilebase.cpp

@@ -23,9 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-
 #include "modfilebase.h"
-#include "tdebug.h"
 
 using namespace TagLib;
 using namespace Mod;

taglib/mod/modproperties.cpp

@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-
 #include "modproperties.h"
 
 using namespace TagLib;

taglib/mod/modtag.cpp

@@ -23,13 +23,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-
 #include "modtag.h"
-#include "tstringlist.h"
-#include "tpropertymap.h"
 
 #include <utility>
 
+#include "tstringlist.h"
+#include "tpropertymap.h"
+
 using namespace TagLib;
 using namespace Mod;
 

taglib/mp4/mp4atom.cpp

@@ -29,7 +29,6 @@
 #include <utility>
 
 #include "tdebug.h"
-#include "tstring.h"
 
 using namespace TagLib;
 

taglib/mp4/mp4atom.h

@@ -28,11 +28,11 @@
 #ifndef TAGLIB_MP4ATOM_H
 #define TAGLIB_MP4ATOM_H
 
+#include <array>
+
 #include "tfile.h"
 #include "tlist.h"
 
-#include <array>
-
 #ifndef DO_NOT_DOCUMENT
 
 namespace TagLib {

taglib/mp4/mp4coverart.cpp

@@ -24,8 +24,6 @@
  ***************************************************************************/
 
 #include "mp4coverart.h"
-#include "taglib.h"
-#include "tdebug.h"
 
 using namespace TagLib;
 

taglib/mp4/mp4file.cpp

@@ -26,7 +26,6 @@
 #include "mp4file.h"
 
 #include "tdebug.h"
-#include "tstring.h"
 #include "tpropertymap.h"
 #include "tagutils.h"
 

taglib/mp4/mp4file.h

@@ -26,10 +26,10 @@
 #ifndef TAGLIB_MP4FILE_H
 #define TAGLIB_MP4FILE_H
 
-#include "mp4tag.h"
-#include "tag.h"
 #include "tfile.h"
 #include "taglib_export.h"
+#include "mp4tag.h"
+#include "tag.h"
 #include "mp4properties.h"
 
 namespace TagLib {

taglib/mp4/mp4item.cpp

@@ -24,8 +24,6 @@
  ***************************************************************************/
 
 #include "mp4item.h"
-#include "taglib.h"
-#include "tdebug.h"
 
 using namespace TagLib;
 

taglib/mp4/mp4item.h

@@ -27,8 +27,8 @@
 #define TAGLIB_MP4ITEM_H
 
 #include "tstringlist.h"
-#include "mp4coverart.h"
 #include "taglib_export.h"
+#include "mp4coverart.h"
 
 namespace TagLib {
   namespace MP4 {

taglib/mp4/mp4properties.cpp

@@ -24,6 +24,7 @@
  ***************************************************************************/
 
 #include "mp4properties.h"
+
 #include "tdebug.h"
 #include "tstring.h"
 #include "mp4file.h"

taglib/mp4/mp4tag.cpp

@@ -24,15 +24,15 @@
  ***************************************************************************/
 
 #include "mp4tag.h"
-#include "tdebug.h"
-#include "tstring.h"
-#include "tpropertymap.h"
-#include "mp4atom.h"
-#include "id3v1genres.h"
 
 #include <array>
 #include <utility>
 
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "id3v1genres.h"
+#include "mp4atom.h"
+
 using namespace TagLib;
 
 class MP4::Tag::TagPrivate

taglib/mp4/mp4tag.h

@@ -26,12 +26,12 @@
 #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 "tag.h"
 #include "mp4atom.h"
 #include "mp4item.h"
 

taglib/mpc/mpcfile.cpp

@@ -25,13 +25,10 @@
 
 #include "mpcfile.h"
 
-#include "tbytevector.h"
-#include "tstring.h"
-#include "tagunion.h"
 #include "tdebug.h"
 #include "tpropertymap.h"
+#include "tagunion.h"
 #include "tagutils.h"
-
 #include "id3v1tag.h"
 #include "id3v2header.h"
 #include "apetag.h"

taglib/mpc/mpcfile.h

@@ -26,13 +26,11 @@
 #ifndef TAGLIB_MPCFILE_H
 #define TAGLIB_MPCFILE_H
 
-#include "taglib_export.h"
 #include "tfile.h"
-#include "tag.h"
-
-#include "mpcproperties.h"
-
 #include "tlist.h"
+#include "taglib_export.h"
+#include "tag.h"
+#include "mpcproperties.h"
 
 namespace TagLib {
 

taglib/mpc/mpcproperties.cpp

@@ -25,12 +25,11 @@
 
 #include "mpcproperties.h"
 
-#include "tdebug.h"
-#include "tstring.h"
 #include <array>
-#include <bitset>
 #include <cmath>
 
+#include "tdebug.h"
+#include "tstring.h"
 #include "mpcfile.h"
 
 using namespace TagLib;

taglib/mpeg/id3v1/id3v1tag.cpp

@@ -27,7 +27,6 @@
 
 #include "tdebug.h"
 #include "tfile.h"
-
 #include "id3v1genres.h"
 
 using namespace 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 "tag.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/attachedpictureframe.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_ATTACHEDPICTUREFRAME_H
 #define TAGLIB_ATTACHEDPICTUREFRAME_H
 
+#include "taglib_export.h"
 #include "id3v2frame.h"
 #include "id3v2header.h"
-#include "taglib_export.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/chapterframe.cpp

@@ -25,11 +25,11 @@
 
 #include "chapterframe.h"
 
+#include <utility>
+
 #include "tbytevectorlist.h"
 #include "tdebug.h"
 #include "tpropertymap.h"
-#include <cstdio>
-#include <utility>
 
 using namespace TagLib;
 using namespace ID3v2;

taglib/mpeg/id3v2/frames/chapterframe.h

@@ -26,9 +26,9 @@
 #ifndef TAGLIB_CHAPTERFRAME
 #define TAGLIB_CHAPTERFRAME
 
+#include "taglib_export.h"
 #include "id3v2tag.h"
 #include "id3v2frame.h"
-#include "taglib_export.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/commentsframe.cpp

@@ -28,11 +28,10 @@
 #include <utility>
 
 #include "tbytevectorlist.h"
-#include "id3v2tag.h"
 #include "tdebug.h"
 #include "tstringlist.h"
-
 #include "tpropertymap.h"
+#include "id3v2tag.h"
 
 using namespace TagLib;
 using namespace ID3v2;

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 "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp

@@ -24,13 +24,14 @@
  ***************************************************************************/
 
 #include "eventtimingcodesframe.h"
-#include "tbytevectorlist.h"
-#include "id3v2tag.h"
-#include "tdebug.h"
-#include "tpropertymap.h"
 
 #include <utility>
 
+#include "tbytevectorlist.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "id3v2tag.h"
+
 using namespace TagLib;
 using namespace ID3v2;
 

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 "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h

@@ -29,9 +29,9 @@
 #ifndef TAGLIB_GENERALENCAPSULATEDOBJECT_H
 #define TAGLIB_GENERALENCAPSULATEDOBJECT_H
 
+#include "taglib_export.h"
 #include "id3v2frame.h"
 #include "id3v2header.h"
-#include "taglib_export.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/ownershipframe.cpp

@@ -25,7 +25,6 @@
 
 #include "ownershipframe.h"
 
-#include "tdebug.h"
 #include "tstringlist.h"
 #include "id3v2tag.h"
 

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 "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/podcastframe.cpp

@@ -24,6 +24,7 @@
  ***************************************************************************/
 
 #include "podcastframe.h"
+
 #include "tpropertymap.h"
 
 using namespace 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 "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/popularimeterframe.cpp

@@ -25,8 +25,6 @@
 
 #include "popularimeterframe.h"
 
-#include "tdebug.h"
-
 using namespace TagLib;
 using namespace ID3v2;
 

taglib/mpeg/id3v2/frames/popularimeterframe.h

@@ -27,8 +27,8 @@
 #ifndef TAGLIB_POPULARIMETERFRAME_H
 #define TAGLIB_POPULARIMETERFRAME_H
 
-#include "id3v2frame.h"
 #include "taglib_export.h"
+#include "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/privateframe.cpp

@@ -27,8 +27,8 @@
 #include "privateframe.h"
 
 #include "tbytevectorlist.h"
-#include "id3v2tag.h"
 #include "tdebug.h"
+#include "id3v2tag.h"
 
 using namespace TagLib;
 using namespace ID3v2;

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 "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/relativevolumeframe.cpp

@@ -25,11 +25,10 @@
 
 #include "relativevolumeframe.h"
 
-#include "tdebug.h"
-#include "tmap.h"
-
 #include <utility>
 
+#include "tmap.h"
+
 using namespace TagLib;
 using namespace ID3v2;
 

taglib/mpeg/id3v2/frames/relativevolumeframe.h

@@ -27,8 +27,8 @@
 #define TAGLIB_RELATIVEVOLUMEFRAME_H
 
 #include "tlist.h"
-#include "id3v2frame.h"
 #include "taglib_export.h"
+#include "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp

@@ -24,13 +24,14 @@
  ***************************************************************************/
 
 #include "synchronizedlyricsframe.h"
-#include "tbytevectorlist.h"
-#include "id3v2tag.h"
-#include "tdebug.h"
-#include "tpropertymap.h"
 
 #include <utility>
 
+#include "tbytevectorlist.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "id3v2tag.h"
+
 using namespace TagLib;
 using namespace ID3v2;
 

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 "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp

@@ -27,12 +27,9 @@
 
 #include <utility>
 
-#include "tbytevectorlist.h"
 #include "tpropertymap.h"
 #include "tdebug.h"
 
-#include <utility>
-
 using namespace TagLib;
 using namespace ID3v2;
 

taglib/mpeg/id3v2/frames/tableofcontentsframe.h

@@ -26,11 +26,10 @@
 #ifndef TAGLIB_TABLEOFCONTENTSFRAME
 #define TAGLIB_TABLEOFCONTENTSFRAME
 
+#include "tbytevectorlist.h"
 #include "id3v2tag.h"
 #include "id3v2frame.h"
 
-#include "tbytevectorlist.h"
-
 namespace TagLib {
 
   namespace ID3v2 {

taglib/mpeg/id3v2/frames/textidentificationframe.cpp

@@ -24,14 +24,14 @@
  ***************************************************************************/
 
 #include "textidentificationframe.h"
-#include "tbytevectorlist.h"
-#include "id3v2tag.h"
-#include "tpropertymap.h"
-#include "id3v1genres.h"
 
 #include <array>
 #include <utility>
 
+#include "tpropertymap.h"
+#include "id3v1genres.h"
+#include "id3v2tag.h"
+
 using namespace TagLib;
 using namespace ID3v2;
 

taglib/mpeg/id3v2/frames/textidentificationframe.h

@@ -29,7 +29,6 @@
 #include "tstringlist.h"
 #include "tmap.h"
 #include "taglib_export.h"
-
 #include "id3v2frame.h"
 
 namespace TagLib {

taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp

@@ -30,7 +30,6 @@
 #include "tbytevectorlist.h"
 #include "tpropertymap.h"
 #include "tdebug.h"
-
 #include "id3v2tag.h"
 
 using namespace 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 "id3v2frame.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp

@@ -27,11 +27,13 @@
  ***************************************************************************/
 
 #include "unsynchronizedlyricsframe.h"
+
 #include <utility>
+
 #include "tbytevectorlist.h"
-#include "id3v2tag.h"
 #include "tdebug.h"
 #include "tpropertymap.h"
+#include "id3v2tag.h"
 
 using namespace TagLib;
 using namespace ID3v2;

taglib/mpeg/id3v2/frames/urllinkframe.cpp

@@ -27,11 +27,13 @@
  ***************************************************************************/
 
 #include "urllinkframe.h"
+
 #include <utility>
-#include "id3v2tag.h"
+
 #include "tdebug.h"
 #include "tstringlist.h"
 #include "tpropertymap.h"
+#include "id3v2tag.h"
 
 using namespace TagLib;
 using namespace ID3v2;

taglib/mpeg/id3v2/id3v2extendedheader.cpp

@@ -24,6 +24,7 @@
  ***************************************************************************/
 
 #include "id3v2extendedheader.h"
+
 #include "id3v2synchdata.h"
 
 using namespace TagLib;

taglib/mpeg/id3v2/id3v2extendedheader.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_ID3V2EXTENDEDHEADER_H
 #define TAGLIB_ID3V2EXTENDEDHEADER_H
 
-#include "taglib_export.h"
 #include "tbytevector.h"
+#include "taglib_export.h"
 #include "taglib.h"
 
 namespace TagLib {

taglib/mpeg/id3v2/id3v2footer.cpp

@@ -24,6 +24,7 @@
  ***************************************************************************/
 
 #include "id3v2footer.h"
+
 #include "id3v2header.h"
 
 using namespace TagLib;

taglib/mpeg/id3v2/id3v2footer.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_ID3V2FOOTER_H
 #define TAGLIB_ID3V2FOOTER_H
 
-#include "taglib_export.h"
 #include "tbytevector.h"
+#include "taglib_export.h"
 
 namespace TagLib {
 

taglib/mpeg/id3v2/id3v2frame.cpp

@@ -31,11 +31,9 @@
 #include "tdebug.h"
 #include "tstringlist.h"
 #include "tzlib.h"
-
+#include "tpropertymap.h"
 #include "id3v2tag.h"
 #include "id3v2synchdata.h"
-
-#include "tpropertymap.h"
 #include "frames/textidentificationframe.h"
 #include "frames/urllinkframe.h"
 #include "frames/unsynchronizedlyricsframe.h"

taglib/mpeg/id3v2/id3v2framefactory.cpp

@@ -25,12 +25,13 @@
 
 #include "id3v2framefactory.h"
 
+#include <array>
+#include <utility>
+
 #include "tdebug.h"
 #include "tzlib.h"
-
 #include "id3v2synchdata.h"
 #include "id3v1genres.h"
-
 #include "frames/attachedpictureframe.h"
 #include "frames/commentsframe.h"
 #include "frames/relativevolumeframe.h"
@@ -49,9 +50,6 @@
 #include "frames/tableofcontentsframe.h"
 #include "frames/podcastframe.h"
 
-#include <array>
-#include <utility>
-
 using namespace TagLib;
 using namespace ID3v2;
 

taglib/mpeg/id3v2/id3v2framefactory.h

@@ -26,8 +26,8 @@
 #ifndef TAGLIB_ID3V2FRAMEFACTORY_H
 #define TAGLIB_ID3V2FRAMEFACTORY_H
 
-#include "taglib_export.h"
 #include "tbytevector.h"
+#include "taglib_export.h"
 #include "id3v2frame.h"
 #include "id3v2header.h"
 

taglib/mpeg/id3v2/id3v2header.cpp

@@ -25,12 +25,10 @@
 
 #include "id3v2header.h"
 
-#include <iostream>
 #include <bitset>
 
 #include "tstring.h"
 #include "tdebug.h"
-
 #include "id3v2footer.h"
 #include "id3v2synchdata.h"
 

taglib/mpeg/id3v2/id3v2tag.cpp

@@ -28,17 +28,14 @@
 #include <algorithm>
 #include <utility>
 
-#include "tfile.h"
-#include "tbytevector.h"
-#include "tpropertymap.h"
 #include "tdebug.h"
-
+#include "tfile.h"
+#include "tpropertymap.h"
 #include "id3v2header.h"
 #include "id3v2extendedheader.h"
 #include "id3v2footer.h"
 #include "id3v2synchdata.h"
 #include "id3v1genres.h"
-
 #include "frames/textidentificationframe.h"
 #include "frames/commentsframe.h"
 #include "frames/urllinkframe.h"

taglib/mpeg/id3v2/id3v2tag.h

@@ -26,13 +26,12 @@
 #ifndef TAGLIB_ID3V2TAG_H
 #define TAGLIB_ID3V2TAG_H
 
-#include "tag.h"
 #include "tbytevector.h"
 #include "tstring.h"
 #include "tlist.h"
 #include "tmap.h"
 #include "taglib_export.h"
-
+#include "tag.h"
 #include "id3v2.h"
 #include "id3v2framefactory.h"
 

taglib/mpeg/mpegfile.cpp

@@ -25,18 +25,16 @@
 
 #include "mpegfile.h"
 
-#include "tagunion.h"
-#include "tagutils.h"
-#include "id3v2tag.h"
-#include "id3v2header.h"
-#include "id3v1tag.h"
+#include "tdebug.h"
+#include "tpropertymap.h"
 #include "apefooter.h"
 #include "apetag.h"
-#include "tdebug.h"
-
+#include "id3v1tag.h"
+#include "id3v2tag.h"
+#include "tagunion.h"
+#include "tagutils.h"
 #include "mpegheader.h"
 #include "mpegutils.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 

taglib/mpeg/mpegfile.h

@@ -26,12 +26,10 @@
 #ifndef TAGLIB_MPEGFILE_H
 #define TAGLIB_MPEGFILE_H
 
-#include "taglib_export.h"
 #include "tfile.h"
+#include "taglib_export.h"
 #include "tag.h"
-
 #include "mpegproperties.h"
-
 #include "id3v2.h"
 
 namespace TagLib {

taglib/mpeg/mpegheader.cpp

@@ -25,15 +25,13 @@
 
 #include "mpegheader.h"
 
+#include <array>
+
 #include "tbytevector.h"
 #include "tdebug.h"
 #include "tfile.h"
-#include "tstring.h"
-
 #include "mpegutils.h"
 
-#include <array>
-
 using namespace TagLib;
 
 class MPEG::Header::HeaderPrivate

taglib/mpeg/mpegheader.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_MPEGHEADER_H
 #define TAGLIB_MPEGHEADER_H
 
+#include <memory>
+
 #include "taglib.h"
 #include "taglib_export.h"
 
-#include <memory>
-
 namespace TagLib {
 
   class ByteVector;

taglib/mpeg/mpegproperties.cpp

@@ -26,8 +26,6 @@
 #include "mpegproperties.h"
 
 #include "tdebug.h"
-#include "tstring.h"
-
 #include "mpegfile.h"
 #include "xingheader.h"
 #include "apetag.h"

taglib/mpeg/mpegproperties.h

@@ -28,7 +28,6 @@
 
 #include "taglib_export.h"
 #include "audioproperties.h"
-
 #include "mpegheader.h"
 
 namespace TagLib {

taglib/mpeg/xingheader.cpp

@@ -29,8 +29,6 @@
 #include "tstring.h"
 #include "tdebug.h"
 
-#include "mpegfile.h"
-
 using namespace TagLib;
 
 class MPEG::XingHeader::XingHeaderPrivate

taglib/mpeg/xingheader.h

@@ -26,11 +26,11 @@
 #ifndef TAGLIB_XINGHEADER_H
 #define TAGLIB_XINGHEADER_H
 
-#include "mpegheader.h"
-#include "taglib_export.h"
-
 #include <memory>
 
+#include "taglib_export.h"
+#include "mpegheader.h"
+
 namespace TagLib {
 
   class ByteVector;

taglib/ogg/flac/oggflacfile.cpp

@@ -25,14 +25,10 @@
 
 #include "oggflacfile.h"
 
-#include "tbytevector.h"
-#include "tstring.h"
 #include "tdebug.h"
 #include "tpropertymap.h"
 #include "tagutils.h"
 
-#include "xiphcomment.h"
-
 using namespace TagLib;
 using TagLib::FLAC::Properties;
 

taglib/ogg/flac/oggflacfile.h

@@ -29,7 +29,6 @@
 #include "taglib_export.h"
 #include "oggfile.h"
 #include "xiphcomment.h"
-
 #include "flacproperties.h"
 
 namespace TagLib {

taglib/ogg/oggfile.cpp

@@ -25,16 +25,13 @@
 
 #include "oggfile.h"
 
-#include "tbytevectorlist.h"
-#include "tmap.h"
-#include "tstring.h"
-#include "tdebug.h"
+#include <utility>
 
+#include "tdebug.h"
+#include "tmap.h"
 #include "oggpage.h"
 #include "oggpageheader.h"
 
-#include <utility>
-
 using namespace TagLib;
 
 namespace

taglib/ogg/oggfile.h

@@ -23,9 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "taglib_export.h"
 #include "tfile.h"
 #include "tbytevectorlist.h"
+#include "taglib_export.h"
 
 #ifndef TAGLIB_OGGFILE_H
 #define TAGLIB_OGGFILE_H