diff --git a/device/hw/buffer.c b/device/hw/buffer.c
index 1f2a559..a880510 100644
--- a/device/hw/buffer.c
+++ b/device/hw/buffer.c
@@ -1,6 +1,7 @@
 #include "device/hw/buffer.h"
 #include "device/hw/buffer_list.h"
 #include "device/hw/device.h"
+#include "device/hw/v4l2.h"
 
 buffer_t *buffer_open(const char *name, buffer_list_t *buf_list, int index) {
   buffer_t *buf = calloc(1, sizeof(buffer_t));
diff --git a/device/hw/buffer.h b/device/hw/buffer.h
index c4e4f8c..9b40d6f 100644
--- a/device/hw/buffer.h
+++ b/device/hw/buffer.h
@@ -21,7 +21,7 @@ typedef struct buffer_s {
   int dma_fd;
 
   int mmap_reflinks;
-  buffer_list_t *mmap_source;
+  buffer_t *mmap_source;
   bool enqueued;
   uint64_t enqueue_time_us;
 } buffer_t;
diff --git a/device/hw/buffer_list.c b/device/hw/buffer_list.c
index aeee865..2f97deb 100644
--- a/device/hw/buffer_list.c
+++ b/device/hw/buffer_list.c
@@ -1,6 +1,7 @@
 #include "device/hw/buffer.h"
 #include "device/hw/buffer_list.h"
 #include "device/hw/device.h"
+#include "device/hw/v4l2.h"
 
 buffer_list_t *buffer_list_open(const char *name, struct device_s *dev, unsigned type, bool do_mmap)
 {
diff --git a/device/hw/buffer_lock.c b/device/hw/buffer_lock.c
index 66273f9..b13af9f 100644
--- a/device/hw/buffer_lock.c
+++ b/device/hw/buffer_lock.c
@@ -1,5 +1,7 @@
 #include "device/hw/buffer_lock.h"
 #include "device/hw/buffer_list.h"
+#include "device/hw/buffer.h"
+#include "device/hw/v4l2.h"
 
 bool buffer_lock_is_used(buffer_lock_t *buf_lock)
 {
diff --git a/device/hw/buffer_queue.c b/device/hw/buffer_queue.c
index e634f3a..6429e47 100644
--- a/device/hw/buffer_queue.c
+++ b/device/hw/buffer_queue.c
@@ -1,7 +1,7 @@
 #include "device/hw/buffer.h"
 #include "device/hw/buffer_list.h"
 #include "device/hw/device.h"
-
+#include "device/hw/v4l2.h"
 #include <pthread.h>
 
 pthread_mutex_t buffer_lock = PTHREAD_MUTEX_INITIALIZER;
diff --git a/device/hw/device.c b/device/hw/device.c
index fd3bafa..5ebe905 100644
--- a/device/hw/device.c
+++ b/device/hw/device.c
@@ -1,6 +1,7 @@
 #include "device/hw/device.h"
 #include "device/hw/buffer.h"
 #include "device/hw/buffer_list.h"
+#include "device/hw/v4l2.h"
 
 device_t *device_open(const char *name, const char *path) {
   device_t *dev = calloc(1, sizeof(device_t));
diff --git a/device/hw/device_media.c b/device/hw/device_media.c
index fc8d99e..06b938a 100644
--- a/device/hw/device_media.c
+++ b/device/hw/device_media.c
@@ -1,4 +1,5 @@
 #include "device/hw/device.h"
+#include "device/hw/v4l2.h"
 
 #include <unistd.h>
 #include <dirent.h>
diff --git a/device/hw/device_options.c b/device/hw/device_options.c
index d13927d..e9c5211 100644
--- a/device/hw/device_options.c
+++ b/device/hw/device_options.c
@@ -1,4 +1,5 @@
 #include "device/hw/device.h"
+#include "device/hw/v4l2.h"
 #include "opts/opts.h"
 
 #include <ctype.h>
diff --git a/device/hw/links.c b/device/hw/links.c
index 5e4b578..389131c 100644
--- a/device/hw/links.c
+++ b/device/hw/links.c
@@ -2,6 +2,7 @@
 #include "device/hw/device.h"
 #include "device/hw/buffer.h"
 #include "device/hw/buffer_list.h"
+#include "device/hw/v4l2.h"
 
 #define N_FDS 50
 #define QUEUE_ON_CAPTURE // seems to provide better latency
diff --git a/http/http_ffmpeg.c b/http/http_ffmpeg.c
index d1608d6..83d4a8d 100644
--- a/http/http_ffmpeg.c
+++ b/http/http_ffmpeg.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "opts/log.h"
 #include "http/http.h"
 #include "device/hw/buffer.h"
 #include "device/hw/buffer_lock.h"
diff --git a/http/http_h264.c b/http/http_h264.c
index 66d41b4..e0f1ae8 100644
--- a/http/http_h264.c
+++ b/http/http_h264.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "opts/log.h"
 #include "http/http.h"
 #include "device/hw/buffer.h"
 #include "device/hw/buffer_lock.h"