diff --git a/.gitignore b/.gitignore
index 98b2c46c..3795d1a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ CMakeLists.txt.user*
 /tests/test_runner
 /tests/Testing
 /taglib/libtag.a
-/taglib_config.h
 /taglib-config
 /bindings/c/libtag_c.a
 /bindings/c/taglib_c.pc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2aaf824..589920bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,8 +148,6 @@ if(TRACE_IN_RELEASE)
   set(TRACE_IN_RELEASE TRUE)
 endif()
 
-configure_file(taglib/taglib_config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h")
-
 find_package(utf8cpp QUIET)
 if(NOT utf8cpp_FOUND)
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/utfcpp/CMakeLists.txt)
diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index f1716069..ebbf0aee 100644
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 #include "tstringlist.h"
-#include "tbytevectorlist.h"
 #include "tbytevectorstream.h"
 #include "tiostream.h"
 #include "tfile.h"
diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 02e6c084..519bd9a6 100644
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -33,7 +33,6 @@ set(tag_HDRS
   fileref.h
   audioproperties.h
   taglib_export.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h
   toolkit/taglib.h
   toolkit/tstring.h
   toolkit/tlist.h
diff --git a/taglib/asf/asfpicture.h b/taglib/asf/asfpicture.h
index 3ea09947..60201cae 100644
--- a/taglib/asf/asfpicture.h
+++ b/taglib/asf/asfpicture.h
@@ -30,7 +30,6 @@
 #include "tbytevector.h"
 #include "tpicturetype.h"
 #include "taglib_export.h"
-#include "attachedpictureframe.h"
 
 namespace TagLib
 {
diff --git a/taglib/dsdiff/dsdiffproperties.cpp b/taglib/dsdiff/dsdiffproperties.cpp
index 0d1a032f..ef1ede0d 100644
--- a/taglib/dsdiff/dsdiffproperties.cpp
+++ b/taglib/dsdiff/dsdiffproperties.cpp
@@ -26,7 +26,6 @@
 #include "dsdiffproperties.h"
 
 #include "tstring.h"
-#include "tdebug.h"
 
 using namespace TagLib;
 
diff --git a/taglib/flac/flacmetadatablock.h b/taglib/flac/flacmetadatablock.h
index 150c5b54..efe61bfd 100644
--- a/taglib/flac/flacmetadatablock.h
+++ b/taglib/flac/flacmetadatablock.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_FLACMETADATABLOCK_H
 #define TAGLIB_FLACMETADATABLOCK_H
 
-#include "tlist.h"
 #include "tbytevector.h"
 #include "taglib_export.h"
 
diff --git a/taglib/flac/flacproperties.cpp b/taglib/flac/flacproperties.cpp
index 43aef968..ce379e15 100644
--- a/taglib/flac/flacproperties.cpp
+++ b/taglib/flac/flacproperties.cpp
@@ -28,8 +28,6 @@
 #include "tstring.h"
 #include "tdebug.h"
 
-#include "flacfile.h"
-
 using namespace TagLib;
 
 class FLAC::Properties::PropertiesPrivate
diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp
index 08d164c3..6c8ec652 100644
--- a/taglib/it/itfile.cpp
+++ b/taglib/it/itfile.cpp
@@ -27,7 +27,6 @@
 
 #include "tstringlist.h"
 #include "tdebug.h"
-#include "tpropertymap.h"
 #include "modfileprivate.h"
 
 using namespace TagLib;
diff --git a/taglib/it/itproperties.h b/taglib/it/itproperties.h
index 0aa149a3..ec14333e 100644
--- a/taglib/it/itproperties.h
+++ b/taglib/it/itproperties.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_ITPROPERTIES_H
 #define TAGLIB_ITPROPERTIES_H
 
-#include "taglib.h"
 #include "audioproperties.h"
 
 namespace TagLib {
diff --git a/taglib/mod/modfilebase.h b/taglib/mod/modfilebase.h
index c3839f18..63e4c187 100644
--- a/taglib/mod/modfilebase.h
+++ b/taglib/mod/modfilebase.h
@@ -28,12 +28,9 @@
 
 #include "taglib.h"
 #include "tfile.h"
-#include "tstring.h"
 #include "tlist.h"
 #include "taglib_export.h"
 
-#include <algorithm>
-
 namespace TagLib {
   namespace Mod {
     //! Base class for module files
diff --git a/taglib/mod/modproperties.h b/taglib/mod/modproperties.h
index 325b1e5a..6bdf44b0 100644
--- a/taglib/mod/modproperties.h
+++ b/taglib/mod/modproperties.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_MODPROPERTIES_H
 #define TAGLIB_MODPROPERTIES_H
 
-#include "taglib.h"
 #include "audioproperties.h"
 
 namespace TagLib {
diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp
index 85165b24..c23b3248 100644
--- a/taglib/mp4/mp4atom.cpp
+++ b/taglib/mp4/mp4atom.cpp
@@ -25,6 +25,7 @@
 
 #include "mp4atom.h"
 
+#include <array>
 #include <climits>
 #include <utility>
 
diff --git a/taglib/mp4/mp4atom.h b/taglib/mp4/mp4atom.h
index 7a093fcc..0dca96cd 100644
--- a/taglib/mp4/mp4atom.h
+++ b/taglib/mp4/mp4atom.h
@@ -28,8 +28,6 @@
 #ifndef TAGLIB_MP4ATOM_H
 #define TAGLIB_MP4ATOM_H
 
-#include <array>
-
 #include "tfile.h"
 #include "tlist.h"
 
diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index e56d1ab0..6e094963 100644
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -25,7 +25,6 @@
 
 #include "mp4tag.h"
 
-#include <array>
 #include <utility>
 
 #include "tdebug.h"
diff --git a/taglib/mp4/mp4tag.h b/taglib/mp4/mp4tag.h
index 297e24dd..bae7d232 100644
--- a/taglib/mp4/mp4tag.h
+++ b/taglib/mp4/mp4tag.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_MP4TAG_H
 #define TAGLIB_MP4TAG_H
 
-#include "tbytevectorlist.h"
 #include "tfile.h"
 #include "tmap.h"
 #include "tstringlist.h"
diff --git a/taglib/mpc/mpcfile.h b/taglib/mpc/mpcfile.h
index 5b9e909a..0c715b63 100644
--- a/taglib/mpc/mpcfile.h
+++ b/taglib/mpc/mpcfile.h
@@ -27,7 +27,6 @@
 #define TAGLIB_MPCFILE_H
 
 #include "tfile.h"
-#include "tlist.h"
 #include "taglib_export.h"
 #include "tag.h"
 #include "mpcproperties.h"
diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/taglib/mpeg/id3v2/frames/attachedpictureframe.h
index 3e65beed..0a69d0c7 100644
--- a/taglib/mpeg/id3v2/frames/attachedpictureframe.h
+++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.h
@@ -29,7 +29,6 @@
 #include "taglib_export.h"
 #include "tpicturetype.h"
 #include "id3v2frame.h"
-#include "id3v2header.h"
 
 namespace TagLib {
 
diff --git a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
index 0970d569..bf4bc3db 100644
--- a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
+++ b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
@@ -29,7 +29,6 @@
 
 #include "tbytevectorlist.h"
 #include "tdebug.h"
-#include "tpropertymap.h"
 #include "id3v2tag.h"
 
 using namespace TagLib;
diff --git a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
index b4dc4130..48134393 100644
--- a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
+++ b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
@@ -31,7 +31,6 @@
 
 #include "taglib_export.h"
 #include "id3v2frame.h"
-#include "id3v2header.h"
 
 namespace TagLib {
 
diff --git a/taglib/mpeg/id3v2/id3v2extendedheader.h b/taglib/mpeg/id3v2/id3v2extendedheader.h
index ef09f07c..93cc90b9 100644
--- a/taglib/mpeg/id3v2/id3v2extendedheader.h
+++ b/taglib/mpeg/id3v2/id3v2extendedheader.h
@@ -28,7 +28,6 @@
 
 #include "tbytevector.h"
 #include "taglib_export.h"
-#include "taglib.h"
 
 namespace TagLib {
 
diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index c99cb16a..1662293a 100644
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -35,12 +35,7 @@
 #include "id3v2tag.h"
 #include "id3v2synchdata.h"
 #include "frames/textidentificationframe.h"
-#include "frames/urllinkframe.h"
-#include "frames/unsynchronizedlyricsframe.h"
-#include "frames/commentsframe.h"
-#include "frames/uniquefileidentifierframe.h"
 #include "frames/unknownframe.h"
-#include "frames/podcastframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
diff --git a/taglib/mpeg/id3v2/id3v2header.h b/taglib/mpeg/id3v2/id3v2header.h
index e103ac82..cdfa949d 100644
--- a/taglib/mpeg/id3v2/id3v2header.h
+++ b/taglib/mpeg/id3v2/id3v2header.h
@@ -28,7 +28,6 @@
 
 #include "tbytevector.h"
 #include "taglib_export.h"
-#include "id3v2.h"
 
 namespace TagLib {
 
diff --git a/taglib/mpeg/id3v2/id3v2synchdata.cpp b/taglib/mpeg/id3v2/id3v2synchdata.cpp
index 943d84c1..e9fafde3 100644
--- a/taglib/mpeg/id3v2/id3v2synchdata.cpp
+++ b/taglib/mpeg/id3v2/id3v2synchdata.cpp
@@ -25,8 +25,6 @@
 
 #include "id3v2synchdata.h"
 
-#include <iostream>
-
 using namespace TagLib;
 using namespace ID3v2;
 
diff --git a/taglib/mpeg/id3v2/id3v2synchdata.h b/taglib/mpeg/id3v2/id3v2synchdata.h
index 6970f733..07ee8441 100644
--- a/taglib/mpeg/id3v2/id3v2synchdata.h
+++ b/taglib/mpeg/id3v2/id3v2synchdata.h
@@ -27,7 +27,6 @@
 #define TAGLIB_ID3V2SYNCHDATA_H
 
 #include "tbytevector.h"
-#include "taglib.h"
 
 namespace TagLib {
 
diff --git a/taglib/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp
index 434beffd..36095373 100644
--- a/taglib/mpeg/mpegproperties.cpp
+++ b/taglib/mpeg/mpegproperties.cpp
@@ -29,7 +29,6 @@
 #include "mpegfile.h"
 #include "xingheader.h"
 #include "apetag.h"
-#include "apefooter.h"
 
 using namespace TagLib;
 
diff --git a/taglib/riff/wav/infotag.h b/taglib/riff/wav/infotag.h
index 14f8c679..b9ab4352 100644
--- a/taglib/riff/wav/infotag.h
+++ b/taglib/riff/wav/infotag.h
@@ -28,7 +28,6 @@
 
 #include "tmap.h"
 #include "tstring.h"
-#include "tstringlist.h"
 #include "tbytevector.h"
 #include "taglib_export.h"
 #include "tag.h"
diff --git a/taglib/riff/wav/wavproperties.h b/taglib/riff/wav/wavproperties.h
index 41dc825c..c62827f2 100644
--- a/taglib/riff/wav/wavproperties.h
+++ b/taglib/riff/wav/wavproperties.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_WAVPROPERTIES_H
 #define TAGLIB_WAVPROPERTIES_H
 
-#include "taglib.h"
 #include "audioproperties.h"
 
 namespace TagLib {
diff --git a/taglib/s3m/s3mproperties.h b/taglib/s3m/s3mproperties.h
index 8b3feb1f..342ddb2b 100644
--- a/taglib/s3m/s3mproperties.h
+++ b/taglib/s3m/s3mproperties.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_S3MPROPERTIES_H
 #define TAGLIB_S3MPROPERTIES_H
 
-#include "taglib.h"
 #include "audioproperties.h"
 
 namespace TagLib {
diff --git a/taglib/taglib_config.h.cmake b/taglib/taglib_config.h.cmake
deleted file mode 100644
index 915f130a..00000000
--- a/taglib/taglib_config.h.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-/* taglib_config.h. Generated by cmake from taglib_config.h.cmake */
-
-#ifndef TAGLIB_TAGLIB_CONFIG_H
-#define TAGLIB_TAGLIB_CONFIG_H
-
-/* These values are no longer used. This file is present only for compatibility reasons. */
-
-#define   TAGLIB_WITH_ASF 1
-#define   TAGLIB_WITH_MP4 1
-
-#endif
diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
index 7f012b9d..34bb394b 100644
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -26,8 +26,6 @@
 #ifndef TAGLIB_H
 #define TAGLIB_H
 
-#include "taglib_config.h"
-
 #define TAGLIB_MAJOR_VERSION 2
 #define TAGLIB_MINOR_VERSION 0
 #define TAGLIB_PATCH_VERSION 0
diff --git a/taglib/toolkit/tbytevector.h b/taglib/toolkit/tbytevector.h
index fdb0eeae..668a24b3 100644
--- a/taglib/toolkit/tbytevector.h
+++ b/taglib/toolkit/tbytevector.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_BYTEVECTOR_H
 #define TAGLIB_BYTEVECTOR_H
 
-#include <iostream>
 #include <memory>
 #include <vector>
 
diff --git a/taglib/toolkit/tdebug.h b/taglib/toolkit/tdebug.h
index 78115d25..1046f49d 100644
--- a/taglib/toolkit/tdebug.h
+++ b/taglib/toolkit/tdebug.h
@@ -26,6 +26,10 @@
 #ifndef TAGLIB_DEBUG_H
 #define TAGLIB_DEBUG_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 namespace TagLib {
 
   class String;
diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp
index 3d0b72b9..200e649d 100644
--- a/taglib/toolkit/tfile.cpp
+++ b/taglib/toolkit/tfile.cpp
@@ -43,8 +43,6 @@
 # define W_OK 2
 #endif
 
-#include "wavpackfile.h"
-
 using namespace TagLib;
 
 class File::FilePrivate
diff --git a/taglib/toolkit/tlist.h b/taglib/toolkit/tlist.h
index 0b91fadc..34b3e356 100644
--- a/taglib/toolkit/tlist.h
+++ b/taglib/toolkit/tlist.h
@@ -30,8 +30,6 @@
 #include <initializer_list>
 #include <memory>
 
-#include "taglib.h"
-
 namespace TagLib {
 
   //! A generic, implicitly shared list.
diff --git a/taglib/toolkit/tmap.h b/taglib/toolkit/tmap.h
index b6df8d58..d04cf33d 100644
--- a/taglib/toolkit/tmap.h
+++ b/taglib/toolkit/tmap.h
@@ -31,8 +31,6 @@
 #include <initializer_list>
 #include <utility>
 
-#include "taglib.h"
-
 namespace TagLib {
 
   //! A generic, implicitly shared map.
diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
index 8da380ee..48f3d1bb 100644
--- a/taglib/toolkit/tstring.h
+++ b/taglib/toolkit/tstring.h
@@ -26,7 +26,6 @@
 #ifndef TAGLIB_STRING_H
 #define TAGLIB_STRING_H
 
-#include <iostream>
 #include <string>
 
 #include "tbytevector.h"
diff --git a/taglib/toolkit/tvariant.h b/taglib/toolkit/tvariant.h
index dcbc6138..2d6c843c 100644
--- a/taglib/toolkit/tvariant.h
+++ b/taglib/toolkit/tvariant.h
@@ -26,9 +26,6 @@
 #ifndef TAGLIB_VARIANT_H
 #define TAGLIB_VARIANT_H
 
-#include <memory.h>
-#include <iostream>
-
 #include "tlist.h"
 #include "tmap.h"
 #include "taglib_export.h"
diff --git a/taglib/wavpack/wavpackproperties.h b/taglib/wavpack/wavpackproperties.h
index 14f1a808..d01c1b63 100644
--- a/taglib/wavpack/wavpackproperties.h
+++ b/taglib/wavpack/wavpackproperties.h
@@ -30,7 +30,6 @@
 #ifndef TAGLIB_WVPROPERTIES_H
 #define TAGLIB_WVPROPERTIES_H
 
-#include "tbytevector.h"
 #include "taglib_export.h"
 #include "audioproperties.h"
 
diff --git a/taglib/xm/xmproperties.h b/taglib/xm/xmproperties.h
index 8b03b3f6..6367b22e 100644
--- a/taglib/xm/xmproperties.h
+++ b/taglib/xm/xmproperties.h
@@ -27,7 +27,6 @@
 #define TAGLIB_XMPROPERTIES_H
 
 #include "tstring.h"
-#include "taglib.h"
 #include "audioproperties.h"
 
 namespace TagLib {
diff --git a/tests/test_apetag.cpp b/tests/test_apetag.cpp
index 9be04aa5..73691a43 100644
--- a/tests/test_apetag.cpp
+++ b/tests/test_apetag.cpp
@@ -27,9 +27,7 @@
 #include <cstdio>
 
 #include "tstringlist.h"
-#include "tbytevectorlist.h"
 #include "tpropertymap.h"
-#include "tdebug.h"
 #include "tag.h"
 #include "apefile.h"
 #include "apetag.h"
diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
index 763a1162..d80b9537 100644
--- a/tests/test_flac.cpp
+++ b/tests/test_flac.cpp
@@ -27,7 +27,6 @@
 #include <cstdio>
 
 #include "tstringlist.h"
-#include "tbytevectorlist.h"
 #include "tpropertymap.h"
 #include "tag.h"
 #include "flacfile.h"
diff --git a/tests/test_flacpicture.cpp b/tests/test_flacpicture.cpp
index 510cea89..eae909ad 100644
--- a/tests/test_flacpicture.cpp
+++ b/tests/test_flacpicture.cpp
@@ -30,7 +30,6 @@
 #include "tbytevectorlist.h"
 #include "tag.h"
 #include "flacfile.h"
-#include "flacmetadatablock.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
diff --git a/tests/test_flacunknownmetadatablock.cpp b/tests/test_flacunknownmetadatablock.cpp
index 1715ed79..86f900d3 100644
--- a/tests/test_flacunknownmetadatablock.cpp
+++ b/tests/test_flacunknownmetadatablock.cpp
@@ -27,7 +27,6 @@
 #include <cstdio>
 
 #include "tstringlist.h"
-#include "tbytevectorlist.h"
 #include "tag.h"
 #include "flacunknownmetadatablock.h"
 #include <cppunit/extensions/HelperMacros.h>
diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp
index 057da9c7..0b3055c0 100644
--- a/tests/test_id3v2.cpp
+++ b/tests/test_id3v2.cpp
@@ -27,7 +27,6 @@
 #include <utility>
 #include <cassert>
 
-#include "tdebug.h"
 #include "tpropertymap.h"
 #include "tzlib.h"
 #include "id3v2tag.h"
diff --git a/tests/test_ogg.cpp b/tests/test_ogg.cpp
index 94ac9d15..36e8e231 100644
--- a/tests/test_ogg.cpp
+++ b/tests/test_ogg.cpp
@@ -28,7 +28,6 @@
 
 #include "tag.h"
 #include "tstringlist.h"
-#include "tbytevectorlist.h"
 #include "tpropertymap.h"
 #include "oggfile.h"
 #include "vorbisfile.h"
diff --git a/tests/test_oggflac.cpp b/tests/test_oggflac.cpp
index 5390222b..2932a340 100644
--- a/tests/test_oggflac.cpp
+++ b/tests/test_oggflac.cpp
@@ -27,7 +27,6 @@
 #include <cstdio>
 
 #include "tstringlist.h"
-#include "tbytevectorlist.h"
 #include "tag.h"
 #include "oggfile.h"
 #include "oggflacfile.h"
diff --git a/tests/test_sizes.cpp b/tests/test_sizes.cpp
index 64758622..c561db03 100644
--- a/tests/test_sizes.cpp
+++ b/tests/test_sizes.cpp
@@ -53,15 +53,12 @@
 #include "flacpicture.h"
 #include "flacproperties.h"
 #include "generalencapsulatedobjectframe.h"
-#include "id3v1genres.h"
 #include "id3v1tag.h"
-#include "id3v2.h"
 #include "id3v2extendedheader.h"
 #include "id3v2footer.h"
 #include "id3v2frame.h"
 #include "id3v2framefactory.h"
 #include "id3v2header.h"
-#include "id3v2synchdata.h"
 #include "id3v2tag.h"
 #include "infotag.h"
 #include "itfile.h"
@@ -70,7 +67,6 @@
 #include "modfilebase.h"
 #include "modproperties.h"
 #include "modtag.h"
-#include "mp4atom.h"
 #include "mp4coverart.h"
 #include "mp4file.h"
 #include "mp4item.h"
diff --git a/tests/test_xiphcomment.cpp b/tests/test_xiphcomment.cpp
index ff85e19a..dd477377 100644
--- a/tests/test_xiphcomment.cpp
+++ b/tests/test_xiphcomment.cpp
@@ -27,7 +27,6 @@
 #include <cstdio>
 
 #include "tpropertymap.h"
-#include "tdebug.h"
 #include "xiphcomment.h"
 #include "vorbisfile.h"
 #include <cppunit/extensions/HelperMacros.h>