1 files changed, 555 insertions, 451 deletions

diff --git a/Makefile.am b/Makefile.am
index a0b32f8b..fd4ff377 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,13 @@ bin_PROGRAMS = src/mpd
 
 noinst_LIBRARIES = \
 	libutil.a \
+	libevent.a \
 	libpcm.a \
+	libconf.a \
 	libtag.a \
 	libinput.a \
+	libfs.a \
+	libdb_plugins.a \
 	libplaylist_plugins.a \
 	libdecoder_plugins.a \
 	libfilter_plugins.a \
@@ -19,10 +23,12 @@ noinst_LIBRARIES = \
 	liboutput_plugins.a
 
 src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(LIBMPDCLIENT_CFLAGS) \
 	$(AVAHI_CFLAGS) \
 	$(LIBWRAP_CFLAGS) \
 	$(SQLITE_CFLAGS)
 src_mpd_LDADD = \
+	$(DB_LIBS) \
 	$(PLAYLIST_LIBS) \
 	$(AVAHI_LIBS) \
 	$(LIBWRAP_LDFLAGS) \
@@ -35,190 +41,72 @@ src_mpd_LDADD = \
 	$(FILTER_LIBS) \
 	$(ENCODER_LIBS) \
 	$(MIXER_LIBS) \
+	libconf.a \
+	libevent.a \
 	libutil.a \
+	libfs.a \
 	$(SYSTEMD_DAEMON_LIBS) \
 	$(GLIB_LIBS)
 
 mpd_headers = \
 	src/check.h \
-	src/notify.h \
 	src/ack.h \
 	src/ape.h \
 	src/audio_format.h \
 	src/audio_check.h \
-	src/audio_parser.h \
 	src/output_internal.h \
 	src/output_api.h \
-	src/output_list.h \
-	src/output_all.h \
-	src/output_thread.h \
-	src/output_control.h \
-	src/output_state.h \
-	src/output_print.h \
-	src/output_command.h \
 	src/filter_internal.h \
-	src/filter_config.h \
-	src/filter_plugin.h \
-	src/filter_registry.h \
-	src/filter/autoconvert_filter_plugin.h \
-	src/filter/chain_filter_plugin.h \
-	src/filter/convert_filter_plugin.h \
-	src/filter/replay_gain_filter_plugin.h \
-	src/filter/volume_filter_plugin.h \
 	src/command.h \
-	src/idle.h \
-	src/cmdline.h \
 	src/conf.h \
-	src/crossfade.h \
-	src/dbUtils.h \
-	src/decoder_thread.h \
-	src/decoder_control.h \
 	src/decoder_plugin.h \
 	src/decoder_command.h \
 	src/decoder_buffer.h \
 	src/decoder_api.h \
 	src/decoder_plugin.h \
-	src/decoder_internal.h \
-	src/directory.h \
-	src/directory_save.h \
-	src/database.h \
 	src/encoder_plugin.h \
 	src/encoder_list.h \
 	src/encoder_api.h \
-	src/exclude.h \
 	src/fd_util.h \
+	src/gerror.h \
 	src/glib_compat.h \
-	src/update.h \
-	src/inotify_source.h \
-	src/inotify_queue.h \
-	src/inotify_update.h \
 	src/gcc.h \
-	src/decoder_list.h \
-	src/decoder_print.h \
-	src/decoder/flac_compat.h \
-	src/decoder/flac_metadata.h \
-	src/decoder/flac_pcm.h \
-	src/decoder/_flac_common.h \
-	src/decoder/_ogg_common.h \
 	src/decoder/pcm_decoder_plugin.h \
-	src/input_init.h \
-	src/input_plugin.h \
-	src/input_registry.h \
 	src/input_stream.h \
-	src/input/file_input_plugin.h \
-	src/input/ffmpeg_input_plugin.h \
-	src/input/curl_input_plugin.h \
-	src/input/rewind_input_plugin.h \
-	src/input/mms_input_plugin.h \
-	src/input/despotify_input_plugin.h \
-	src/input/cdio_paranoia_input_plugin.h \
-	src/despotify_utils.h \
-	src/text_file.h \
 	src/text_input_stream.h \
-	src/icy_server.h \
-	src/icy_metadata.h \
-	src/client.h \
-	src/client_internal.h \
-	src/server_socket.h \
-	src/listen.h \
-	src/log.h \
 	src/ls.h \
-	src/main.h \
-	src/mixer_all.h \
 	src/mixer_api.h \
 	src/mixer_control.h \
 	src/mixer_list.h \
-	src/event_pipe.h \
 	src/mixer_plugin.h \
 	src/mixer_type.h \
-	src/mixer/software_mixer_plugin.h \
-	src/mixer/pulse_mixer_plugin.h \
 	src/daemon.h \
 	src/AudioCompress/config.h \
 	src/AudioCompress/compress.h \
-	src/buffer.h \
-	src/pipe.h \
-	src/chunk.h \
-	src/path.h \
-	src/mapper.h \
 	src/open.h \
-	src/output/httpd_client.h \
-	src/output/httpd_internal.h \
-	src/page.h \
-	src/permission.h \
-	src/player_thread.h \
-	src/player_control.h \
-	src/playlist.h \
+	src/Playlist.hxx \
 	src/playlist_error.h \
-	src/playlist_internal.h \
-	src/playlist_print.h \
-	src/playlist_save.h \
-	src/playlist_state.h \
-	src/playlist_plugin.h \
-	src/playlist_list.h \
-	src/playlist_mapper.h \
-	src/playlist_any.h \
-	src/playlist_song.h \
-	src/playlist_queue.h \
-	src/playlist_vector.h \
-	src/playlist_database.h \
-	src/playlist/extm3u_playlist_plugin.h \
-	src/playlist/m3u_playlist_plugin.h \
-	src/playlist/pls_playlist_plugin.h \
-	src/playlist/xspf_playlist_plugin.h \
-	src/playlist/asx_playlist_plugin.h \
-	src/playlist/rss_playlist_plugin.h \
-	src/playlist/lastfm_playlist_plugin.h \
-	src/playlist/despotify_playlist_plugin.h \
-	src/playlist/cue_playlist_plugin.h \
 	src/poison.h \
 	src/riff.h \
 	src/aiff.h \
-	src/queue.h \
-	src/queue_print.h \
-	src/queue_save.h \
-	src/refcount.h \
 	src/replay_gain_config.h \
 	src/replay_gain_info.h \
 	src/replay_gain_ape.h \
-	src/sig_handlers.h \
+	src/TimePrint.cxx src/TimePrint.hxx \
 	src/song.h \
-	src/song_print.h \
-	src/song_save.h \
-	src/song_sticker.h \
 	src/song_sort.c src/song_sort.h \
-	src/socket_util.h \
-	src/state_file.h \
 	src/stats.h \
-	src/sticker.h \
-	src/sticker_print.h \
 	src/tag.h \
 	src/tag_internal.h \
-	src/tag_pool.h \
 	src/tag_table.h \
 	src/tag_ape.h \
 	src/tag_id3.h \
 	src/tag_rva2.h \
-	src/tag_print.h \
-	src/tag_save.h \
 	src/tokenizer.h \
-	src/strset.h \
 	src/uri.h \
 	src/utils.h \
 	src/string_util.h \
-	src/volume.h \
-	src/zeroconf.h src/zeroconf-internal.h \
-	src/locate.h \
-	src/stored_playlist.h \
 	src/timer.h \
-	src/archive_api.h \
-	src/archive_internal.h \
-	src/archive_list.h \
-	src/archive_plugin.h \
-	src/archive/bz2_archive_plugin.h \
-	src/archive/iso9660_archive_plugin.h \
-	src/archive/zzip_archive_plugin.h \
-	src/input/archive_input_plugin.h \
 	src/mpd_error.h
 
 src_mpd_SOURCES = \
