diff --git a/http/http_ffmpeg.c b/http/http_ffmpeg.c
index 4cf8a72..8c7a895 100644
--- a/http/http_ffmpeg.c
+++ b/http/http_ffmpeg.c
@@ -7,7 +7,7 @@
 #include "device/buffer_lock.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "ffmpeg/remuxer.h"
+#include "util/ffmpeg/remuxer.h"
 
 buffer_lock_t *http_h264_buffer_for_res(http_worker_t *worker);
 
diff --git a/ffmpeg/remuxer.c b/util/ffmpeg/remuxer.c
similarity index 99%
rename from ffmpeg/remuxer.c
rename to util/ffmpeg/remuxer.c
index 3cc0f0c..fb1b141 100644
--- a/ffmpeg/remuxer.c
+++ b/util/ffmpeg/remuxer.c
@@ -1,4 +1,4 @@
-#include "ffmpeg/remuxer.h"
+#include "remuxer.h"
 #include "util/opts/log.h"
 
 #include <inttypes.h>
diff --git a/ffmpeg/remuxer.h b/util/ffmpeg/remuxer.h
similarity index 100%
rename from ffmpeg/remuxer.h
rename to util/ffmpeg/remuxer.h