Tag, ...: move to libtag.a

2013-09-05 18:22:02 +02:00
parent 7a4c9f5f4c
commit 3f267b1795
83 changed files with 98 additions and 105 deletions
--- a/src/AllCommands.cxx
+++ b/src/AllCommands.cxx
@@ -28,7 +28,7 @@
 #include "MessageCommands.hxx"
 #include "OtherCommands.hxx"
 #include "Permission.hxx"
-#include "Tag.hxx"
+#include "tag/TagType.h"
 #include "protocol/Result.hxx"
 #include "Client.hxx"
 #include "util/Tokenizer.hxx"
--- a/src/CrossFade.cxx
+++ b/src/CrossFade.cxx
@@ -21,7 +21,6 @@
 #include "CrossFade.hxx"
 #include "MusicChunk.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"

 #include <cmath>

--- a/src/DatabaseCommands.cxx
+++ b/src/DatabaseCommands.cxx
@@ -25,7 +25,7 @@
 #include "DatabaseSelection.hxx"
 #include "CommandError.hxx"
 #include "ClientInternal.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 #include "SongFilter.hxx"
--- a/src/DatabaseHelpers.cxx
+++ b/src/DatabaseHelpers.cxx
@@ -20,7 +20,7 @@
 #include "DatabaseHelpers.hxx"
 #include "DatabasePlugin.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <functional>
 #include <set>
--- a/src/DatabaseHelpers.hxx
+++ b/src/DatabaseHelpers.hxx
@@ -21,7 +21,7 @@
 #define MPD_MEMORY_DATABASE_PLUGIN_HXX

 #include "DatabaseVisitor.hxx"
-#include "TagType.h"
+#include "tag/TagType.h"
 #include "gcc.h"

 class Error;
--- a/src/DatabasePlugin.hxx
+++ b/src/DatabasePlugin.hxx
@@ -27,7 +27,7 @@
 #define MPD_DATABASE_PLUGIN_HXX

 #include "DatabaseVisitor.hxx"
-#include "TagType.h"
+#include "tag/TagType.h"
 #include "gcc.h"

 struct config_param;
--- a/src/DatabasePrint.cxx
+++ b/src/DatabasePrint.cxx
@@ -26,7 +26,7 @@
 #include "TimePrint.hxx"
 #include "Directory.hxx"
 #include "Client.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"
--- a/src/DatabaseSave.cxx
+++ b/src/DatabaseSave.cxx
@@ -25,8 +25,8 @@
 #include "DirectorySave.hxx"
 #include "Song.hxx"
 #include "TextFile.hxx"
-#include "TagInternal.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagInternal.hxx"
 #include "fs/Path.hxx"
 #include "util/Error.hxx"

--- a/src/DecoderAPI.hxx
+++ b/src/DecoderAPI.hxx
@@ -31,7 +31,7 @@
 #include "DecoderCommand.hxx"
 #include "DecoderPlugin.hxx"
 #include "replay_gain_info.h"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
 #include "ConfigData.hxx"

--- a/src/DecoderInternal.cxx
+++ b/src/DecoderInternal.cxx
@@ -23,7 +23,7 @@
 #include "MusicPipe.hxx"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <assert.h>

--- a/src/DecoderThread.cxx
+++ b/src/DecoderThread.cxx
@@ -28,7 +28,7 @@
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
 #include "DecoderAPI.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "InputStream.hxx"
 #include "DecoderList.hxx"
 #include "util/UriUtil.hxx"
--- a/src/DespotifyUtils.cxx
+++ b/src/DespotifyUtils.cxx
@@ -18,7 +18,7 @@
 */

 #include "DespotifyUtils.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"

--- a/src/EncoderAPI.hxx
+++ b/src/EncoderAPI.hxx
@@ -27,7 +27,7 @@

 #include "EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigData.hxx"

 #endif
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -19,7 +19,7 @@

 #include "config.h"
 #include "IcyMetaDataParser.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <glib.h>

--- a/src/IcyMetaDataServer.cxx
+++ b/src/IcyMetaDataServer.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "IcyMetaDataServer.hxx"
 #include "Page.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <glib.h>

--- a/src/IcyMetaDataServer.hxx
+++ b/src/IcyMetaDataServer.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_ICY_META_DATA_SERVER_HXX
 #define MPD_ICY_META_DATA_SERVER_HXX