@@ -226,133 +114,149 @@ src_mpd_SOURCES = \
 	$(DECODER_SRC) \
 	$(OUTPUT_API_SRC) \
 	$(MIXER_API_SRC) \
-	src/glib_socket.h \
+	src/thread/Mutex.hxx \
+	src/thread/PosixMutex.hxx \
+	src/thread/CriticalSection.hxx \
+	src/thread/GLibMutex.hxx \
+	src/thread/Cond.hxx \
+	src/thread/PosixCond.hxx \
+	src/thread/WindowsCond.hxx \
+	src/thread/GLibCond.hxx \
 	src/clock.c src/clock.h \
-	src/notify.c \
-	src/audio_config.c src/audio_config.h \
+	src/notify.cxx src/notify.hxx \
+	src/AudioConfig.cxx src/AudioConfig.hxx \
 	src/audio_check.c \
 	src/audio_format.c \
-	src/audio_parser.c \
-	src/protocol/argparser.c src/protocol/argparser.h \
-	src/protocol/result.c src/protocol/result.h \
-	src/command.c \
-	src/idle.c \
-	src/cmdline.c \
-	src/conf.c \
-	src/crossfade.c \
+	src/AudioParser.cxx src/AudioParser.hxx \
+	src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \
+	src/protocol/Result.cxx src/protocol/Result.hxx \
+	src/CommandError.cxx src/CommandError.hxx \
+	src/AllCommands.cxx src/AllCommands.hxx \
+	src/QueueCommands.cxx src/QueueCommands.hxx \
+	src/PlayerCommands.cxx src/PlayerCommands.hxx \
+	src/PlaylistCommands.cxx src/PlaylistCommands.hxx \
+	src/DatabaseCommands.cxx src/DatabaseCommands.hxx \
+	src/OutputCommands.cxx src/OutputCommands.hxx \
+	src/MessageCommands.cxx src/MessageCommands.hxx \
+	src/OtherCommands.cxx src/OtherCommands.hxx \
+	src/Idle.cxx src/Idle.hxx \
+	src/CommandLine.cxx src/CommandLine.hxx \
+	src/CrossFade.cxx src/CrossFade.hxx \
 	src/cue/cue_parser.c src/cue/cue_parser.h \
-	src/dbUtils.c \
-	src/decoder_thread.c \
-	src/decoder_control.c \
-	src/decoder_api.c \
-	src/decoder_internal.c \
-	src/decoder_print.c \
-	src/directory.c \
-	src/directory_save.c \
-	src/database.c \
-	src/db_internal.h \
+	src/decoder_error.h \
+	src/DecoderThread.cxx src/DecoderThread.hxx \
+	src/DecoderControl.cxx src/DecoderControl.hxx \
+	src/DecoderAPI.cxx \
+	src/DecoderInternal.cxx src/DecoderInternal.hxx \
+	src/DecoderPrint.cxx src/DecoderPrint.hxx \
+	src/Directory.cxx src/Directory.hxx \
+	src/DirectorySave.cxx src/DirectorySave.hxx \
+	src/DatabaseSimple.hxx \
+	src/DatabaseGlue.cxx src/DatabaseGlue.hxx \
+	src/DatabasePrint.cxx src/DatabasePrint.hxx \
+	src/DatabaseQueue.cxx src/DatabaseQueue.hxx \
+	src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \
 	src/db_error.h \
-	src/db_lock.c src/db_lock.h \
-	src/db_save.c src/db_save.h \
-	src/db_print.c src/db_print.h \
-	src/db_plugin.h \
-	src/db_visitor.h \
-	src/db_selection.h \
-	src/db/simple_db_plugin.c src/db/simple_db_plugin.h \
-	src/exclude.c \
+	src/DatabaseLock.cxx src/DatabaseLock.hxx \
+	src/DatabaseSave.cxx src/DatabaseSave.hxx \
+	src/DatabasePlugin.hxx \
+	src/DatabaseVisitor.hxx \
+	src/DatabaseSelection.cxx src/DatabaseSelection.hxx \
+	src/ExcludeList.cxx src/ExcludeList.hxx \
 	src/fd_util.c \
-	src/fifo_buffer.c src/fifo_buffer.h \
-	src/growing_fifo.c src/growing_fifo.h \
-	src/filter_config.c \
-	src/filter_plugin.c \
-	src/filter_registry.c \
-	src/update.c \
-	src/update_queue.c src/update_queue.h \
-	src/update_io.c src/update_io.h \
-	src/update_db.c src/update_db.h \
-	src/update_walk.c src/update_walk.h \
-	src/update_song.c src/update_song.h \
-	src/update_container.c src/update_container.h \
-	src/update_internal.h \
-	src/update_remove.c src/update_remove.h \
-	src/client.c \
-	src/client_event.c \
-	src/client_expire.c \
-	src/client_global.c \
-	src/client_idle.h \
-	src/client_idle.c \
-	src/client_list.c \
-	src/client_new.c \
-	src/client_process.c \
-	src/client_read.c \
-	src/client_write.c \
-	src/client_message.h \
-	src/client_message.c \
-	src/client_subscribe.h \
-	src/client_subscribe.c \
-	src/client_file.c src/client_file.h \
-	src/server_socket.c \
-	src/listen.c \
-	src/log.c \
-	src/ls.c \
-	src/io_thread.c src/io_thread.h \
-	src/main.c \
-	src/main_win32.c \
-	src/event_pipe.c \
+	src/FilterConfig.cxx src/FilterConfig.hxx \
+	src/FilterPlugin.cxx src/FilterPlugin.hxx \
+	src/FilterRegistry.cxx src/FilterRegistry.hxx \
+	src/UpdateGlue.cxx src/UpdateGlue.hxx \
+	src/UpdateQueue.cxx src/UpdateQueue.hxx \
+	src/UpdateIO.cxx src/UpdateIO.hxx \
+	src/UpdateDatabase.cxx src/UpdateDatabase.hxx \
+	src/UpdateWalk.cxx src/UpdateWalk.hxx \
+	src/UpdateSong.cxx src/UpdateSong.hxx \
+	src/UpdateContainer.cxx src/UpdateContainer.hxx \
+	src/UpdateInternal.hxx \
+	src/UpdateRemove.cxx src/UpdateRemove.hxx \
+	src/CommandListBuilder.cxx src/CommandListBuilder.hxx \
+	src/Client.cxx src/Client.hxx \
+	src/ClientInternal.hxx \
+	src/ClientEvent.cxx \
+	src/ClientExpire.cxx \
+	src/ClientGlobal.cxx \
+	src/ClientIdle.cxx \
+	src/ClientList.cxx src/ClientList.hxx \
+	src/ClientNew.cxx \
+	src/ClientProcess.cxx \
+	src/ClientRead.cxx \
+	src/ClientWrite.cxx \
+	src/ClientMessage.cxx src/ClientMessage.hxx \
+	src/ClientSubscribe.cxx src/ClientSubscribe.hxx \
+	src/ClientFile.cxx src/ClientFile.hxx \
+	src/Listen.cxx src/Listen.hxx \
+	src/Log.cxx src/Log.hxx \
+	src/ls.cxx \
+	src/SocketError.hxx \
+	src/io_error.h \
+	src/IOThread.cxx src/IOThread.hxx \
+	src/Main.cxx src/Main.hxx \
+	src/Win32Main.cxx \
+	src/GlobalEvents.cxx src/GlobalEvents.hxx \
 	src/daemon.c \
 	src/AudioCompress/compress.c \
