diff --git a/src/ustreamer/stream.c b/src/ustreamer/stream.c
index 5cd14b1..19f843e 100644
--- a/src/ustreamer/stream.c
+++ b/src/ustreamer/stream.c
@@ -22,6 +22,33 @@
 
 #include "stream.h"
 
+#include <stdlib.h>
+#include <stdatomic.h>
+#include <unistd.h>
+#include <errno.h>
+#include <assert.h>
+
+#include <pthread.h>
+
+#include "../libs/types.h"
+#include "../libs/tools.h"
+#include "../libs/threading.h"
+#include "../libs/process.h"
+#include "../libs/logging.h"
+#include "../libs/ring.h"
+#include "../libs/frame.h"
+#include "../libs/memsink.h"
+#include "../libs/device.h"
+
+#include "blank.h"
+#include "encoder.h"
+#include "workers.h"
+#include "h264.h"
+#ifdef WITH_GPIO
+#	include "gpio/gpio.h"
+#endif
+
+
 
 static bool _stream_is_stopped(us_stream_s *stream);
 static bool _stream_has_any_clients(us_stream_s *stream);
diff --git a/src/ustreamer/stream.h b/src/ustreamer/stream.h
index e39bff2..0c23c9a 100644
--- a/src/ustreamer/stream.h
+++ b/src/ustreamer/stream.h
@@ -22,32 +22,16 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include <stdbool.h>
 #include <stdatomic.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
 
-#include <pthread.h>
-#include <linux/videodev2.h>
-
-#include "../libs/tools.h"
-#include "../libs/threading.h"
-#include "../libs/process.h"
-#include "../libs/logging.h"
+#include "../libs/types.h"
 #include "../libs/ring.h"
-#include "../libs/frame.h"
 #include "../libs/memsink.h"
 #include "../libs/device.h"
 
 #include "blank.h"
 #include "encoder.h"
-#include "workers.h"
 #include "h264.h"
-#ifdef WITH_GPIO
-#	include "gpio/gpio.h"
-#endif
 
 
 typedef struct {