-#include "TagType.h"
+#include "tag/TagType.h"

 struct Tag;
 class Page;
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -38,7 +38,7 @@
 #include "Partition.hxx"
 #include "Volume.hxx"
 #include "OutputAll.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "replay_gain_config.h"
 #include "Idle.hxx"
 #include "SignalHandlers.hxx"
--- a/src/MusicChunk.cxx
+++ b/src/MusicChunk.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "MusicChunk.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <assert.h>

--- a/src/OutputAPI.hxx
+++ b/src/OutputAPI.hxx
@@ -23,7 +23,7 @@
 #include "OutputPlugin.hxx"
 #include "OutputInternal.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigData.hxx"

 #endif
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -30,7 +30,7 @@
 #include "CrossFade.hxx"
 #include "PlayerControl.hxx"
 #include "OutputAll.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Idle.hxx"
 #include "GlobalEvents.hxx"

--- a/src/PlaylistSong.cxx
+++ b/src/PlaylistSong.cxx
@@ -23,7 +23,7 @@
 #include "DatabasePlugin.hxx"
 #include "DatabaseGlue.hxx"
 #include "ls.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "fs/Path.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
--- a/src/Song.cxx
+++ b/src/Song.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Song.hxx"
 #include "Directory.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <glib.h>

--- a/src/SongFilter.cxx
+++ b/src/SongFilter.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "SongFilter.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <glib.h>

--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -23,7 +23,7 @@
 #include "TagSave.hxx"
 #include "Directory.hxx"
 #include "TextFile.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
--- a/src/SongSort.cxx
+++ b/src/SongSort.cxx
@@ -21,7 +21,7 @@
 #include "SongSort.hxx"
 #include "Song.hxx"
 #include "util/list.h"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 extern "C" {
 #include "util/list_sort.h"
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -25,11 +25,11 @@
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
-#include "Tag.hxx"
 #include "InputStream.hxx"
 #include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
-#include "TagHandler.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/ApeTag.hxx"

--- a/src/TagPrint.cxx
+++ b/src/TagPrint.cxx
@@ -19,8 +19,8 @@

 #include "config.h"
 #include "TagPrint.hxx"
-#include "Tag.hxx"
-#include "TagInternal.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagInternal.hxx"
 #include "Song.hxx"
 #include "Client.hxx"

--- a/src/TagSave.cxx
+++ b/src/TagSave.cxx
@@ -19,8 +19,7 @@

 #include "config.h"
 #include "TagSave.hxx"
-#include "Tag.hxx"
-#include "TagInternal.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"

 void
--- a/src/UpdateContainer.cxx
+++ b/src/UpdateContainer.cxx
@@ -27,8 +27,8 @@
 #include "DecoderPlugin.hxx"
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
-#include "TagHandler.hxx"
-#include "Tag.hxx"
+#include "tag/TagHandler.hxx"
+#include "tag/Tag.hxx"

 #include <glib.h>

--- a/src/cue/CueParser.cxx
+++ b/src/cue/CueParser.cxx
@@ -21,7 +21,7 @@
 #include "CueParser.hxx"
 #include "util/StringUtil.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <glib.h>

--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/ProxyDatabasePlugin.cxx
@@ -27,7 +27,7 @@
 #include "Song.hxx"
 #include "gcc.h"
 #include "ConfigData.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"

--- a/src/decoder/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/AdPlugDecoderPlugin.cxx
@@ -19,7 +19,7 @@

 #include "config.h"
 #include "AdPlugDecoderPlugin.h"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
 #include "util/Error.hxx"
--- a/src/decoder/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/AudiofileDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "util/Error.hxx"

 #include <audiofile.h>
--- a/src/decoder/DsdLib.cxx
+++ b/src/decoder/DsdLib.cxx
@@ -28,7 +28,7 @@
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
 #include "util/bit_reverse.h"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/TagId3.hxx"
 #include "util/Error.hxx"

--- a/src/decoder/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/DsdiffDecoderPlugin.cxx
@@ -33,7 +33,7 @@
 #include "CheckAudioFormat.hxx"
 #include "util/bit_reverse.h"
 #include "util/Error.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "DsdLib.hxx"

 #include <unistd.h>
