diff --git a/CMakeLists.txt b/CMakeLists.txt
index 195891f3..81317304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,6 +188,36 @@ else()
   endif()
 endif()
 
+if(WITH_APE)
+  set(TAGLIB_WITH_APE TRUE)
+endif()
+if(WITH_ASF)
+  set(TAGLIB_WITH_ASF TRUE)
+endif()
+if(WITH_DSF)
+  set(TAGLIB_WITH_DSF TRUE)
+endif()
+if(WITH_MOD)
+  set(TAGLIB_WITH_MOD TRUE)
+endif()
+if(WITH_MP4)
+  set(TAGLIB_WITH_MP4 TRUE)
+endif()
+if(WITH_RIFF)
+  set(TAGLIB_WITH_RIFF TRUE)
+endif()
+if(WITH_SHORTEN)
+  set(TAGLIB_WITH_SHORTEN TRUE)
+endif()
+if(WITH_TRUEAUDIO)
+  set(TAGLIB_WITH_TRUEAUDIO TRUE)
+endif()
+if(WITH_VORBIS)
+  set(TAGLIB_WITH_VORBIS TRUE)
+endif()
+
+configure_file(taglib/taglib_config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h")
+
 add_subdirectory(taglib)
 
 if(BUILD_BINDINGS)
diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index 2e6509af..c5c73486 100644
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include "taglib_config.h"
 #include "tstringlist.h"
 #include "tbytevectorstream.h"
 #include "tiostream.h"
@@ -38,44 +39,44 @@
 #include "mpegfile.h"
 #include "tag.h"
 #include "id3v2framefactory.h"
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
 #include "asffile.h"
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
 #include "vorbisfile.h"
 #include "flacfile.h"
 #include "oggflacfile.h"
 #include "speexfile.h"
 #include "opusfile.h"
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "mpcfile.h"
 #include "wavpackfile.h"
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
 #include "trueaudiofile.h"
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
 #include "mp4file.h"
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
 #include "aifffile.h"
 #include "wavfile.h"
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apefile.h"
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
 #include "itfile.h"
 #include "modfile.h"
 #include "s3mfile.h"
 #include "xmfile.h"
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
 #include "dsffile.h"
 #include "dsdifffile.h"
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
 #include "shortenfile.h"
 #endif
 
@@ -154,7 +155,7 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
   case TagLib_File_MPEG:
     file = new MPEG::File(filename);
       break;
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   case TagLib_File_OggVorbis:
     file = new Ogg::Vorbis::File(filename);
     break;
@@ -171,7 +172,7 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
     file = new Ogg::Opus::File(filename);
     break;
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   case TagLib_File_MPC:
     file = new MPC::File(filename);
     break;
@@ -182,22 +183,22 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
     file = new APE::File(filename);
     break;
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
   case TagLib_File_TrueAudio:
     file = new TrueAudio::File(filename);
     break;
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   case TagLib_File_MP4:
     file = new MP4::File(filename);
     break;
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   case TagLib_File_ASF:
     file = new ASF::File(filename);
     break;
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   case TagLib_File_AIFF:
     file = new RIFF::AIFF::File(filename);
     break;
@@ -205,7 +206,7 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
     file = new RIFF::WAV::File(filename);
     break;
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
   case TagLib_File_IT:
     file = new IT::File(filename);
     break;
@@ -219,7 +220,7 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
     file = new XM::File(filename);
     break;
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
   case TagLib_File_DSF:
     file = new DSF::File(filename);
     break;
@@ -227,7 +228,7 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
     file = new DSDIFF::File(filename);
     break;
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
   case TagLib_File_SHORTEN:
     file = new Shorten::File(filename);
     break;
diff --git a/config.h.cmake b/config.h.cmake
index ebfc7084..67334d79 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -21,14 +21,4 @@
 
 #cmakedefine TESTS_DIR "@TESTS_DIR@"
 
-#cmakedefine WITH_APE 1
-#cmakedefine WITH_ASF 1
-#cmakedefine WITH_DSF 1
-#cmakedefine WITH_MOD 1
-#cmakedefine WITH_MP4 1
-#cmakedefine WITH_RIFF 1
-#cmakedefine WITH_SHORTEN 1
-#cmakedefine WITH_TRUEAUDIO 1
-#cmakedefine WITH_VORBIS 1
-
 #endif
diff --git a/examples/framelist.cpp b/examples/framelist.cpp
index 6abffd97..f2f23941 100644
--- a/examples/framelist.cpp
+++ b/examples/framelist.cpp
@@ -22,13 +22,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <iostream>
 #include <cstdlib>
 
+#include "taglib_config.h"
 #include "tbytevector.h"
 #include "mpegfile.h"
 #include "id3v2tag.h"
@@ -36,7 +33,7 @@
 #include "id3v2header.h"
 #include "commentsframe.h"
 #include "id3v1tag.h"
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apetag.h"
 #endif
 
@@ -96,7 +93,7 @@ int main(int argc, char *argv[])
     else
       std::cout << "file does not have a valid id3v1 tag" << std::endl;
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
     APE::Tag *ape = f.APETag();
 
     std::cout << std::endl << "APE" << std::endl;
diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 609d45f7..3afd845f 100644
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -71,6 +71,7 @@ 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/fileref.cpp b/taglib/fileref.cpp
index c10d34d6..3ff45c33 100644
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -29,55 +29,52 @@
 
 #include "fileref.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <cstring>
 #include <utility>
 
+#include "taglib_config.h"
 #include "tfilestream.h"
 #include "tpropertymap.h"
 #include "tstringlist.h"
 #include "tvariant.h"
 #include "tdebug.h"
 #include "mpegfile.h"
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
 #include "aifffile.h"
 #include "wavfile.h"
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apefile.h"
 #include "mpcfile.h"
 #include "wavpackfile.h"
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
 #include "asffile.h"
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
 #include "flacfile.h"
 #include "speexfile.h"
 #include "vorbisfile.h"
 #include "oggflacfile.h"
 #include "opusfile.h"
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
 #include "itfile.h"
 #include "modfile.h"
 #include "xmfile.h"
 #include "s3mfile.h"
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
 #include "mp4file.h"
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
 #include "trueaudiofile.h"
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
 #include "dsffile.h"
 #include "dsdifffile.h"
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
 #include "shortenfile.h"
 #endif
 
@@ -158,7 +155,7 @@ namespace
 
     if(ext == "MP3" || ext == "MP2" || ext == "AAC")
       file = new MPEG::File(stream, readAudioProperties, audioPropertiesStyle);
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
     else if(ext == "OGG")
       file = new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(ext == "OGA") {
@@ -176,7 +173,7 @@ namespace
     else if(ext == "OPUS")
       file = new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
     else if(ext == "MPC")
       file = new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(ext == "WV")
@@ -184,25 +181,25 @@ namespace
     else if(ext == "APE")
       file = new APE::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
     else if(ext == "TTA")
       file = new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
     else if(ext == "M4A" || ext == "M4R" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2" || ext == "M4V")
       file = new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
     else if(ext == "WMA" || ext == "ASF")
       file = new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
     else if(ext == "AIF" || ext == "AIFF" || ext == "AFC" || ext == "AIFC")
       file = new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(ext == "WAV")
       file = new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
     // module, nst and wow are possible but uncommon extensions
     else if(ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
       file = new Mod::File(stream, readAudioProperties, audioPropertiesStyle);
@@ -213,13 +210,13 @@ namespace
     else if(ext == "XM")
       file = new XM::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
     else if(ext == "DSF")
       file = new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(ext == "DFF" || ext == "DSDIFF")
       file = new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
     else if(ext == "SHN")
       file = new Shorten::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
@@ -244,7 +241,7 @@ namespace
 
     if(MPEG::File::isSupported(stream))
       file = new MPEG::File(stream, readAudioProperties, audioPropertiesStyle);
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
     else if(Ogg::Vorbis::File::isSupported(stream))
       file = new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(Ogg::FLAC::File::isSupported(stream))
@@ -256,7 +253,7 @@ namespace
     else if(Ogg::Opus::File::isSupported(stream))
       file = new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
     else if(MPC::File::isSupported(stream))
       file = new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(WavPack::File::isSupported(stream))
@@ -264,31 +261,31 @@ namespace
     else if(APE::File::isSupported(stream))
       file = new APE::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
     else if(TrueAudio::File::isSupported(stream))
       file = new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
     else if(MP4::File::isSupported(stream))
       file = new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
     else if(ASF::File::isSupported(stream))
       file = new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
     else if(RIFF::AIFF::File::isSupported(stream))
       file = new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(RIFF::WAV::File::isSupported(stream))
       file = new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
     else if(DSF::File::isSupported(stream))
       file = new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(DSDIFF::File::isSupported(stream))
       file = new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
     else if(Shorten::File::isSupported(stream))
       file = new Shorten::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
@@ -464,22 +461,22 @@ StringList FileRef::defaultFileExtensions()
   l.append("mp3");
   l.append("mp2");
   l.append("aac");
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   l.append("ogg");
   l.append("flac");
   l.append("oga");
   l.append("opus");
   l.append("spx");
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   l.append("mpc");
   l.append("wv");
   l.append("ape");
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
   l.append("tta");
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   l.append("m4a");
   l.append("m4r");
   l.append("m4b");
@@ -488,18 +485,18 @@ StringList FileRef::defaultFileExtensions()
   l.append("mp4");
   l.append("m4v");
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   l.append("wma");
   l.append("asf");
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   l.append("aif");
   l.append("aiff");
   l.append("afc");
   l.append("aifc");
   l.append("wav");
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
   l.append("mod");
   l.append("module"); // alias for "mod"
   l.append("nst"); // alias for "mod"
@@ -508,12 +505,12 @@ StringList FileRef::defaultFileExtensions()
   l.append("it");
   l.append("xm");
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
   l.append("dsf");
   l.append("dff");
   l.append("dsdiff"); // alias for "dff"
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
   l.append("shn");
 #endif
 
diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
index fd10e91f..0128250d 100644
--- a/taglib/mpeg/mpegfile.cpp
+++ b/taglib/mpeg/mpegfile.cpp
@@ -25,14 +25,11 @@
 
 #include "mpegfile.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "taglib_config.h"
 #include "id3v2framefactory.h"
 #include "tdebug.h"
 #include "tpropertymap.h"
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apefooter.h"
 #include "apetag.h"
 #endif
@@ -283,7 +280,7 @@ bool MPEG::File::save(int tags, StripTags strip, ID3v2::Version version, Duplica
     }
   }
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   if(APE & tags) {
 
     if(APETag() && !APETag()->isEmpty()) {
@@ -329,7 +326,7 @@ ID3v1::Tag *MPEG::File::ID3v1Tag(bool create)
 
 APE::Tag *MPEG::File::APETag(bool create)
 {
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   return d->tag.access<APE::Tag>(APEIndex, create);
 #else
   return nullptr;
@@ -492,7 +489,7 @@ void MPEG::File::read(bool readProperties, Properties::ReadStyle readStyle)
   if(d->ID3v1Location >= 0)
     d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   // Look for an APE tag
 
   d->APELocation = Utils::findAPE(this, d->ID3v1Location);
diff --git a/taglib/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp
index fad26f55..1790b282 100644
--- a/taglib/mpeg/mpegproperties.cpp
+++ b/taglib/mpeg/mpegproperties.cpp
@@ -25,14 +25,11 @@
 
 #include "mpegproperties.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "taglib_config.h"
 #include "tdebug.h"
 #include "mpegfile.h"
 #include "xingheader.h"
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apetag.h"
 #endif
 
diff --git a/taglib/taglib_config.h.cmake b/taglib/taglib_config.h.cmake
new file mode 100644
index 00000000..7a3a02c4
--- /dev/null
+++ b/taglib/taglib_config.h.cmake
@@ -0,0 +1,16 @@
+/* taglib_config.h. Generated by cmake from taglib_config.h.cmake */
+
+#ifndef TAGLIB_TAGLIB_CONFIG_H
+#define TAGLIB_TAGLIB_CONFIG_H
+
+#cmakedefine TAGLIB_WITH_APE 1
+#cmakedefine TAGLIB_WITH_ASF 1
+#cmakedefine TAGLIB_WITH_DSF 1
+#cmakedefine TAGLIB_WITH_MOD 1
+#cmakedefine TAGLIB_WITH_MP4 1
+#cmakedefine TAGLIB_WITH_RIFF 1
+#cmakedefine TAGLIB_WITH_SHORTEN 1
+#cmakedefine TAGLIB_WITH_TRUEAUDIO 1
+#cmakedefine TAGLIB_WITH_VORBIS 1
+
+#endif
diff --git a/taglib/tagutils.cpp b/taglib/tagutils.cpp
index 785ad360..25242bd1 100644
--- a/taglib/tagutils.cpp
+++ b/taglib/tagutils.cpp
@@ -25,15 +25,12 @@
 
 #include "tagutils.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "taglib_config.h"
 #include "tfile.h"
 
 #include "id3v1tag.h"
 #include "id3v2header.h"
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apetag.h"
 #endif
 
@@ -52,7 +49,7 @@ offset_t Utils::findID3v1(File *file)
 
     if(const TagLib::ByteVector data = file->readBlock(8);
        data.containsAt(ID3v1::Tag::fileIdentifier(), 3) &&
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
        data != APE::Tag::fileIdentifier()
 #else
        data != ByteVector::fromCString("APETAGEX")
@@ -96,7 +93,7 @@ offset_t Utils::findAPE(File *file, offset_t id3v1Location)
   const offset_t p = file->tell();
 
   if(file->readBlock(8) ==
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
      APE::Tag::fileIdentifier()
 #else
      ByteVector::fromCString("APETAGEX")
diff --git a/tests/test_complexproperties.cpp b/tests/test_complexproperties.cpp
index 1f3ae147..ca5e3f40 100644
--- a/tests/test_complexproperties.cpp
+++ b/tests/test_complexproperties.cpp
@@ -23,10 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "taglib_config.h"
 #include "tbytevector.h"
 #include "tvariant.h"
 #include "tzlib.h"
@@ -35,19 +32,19 @@
 #include "id3v2tag.h"
 #include "attachedpictureframe.h"
 #include "generalencapsulatedobjectframe.h"
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
 #include "asfpicture.h"
 #include "asftag.h"
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
 #include "flacpicture.h"
 #include "flacfile.h"
 #include "xiphcomment.h"
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apetag.h"
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
 #include "mp4tag.h"
 #endif
 #include <cppunit/extensions/HelperMacros.h>
@@ -84,20 +81,20 @@ class TestComplexProperties : public CppUnit::TestFixture
   CPPUNIT_TEST(testSetGetId3Geob);
   CPPUNIT_TEST(testSetGetId3Picture);
   CPPUNIT_TEST(testNonExistent);
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   CPPUNIT_TEST(testReadM4aPicture);
   CPPUNIT_TEST(testSetGetMp4Picture);
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   CPPUNIT_TEST(testReadOggPicture);
   CPPUNIT_TEST(testReadWriteFlacPicture);
   CPPUNIT_TEST(testReadWriteMultipleProperties);
   CPPUNIT_TEST(testSetGetXiphPicture);
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   CPPUNIT_TEST(testSetGetApePicture);
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   CPPUNIT_TEST(testSetGetAsfPicture);
 #endif
   CPPUNIT_TEST_SUITE_END();
@@ -123,7 +120,7 @@ public:
     }
   }
 
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   void testReadM4aPicture()
   {
     const ByteVector expectedData1(
@@ -168,7 +165,7 @@ public:
   }
 #endif
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testReadOggPicture()
   {
     FileRef f(TEST_FILE_PATH_C("lowercase-fields.ogg"), false);
@@ -335,7 +332,7 @@ public:
     CPPUNIT_ASSERT_EQUAL(ID3v2::AttachedPictureFrame::FrontCover, frame->type());
   }
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   void testSetGetApePicture()
   {
     const String FRONT_COVER("COVER ART (FRONT)");
@@ -353,7 +350,7 @@ public:
   }
 #endif
 
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   void testSetGetAsfPicture()
   {
     VariantMap picture(TEST_PICTURE);
@@ -373,7 +370,7 @@ public:
   }
 #endif
 
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   void testSetGetMp4Picture()
   {
     VariantMap picture(TEST_PICTURE);
@@ -391,7 +388,7 @@ public:
   }
 #endif
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testSetGetXiphPicture()
   {
     VariantMap picture(TEST_PICTURE);
diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp
index eda3f6cd..5c3e4e0d 100644
--- a/tests/test_fileref.cpp
+++ b/tests/test_fileref.cpp
@@ -23,47 +23,44 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <string>
 #include <cstdio>
 
+#include "taglib_config.h"
 #include "tfilestream.h"
 #include "tbytevectorstream.h"
 #include "tag.h"
 #include "fileref.h"
 #include "mpegfile.h"
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
 #include "oggflacfile.h"
 #include "vorbisfile.h"
 #include "speexfile.h"
 #include "flacfile.h"
 #include "opusfile.h"
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "mpcfile.h"
 #include "apefile.h"
 #include "wavpackfile.h"
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
 #include "asffile.h"
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
 #include "trueaudiofile.h"
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
 #include "mp4file.h"
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
 #include "wavfile.h"
 #include "aifffile.h"
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
 #include "xmfile.h"
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
 #include "dsffile.h"
 #include "dsdifffile.h"
 #endif
@@ -75,7 +72,7 @@ using namespace TagLib;
 
 namespace
 {
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   class DummyResolver : public FileRef::FileTypeResolver
   {
   public:
@@ -86,7 +83,7 @@ namespace
   };
 #endif
 
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   class DummyStreamResolver : public FileRef::StreamTypeResolver
   {
   public:
@@ -111,15 +108,15 @@ class TestFileRef : public CppUnit::TestFixture
   CPPUNIT_TEST(testAudioProperties);
   CPPUNIT_TEST(testDefaultFileExtensions);
   CPPUNIT_TEST(testFileResolver);
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   CPPUNIT_TEST(testASF);
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   CPPUNIT_TEST(testMusepack);
   CPPUNIT_TEST(testAPE);
   CPPUNIT_TEST(testWavPack);
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   CPPUNIT_TEST(testVorbis);
   CPPUNIT_TEST(testSpeex);
   CPPUNIT_TEST(testFLAC);
@@ -127,21 +124,21 @@ class TestFileRef : public CppUnit::TestFixture
   CPPUNIT_TEST(testOGA_Vorbis);
   CPPUNIT_TEST(testOpus);
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   CPPUNIT_TEST(testMP4_1);
   CPPUNIT_TEST(testMP4_2);
   CPPUNIT_TEST(testMP4_3);
   CPPUNIT_TEST(testMP4_4);
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
   CPPUNIT_TEST(testTrueAudio);
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   CPPUNIT_TEST(testWav);
   CPPUNIT_TEST(testAIFF_1);
   CPPUNIT_TEST(testAIFF_2);
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
   CPPUNIT_TEST(testDSF);
   CPPUNIT_TEST(testDSDIFF);
 #endif
@@ -277,21 +274,21 @@ public:
     }
   }
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   void testMusepack()
   {
     fileRefSave<MPC::File>("click", ".mpc");
   }
 #endif
 
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   void testASF()
   {
     fileRefSave<ASF::File>("silence-1", ".wma");
   }
 #endif
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testVorbis()
   {
     fileRefSave<Ogg::Vorbis::File>("empty", ".ogg");
@@ -313,14 +310,14 @@ public:
     fileRefSave<MPEG::File>("xing", ".mp3");
   }
 
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
   void testTrueAudio()
   {
     fileRefSave<TrueAudio::File>("empty", ".tta");
   }
 #endif
 
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   void testMP4_1()
   {
     fileRefSave<MP4::File>("has-tags", ".m4a");
@@ -342,14 +339,14 @@ public:
   }
 #endif
 
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   void testWav()
   {
     fileRefSave<RIFF::WAV::File>("empty", ".wav");
   }
 #endif
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testOGA_FLAC()
   {
     fileRefSave<Ogg::FLAC::File>("empty_flac", ".oga");
@@ -361,14 +358,14 @@ public:
   }
 #endif
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   void testAPE()
   {
     fileRefSave<APE::File>("mac-399", ".ape");
   }
 #endif
 
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   void testAIFF_1()
   {
     fileRefSave<RIFF::AIFF::File>("empty", ".aiff");
@@ -380,21 +377,21 @@ public:
   }
 #endif
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   void testWavPack()
   {
     fileRefSave<WavPack::File>("click", ".wv");
   }
 #endif
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testOpus()
   {
     fileRefSave<Ogg::Opus::File>("correctness_gain_silent_output", ".opus");
   }
 #endif
 
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
   void testDSF()
   {
     fileRefSave<DSF::File>("empty10ms",".dsf");
@@ -426,54 +423,54 @@ public:
   void testDefaultFileExtensions()
   {
     const StringList extensions = FileRef::defaultFileExtensions();
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
     CPPUNIT_ASSERT(extensions.contains("mpc"));
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
     CPPUNIT_ASSERT(extensions.contains("wma"));
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
     CPPUNIT_ASSERT(extensions.contains("ogg"));
     CPPUNIT_ASSERT(extensions.contains("spx"));
     CPPUNIT_ASSERT(extensions.contains("flac"));
 #endif
     CPPUNIT_ASSERT(extensions.contains("mp3"));
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
     CPPUNIT_ASSERT(extensions.contains("tta"));
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
     CPPUNIT_ASSERT(extensions.contains("m4a"));
     CPPUNIT_ASSERT(extensions.contains("3g2"));
     CPPUNIT_ASSERT(extensions.contains("m4v"));
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
     CPPUNIT_ASSERT(extensions.contains("wav"));
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
     CPPUNIT_ASSERT(extensions.contains("oga"));
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
     CPPUNIT_ASSERT(extensions.contains("ape"));
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
     CPPUNIT_ASSERT(extensions.contains("aiff"));
     CPPUNIT_ASSERT(extensions.contains("aifc"));
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
     CPPUNIT_ASSERT(extensions.contains("wv"));
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
     CPPUNIT_ASSERT(extensions.contains("opus"));
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
     CPPUNIT_ASSERT(extensions.contains("xm"));
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
     CPPUNIT_ASSERT(extensions.contains("dsf"));
     CPPUNIT_ASSERT(extensions.contains("dff"));
     CPPUNIT_ASSERT(extensions.contains("dsdiff"));
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
     CPPUNIT_ASSERT(extensions.contains("shn"));
 #endif
   }
@@ -485,7 +482,7 @@ public:
       CPPUNIT_ASSERT(dynamic_cast<MPEG::File *>(f.file()) != nullptr);
     }
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
     DummyResolver resolver;
     FileRef::addFileTypeResolver(&resolver);
 
@@ -495,7 +492,7 @@ public:
     }
 #endif
 
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
     DummyStreamResolver streamResolver;
     FileRef::addFileTypeResolver(&streamResolver);
 
diff --git a/tests/test_id3v2framefactory.cpp b/tests/test_id3v2framefactory.cpp
index 16440253..de4c6b6b 100644
--- a/tests/test_id3v2framefactory.cpp
+++ b/tests/test_id3v2framefactory.cpp
@@ -23,13 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <functional>
 #include <memory>
 
+#include "taglib_config.h"
 #include "mpegproperties.h"
 #include "tbytevector.h"
 #include "tpropertymap.h"
@@ -37,19 +34,19 @@
 #include "id3v2tag.h"
 #include "id3v2frame.h"
 #include "id3v2framefactory.h"
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
 #include "flacproperties.h"
 #include "flacfile.h"
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
 #include "trueaudiofile.h"
 #include "trueaudioproperties.h"
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
 #include "wavfile.h"
 #include "aifffile.h"
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
 #include "dsffile.h"
 #include "dsdifffile.h"
 #endif
@@ -130,17 +127,17 @@ class TestId3v2FrameFactory : public CppUnit::TestFixture
 {
   CPPUNIT_TEST_SUITE(TestId3v2FrameFactory);
   CPPUNIT_TEST(testMPEG);
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   CPPUNIT_TEST(testFLAC);
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
   CPPUNIT_TEST(testTrueAudio);
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   CPPUNIT_TEST(testWAV);
   CPPUNIT_TEST(testAIFF);
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
   CPPUNIT_TEST(testDSF);
   CPPUNIT_TEST(testDSDIFF);
 #endif
@@ -256,7 +253,7 @@ public:
     );
   }
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testFLAC()
   {
     ScopedFileCopy copy("no-tags", ".flac");
@@ -283,7 +280,7 @@ public:
   }
 #endif
 
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
   void testTrueAudio()
   {
     ScopedFileCopy copy("empty", ".tta");
@@ -310,7 +307,7 @@ public:
   }
 #endif
 
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   void testWAV()
   {
     ScopedFileCopy copy("empty", ".wav");
@@ -362,7 +359,7 @@ public:
   }
 #endif
 
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
   void testDSF()
   {
     ScopedFileCopy copy("empty10ms", ".dsf");
diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp
index 5c1f7961..14f68588 100644
--- a/tests/test_mpeg.cpp
+++ b/tests/test_mpeg.cpp
@@ -23,20 +23,17 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <string>
 #include <cstdio>
 #include <array>
 
+#include "taglib_config.h"
 #include "tstring.h"
 #include "tpropertymap.h"
 #include "mpegfile.h"
 #include "id3v2tag.h"
 #include "id3v1tag.h"
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apetag.h"
 #endif
 #include "mpegproperties.h"
@@ -73,7 +70,7 @@ class TestMPEG : public CppUnit::TestFixture
   CPPUNIT_TEST(testRepeatedSave3);
   CPPUNIT_TEST(testEmptyID3v2);
   CPPUNIT_TEST(testEmptyID3v1);
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   CPPUNIT_TEST(testEmptyAPE);
 #endif
   CPPUNIT_TEST(testIgnoreGarbage);
@@ -312,7 +309,7 @@ public:
     {
       MPEG::File f(copy.fileName().c_str());
       f.ID3v2Tag(true)->setTitle("ID3v2");
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
       f.APETag(true)->setTitle("APE");
 #endif
       f.ID3v1Tag(true)->setTitle("ID3v1");
@@ -322,7 +319,7 @@ public:
       MPEG::File f(copy.fileName().c_str());
       CPPUNIT_ASSERT_EQUAL(String("ID3v2"), f.properties()["TITLE"].front());
       f.strip(MPEG::File::ID3v2);
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
       CPPUNIT_ASSERT_EQUAL(String("APE"), f.properties()["TITLE"].front());
       f.strip(MPEG::File::APE);
 #endif
@@ -476,21 +473,21 @@ public:
       CPPUNIT_ASSERT(!f.hasAPETag());
       CPPUNIT_ASSERT(!f.hasID3v1Tag());
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
       f.APETag(true)->setTitle("01234 56789 ABCDE FGHIJ");
       f.save();
       f.APETag()->setTitle("0");
       f.save();
 #endif
       f.ID3v1Tag(true)->setTitle("01234 56789 ABCDE FGHIJ");
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
       f.APETag()->setTitle("01234 56789 ABCDE FGHIJ 01234 56789 ABCDE FGHIJ 01234 56789");
 #endif
       f.save();
     }
     {
       MPEG::File f(copy.fileName().c_str());
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
       CPPUNIT_ASSERT(f.hasAPETag());
 #endif
       CPPUNIT_ASSERT(f.hasID3v1Tag());
@@ -537,7 +534,7 @@ public:
     }
   }
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   void testEmptyAPE()
   {
     ScopedFileCopy copy("xing", ".mp3");
diff --git a/tests/test_propertymap.cpp b/tests/test_propertymap.cpp
index bcb1d9d3..db39ce14 100644
--- a/tests/test_propertymap.cpp
+++ b/tests/test_propertymap.cpp
@@ -23,27 +23,24 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "taglib_config.h"
 #include "tpropertymap.h"
 #include "tag.h"
 #include "id3v1tag.h"
 #include "id3v2tag.h"
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apetag.h"
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
 #include "asftag.h"
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
 #include "infotag.h"
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
 #include "mp4tag.h"
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
 #include "xiphcomment.h"
 #endif
 #include <cppunit/extensions/HelperMacros.h>
@@ -58,19 +55,19 @@ class TestPropertyMap : public CppUnit::TestFixture
   CPPUNIT_TEST(testGetSetId3v1);
   CPPUNIT_TEST(testGetSetId3v2);
   CPPUNIT_TEST(testGetSet);
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   CPPUNIT_TEST(testGetSetApe);
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   CPPUNIT_TEST(testGetSetAsf);
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   CPPUNIT_TEST(testGetSetInfo);
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   CPPUNIT_TEST(testGetSetMp4);
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   CPPUNIT_TEST(testGetSetXiphComment);
 #endif
   CPPUNIT_TEST_SUITE_END();
@@ -165,35 +162,35 @@ public:
     tagGetSet<ID3v2::Tag>();
   }
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testGetSetXiphComment()
   {
     tagGetSet<Ogg::XiphComment>();
   }
 #endif
 
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
   void testGetSetApe()
   {
     tagGetSet<APE::Tag>();
   }
 #endif
 
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
   void testGetSetAsf()
   {
     tagGetSet<ASF::Tag>();
   }
 #endif
 
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
   void testGetSetMp4()
   {
     tagGetSet<MP4::Tag>();
   }
 #endif
 
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
   void testGetSetInfo()
   {
     tagGetSet<RIFF::Info::Tag>();
diff --git a/tests/test_sizes.cpp b/tests/test_sizes.cpp
index c5ff3bd1..0bf03cce 100644
--- a/tests/test_sizes.cpp
+++ b/tests/test_sizes.cpp
@@ -23,12 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <cstring>
 
+#include "taglib_config.h"
 #include "tag.h"
 #include "tbytevector.h"
 #include "tbytevectorlist.h"
@@ -72,7 +69,7 @@
 #include "unknownframe.h"
 #include "unsynchronizedlyricsframe.h"
 #include "urllinkframe.h"
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
 #include "aifffile.h"
 #include "aiffproperties.h"
 #include "infotag.h"
@@ -80,7 +77,7 @@
 #include "wavfile.h"
 #include "wavproperties.h"
 #endif
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
 #include "apefile.h"
 #include "apefooter.h"
 #include "apeitem.h"
@@ -91,20 +88,20 @@
 #include "wavpackfile.h"
 #include "wavpackproperties.h"
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
 #include "asfattribute.h"
 #include "asffile.h"
 #include "asfpicture.h"
 #include "asfproperties.h"
 #include "asftag.h"
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
 #include "dsffile.h"
 #include "dsfproperties.h"
 #include "dsdifffile.h"
 #include "dsdiffproperties.h"
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
 #include "flacfile.h"
 #include "flacmetadatablock.h"
 #include "flacunknownmetadatablock.h"
@@ -122,7 +119,7 @@
 #include "vorbisproperties.h"
 #include "xiphcomment.h"
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
 #include "itfile.h"
 #include "itproperties.h"
 #include "modfile.h"
@@ -134,7 +131,7 @@
 #include "xmfile.h"
 #include "xmproperties.h"
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
 #include "mp4coverart.h"
 #include "mp4file.h"
 #include "mp4item.h"
@@ -142,12 +139,12 @@
 #include "mp4properties.h"
 #include "mp4tag.h"
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
 #include "shortenfile.h"
 #include "shortenproperties.h"
 #include "shortentag.h"
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
 #include "trueaudiofile.h"
 #include "trueaudioproperties.h"
 #endif
@@ -219,7 +216,7 @@ public:
         CPPUNIT_ASSERT_EQUAL(classSize(1, false), sizeof(TagLib::String));
         CPPUNIT_ASSERT_EQUAL(classSize(2, false), sizeof(TagLib::StringList));
         CPPUNIT_ASSERT_EQUAL(classSize(0, true), sizeof(TagLib::Tag));
-#ifdef WITH_APE
+#ifdef TAGLIB_WITH_APE
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::APE::File));
         CPPUNIT_ASSERT_EQUAL(classSize(0, false), sizeof(TagLib::APE::Footer));
         CPPUNIT_ASSERT_EQUAL(classSize(0, false), sizeof(TagLib::APE::Item));
@@ -230,21 +227,21 @@ public:
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::WavPack::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::WavPack::Properties));
 #endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
         CPPUNIT_ASSERT_EQUAL(classSize(1, false), sizeof(TagLib::ASF::Attribute));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::ASF::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, false), sizeof(TagLib::ASF::Picture));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::ASF::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::ASF::Tag));
 #endif
