diff --git a/src/input/IcyInputStream.cxx b/src/input/IcyInputStream.cxx
index 1c114e589..8e21ed69e 100644
--- a/src/input/IcyInputStream.cxx
+++ b/src/input/IcyInputStream.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "IcyInputStream.hxx"
-#include "IcyMetaDataParser.hxx"
+#include "tag/IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
 #include "util/UriExtract.hxx"
 #include "util/UriQueryParser.hxx"
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index 95f745963..be5efed91 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -27,7 +27,7 @@
 #include "../MaybeBufferedInputStream.hxx"
 #include "../AsyncInputStream.hxx"
 #include "../IcyInputStream.hxx"
-#include "IcyMetaDataParser.hxx"
+#include "tag/IcyMetaDataParser.hxx"
 #include "../InputPlugin.hxx"
 #include "config/Block.hxx"
 #include "tag/Builder.hxx"
diff --git a/src/input/plugins/meson.build b/src/input/plugins/meson.build
index 9802e942e..fdd4ed309 100644
--- a/src/input/plugins/meson.build
+++ b/src/input/plugins/meson.build
@@ -20,7 +20,7 @@ if curl_dep.found()
   input_plugins_sources += [
     'CurlInputPlugin.cxx',
     '../IcyInputStream.cxx',
-    '../../IcyMetaDataParser.cxx',
+    '../../tag/IcyMetaDataParser.cxx',
   ]
 endif
 
diff --git a/src/IcyMetaDataParser.cxx b/src/tag/IcyMetaDataParser.cxx
similarity index 100%
rename from src/IcyMetaDataParser.cxx
rename to src/tag/IcyMetaDataParser.cxx
diff --git a/src/IcyMetaDataParser.hxx b/src/tag/IcyMetaDataParser.hxx
similarity index 100%
rename from src/IcyMetaDataParser.hxx
rename to src/tag/IcyMetaDataParser.hxx
diff --git a/test/test_icy_parser.cxx b/test/test_icy_parser.cxx
index a9e73e16e..e5c546e4a 100644
--- a/test/test_icy_parser.cxx
+++ b/test/test_icy_parser.cxx
@@ -5,7 +5,7 @@
 #include "util/ScopeExit.hxx"
 
 /* include the .cxx file to get access to internal functions */
-#include "IcyMetaDataParser.cxx"
+#include "tag/IcyMetaDataParser.cxx"
 
 #include <gtest/gtest.h>