-	src/buffer.c \
-	src/pipe.c \
-	src/chunk.c \
-	src/path.c \
-	src/mapper.c \
-	src/page.c \
-	src/permission.c \
-	src/player_thread.c \
-	src/player_control.c \
-	src/playlist.c \
-	src/playlist_global.c \
-	src/playlist_control.c \
-	src/playlist_edit.c \
-	src/playlist_print.c \
-	src/playlist_save.c \
-	src/playlist_mapper.c \
-	src/playlist_any.c \
-	src/playlist_song.c \
-	src/playlist_state.c \
-	src/playlist_queue.c \
-	src/playlist_vector.c \
-	src/playlist_database.c \
-	src/queue.c \
-	src/queue_print.c \
-	src/queue_save.c \
-	src/replay_gain_config.c \
-	src/replay_gain_info.c \
-	src/sig_handlers.c \
-	src/song.c \
-	src/song_update.c \
-	src/song_print.c \
-	src/song_save.c \
+	src/MusicBuffer.cxx src/MusicBuffer.hxx \
+	src/MusicPipe.cxx src/MusicPipe.hxx \
+	src/MusicChunk.cxx src/MusicChunk.hxx \
+	src/Mapper.cxx src/Mapper.hxx \
+	src/Page.cxx src/Page.hxx \
+	src/Partition.hxx \
+	src/Permission.cxx src/Permission.hxx \
+	src/PlayerThread.cxx src/PlayerThread.hxx \
+	src/PlayerControl.cxx src/PlayerControl.hxx \
+	src/Playlist.cxx \
+	src/PlaylistGlobal.cxx src/PlaylistGlobal.hxx \
+	src/PlaylistControl.cxx \
+	src/PlaylistEdit.cxx \
+	src/PlaylistPrint.cxx src/PlaylistPrint.hxx \
+	src/PlaylistSave.cxx src/PlaylistSave.hxx \
+	src/PlaylistMapper.cxx src/PlaylistMapper.hxx \
+	src/PlaylistAny.cxx src/PlaylistAny.hxx \
+	src/PlaylistSong.cxx src/PlaylistSong.hxx \
+	src/PlaylistState.cxx src/PlaylistState.hxx \
+	src/PlaylistQueue.cxx src/PlaylistQueue.hxx \
+	src/PlaylistVector.cxx src/PlaylistVector.hxx \
+	src/PlaylistInfo.hxx \
+	src/PlaylistDatabase.cxx \
+	src/IdTable.hxx \
+	src/Queue.cxx src/Queue.hxx \
+	src/QueuePrint.cxx src/QueuePrint.hxx \
+	src/QueueSave.cxx src/QueueSave.hxx \
+	src/ReplayGainConfig.cxx \
+	src/ReplayGainInfo.cxx \
+	src/SignalHandlers.cxx src/SignalHandlers.hxx \
+	src/Song.cxx \
+	src/SongUpdate.cxx \
+	src/SongPrint.cxx src/SongPrint.hxx \
+	src/SongSave.cxx src/SongSave.hxx \
 	src/resolver.c src/resolver.h \
-	src/socket_util.c \
-	src/state_file.c \
-	src/stats.c \
-	src/tag.c \
-	src/tag_pool.c \
-	src/tag_print.c \
-	src/tag_save.c \
+	src/SocketUtil.cxx src/SocketUtil.hxx \
+	src/StateFile.cxx src/StateFile.hxx \
+	src/Stats.cxx \
+	src/Tag.cxx \
+	src/TagNames.c \
+	src/TagPool.cxx src/TagPool.hxx \
+	src/TagPrint.cxx src/TagPrint.hxx \
+	src/TagSave.cxx src/TagSave.hxx \
 	src/tag_handler.c src/tag_handler.h \
-	src/tag_file.c src/tag_file.h \
+	src/TagFile.cxx src/TagFile.hxx \
 	src/tokenizer.c \
-	src/text_file.c \
+	src/TextFile.cxx src/TextFile.hxx \
 	src/text_input_stream.c \
-	src/strset.c \
 	src/uri.c \
 	src/utils.c \
 	src/string_util.c \
-	src/volume.c \
-	src/locate.c \
-	src/stored_playlist.c \
+	src/Volume.cxx src/Volume.hxx \
+	src/SongFilter.cxx src/SongFilter.hxx \
+	src/SongPointer.hxx \
+	src/PlaylistFile.cxx src/PlaylistFile.hxx \
 	src/timer.c
 
 #
@@ -371,51 +275,72 @@ endif
 
 if ENABLE_DESPOTIFY
 src_mpd_SOURCES += \
-	src/despotify_utils.c
+	src/DespotifyUtils.cxx src/DespotifyUtils.hxx
 endif
 
 if ENABLE_INOTIFY
 src_mpd_SOURCES += \
-	src/inotify_source.c \
-	src/inotify_queue.c \
-	src/inotify_update.c
+	src/InotifySource.cxx src/InotifySource.hxx \
+	src/InotifyQueue.cxx src/InotifyQueue.hxx \
+	src/InotifyUpdate.cxx src/InotifyUpdate.hxx
 endif
 
 if ENABLE_SQLITE
 src_mpd_SOURCES += \
-	src/sticker.c \
-	src/sticker_print.c \
-	src/song_sticker.c
+	src/StickerCommands.cxx src/StickerCommands.hxx \
+	src/StickerDatabase.cxx src/StickerDatabase.hxx \
+	src/StickerPrint.cxx src/StickerPrint.hxx \
+	src/SongSticker.cxx src/SongSticker.hxx
 endif
 
 # Generic utility library
 
 libutil_a_SOURCES = \
+	src/util/Manual.hxx \
+	src/util/RefCount.hxx \
+	src/util/fifo_buffer.c src/util/fifo_buffer.h \
+	src/util/growing_fifo.c src/util/growing_fifo.h \
+	src/util/LazyRandomEngine.cxx src/util/LazyRandomEngine.hxx \
+	src/util/SliceBuffer.hxx \
+	src/util/HugeAllocator.cxx src/util/HugeAllocator.hxx \
+	src/util/PeakBuffer.cxx src/util/PeakBuffer.hxx \
 	src/util/list.h \
 	src/util/list_sort.c src/util/list_sort.h \
 	src/util/byte_reverse.c src/util/byte_reverse.h \
 	src/util/bit_reverse.c src/util/bit_reverse.h
 
+# Event loop library
+
+libevent_a_SOURCES = \
+	src/event/WakeFD.cxx src/event/WakeFD.hxx \
+	src/event/TimeoutMonitor.hxx src/event/TimeoutMonitor.cxx \
+	src/event/SocketMonitor.cxx src/event/SocketMonitor.hxx \
+	src/event/BufferedSocket.cxx src/event/BufferedSocket.hxx \
+	src/event/FullyBufferedSocket.cxx src/event/FullyBufferedSocket.hxx \
+	src/event/MultiSocketMonitor.cxx src/event/MultiSocketMonitor.hxx \
+	src/event/ServerSocket.cxx src/event/ServerSocket.hxx \
+	src/event/Loop.hxx
+
 # PCM library
 
 libpcm_a_SOURCES = \
 	src/pcm_buffer.c src/pcm_buffer.h \
 	src/pcm_export.c src/pcm_export.h \
-	src/pcm_convert.c src/pcm_convert.h \
+	src/PcmConvert.cxx src/PcmConvert.hxx \
 	src/dsd2pcm/dsd2pcm.c src/dsd2pcm/dsd2pcm.h \
 	src/pcm_dsd.c src/pcm_dsd.h \
 	src/pcm_dsd_usb.c src/pcm_dsd_usb.h \
-	src/pcm_volume.c src/pcm_volume.h \
-	src/pcm_mix.c src/pcm_mix.h \
-	src/pcm_channels.c src/pcm_channels.h \
+	src/PcmVolume.cxx src/PcmVolume.hxx \
+	src/PcmMix.cxx src/PcmMix.hxx \
+	src/PcmChannels.cxx src/PcmChannels.hxx \
 	src/pcm_pack.c src/pcm_pack.h \
-	src/pcm_format.c src/pcm_format.h \
+	src/PcmFormat.cxx src/PcmFormat.hxx \
 	src/pcm_resample.c src/pcm_resample.h \
 	src/pcm_resample_fallback.c \
 	src/pcm_resample_internal.h \