-#ifdef WITH_DSF
+#ifdef TAGLIB_WITH_DSF
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::DSDIFF::DIIN::Tag));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::DSDIFF::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::DSDIFF::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::DSF::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::DSF::Properties));
 #endif
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::FLAC::File));
         CPPUNIT_ASSERT_EQUAL(classSize(0, true), sizeof(TagLib::FLAC::MetadataBlock));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::FLAC::Picture));
@@ -262,7 +259,7 @@ public:
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::Ogg::Vorbis::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::Ogg::XiphComment));
 #endif
-#ifdef WITH_MOD
+#ifdef TAGLIB_WITH_MOD
         CPPUNIT_ASSERT_EQUAL(classSize(2, true), sizeof(TagLib::IT::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::IT::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(2, true), sizeof(TagLib::Mod::File));
@@ -275,7 +272,7 @@ public:
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::XM::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(1, false), sizeof(TagLib::Variant));
 #endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
         CPPUNIT_ASSERT_EQUAL(classSize(1, false), sizeof(TagLib::MP4::CoverArt));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::MP4::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, false), sizeof(TagLib::MP4::Item));
@@ -283,7 +280,7 @@ public:
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::MP4::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::MP4::Tag));
 #endif
-#ifdef WITH_RIFF
+#ifdef TAGLIB_WITH_RIFF
         CPPUNIT_ASSERT_EQUAL(classSize(2, true), sizeof(TagLib::RIFF::AIFF::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::RIFF::AIFF::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::RIFF::File));