--- a/src/decoder/DsfDecoderPlugin.cxx
+++ b/src/decoder/DsfDecoderPlugin.cxx
@@ -35,7 +35,7 @@
 #include "util/bit_reverse.h"
 #include "util/Error.hxx"
 #include "DsdLib.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"

 #include <unistd.h>
 #include <stdio.h> /* for SEEK_SET, SEEK_CUR */
--- a/src/decoder/FaadDecoderPlugin.cxx
+++ b/src/decoder/FaadDecoderPlugin.cxx
@@ -23,7 +23,7 @@
 #include "DecoderBuffer.hxx"
 #include "InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"

--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -24,7 +24,7 @@
 #include "FfmpegDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
 #include "FfmpegMetaData.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "InputStream.hxx"
 #include "CheckAudioFormat.hxx"
 #include "util/Error.hxx"
--- a/src/decoder/FfmpegMetaData.cxx
+++ b/src/decoder/FfmpegMetaData.cxx
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "FfmpegMetaData.hxx"
 #include "tag/TagTable.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"

 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "ffmpeg"
--- a/src/decoder/FlacMetadata.cxx
+++ b/src/decoder/FlacMetadata.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "FlacMetadata.hxx"
 #include "XiphTags.hxx"
-#include "Tag.hxx"
-#include "TagHandler.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/TagTable.hxx"
 #include "replay_gain_info.h"

--- a/src/decoder/GmeDecoderPlugin.cxx
+++ b/src/decoder/GmeDecoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "GmeDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"

--- a/src/decoder/MadDecoderPlugin.cxx
+++ b/src/decoder/MadDecoderPlugin.cxx
@@ -24,7 +24,7 @@
 #include "ConfigGlobal.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/TagRva2.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "CheckAudioFormat.hxx"
 #include "util/Error.hxx"

--- a/src/decoder/MikmodDecoderPlugin.cxx
+++ b/src/decoder/MikmodDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "MikmodDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "system/FatalError.hxx"

 #include <glib.h>
--- a/src/decoder/ModplugDecoderPlugin.cxx
+++ b/src/decoder/ModplugDecoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "ModplugDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"

 #include <glib.h>
 #include <modplug.h>
--- a/src/decoder/MpcdecDecoderPlugin.cxx
+++ b/src/decoder/MpcdecDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "util/Error.hxx"

 #include <mpc/mpcdec.h>
--- a/src/decoder/Mpg123DecoderPlugin.cxx
+++ b/src/decoder/Mpg123DecoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "Mpg123DecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "util/Error.hxx"

 #include <glib.h>
--- a/src/decoder/OpusDecoderPlugin.cxx
+++ b/src/decoder/OpusDecoderPlugin.cxx
@@ -27,7 +27,7 @@
 #include "DecoderAPI.hxx"
 #include "OggCodec.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "InputStream.hxx"
 #include "util/Error.hxx"

--- a/src/decoder/OpusTags.cxx
+++ b/src/decoder/OpusTags.cxx
@@ -21,7 +21,7 @@
 #include "OpusTags.hxx"
 #include "OpusReader.hxx"
 #include "XiphTags.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"

 #include <stdint.h>
 #include <string.h>
--- a/src/decoder/SndfileDecoderPlugin.cxx
+++ b/src/decoder/SndfileDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "util/Error.hxx"

 #include <sndfile.h>
--- a/src/decoder/VorbisComments.cxx
+++ b/src/decoder/VorbisComments.cxx
@@ -20,9 +20,9 @@
 #include "config.h"
 #include "VorbisComments.hxx"
 #include "XiphTags.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "tag/TagTable.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "replay_gain_info.h"

 #include <glib.h>
--- a/src/decoder/VorbisDecoderPlugin.cxx
+++ b/src/decoder/VorbisDecoderPlugin.cxx
@@ -26,7 +26,7 @@
 #include "util/Error.hxx"
 #include "util/UriUtil.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"

 #ifndef HAVE_TREMOR
 #define OV_EXCLUDE_STATIC_CALLBACKS
--- a/src/decoder/WavpackDecoderPlugin.cxx
+++ b/src/decoder/WavpackDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/ApeTag.hxx"
 #include "util/Error.hxx"

--- a/src/decoder/WildmidiDecoderPlugin.cxx
+++ b/src/decoder/WildmidiDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WildmidiDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "util/Error.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
--- a/src/decoder/sidplay_decoder_plugin.cxx
+++ b/src/decoder/sidplay_decoder_plugin.cxx
@@ -19,10 +19,7 @@

 #include "config.h"
 #include "../DecoderAPI.hxx"