-	src/pcm_dither.c src/pcm_dither.h \
-	src/pcm_prng.h \
-	src/pcm_utils.h
+	src/PcmDither.cxx src/PcmDither.hxx \
+	src/PcmPrng.hxx \
+	src/PcmUtils.hxx
 libpcm_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(SAMPLERATE_CFLAGS)
 
@@ -427,6 +352,29 @@ if HAVE_LIBSAMPLERATE
 libpcm_a_SOURCES += src/pcm_resample_libsamplerate.c
 endif
 
+# File system library
+
+libfs_a_SOURCES = \
+	src/fs/Path.cxx src/fs/Path.hxx \
+	src/fs/FileSystem.cxx src/fs/FileSystem.hxx \
+	src/fs/DirectoryReader.hxx
+
+# database plugins
+
+libdb_plugins_a_SOURCES = \
+	src/DatabaseRegistry.cxx src/DatabaseRegistry.hxx \
+	src/DatabaseHelpers.cxx src/DatabaseHelpers.hxx \
+	src/db/SimpleDatabasePlugin.cxx src/db/SimpleDatabasePlugin.hxx
+
+if HAVE_LIBMPDCLIENT
+libdb_plugins_a_SOURCES += \
+	src/db/ProxyDatabasePlugin.cxx src/db/ProxyDatabasePlugin.hxx
+endif
+
+DB_LIBS = \
+	libdb_plugins.a \
+	$(LIBMPDCLIENT_LIBS)
+
 # archive plugins
 
 if ENABLE_ARCHIVE
@@ -434,13 +382,15 @@ if ENABLE_ARCHIVE
 noinst_LIBRARIES += libarchive.a
 
 src_mpd_SOURCES +=  \
-	src/update_archive.c src/update_archive.h
+	src/UpdateArchive.cxx src/UpdateArchive.hxx
 
 libarchive_a_SOURCES = \
-	src/archive_api.c \
-	src/archive_list.c \
-	src/archive_plugin.c \
-	src/input/archive_input_plugin.c
+	src/ArchiveLookup.cxx src/ArchiveLookup.hxx \
+	src/ArchiveList.cxx src/ArchiveList.hxx \
+	src/ArchivePlugin.cxx src/ArchivePlugin.hxx \
+	src/ArchiveVisitor.hxx \
+	src/ArchiveFile.hxx \
+	src/input/ArchiveInputPlugin.cxx src/input/ArchiveInputPlugin.hxx
 libarchive_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(BZ2_CFLAGS) \
 	$(ISO9660_CFLAGS) \
@@ -453,21 +403,37 @@ ARCHIVE_LIBS = \
 	$(ZZIP_LIBS)
 
 if HAVE_BZ2
-libarchive_a_SOURCES += src/archive/bz2_archive_plugin.c
+libarchive_a_SOURCES += \
+	src/archive/Bzip2ArchivePlugin.cxx \
+	src/archive/Bzip2ArchivePlugin.hxx
 endif
 
 if HAVE_ZZIP
-libarchive_a_SOURCES += src/archive/zzip_archive_plugin.c
+libarchive_a_SOURCES += \
+	src/archive/ZzipArchivePlugin.cxx \
+	src/archive/ZzipArchivePlugin.hxx
 endif
 
 if HAVE_ISO9660
-libarchive_a_SOURCES += src/archive/iso9660_archive_plugin.c
+libarchive_a_SOURCES += \
+	src/archive/Iso9660ArchivePlugin.cxx \
+	src/archive/Iso9660ArchivePlugin.hxx
 endif
 
 else
 ARCHIVE_LIBS =
 endif
 
+# configuration library
+
+libconf_a_SOURCES = \
+	src/ConfigData.cxx src/ConfigData.hxx \
+	src/ConfigParser.cxx src/ConfigParser.hxx \
+	src/ConfigGlobal.cxx src/ConfigGlobal.hxx \
+	src/ConfigFile.cxx src/ConfigFile.hxx \
+	src/ConfigTemplates.cxx src/ConfigTemplates.hxx \
+	src/ConfigQuark.hxx \
+	src/ConfigOption.hxx
 
 # tag plugins
 
@@ -501,7 +467,7 @@ libdecoder_plugins_a_SOURCES = \
 	src/decoder/dsdlib.h \
 	src/decoder_buffer.c \
 	src/decoder_plugin.c \
-	src/decoder_list.c
+	src/DecoderList.cxx src/DecoderList.hxx
 libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
@@ -515,8 +481,10 @@ libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(WAVPACK_CFLAGS) \
 	$(MAD_CFLAGS) \
 	$(MPG123_CFLAGS) \
+	$(OPUS_CFLAGS) \
 	$(FFMPEG_CFLAGS) \
 	$(MPCDEC_CFLAGS) \
+	$(ADPLUG_CFLAGS) \
 	$(FAAD_CFLAGS)
 
 DECODER_LIBS = \
@@ -532,9 +500,10 @@ DECODER_LIBS = \
 	$(WAVPACK_LIBS) \
 	$(MAD_LIBS) \
 	$(MPG123_LIBS) \
-	$(MP4FF_LIBS) \
+	$(OPUS_LIBS) \
 	$(FFMPEG_LIBS) \
 	$(MPCDEC_LIBS) \
+	$(ADPLUG_LIBS) \
 	$(FAAD_LIBS)
 
 DECODER_SRC =
@@ -551,38 +520,57 @@ if HAVE_MPCDEC
 libdecoder_plugins_a_SOURCES += src/decoder/mpcdec_decoder_plugin.c
 endif
 
-if HAVE_WAVPACK
-libdecoder_plugins_a_SOURCES += src/decoder/wavpack_decoder_plugin.c
+if HAVE_OPUS
+libdecoder_plugins_a_SOURCES += \
+	src/decoder/OggUtil.cxx \
+	src/decoder/OggUtil.hxx \
+	src/decoder/OggFind.cxx src/decoder/OggFind.hxx \
+	src/decoder/OpusReader.hxx \
+	src/decoder/OpusHead.hxx \
+	src/decoder/OpusHead.cxx \
+	src/decoder/OpusTags.cxx \
+	src/decoder/OpusTags.hxx \
+	src/decoder/OpusDecoderPlugin.cxx \
+	src/decoder/OpusDecoderPlugin.h
 endif
 
-if HAVE_FAAD
-libdecoder_plugins_a_SOURCES += src/decoder/faad_decoder_plugin.c
+if HAVE_WAVPACK
+libdecoder_plugins_a_SOURCES += \
+	src/decoder/WavpackDecoderPlugin.cxx \
+	src/decoder/WavpackDecoderPlugin.hxx
 endif
 
-if HAVE_MP4
-libdecoder_plugins_a_SOURCES += src/decoder/mp4ff_decoder_plugin.c
+if HAVE_ADPLUG
+libdecoder_plugins_a_SOURCES += \
+	src/decoder/AdPlugDecoderPlugin.cxx \
+	src/decoder/AdPlugDecoderPlugin.h
 endif
 
-if HAVE_OGG_COMMON
-libdecoder_plugins_a_SOURCES += src/decoder/_ogg_common.c
+if HAVE_FAAD
+libdecoder_plugins_a_SOURCES += src/decoder/faad_decoder_plugin.c
 endif
 
-if HAVE_FLAC_COMMON
+if HAVE_XIPH
 libdecoder_plugins_a_SOURCES += \
-	src/decoder/flac_metadata.c \
-	src/decoder/flac_pcm.c \
-	src/decoder/_flac_common.c
+	src/decoder/XiphTags.c src/decoder/XiphTags.h \
+	src/decoder/OggCodec.cxx src/decoder/OggCodec.hxx
 endif
 
 if ENABLE_VORBIS_DECODER
 libdecoder_plugins_a_SOURCES += \
-	src/decoder/vorbis_comments.c \
-	src/decoder/vorbis_comments.h \
-	src/decoder/vorbis_decoder_plugin.c
+	src/decoder/VorbisComments.cxx src/decoder/VorbisComments.hxx \
+	src/decoder/VorbisDecoderPlugin.cxx src/decoder/VorbisDecoderPlugin.h
 endif
 
 if HAVE_FLAC
