diff --git a/include/README b/include/README
deleted file mode 100644
index bc7b4707..00000000
--- a/include/README
+++ /dev/null
@@ -1,16 +0,0 @@
-These are only necessary at build-time when building the entire kdesupport module; they do not need to be installed on a running system.
-
-It can be regenerated by using something like the following from the taglib/taglib directory:
-
-for file in `find -type f -name "*\.h"`;
-do 
-  dir=`dirname $file`
-  strippeddir=`echo $dir | cut -c 3-`
-  base=`basename $file`
-  if test -z $strippeddir
-  then
-    echo "#include \"../taglib/$base\"" > ../include/$base
-  else
-    echo "#include \"../taglib/$strippeddir/$base\"" > ../include/$base
-  fi
-done
diff --git a/include/aifffile.h b/include/aifffile.h
deleted file mode 100644
index a198c90e..00000000
--- a/include/aifffile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/riff/aiff/aifffile.h"
diff --git a/include/aiffproperties.h b/include/aiffproperties.h
deleted file mode 100644
index c77e6266..00000000
--- a/include/aiffproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/riff/aiff/aiffproperties.h"
diff --git a/include/apefooter.h b/include/apefooter.h
deleted file mode 100644
index 8c36537a..00000000
--- a/include/apefooter.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ape/apefooter.h"
diff --git a/include/apeitem.h b/include/apeitem.h
deleted file mode 100644
index 4b157284..00000000
--- a/include/apeitem.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ape/apeitem.h"
diff --git a/include/apetag.h b/include/apetag.h
deleted file mode 100644
index 4df115a1..00000000
--- a/include/apetag.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ape/apetag.h"
diff --git a/include/asfattribute.h b/include/asfattribute.h
deleted file mode 100644
index ba588fc5..00000000
--- a/include/asfattribute.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/asf/asfattribute.h"
diff --git a/include/asffile.h b/include/asffile.h
deleted file mode 100644
index 5b413662..00000000
--- a/include/asffile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/asf/asffile.h"
diff --git a/include/asfproperties.h b/include/asfproperties.h
deleted file mode 100644
index 7d913c14..00000000
--- a/include/asfproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/asf/asfproperties.h"
diff --git a/include/asftag.h b/include/asftag.h
deleted file mode 100644
index 74223a54..00000000
--- a/include/asftag.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/asf/asftag.h"
diff --git a/include/attachedpictureframe.h b/include/attachedpictureframe.h
deleted file mode 100644
index ebd7bced..00000000
--- a/include/attachedpictureframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"
diff --git a/include/audioproperties.h b/include/audioproperties.h
deleted file mode 100644
index 4fc2742a..00000000
--- a/include/audioproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/audioproperties.h"
diff --git a/include/commentsframe.h b/include/commentsframe.h
deleted file mode 100644
index 46bf84ac..00000000
--- a/include/commentsframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/commentsframe.h"
diff --git a/include/fileref.h b/include/fileref.h
deleted file mode 100644
index 450e525f..00000000
--- a/include/fileref.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/fileref.h"
diff --git a/include/flacfile.h b/include/flacfile.h
deleted file mode 100644
index cd5f900a..00000000
--- a/include/flacfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/flac/flacfile.h"
diff --git a/include/flacproperties.h b/include/flacproperties.h
deleted file mode 100644
index 03494c22..00000000
--- a/include/flacproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/flac/flacproperties.h"
diff --git a/include/generalencapsulatedobjectframe.h b/include/generalencapsulatedobjectframe.h
deleted file mode 100644
index e523d0eb..00000000
--- a/include/generalencapsulatedobjectframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"
diff --git a/include/id3v1genres.h b/include/id3v1genres.h
deleted file mode 100644
index 6f1aed34..00000000
--- a/include/id3v1genres.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v1/id3v1genres.h"
diff --git a/include/id3v1tag.h b/include/id3v1tag.h
deleted file mode 100644
index d97e2542..00000000
--- a/include/id3v1tag.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v1/id3v1tag.h"
diff --git a/include/id3v2extendedheader.h b/include/id3v2extendedheader.h
deleted file mode 100644
index 5f83462a..00000000
--- a/include/id3v2extendedheader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"
diff --git a/include/id3v2footer.h b/include/id3v2footer.h
deleted file mode 100644
index 305ca9d9..00000000
--- a/include/id3v2footer.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2footer.h"
diff --git a/include/id3v2frame.h b/include/id3v2frame.h
deleted file mode 100644
index 5f1496ca..00000000
--- a/include/id3v2frame.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2frame.h"
diff --git a/include/id3v2framefactory.h b/include/id3v2framefactory.h
deleted file mode 100644
index 89feae74..00000000
--- a/include/id3v2framefactory.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2framefactory.h"
diff --git a/include/id3v2header.h b/include/id3v2header.h
deleted file mode 100644
index 61f86501..00000000
--- a/include/id3v2header.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2header.h"
diff --git a/include/id3v2synchdata.h b/include/id3v2synchdata.h
deleted file mode 100644
index ed2ef1ff..00000000
--- a/include/id3v2synchdata.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2synchdata.h"
diff --git a/include/id3v2tag.h b/include/id3v2tag.h
deleted file mode 100644
index 37cdd622..00000000
--- a/include/id3v2tag.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2tag.h"
diff --git a/include/mp4atom.h b/include/mp4atom.h
deleted file mode 100644
index 727e68d4..00000000
--- a/include/mp4atom.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4atom.h"
diff --git a/include/mp4coverart.h b/include/mp4coverart.h
deleted file mode 100644
index f5ca629e..00000000
--- a/include/mp4coverart.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4coverart.h"
diff --git a/include/mp4file.h b/include/mp4file.h
deleted file mode 100644
index e96385b0..00000000
--- a/include/mp4file.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4file.h"
diff --git a/include/mp4item.h b/include/mp4item.h
deleted file mode 100644
index 074ad736..00000000
--- a/include/mp4item.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4item.h"
diff --git a/include/mp4properties.h b/include/mp4properties.h
deleted file mode 100644
index 97715fa0..00000000
--- a/include/mp4properties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4properties.h"
diff --git a/include/mp4tag.h b/include/mp4tag.h
deleted file mode 100644
index e615f932..00000000
--- a/include/mp4tag.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4tag.h"
diff --git a/include/mpcfile.h b/include/mpcfile.h
deleted file mode 100644
index 5b879d78..00000000
--- a/include/mpcfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpc/mpcfile.h"
diff --git a/include/mpcproperties.h b/include/mpcproperties.h
deleted file mode 100644
index d5203d63..00000000
--- a/include/mpcproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpc/mpcproperties.h"
diff --git a/include/mpegfile.h b/include/mpegfile.h
deleted file mode 100644
index a443b704..00000000
--- a/include/mpegfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/mpegfile.h"
diff --git a/include/mpegheader.h b/include/mpegheader.h
deleted file mode 100644
index 4e11d193..00000000
--- a/include/mpegheader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/mpegheader.h"
diff --git a/include/mpegproperties.h b/include/mpegproperties.h
deleted file mode 100644
index 7b4fce55..00000000
--- a/include/mpegproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/mpegproperties.h"
diff --git a/include/oggfile.h b/include/oggfile.h
deleted file mode 100644
index 7e372f0d..00000000
--- a/include/oggfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/oggfile.h"
diff --git a/include/oggflacfile.h b/include/oggflacfile.h
deleted file mode 100644
index e41f9f3b..00000000
--- a/include/oggflacfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/flac/oggflacfile.h"
diff --git a/include/oggpage.h b/include/oggpage.h
deleted file mode 100644
index 043af652..00000000
--- a/include/oggpage.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/oggpage.h"
diff --git a/include/oggpageheader.h b/include/oggpageheader.h
deleted file mode 100644
index 34add496..00000000
--- a/include/oggpageheader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/oggpageheader.h"
diff --git a/include/popularimeterframe.h b/include/popularimeterframe.h
deleted file mode 100644
index 3fdfe320..00000000
--- a/include/popularimeterframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/popularimeterframe.h"
diff --git a/include/privateframe.h b/include/privateframe.h
deleted file mode 100644
index adcedfa9..00000000
--- a/include/privateframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/privateframe.h"
diff --git a/include/relativevolumeframe.h b/include/relativevolumeframe.h
deleted file mode 100644
index c0cf4fbd..00000000
--- a/include/relativevolumeframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/relativevolumeframe.h"
diff --git a/include/rifffile.h b/include/rifffile.h
deleted file mode 100644
index 2c82d471..00000000
--- a/include/rifffile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/riff/rifffile.h"
diff --git a/include/speexfile.h b/include/speexfile.h
deleted file mode 100644
index 7f32eaf6..00000000
--- a/include/speexfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/speex/speexfile.h"
diff --git a/include/speexproperties.h b/include/speexproperties.h
deleted file mode 100644
index 355ee4f2..00000000
--- a/include/speexproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/speex/speexproperties.h"
diff --git a/include/tag.h b/include/tag.h
deleted file mode 100644
index db5856da..00000000
--- a/include/tag.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/tag.h"
diff --git a/include/taglib.h b/include/taglib.h
deleted file mode 100644
index b224f7ed..00000000
--- a/include/taglib.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/taglib.h"
diff --git a/include/taglib_export.h b/include/taglib_export.h
deleted file mode 100644
index ce56868a..00000000
--- a/include/taglib_export.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/taglib_export.h"
diff --git a/include/tagunion.h b/include/tagunion.h
deleted file mode 100644
index 6c457656..00000000
--- a/include/tagunion.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/tagunion.h"
diff --git a/include/tbytevector.h b/include/tbytevector.h
deleted file mode 100644
index 39a0c27e..00000000
--- a/include/tbytevector.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tbytevector.h"
diff --git a/include/tbytevectorlist.h b/include/tbytevectorlist.h
deleted file mode 100644
index 35b9c905..00000000
--- a/include/tbytevectorlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tbytevectorlist.h"
diff --git a/include/tdebug.h b/include/tdebug.h
deleted file mode 100644
index 5d31dd61..00000000
--- a/include/tdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tdebug.h"
diff --git a/include/textidentificationframe.h b/include/textidentificationframe.h
deleted file mode 100644
index 44a3d3ce..00000000
--- a/include/textidentificationframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/textidentificationframe.h"
diff --git a/include/tfile.h b/include/tfile.h
deleted file mode 100644
index ff88a846..00000000
--- a/include/tfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tfile.h"
diff --git a/include/tlist.h b/include/tlist.h
deleted file mode 100644
index d5ee1c08..00000000
--- a/include/tlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tlist.h"
diff --git a/include/tmap.h b/include/tmap.h
deleted file mode 100644
index 9bbe31de..00000000
--- a/include/tmap.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tmap.h"
diff --git a/include/trueaudiofile.h b/include/trueaudiofile.h
deleted file mode 100644
index c5b17c59..00000000
--- a/include/trueaudiofile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/trueaudio/trueaudiofile.h"
diff --git a/include/trueaudioproperties.h b/include/trueaudioproperties.h
deleted file mode 100644
index e86c7791..00000000
--- a/include/trueaudioproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/trueaudio/trueaudioproperties.h"
diff --git a/include/tstring.h b/include/tstring.h
deleted file mode 100644
index 898bc07d..00000000
--- a/include/tstring.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tstring.h"
diff --git a/include/tstringlist.h b/include/tstringlist.h
deleted file mode 100644
index b22f3d7d..00000000
--- a/include/tstringlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tstringlist.h"
diff --git a/include/unicode.h b/include/unicode.h
deleted file mode 100644
index 17f6a5b5..00000000
--- a/include/unicode.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/toolkit/unicode.h"
diff --git a/include/uniquefileidentifierframe.h b/include/uniquefileidentifierframe.h
deleted file mode 100644
index f67c7399..00000000
--- a/include/uniquefileidentifierframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h"
diff --git a/include/unknownframe.h b/include/unknownframe.h
deleted file mode 100644
index be6ce89c..00000000
--- a/include/unknownframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/unknownframe.h"
diff --git a/include/unsynchronizedlyricsframe.h b/include/unsynchronizedlyricsframe.h
deleted file mode 100644
index a32630c2..00000000
--- a/include/unsynchronizedlyricsframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h"
diff --git a/include/urllinkframe.h b/include/urllinkframe.h
deleted file mode 100644
index 29054b9b..00000000
--- a/include/urllinkframe.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/urllinkframe.h"
diff --git a/include/vorbisfile.h b/include/vorbisfile.h
deleted file mode 100644
index 1532c40c..00000000
--- a/include/vorbisfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/vorbis/vorbisfile.h"
diff --git a/include/vorbisproperties.h b/include/vorbisproperties.h
deleted file mode 100644
index f016f2f6..00000000
--- a/include/vorbisproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/vorbis/vorbisproperties.h"
diff --git a/include/wavfile.h b/include/wavfile.h
deleted file mode 100644
index 7357040f..00000000
--- a/include/wavfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/riff/wav/wavfile.h"
diff --git a/include/wavpackfile.h b/include/wavpackfile.h
deleted file mode 100644
index d5141a2c..00000000
--- a/include/wavpackfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/wavpack/wavpackfile.h"
diff --git a/include/wavpackproperties.h b/include/wavpackproperties.h
deleted file mode 100644
index a80e5354..00000000
--- a/include/wavpackproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/wavpack/wavpackproperties.h"
diff --git a/include/wavproperties.h b/include/wavproperties.h
deleted file mode 100644
index ac8f3aa0..00000000
--- a/include/wavproperties.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/riff/wav/wavproperties.h"
diff --git a/include/xingheader.h b/include/xingheader.h
deleted file mode 100644
index c5ff018e..00000000
--- a/include/xingheader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/mpeg/xingheader.h"
diff --git a/include/xiphcomment.h b/include/xiphcomment.h
deleted file mode 100644
index 11867254..00000000
--- a/include/xiphcomment.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../taglib/ogg/xiphcomment.h"