diff --git a/src/device.c b/src/device.c
index 02e9975..a549c89 100644
--- a/src/device.c
+++ b/src/device.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "device.h"
+
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdbool.h>
@@ -37,7 +39,6 @@
 #include "tools.h"
 #include "logging.h"
 #include "xioctl.h"
-#include "device.h"
 
 
 static const struct {
diff --git a/src/encoder.c b/src/encoder.c
index 4b552c9..f1a8aee 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "encoder.h"
+
 #include <stdbool.h>
 #include <strings.h>
 #include <assert.h>
@@ -29,7 +31,6 @@
 #include "tools.h"
 #include "logging.h"
 #include "device.h"
-#include "encoder.h"
 
 #include "encoders/cpu/encoder.h"
 #include "encoders/hw/encoder.h"
diff --git a/src/encoders/cpu/encoder.c b/src/encoders/cpu/encoder.c
index de8ae36..ce71ffd 100644
--- a/src/encoders/cpu/encoder.c
+++ b/src/encoders/cpu/encoder.c
@@ -25,6 +25,8 @@
 *****************************************************************************/
 
 
+#include "encoder.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,8 +38,6 @@
 #include "../../tools.h"
 #include "../../device.h"
 
-#include "encoder.h"
-
 
 struct _jpeg_dest_manager_t {
 	struct				jpeg_destination_mgr mgr; // Default manager
diff --git a/src/encoders/hw/encoder.c b/src/encoders/hw/encoder.c
index 9ab6f2e..dc4fbee 100644
--- a/src/encoders/hw/encoder.c
+++ b/src/encoders/hw/encoder.c
@@ -25,6 +25,8 @@
 *****************************************************************************/
 
 
+#include "encoder.h"
+
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
@@ -37,7 +39,6 @@
 #include "../../device.h"
 
 #include "huffman.h"
-#include "encoder.h"
 
 
 static bool _is_huffman(const unsigned char *data);
diff --git a/src/encoders/omx/component.c b/src/encoders/omx/component.c
index e77014f..458c301 100644
--- a/src/encoders/omx/component.c
+++ b/src/encoders/omx/component.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "component.h"
+
 #include <unistd.h>
 
 #include <IL/OMX_Core.h>
@@ -28,7 +30,6 @@
 #include "../../logging.h"
 
 #include "formatters.h"
-#include "component.h"
 
 
 static int _component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port, OMX_BOOL enabled);
diff --git a/src/encoders/omx/encoder.c b/src/encoders/omx/encoder.c
index 7633138..fa93b50 100644
--- a/src/encoders/omx/encoder.c
+++ b/src/encoders/omx/encoder.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "encoder.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -39,7 +41,6 @@
 
 #include "formatters.h"
 #include "component.h"
-#include "encoder.h"
 
 
 static const OMX_U32 _INPUT_PORT = 340;
diff --git a/src/encoders/omx/formatters.c b/src/encoders/omx/formatters.c
index cc06e4f..b16f3d6 100644
--- a/src/encoders/omx/formatters.c
+++ b/src/encoders/omx/formatters.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "formatters.h"
+
 #include <stdio.h>
 #include <assert.h>
 
@@ -27,7 +29,6 @@
 #include <IL/OMX_Core.h>
 
 #include "../../tools.h"
-#include "formatters.h"
 
 
 #define CASE_TO_STRING(_value) \
diff --git a/src/http/base64.c b/src/http/base64.c
index 92e8cec..0572193 100644
--- a/src/http/base64.c
+++ b/src/http/base64.c
@@ -20,12 +20,13 @@
 *****************************************************************************/
 
 
+#include "base64.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
 #include "../tools.h"
-#include "base64.h"
 
 
 static const char ENCODING_TABLE[] = {
diff --git a/src/http/blank.c b/src/http/blank.c
index a10066e..4e5acaf 100644
--- a/src/http/blank.c
+++ b/src/http/blank.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "blank.h"
+
 #include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
@@ -32,8 +34,6 @@
 
 #include "data/blank_jpeg.h"
 
-#include "blank.h"
-
 
 struct _jpeg_error_manager_t {
 	struct jpeg_error_mgr	mgr; // Default manager
diff --git a/src/http/mime.c b/src/http/mime.c
index aaa9dd0..62f356e 100644
--- a/src/http/mime.c
+++ b/src/http/mime.c
@@ -20,14 +20,14 @@
 *****************************************************************************/
 
 
+#include "mime.h"
+
 #include <string.h>
 
 #include <event2/util.h>
 
 #include "../tools.h"
 
-#include "mime.h"
-
 
 static const struct {
 	const char *ext;
diff --git a/src/http/path.c b/src/http/path.c
index 257ddaf..6b69a48 100644
--- a/src/http/path.c
+++ b/src/http/path.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "path.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,8 +29,6 @@
 
 #include "../tools.h"
 
-#include "path.h"
-
 
 char *simplify_request_path(const char *str) {
 	// Based on Lighttpd sources:
diff --git a/src/http/server.c b/src/http/server.c
index f139023..54f1fed 100644
--- a/src/http/server.c
+++ b/src/http/server.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "server.h"
+
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdatomic.h>
@@ -56,7 +58,6 @@
 #include "base64.h"
 #include "mime.h"
 #include "static.h"
-#include "server.h"
 
 #include "data/index_html.h"
 
diff --git a/src/http/static.c b/src/http/static.c
index 4da6007..9ac53fd 100644
--- a/src/http/static.c
+++ b/src/http/static.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "static.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,7 +34,6 @@
 #include "../logging.h"
 
 #include "path.h"
-#include "static.h"
 
 
 char *find_static_file_path(const char *root_path, const char *request_path) {
diff --git a/src/stream.c b/src/stream.c
index 10f7f41..8a47363 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#include "stream.h"
+
 #include <stdbool.h>
 #include <stdatomic.h>
 #include <unistd.h>
@@ -36,7 +38,6 @@
 #include "xioctl.h"
 #include "device.h"
 #include "encoder.h"
-#include "stream.h"
 
 #ifdef WITH_WORKERS_GPIO_DEBUG
 #	include <wiringPi.h>