-libdecoder_plugins_a_SOURCES += src/decoder/flac_decoder_plugin.c
+libdecoder_plugins_a_SOURCES += \
+	src/decoder/FLACInput.cxx src/decoder/FLACInput.hxx \
+	src/decoder/FLACIOHandle.cxx src/decoder/FLACIOHandle.hxx \
+	src/decoder/FLACMetaData.cxx src/decoder/FLACMetaData.hxx \
+	src/decoder/FLAC_PCM.cxx src/decoder/FLAC_PCM.hxx \
+	src/decoder/FLACCommon.cxx src/decoder/FLACCommon.hxx \
+	src/decoder/FLACDecoderPlugin.cxx \
+	src/decoder/FLACDecoderPlugin.h
 endif
 
 if HAVE_AUDIOFILE
@@ -603,7 +591,6 @@ endif
 
 if ENABLE_SIDPLAY
 libdecoder_plugins_a_SOURCES += src/decoder/sidplay_decoder_plugin.cxx
-DECODER_SRC += src/dummy.cxx
 endif
 
 if ENABLE_FLUIDSYNTH
@@ -616,9 +603,10 @@ endif
 
 if HAVE_FFMPEG
 libdecoder_plugins_a_SOURCES += \
-	src/decoder/ffmpeg_metadata.c \
-	src/decoder/ffmpeg_metadata.h \
-	src/decoder/ffmpeg_decoder_plugin.c
+	src/decoder/FfmpegMetaData.cxx \
+	src/decoder/FfmpegMetaData.hxx \
+	src/decoder/FfmpegDecoderPlugin.cxx \
+	src/decoder/FfmpegDecoderPlugin.hxx
 endif
 
 if ENABLE_SNDFILE
@@ -639,6 +627,7 @@ libencoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(LAME_CFLAGS) \
 	$(TWOLAME_CFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
+	$(OPUS_CFLAGS) \
 	$(VORBISENC_CFLAGS)
 
 ENCODER_LIBS = \
@@ -646,19 +635,28 @@ ENCODER_LIBS = \
 	$(LAME_LIBS) \
 	$(TWOLAME_LIBS) \
 	$(FLAC_LIBS) \
+	$(OPUS_LIBS) \
 	$(VORBISENC_LIBS)
 
-libencoder_plugins_a_SOURCES =
-
-libencoder_plugins_a_SOURCES += src/encoder_list.c
-libencoder_plugins_a_SOURCES += src/encoder/null_encoder.c
+libencoder_plugins_a_SOURCES = \
+	src/encoder/OggStream.hxx \
+	src/encoder/null_encoder.c \
+	src/encoder_list.c
 
 if ENABLE_WAVE_ENCODER
 libencoder_plugins_a_SOURCES += src/encoder/wave_encoder.c
 endif
 
 if ENABLE_VORBIS_ENCODER
-libencoder_plugins_a_SOURCES += src/encoder/vorbis_encoder.c
+libencoder_plugins_a_SOURCES += \
+	src/encoder/VorbisEncoderPlugin.cxx \
+	src/encoder/VorbisEncoderPlugin.hxx
+endif
+
+if HAVE_OPUS
+libencoder_plugins_a_SOURCES += \
+	src/encoder/OpusEncoderPlugin.cxx \
+	src/encoder/OpusEncoderPlugin.hxx
 endif
 
 if ENABLE_LAME_ENCODER
@@ -679,14 +677,16 @@ endif
 
 
 if HAVE_ZEROCONF
-src_mpd_SOURCES += src/zeroconf.c
+src_mpd_SOURCES += \
+	src/ZeroconfInternal.hxx \
+	src/ZeroconfGlue.cxx src/ZeroconfGlue.hxx
 
 if HAVE_AVAHI
-src_mpd_SOURCES += src/zeroconf-avahi.c
+src_mpd_SOURCES += src/ZeroconfAvahi.cxx src/ZeroconfAvahi.hxx
 endif
 
 if HAVE_BONJOUR
-src_mpd_SOURCES += src/zeroconf-bonjour.c
+src_mpd_SOURCES += src/ZeroconfBonjour.cxx src/ZeroconfBonjour.hxx
 endif
 endif
 
@@ -695,12 +695,13 @@ endif
 #
 
 libinput_a_SOURCES = \
-	src/input_init.c \
-	src/input_registry.c \
-	src/input_stream.c \
-	src/input_internal.c src/input_internal.h \
-	src/input/rewind_input_plugin.c \
-	src/input/file_input_plugin.c
+	src/InputInit.cxx src/InputInit.hxx \
+	src/InputRegistry.cxx src/InputRegistry.hxx \
+	src/InputStream.cxx src/InputStream.hxx \
+	src/InputPlugin.hxx \
+	src/InputInternal.cxx src/InputInternal.hxx \
+	src/input/RewindInputPlugin.cxx src/input/RewindInputPlugin.hxx \
+	src/input/FileInputPlugin.cxx src/input/FileInputPlugin.hxx
 
 libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(CURL_CFLAGS) \
@@ -720,30 +721,36 @@ INPUT_LIBS = \
 	$(MMS_LIBS)
 
 if ENABLE_CURL
-libinput_a_SOURCES += src/input/curl_input_plugin.c \
-	src/icy_metadata.c
+libinput_a_SOURCES += \
+	src/input/CurlInputPlugin.cxx src/input/CurlInputPlugin.hxx \
+	src/IcyMetaDataParser.cxx src/IcyMetaDataParser.hxx
 endif
 
 if ENABLE_SOUP
 libinput_a_SOURCES += \
-	src/input/soup_input_plugin.c \
-	src/input/soup_input_plugin.h
+	src/input/SoupInputPlugin.cxx src/input/SoupInputPlugin.hxx
 endif
 
 if ENABLE_CDIO_PARANOIA
-libinput_a_SOURCES += src/input/cdio_paranoia_input_plugin.c
+libinput_a_SOURCES += \
+	src/input/CdioParanoiaInputPlugin.cxx \
+	src/input/CdioParanoiaInputPlugin.hxx
 endif
 
 if HAVE_FFMPEG
-libinput_a_SOURCES += src/input/ffmpeg_input_plugin.c
+libinput_a_SOURCES += \
+	src/input/FfmpegInputPlugin.cxx src/input/FfmpegInputPlugin.hxx
 endif
 
 if ENABLE_MMS
-libinput_a_SOURCES += src/input/mms_input_plugin.c
+libinput_a_SOURCES += \
+	src/input/MmsInputPlugin.cxx src/input/MmsInputPlugin.hxx
 endif
 
 if ENABLE_DESPOTIFY
-libinput_a_SOURCES += src/input/despotify_input_plugin.c
+libinput_a_SOURCES += \
+	src/input/DespotifyInputPlugin.cxx \
+	src/input/DespotifyInputPlugin.hxx
 endif
 
 
@@ -770,20 +777,21 @@ OUTPUT_LIBS = \
 	$(SHOUT_LIBS)
 
 OUTPUT_API_SRC = \
-	src/output_list.c \
-	src/output_all.c \
-	src/output_thread.c \
-	src/output_control.c \
-	src/output_state.c \
-	src/output_print.c \
-	src/output_command.c \
-	src/output_plugin.c src/output_plugin.h \
-	src/output_finish.c \
-	src/output_init.c
+	src/OutputList.cxx src/OutputList.hxx \
+	src/OutputAll.cxx src/OutputAll.hxx \
+	src/OutputThread.cxx src/OutputThread.hxx \
+	src/OutputError.hxx \
+	src/OutputControl.cxx src/OutputControl.hxx \
+	src/OutputState.cxx src/OutputState.hxx \
+	src/OutputPrint.cxx src/OutputPrint.hxx \
+	src/OutputCommand.cxx src/OutputCommand.hxx \
+	src/OutputPlugin.cxx src/output_plugin.h \
+	src/OutputFinish.cxx \
+	src/OutputInit.cxx
 
 liboutput_plugins_a_SOURCES = \
-	src/output/null_output_plugin.h \
-	src/output/null_output_plugin.c
+	src/output/NullOutputPlugin.cxx \
+	src/output/NullOutputPlugin.hxx
 
 MIXER_LIBS = \
 	libmixer_plugins.a \
@@ -792,25 +800,27 @@ MIXER_LIBS = \
 MIXER_API_SRC = \
 	src/mixer_control.c \
 	src/mixer_type.c \
-	src/mixer_all.c \
+	src/MixerAll.cxx src/MixerAll.hxx \
 	src/mixer_api.c
 
 libmixer_plugins_a_SOURCES = \
-	src/mixer/software_mixer_plugin.c
+	src/mixer/SoftwareMixerPlugin.cxx \
+	src/mixer/SoftwareMixerPlugin.hxx
 libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ALSA_CFLAGS) \
 	$(PULSE_CFLAGS)
 
 if HAVE_ALSA
 liboutput_plugins_a_SOURCES += \
