diff --git a/Makefile.am b/Makefile.am
index 59f887788..c877e7e1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -230,7 +230,8 @@ endif
 
 if ENABLE_DESPOTIFY
 src_mpd_SOURCES += \
-	src/DespotifyUtils.cxx src/DespotifyUtils.hxx
+	src/lib/despotify/DespotifyUtils.cxx \
+	src/lib/despotify/DespotifyUtils.hxx
 endif
 
 if ENABLE_INOTIFY
@@ -1092,7 +1093,7 @@ endif
 
 if HAVE_EXPAT
 libplaylist_plugins_a_SOURCES += \
-	src/Expat.cxx src/Expat.hxx \
+	src/lib/expat/ExpatParser.cxx src/lib/expat/ExpatParser.hxx \
 	src/playlist/plugins/XspfPlaylistPlugin.cxx \
 	src/playlist/plugins/XspfPlaylistPlugin.hxx \
 	src/playlist/plugins/AsxPlaylistPlugin.cxx \
@@ -1256,7 +1257,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/SongFilter.cxx
 
 if HAVE_LIBUPNP
-test_DumpDatabase_SOURCES += src/Expat.cxx
+test_DumpDatabase_SOURCES += src/lib/expat/ExpatParser.cxx
 endif
 
 test_run_input_LDADD = \
@@ -1295,7 +1296,7 @@ test_visit_archive_SOURCES = test/visit_archive.cxx \
 	src/input/InputStream.cxx
 
 if ENABLE_DESPOTIFY
-test_visit_archive_SOURCES += src/DespotifyUtils.cxx
+test_visit_archive_SOURCES += src/lib/despotify/DespotifyUtils.cxx
 endif
 
 endif
@@ -1422,11 +1423,11 @@ test_run_filter_SOURCES = test/run_filter.cxx \
 	src/AudioCompress/compress.c
 
 if ENABLE_DESPOTIFY
-test_read_tags_SOURCES += src/DespotifyUtils.cxx
-test_run_input_SOURCES += src/DespotifyUtils.cxx
-test_dump_text_file_SOURCES += src/DespotifyUtils.cxx
-test_dump_playlist_SOURCES += src/DespotifyUtils.cxx
-test_run_decoder_SOURCES += src/DespotifyUtils.cxx
+test_read_tags_SOURCES += src/lib/despotify/DespotifyUtils.cxx
+test_run_input_SOURCES += src/lib/despotify/DespotifyUtils.cxx
+test_dump_text_file_SOURCES += src/lib/despotify/DespotifyUtils.cxx
+test_dump_playlist_SOURCES += src/lib/despotify/DespotifyUtils.cxx
+test_run_decoder_SOURCES += src/lib/despotify/DespotifyUtils.cxx
 endif
 
 if ENABLE_ENCODER
diff --git a/src/db/plugins/upnp/Device.cxx b/src/db/plugins/upnp/Device.cxx
index 7bec1cccd..26bffd0f0 100644
--- a/src/db/plugins/upnp/Device.cxx
+++ b/src/db/plugins/upnp/Device.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Device.hxx"
 #include "Util.hxx"
-#include "Expat.hxx"
+#include "lib/expat/ExpatParser.hxx"
 #include "util/Error.hxx"
 
 #include <stdlib.h>
diff --git a/src/db/plugins/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx
index adb8b213a..9c089cc5e 100644
--- a/src/db/plugins/upnp/Directory.cxx
+++ b/src/db/plugins/upnp/Directory.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Directory.hxx"
 #include "Util.hxx"
-#include "Expat.hxx"
+#include "lib/expat/ExpatParser.hxx"
 #include "Tags.hxx"
 #include "tag/TagBuilder.hxx"
 #include "tag/TagTable.hxx"
