13 files changed, 12 insertions, 12 deletions
diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx
index 6ece4d5c9..77eb33c8e 100644
--- a/src/ClientNew.cxx
+++ b/src/ClientNew.cxx
@@ -22,7 +22,7 @@
 #include "ClientList.hxx"
 #include "Partition.hxx"
 #include "fd_util.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 extern "C" {
 #include "resolver.h"
 }
diff --git a/src/ClientRead.cxx b/src/ClientRead.cxx
index e84f6622d..7e85c3a99 100644
--- a/src/ClientRead.cxx
+++ b/src/ClientRead.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ClientInternal.hxx"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/InotifySource.cxx b/src/InotifySource.cxx
index 5f6239585..37c96536f 100644
--- a/src/InotifySource.cxx
+++ b/src/InotifySource.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "InotifySource.hxx"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 #include "fd_util.h"
 #include "mpd_error.h"
 
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c
index 6b09bcd66..db6503fb0 100644
--- a/src/encoder/flac_encoder.c
+++ b/src/encoder/flac_encoder.c
@@ -22,8 +22,8 @@
 #include "encoder_plugin.h"
 #include "audio_format.h"
 #include "pcm_buffer.h"
-#include "fifo_buffer.h"
-#include "growing_fifo.h"
+#include "util/fifo_buffer.h"
+#include "util/growing_fifo.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/encoder/null_encoder.c b/src/encoder/null_encoder.c
index 48cdf139b..fa1a0a034 100644
--- a/src/encoder/null_encoder.c
+++ b/src/encoder/null_encoder.c
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
-#include "fifo_buffer.h"
-#include "growing_fifo.h"
+#include "util/fifo_buffer.h"
+#include "util/growing_fifo.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/encoder/wave_encoder.c b/src/encoder/wave_encoder.c
index 9eeb4d513..a6ee512d4 100644
--- a/src/encoder/wave_encoder.c
+++ b/src/encoder/wave_encoder.c
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
-#include "fifo_buffer.h"
-#include "growing_fifo.h"
+#include "util/fifo_buffer.h"
+#include "util/growing_fifo.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/output/httpd_client.c b/src/output/httpd_client.c
index 72de90457..781858109 100644
--- a/src/output/httpd_client.c
+++ b/src/output/httpd_client.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "httpd_client.h"
 #include "httpd_internal.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 #include "page.h"
 #include "icy_server.h"
 #include "glib_socket.h"
diff --git a/src/output/osx_output_plugin.c b/src/output/osx_output_plugin.c
index cd51fca20..7b42589f7 100644
--- a/src/output/osx_output_plugin.c
+++ b/src/output/osx_output_plugin.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "osx_output_plugin.h"
 #include "output_api.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 
 #include <glib.h>
 #include <CoreAudio/AudioHardware.h>
diff --git a/src/text_input_stream.c b/src/text_input_stream.c
index 4a858fc85..4a2eeb817 100644
--- a/src/text_input_stream.c
+++ b/src/text_input_stream.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "text_input_stream.h"
 #include "input_stream.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 
 #include <glib.h>
 
diff --git a/src/fifo_buffer.c b/src/util/fifo_buffer.c
index 915fb0579..915fb0579 100644
--- a/src/fifo_buffer.c
+++ b/src/util/fifo_buffer.c
diff --git a/src/fifo_buffer.h b/src/util/fifo_buffer.h
index 49c7f4992..49c7f4992 100644
--- a/src/fifo_buffer.h
+++ b/src/util/fifo_buffer.h
diff --git a/src/growing_fifo.c b/src/util/growing_fifo.c
index 88431f60e..88431f60e 100644
--- a/src/growing_fifo.c
+++ b/src/util/growing_fifo.c
diff --git a/src/growing_fifo.h b/src/util/growing_fifo.h
index 723c3b3ff..723c3b3ff 100644
--- a/src/growing_fifo.h
+++ b/src/util/growing_fifo.h