-	src/output/alsa_output_plugin.c src/output/alsa_output_plugin.h
-libmixer_plugins_a_SOURCES += src/mixer/alsa_mixer_plugin.c
+	src/output/AlsaOutputPlugin.cxx \
+	src/output/AlsaOutputPlugin.hxx
+libmixer_plugins_a_SOURCES += src/mixer/AlsaMixerPlugin.cxx
 endif
 
 if HAVE_ROAR
 liboutput_plugins_a_SOURCES += \
-	src/output/roar_output_plugin.c src/output/roar_output_plugin.h
-libmixer_plugins_a_SOURCES += src/mixer/roar_mixer_plugin.c
+	src/output/RoarOutputPlugin.cxx src/output/RoarOutputPlugin.hxx
+libmixer_plugins_a_SOURCES += src/mixer/RoarMixerPlugin.cxx
 endif
 
 if ENABLE_FFADO_OUTPUT
@@ -845,8 +855,9 @@ endif
 
 if HAVE_OSS
 liboutput_plugins_a_SOURCES += \
-	src/output/oss_output_plugin.c src/output/oss_output_plugin.h
-libmixer_plugins_a_SOURCES += src/mixer/oss_mixer_plugin.c
+	src/output/OssOutputPlugin.cxx \
+	src/output/OssOutputPlugin.hxx
+libmixer_plugins_a_SOURCES += src/mixer/OssMixerPlugin.cxx
 endif
 
 if HAVE_OPENAL
@@ -856,13 +867,15 @@ endif
 
 if HAVE_OSX
 liboutput_plugins_a_SOURCES += \
-	src/output/osx_output_plugin.c src/output/osx_output_plugin.h
+	src/output/OSXOutputPlugin.cxx \
+	src/output/OSXOutputPlugin.hxx
 endif
 
 if HAVE_PULSE
 liboutput_plugins_a_SOURCES += \
 	src/output/pulse_output_plugin.c src/output/pulse_output_plugin.h
-libmixer_plugins_a_SOURCES += src/mixer/pulse_mixer_plugin.c
+libmixer_plugins_a_SOURCES += \
+	src/mixer/PulseMixerPlugin.cxx src/mixer/PulseMixerPlugin.h
 endif
 
 if HAVE_SHOUT
@@ -877,9 +890,10 @@ endif
 
 if ENABLE_HTTPD_OUTPUT
 liboutput_plugins_a_SOURCES += \
-	src/icy_server.c \
-	src/output/httpd_client.c \
-	src/output/httpd_output_plugin.c src/output/httpd_output_plugin.h
+	src/IcyMetaDataServer.cxx src/IcyMetaDataServer.hxx \
+	src/output/HttpdInternal.hxx \
+	src/output/HttpdClient.cxx src/output/HttpdClient.hxx \
+	src/output/HttpdOutputPlugin.cxx src/output/HttpdOutputPlugin.hxx
 endif
 
 if ENABLE_SOLARIS_OUTPUT
@@ -899,16 +913,26 @@ endif
 #
 
 libplaylist_plugins_a_SOURCES = \
-	src/playlist/extm3u_playlist_plugin.c \
-	src/playlist/m3u_playlist_plugin.c \
-	src/playlist/pls_playlist_plugin.c \
-	src/playlist/xspf_playlist_plugin.c \
-	src/playlist/asx_playlist_plugin.c \
-	src/playlist/rss_playlist_plugin.c \
-	src/playlist/cue_playlist_plugin.c \
-	src/playlist/embcue_playlist_plugin.c \
-	src/playlist/embcue_playlist_plugin.h \
-	src/playlist_list.c
+	src/PlaylistPlugin.hxx \
+	src/playlist/MemoryPlaylistProvider.cxx \
+	src/playlist/MemoryPlaylistProvider.hxx \
+	src/playlist/ExtM3uPlaylistPlugin.cxx \
+	src/playlist/ExtM3uPlaylistPlugin.hxx \
+	src/playlist/M3uPlaylistPlugin.cxx \
+	src/playlist/M3uPlaylistPlugin.hxx \
+	src/playlist/PlsPlaylistPlugin.cxx \
+	src/playlist/PlsPlaylistPlugin.hxx \
+	src/playlist/XspfPlaylistPlugin.cxx \
+	src/playlist/XspfPlaylistPlugin.hxx \
+	src/playlist/AsxPlaylistPlugin.cxx \
+	src/playlist/AsxPlaylistPlugin.hxx \
+	src/playlist/RssPlaylistPlugin.cxx \
+	src/playlist/RssPlaylistPlugin.hxx \
+	src/playlist/CuePlaylistPlugin.cxx \
+	src/playlist/CuePlaylistPlugin.hxx \
+	src/playlist/EmbeddedCuePlaylistPlugin.cxx \
+	src/playlist/EmbeddedCuePlaylistPlugin.hxx \
+	src/PlaylistRegistry.cxx src/PlaylistRegistry.hxx
 libplaylist_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(YAJL_CFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS))
@@ -918,17 +942,21 @@ PLAYLIST_LIBS = \
 	$(FLAC_LIBS)
 
 if ENABLE_LASTFM
-libplaylist_plugins_a_SOURCES += src/playlist/lastfm_playlist_plugin.c
+libplaylist_plugins_a_SOURCES += \
+	src/playlist/LastFMPlaylistPlugin.cxx \
+	src/playlist/LastFMPlaylistPlugin.hxx
 endif
 
 if ENABLE_DESPOTIFY
-libplaylist_plugins_a_SOURCES += src/playlist/despotify_playlist_plugin.c
+libplaylist_plugins_a_SOURCES += \
+	src/playlist/DespotifyPlaylistPlugin.cxx \
+	src/playlist/DespotifyPlaylistPlugin.hxx
 endif
 
 if ENABLE_SOUNDCLOUD
 libplaylist_plugins_a_SOURCES += \
-	src/playlist/soundcloud_playlist_plugin.h \
-	src/playlist/soundcloud_playlist_plugin.c
+	src/playlist/SoundCloudPlaylistPlugin.cxx \
+	src/playlist/SoundCloudPlaylistPlugin.hxx
 PLAYLIST_LIBS += $(YAJL_LIBS)
 endif
 
@@ -937,14 +965,19 @@ endif
 #
 
 libfilter_plugins_a_SOURCES = \