-
-extern "C" {
-#include "TagHandler.hxx"
-}
+#include "tag/TagHandler.hxx"

 #include <errno.h>
 #include <stdlib.h>
--- a/src/encoder/VorbisEncoderPlugin.cxx
+++ b/src/encoder/VorbisEncoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "VorbisEncoderPlugin.hxx"
 #include "OggStream.hxx"
 #include "EncoderAPI.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
 #include "ConfigError.hxx"
 #include "util/Error.hxx"
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -24,7 +24,7 @@
 #include "InputPlugin.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigData.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "IcyMetaDataParser.hxx"
 #include "event/MultiSocketMonitor.hxx"
 #include "event/Call.hxx"
--- a/src/input/DespotifyInputPlugin.cxx
+++ b/src/input/DespotifyInputPlugin.cxx
@@ -23,7 +23,7 @@
 #include "InputInternal.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 extern "C" {
 #include <despotify.h>
--- a/src/input/RewindInputPlugin.cxx
+++ b/src/input/RewindInputPlugin.cxx
@@ -22,7 +22,7 @@
 #include "InputInternal.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"

 #include <assert.h>
 #include <string.h>
--- a/src/playlist/AsxPlaylistPlugin.cxx
+++ b/src/playlist/AsxPlaylistPlugin.cxx
@@ -23,7 +23,7 @@
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"

 #include <glib.h>
--- a/src/playlist/CuePlaylistPlugin.cxx
+++ b/src/playlist/CuePlaylistPlugin.cxx
@@ -21,7 +21,7 @@
 #include "CuePlaylistPlugin.hxx"
 #include "PlaylistPlugin.hxx"
 #include "SongEnumerator.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"
 #include "cue/CueParser.hxx"
 #include "TextInputStream.hxx"
--- a/src/playlist/DespotifyPlaylistPlugin.cxx
+++ b/src/playlist/DespotifyPlaylistPlugin.cxx
@@ -22,7 +22,7 @@
 #include "DespotifyUtils.hxx"
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"

 extern "C" {
--- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx
@@ -27,8 +27,8 @@
 #include "EmbeddedCuePlaylistPlugin.hxx"
 #include "PlaylistPlugin.hxx"
 #include "SongEnumerator.hxx"
-#include "Tag.hxx"
-#include "TagHandler.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/ApeTag.hxx"
 #include "Song.hxx"
--- a/src/playlist/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/ExtM3uPlaylistPlugin.cxx
@@ -22,7 +22,7 @@
 #include "PlaylistPlugin.hxx"
 #include "SongEnumerator.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/StringUtil.hxx"
 #include "TextInputStream.hxx"

--- a/src/playlist/PlsPlaylistPlugin.cxx
+++ b/src/playlist/PlsPlaylistPlugin.cxx
@@ -23,7 +23,7 @@
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"

 #include <glib.h>
--- a/src/playlist/RssPlaylistPlugin.cxx
+++ b/src/playlist/RssPlaylistPlugin.cxx
@@ -23,7 +23,7 @@
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"

 #include <glib.h>
--- a/src/playlist/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/SoundCloudPlaylistPlugin.cxx
@@ -24,7 +24,7 @@
 #include "ConfigData.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"

 #include <glib.h>
--- a/src/playlist/XspfPlaylistPlugin.cxx
+++ b/src/playlist/XspfPlaylistPlugin.cxx
@@ -22,7 +22,7 @@
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"

 #include <glib.h>
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
--- a/src/tag/Tag.hxx
+++ b/src/tag/Tag.hxx
--- a/src/tag/TagHandler.cxx
+++ b/src/tag/TagHandler.cxx
--- a/src/tag/TagHandler.hxx
+++ b/src/tag/TagHandler.hxx
--- a/src/tag/TagInternal.hxx
+++ b/src/tag/TagInternal.hxx
--- a/src/tag/TagNames.c
+++ b/src/tag/TagNames.c
--- a/src/tag/TagPool.cxx
+++ b/src/tag/TagPool.cxx
--- a/src/tag/TagPool.hxx
+++ b/src/tag/TagPool.hxx
--- a/src/tag/TagType.h
+++ b/src/tag/TagType.h