diff --git a/src/input/plugins/DespotifyInputPlugin.cxx b/src/input/plugins/DespotifyInputPlugin.cxx
index a01ba3759..152fda95f 100644
--- a/src/input/plugins/DespotifyInputPlugin.cxx
+++ b/src/input/plugins/DespotifyInputPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DespotifyInputPlugin.hxx"
-#include "DespotifyUtils.hxx"
+#include "lib/despotify/DespotifyUtils.hxx"
 #include "../InputStream.hxx"
 #include "../InputPlugin.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/DespotifyUtils.cxx b/src/lib/despotify/DespotifyUtils.cxx
similarity index 100%
rename from src/DespotifyUtils.cxx
rename to src/lib/despotify/DespotifyUtils.cxx
diff --git a/src/DespotifyUtils.hxx b/src/lib/despotify/DespotifyUtils.hxx
similarity index 100%
rename from src/DespotifyUtils.hxx
rename to src/lib/despotify/DespotifyUtils.hxx
diff --git a/src/Expat.cxx b/src/lib/expat/ExpatParser.cxx
similarity index 98%
rename from src/Expat.cxx
rename to src/lib/expat/ExpatParser.cxx
index b6e3a5f8f..b69dc55b4 100644
--- a/src/Expat.cxx
+++ b/src/lib/expat/ExpatParser.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "Expat.hxx"
+#include "ExpatParser.hxx"
 #include "input/InputStream.hxx"
 #include "util/ASCII.hxx"
 #include "util/Error.hxx"
diff --git a/src/Expat.hxx b/src/lib/expat/ExpatParser.hxx
similarity index 100%
rename from src/Expat.hxx
rename to src/lib/expat/ExpatParser.hxx
diff --git a/src/playlist/plugins/AsxPlaylistPlugin.cxx b/src/playlist/plugins/AsxPlaylistPlugin.cxx
index 5434c8e85..3185a8144 100644
--- a/src/playlist/plugins/AsxPlaylistPlugin.cxx
+++ b/src/playlist/plugins/AsxPlaylistPlugin.cxx
@@ -24,7 +24,7 @@
 #include "tag/TagBuilder.hxx"
 #include "util/ASCII.hxx"
 #include "util/Error.hxx"
-#include "Expat.hxx"
+#include "lib/expat/ExpatParser.hxx"
 #include "Log.hxx"
 
 /**
diff --git a/src/playlist/plugins/DespotifyPlaylistPlugin.cxx b/src/playlist/plugins/DespotifyPlaylistPlugin.cxx
index 1e8de0130..0d18e8b25 100644
--- a/src/playlist/plugins/DespotifyPlaylistPlugin.cxx
+++ b/src/playlist/plugins/DespotifyPlaylistPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DespotifyPlaylistPlugin.hxx"
-#include "DespotifyUtils.hxx"
+#include "lib/despotify/DespotifyUtils.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/playlist/plugins/RssPlaylistPlugin.cxx b/src/playlist/plugins/RssPlaylistPlugin.cxx
index 076d82f14..6f9aad54b 100644
--- a/src/playlist/plugins/RssPlaylistPlugin.cxx
+++ b/src/playlist/plugins/RssPlaylistPlugin.cxx
@@ -24,7 +24,7 @@
 #include "tag/TagBuilder.hxx"
 #include "util/ASCII.hxx"
 #include "util/Error.hxx"
-#include "Expat.hxx"
+#include "lib/expat/ExpatParser.hxx"
 #include "Log.hxx"
 
 /**
diff --git a/src/playlist/plugins/XspfPlaylistPlugin.cxx b/src/playlist/plugins/XspfPlaylistPlugin.cxx
index f9c1f21b1..5b6010b53 100644
--- a/src/playlist/plugins/XspfPlaylistPlugin.cxx
+++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx
@@ -26,7 +26,7 @@
 #include "tag/TagBuilder.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
-#include "Expat.hxx"
+#include "lib/expat/ExpatParser.hxx"
 #include "Log.hxx"
 
 #include <string.h>