-	src/filter/null_filter_plugin.c \
-	src/filter/chain_filter_plugin.c \
-	src/filter/autoconvert_filter_plugin.c \
-	src/filter/convert_filter_plugin.c \
-	src/filter/route_filter_plugin.c \
-	src/filter/normalize_filter_plugin.c \
-	src/filter/replay_gain_filter_plugin.c \
-	src/filter/volume_filter_plugin.c
+	src/filter/NullFilterPlugin.cxx \
+	src/filter/ChainFilterPlugin.cxx \
+	src/filter/ChainFilterPlugin.hxx \
+	src/filter/AutoConvertFilterPlugin.cxx \
+	src/filter/AutoConvertFilterPlugin.hxx \
+	src/filter/ConvertFilterPlugin.cxx \
+	src/filter/ConvertFilterPlugin.hxx \
+	src/filter/RouteFilterPlugin.cxx \
+	src/filter/NormalizeFilterPlugin.cxx \
+	src/filter/ReplayGainFilterPlugin.cxx \
+	src/filter/ReplayGainFilterPlugin.hxx \
+	src/filter/VolumeFilterPlugin.cxx \
+	src/filter/VolumeFilterPlugin.hxx
 
 FILTER_LIBS = \
 	libfilter_plugins.a \
@@ -998,6 +1031,7 @@ noinst_PROGRAMS = \
 	$(C_TESTS) \
 	test/read_conf \
 	test/run_resolver \
+	test/DumpDatabase \
 	test/run_input \
 	test/dump_text_file \
 	test/dump_playlist \
@@ -1009,6 +1043,10 @@ noinst_PROGRAMS = \
 	test/run_normalize \
 	test/software_volume
 
+if ENABLE_ARCHIVE
+noinst_PROGRAMS += test/visit_archive
+endif
+
 if HAVE_ID3TAG
 noinst_PROGRAMS += test/dump_rva2
 endif
@@ -1019,36 +1057,88 @@ noinst_PROGRAMS += test/read_mixer
 endif
 
 test_read_conf_LDADD = \
+	libconf.a \
+	libfs.a \
 	$(GLIB_LIBS)
-test_read_conf_SOURCES = test/read_conf.c \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c
+test_read_conf_SOURCES = test/read_conf.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c
 
 test_run_resolver_LDADD = \
 	$(GLIB_LIBS)
 test_run_resolver_SOURCES = test/run_resolver.c \
 	src/resolver.c
 
+test_DumpDatabase_LDADD = \
+	$(DB_LIBS) \
+	libconf.a \
+	libutil.a \
+	libfs.a \
+	$(GLIB_LIBS)
+test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
+	src/DatabaseRegistry.cxx \
+	src/DatabaseSelection.cxx \
+	src/Directory.cxx src/DirectorySave.cxx \
+	src/PlaylistVector.cxx src/PlaylistDatabase.cxx \
+	src/DatabaseLock.cxx src/DatabaseSave.cxx \
+	src/Song.cxx src/song_sort.c src/SongSave.cxx \
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
+	src/SongFilter.cxx \
+	src/TextFile.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c
+
 test_run_input_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
 	$(GLIB_LIBS)
-test_run_input_SOURCES = test/run_input.c \
+test_run_input_SOURCES = test/run_input.cxx \
 	test/stdbin.h \
-	src/io_thread.c src/io_thread.h \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c\
-	src/tag.c src/tag_pool.c src/tag_save.c \
+	src/IOThread.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c\
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
+	src/uri.c \
 	src/fd_util.c
 