@@ -292,12 +289,12 @@ public:
         CPPUNIT_ASSERT_EQUAL(classSize(2, true), sizeof(TagLib::RIFF::WAV::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::RIFF::WAV::Properties));
 #endif
-#ifdef WITH_SHORTEN
+#ifdef TAGLIB_WITH_SHORTEN
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::Shorten::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::Shorten::Properties));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::Shorten::Tag));
 #endif
-#ifdef WITH_TRUEAUDIO
+#ifdef TAGLIB_WITH_TRUEAUDIO
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::TrueAudio::File));
         CPPUNIT_ASSERT_EQUAL(classSize(1, true), sizeof(TagLib::TrueAudio::Properties));
 #endif
diff --git a/tests/test_tag_c.cpp b/tests/test_tag_c.cpp
index 5fa09b57..b9d8511a 100644
--- a/tests/test_tag_c.cpp
+++ b/tests/test_tag_c.cpp
@@ -23,14 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <string>
 #include <unordered_map>
 #include <list>
 
+#include "taglib_config.h"
 #include "tag_c.h"
 #include "tbytevector.h"
 #include "tstring.h"
@@ -81,7 +78,7 @@ class TestTagC : public CppUnit::TestFixture
 {
   CPPUNIT_TEST_SUITE(TestTagC);
   CPPUNIT_TEST(testMp3);
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   CPPUNIT_TEST(testStream);
 #endif
   CPPUNIT_TEST_SUITE_END();
@@ -171,7 +168,7 @@ public:
     taglib_tag_free_strings();
   }
 
-#ifdef WITH_VORBIS
+#ifdef TAGLIB_WITH_VORBIS
   void testStream()
   {
     // Only fetch the beginning of a FLAC file