+if ENABLE_ARCHIVE
+
+test_visit_archive_LDADD = \
+	$(INPUT_LIBS) \
+	$(ARCHIVE_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
+	$(GLIB_LIBS)
+test_visit_archive_SOURCES = test/visit_archive.cxx \
+	src/IOThread.cxx \
+	src/InputStream.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c \
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
+	src/uri.c \
+	src/fd_util.c
+
+if ENABLE_DESPOTIFY
+test_visit_archive_SOURCES += src/DespotifyUtils.cxx
+endif
+
+endif
+
 test_dump_text_file_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
+	libutil.a \
 	$(GLIB_LIBS)
-test_dump_text_file_SOURCES = test/dump_text_file.c \
+test_dump_text_file_SOURCES = test/dump_text_file.cxx \
 	test/stdbin.h \
-	src/io_thread.c src/io_thread.h \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c\
-	src/tag.c src/tag_pool.c \
-	src/text_input_stream.c src/fifo_buffer.c \
+	src/IOThread.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c\
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
+	src/text_input_stream.c \
+	src/uri.c \
 	src/fd_util.c
 
 test_dump_playlist_LDADD = \
@@ -1058,24 +1148,27 @@ test_dump_playlist_LDADD = \
 	$(ARCHIVE_LIBS) \
 	$(DECODER_LIBS) \
 	$(TAG_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
 	libutil.a \
 	$(GLIB_LIBS)
-test_dump_playlist_SOURCES = test/dump_playlist.c \
+test_dump_playlist_SOURCES = test/dump_playlist.cxx \
 	$(DECODER_SRC) \
-	src/io_thread.c src/io_thread.h \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c\
+	src/IOThread.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c\
 	src/uri.c \
-	src/song.c src/tag.c src/tag_pool.c src/tag_save.c \
-	src/tag_handler.c src/tag_file.c \
+	src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
+	src/tag_handler.c src/TagFile.cxx \
 	src/audio_check.c src/pcm_buffer.c \
-	src/text_input_stream.c src/fifo_buffer.c \
+	src/text_input_stream.c \
 	src/cue/cue_parser.c src/cue/cue_parser.h \
 	src/fd_util.c
 
 if HAVE_FLAC
 test_dump_playlist_SOURCES += \
-	src/replay_gain_info.c \
-	src/decoder/flac_metadata.c
+	src/ReplayGainInfo.cxx \
+	src/decoder/FLACMetaData.cxx
 endif
 
 test_run_decoder_LDADD = \
@@ -1084,14 +1177,17 @@ test_run_decoder_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
 	$(TAG_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
 	libutil.a \
 	$(GLIB_LIBS)
-test_run_decoder_SOURCES = test/run_decoder.c \
+test_run_decoder_SOURCES = test/run_decoder.cxx \
 	test/stdbin.h \
-	src/io_thread.c src/io_thread.h \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
-	src/tag.c src/tag_pool.c src/tag_handler.c \
-	src/replay_gain_info.c \
+	src/IOThread.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c \
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
+	src/ReplayGainInfo.cxx \
 	src/uri.c \
 	src/fd_util.c \
 	src/audio_check.c \
@@ -1107,13 +1203,16 @@ test_read_tags_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
 	$(TAG_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
 	libutil.a \
 	$(GLIB_LIBS)
-test_read_tags_SOURCES = test/read_tags.c \
-	src/io_thread.c src/io_thread.h \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
-	src/tag.c src/tag_pool.c src/tag_handler.c \
-	src/replay_gain_info.c \
+test_read_tags_SOURCES = test/read_tags.cxx \
+	src/IOThread.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c \
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
+	src/ReplayGainInfo.cxx \
 	src/uri.c \
 	src/fd_util.c \
 	src/audio_check.c \
@@ -1132,93 +1231,89 @@ endif
 
 test_run_filter_LDADD = \
 	$(FILTER_LIBS) \
+	libconf.a \
+	libfs.a \
 	$(GLIB_LIBS)
-test_run_filter_SOURCES = test/run_filter.c \
+test_run_filter_SOURCES = test/run_filter.cxx \
+	test/FakeReplayGainConfig.cxx \
 	test/stdbin.h \
-	src/filter_plugin.c \
-	src/filter_registry.c \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
+	src/FilterPlugin.cxx src/FilterRegistry.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c \
 	src/audio_check.c \
 	src/audio_format.c \
-	src/audio_parser.c \
-	src/replay_gain_config.c \
-	src/replay_gain_info.c \
+	src/AudioParser.cxx \
+	src/ReplayGainInfo.cxx \
 	src/AudioCompress/compress.c
 
 if ENABLE_DESPOTIFY
-test_read_tags_SOURCES += \
-	src/despotify_utils.c
-test_run_input_SOURCES += \
-	src/despotify_utils.c
-test_dump_text_file_SOURCES += \
-	src/despotify_utils.c
-test_dump_playlist_SOURCES += \
-	src/despotify_utils.c
-test_run_decoder_SOURCES += \
-	src/despotify_utils.c
+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
 endif
 
 if ENABLE_ENCODER
 noinst_PROGRAMS += test/run_encoder
-test_run_encoder_SOURCES = test/run_encoder.c \
+test_run_encoder_SOURCES = test/run_encoder.cxx \
 	test/stdbin.h \
-	src/fifo_buffer.c src/growing_fifo.c \
-	src/conf.c src/tokenizer.c \
-	src/utils.c src/string_util.c \
-	src/tag.c src/tag_pool.c \
+	src/tokenizer.c src/utils.c src/string_util.c \
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
 	src/audio_check.c \
 	src/audio_format.c \
-	src/audio_parser.c
+	src/AudioParser.cxx
 test_run_encoder_LDADD = \
 	$(ENCODER_LIBS) \
-	libpcm.a \
 	$(TAG_LIBS) \
+	libconf.a \
+	libpcm.a \
+	libfs.a \
+	libutil.a \
 	$(GLIB_LIBS)
 endif
 
 if ENABLE_VORBIS_ENCODER
 noinst_PROGRAMS += test/test_vorbis_encoder
-test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.c \
+test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \
 	test/stdbin.h \
-	src/conf.c src/tokenizer.c \
-	src/utils.c \
-	src/string_util.c \
-	src/tag.c src/tag_pool.c \
+	src/tokenizer.c src/utils.c src/string_util.c \
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
 	src/audio_check.c \
 	src/audio_format.c \
-	src/audio_parser.c \
+	src/AudioParser.cxx \
 	src/pcm_buffer.c \
-	src/fifo_buffer.c src/growing_fifo.c \
 	$(ENCODER_SRC)
 test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS)
 test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
 	$(ENCODER_LIBS) \
+	libconf.a \
+	libfs.a \
+	libutil.a \
 	$(GLIB_LIBS)
 endif
 
-test_software_volume_SOURCES = test/software_volume.c \
+test_software_volume_SOURCES = test/software_volume.cxx \
 	test/stdbin.h \
 	src/audio_check.c \
-	src/audio_parser.c
+	src/AudioParser.cxx
 test_software_volume_LDADD = \
 	$(PCM_LIBS) \
 	$(GLIB_LIBS)
 
-test_run_normalize_SOURCES = test/run_normalize.c \
+test_run_normalize_SOURCES = test/run_normalize.cxx \
 	test/stdbin.h \
 	src/audio_check.c \
-	src/audio_parser.c \
+	src/AudioParser.cxx \
 	src/AudioCompress/compress.c
 test_run_normalize_LDADD = \
 	$(GLIB_LIBS)
 
-test_run_convert_SOURCES = test/run_convert.c \
+test_run_convert_SOURCES = test/run_convert.cxx \
 	src/dsd2pcm/dsd2pcm.c \
-	src/fifo_buffer.c \
 	src/audio_format.c \
 	src/audio_check.c \
-	src/audio_parser.c
+	src/AudioParser.cxx
 test_run_convert_LDADD = \
 	$(PCM_LIBS) \
 	libutil.a \
@@ -1229,44 +1324,48 @@ test_run_output_LDADD = $(MPD_LIBS) \
 	$(ENCODER_LIBS) \
 	libmixer_plugins.a \
 	$(FILTER_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
 	libutil.a \
 	$(GLIB_LIBS)
-test_run_output_SOURCES = test/run_output.c \
+test_run_output_SOURCES = test/run_output.cxx \
+	test/FakeReplayGainConfig.cxx \
 	test/stdbin.h \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
-	src/io_thread.c src/io_thread.h \
+	src/tokenizer.c src/utils.c src/string_util.c \
+	src/IOThread.cxx \
 	src/audio_check.c \
 	src/audio_format.c \
-	src/audio_parser.c \
+	src/AudioParser.cxx \
 	src/timer.c src/clock.c \
-	src/tag.c src/tag_pool.c \
-	src/fifo_buffer.c src/growing_fifo.c \
-	src/page.c \
-	src/socket_util.c \
+	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
+	src/Page.cxx \
+	src/SocketUtil.cxx \
 	src/resolver.c \
-	src/output_init.c src/output_finish.c src/output_list.c \
-	src/output_plugin.c \
+	src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \
+	src/OutputPlugin.cxx \
 	src/mixer_api.c \
 	src/mixer_control.c \
 	src/mixer_type.c \
-	src/filter_plugin.c \
-	src/filter_config.c \
+	src/FilterPlugin.cxx \
+	src/FilterConfig.cxx \
 	src/AudioCompress/compress.c \
-	src/replay_gain_info.c \
-	src/replay_gain_config.c \
-	src/fd_util.c \
-	src/server_socket.c
+	src/ReplayGainInfo.cxx \
+	src/fd_util.c
 
 test_read_mixer_LDADD = \
 	libpcm.a \
 	libmixer_plugins.a \
 	$(OUTPUT_LIBS) \
+	libconf.a \
+	libevent.a \
+	libfs.a \
 	$(GLIB_LIBS)
-test_read_mixer_SOURCES = test/read_mixer.c \
-	src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
+test_read_mixer_SOURCES = test/read_mixer.cxx \
+	src/tokenizer.c src/utils.c src/string_util.c \
 	src/mixer_control.c src/mixer_api.c \
-	src/filter_plugin.c \
-	src/filter/volume_filter_plugin.c \
+	src/FilterPlugin.cxx \
+	src/filter/VolumeFilterPlugin.cxx \
 	src/fd_util.c
 
 if ENABLE_BZIP2_TEST
@@ -1283,11 +1382,13 @@ endif
 
 if ENABLE_INOTIFY
 noinst_PROGRAMS += test/run_inotify
-test_run_inotify_SOURCES = test/run_inotify.c \
+test_run_inotify_SOURCES = test/run_inotify.cxx \
 	src/fd_util.c \
-	src/fifo_buffer.c \
-	src/inotify_source.c
-test_run_inotify_LDADD = $(GLIB_LIBS)
+	src/InotifySource.cxx
+test_run_inotify_LDADD = \
+	libevent.a \
+	libutil.a \
+	$(GLIB_LIBS)
 endif
 
 test_test_byte_reverse_SOURCES = \
@@ -1297,24 +1398,28 @@ test_test_byte_reverse_LDADD = \
 	$(GLIB_LIBS)
 
 test_test_pcm_SOURCES = \
-	test/test_pcm_dither.c \
-	test/test_pcm_pack.c \
-	test/test_pcm_channels.c \
-	test/test_pcm_volume.c \
-	test/test_pcm_all.h \
-	test/test_pcm_main.c
+	test/test_pcm_util.hxx \
+	test/test_pcm_dither.cxx \
+	test/test_pcm_pack.cxx \
+	test/test_pcm_channels.cxx \
+	test/test_pcm_format.cxx \
+	test/test_pcm_volume.cxx \
+	test/test_pcm_mix.cxx \
+	test/test_pcm_all.hxx \
+	test/test_pcm_main.cxx
 test_test_pcm_LDADD = \
 	$(PCM_LIBS) \
 	libutil.a \
 	$(GLIB_LIBS)
 
 test_test_queue_priority_SOURCES = \
-	src/queue.c \
-	test/test_queue_priority.c
+	src/Queue.cxx \
+	src/fd_util.c \
+	test/test_queue_priority.cxx
 test_test_queue_priority_LDADD = \
+	libutil.a \
 	$(GLIB_LIBS)
 
-if HAVE_CXX
 noinst_PROGRAMS += src/dsd2pcm/dsd2pcm
 
 src_dsd2pcm_dsd2pcm_SOURCES = \
@@ -1322,7 +1427,6 @@ src_dsd2pcm_dsd2pcm_SOURCES = \
 	src/dsd2pcm/noiseshape.c src/dsd2pcm/noiseshape.h \
 	src/dsd2pcm/main.cpp
 src_dsd2pcm_dsd2pcm_LDADD = libutil.a
-endif
 
 endif