From fcdb8f5d4261e2a94dd1ef62643088c6f4602b1c Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Tue, 17 Sep 2019 19:45:56 +0300
Subject: [PATCH] headers sanity

---
 src/device.c               | 4 ++++
 src/encoder.c              | 2 +-
 src/encoder.h              | 1 -
 src/encoders/cpu/encoder.c | 2 +-
 src/http/base64.c          | 1 -
 src/http/base64.h          | 2 --
 src/http/blank.c           | 2 --
 src/http/blank.h           | 2 --
 src/http/path.c            | 9 +++++----
 src/http/server.c          | 3 ++-
 src/http/server.h          | 3 ---
 src/http/static.c          | 3 +--
 src/http/unix.c            | 1 -
 src/http/uri.h             | 1 +
 src/main.c                 | 2 --
 src/options.c              | 9 +++++----
 src/stream.c               | 5 +----
 src/stream.h               | 3 +++
 18 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/device.c b/src/device.c
index d527b78..5b398c7 100644
--- a/src/device.c
+++ b/src/device.c
@@ -34,11 +34,15 @@
 
 #include <sys/select.h>
 #include <sys/mman.h>
+#include <sys/time.h>
+
 #include <linux/videodev2.h>
+#include <linux/v4l2-controls.h>
 
 #include "tools.h"
 #include "logging.h"
 #include "xioctl.h"
+#include "picture.h"
 
 
 static const struct {
diff --git a/src/encoder.c b/src/encoder.c
index 995b657..4cdf8c8 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -22,6 +22,7 @@
 
 #include "encoder.h"
 
+#include <stdlib.h>
 #include <stdbool.h>
 #include <strings.h>
 #include <assert.h>
@@ -35,7 +36,6 @@
 
 #include "encoders/cpu/encoder.h"
 #include "encoders/hw/encoder.h"
-
 #ifdef WITH_OMX
 #	include "encoders/omx/encoder.h"
 #endif
diff --git a/src/encoder.h b/src/encoder.h
index 831f2df..270d9ef 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -26,7 +26,6 @@
 
 #include <pthread.h>
 
-#include "tools.h"
 #include "device.h"
 
 #ifdef WITH_OMX
diff --git a/src/encoders/cpu/encoder.c b/src/encoders/cpu/encoder.c
index 7902488..a2ad747 100644
--- a/src/encoders/cpu/encoder.c
+++ b/src/encoders/cpu/encoder.c
@@ -29,10 +29,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #include <jpeglib.h>
+
 #include <linux/videodev2.h>
 
 #include "../../tools.h"
diff --git a/src/http/base64.c b/src/http/base64.c
index b374066..9f20fd1 100644
--- a/src/http/base64.c
+++ b/src/http/base64.c
@@ -24,7 +24,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "../tools.h"
 
diff --git a/src/http/base64.h b/src/http/base64.h
index ba55911..516a5f5 100644
--- a/src/http/base64.h
+++ b/src/http/base64.h
@@ -22,7 +22,5 @@
 
 #pragma once
 
-#include <stdlib.h>
-
 
 char *base64_encode(const unsigned char *str);
diff --git a/src/http/blank.c b/src/http/blank.c
index 0bc223a..e2f16d3 100644
--- a/src/http/blank.c
+++ b/src/http/blank.c
@@ -24,7 +24,6 @@
 
 #include <stdio.h>
 #include <stdbool.h>
-#include <string.h>
 #include <setjmp.h>
 
 #include <jpeglib.h>
@@ -32,7 +31,6 @@
 #include "../tools.h"
 #include "../logging.h"
 #include "../picture.h"
-#include "../device.h"
 
 #include "data/blank_jpeg.h"
 
diff --git a/src/http/blank.h b/src/http/blank.h
index 8ff5895..9d8b39e 100644
--- a/src/http/blank.h
+++ b/src/http/blank.h
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include <stdlib.h>
-
 #include "../picture.h"
 
 
diff --git a/src/http/path.c b/src/http/path.c
index 6b69a48..60c2f4c 100644
--- a/src/http/path.c
+++ b/src/http/path.c
@@ -22,10 +22,11 @@
 
 #include "path.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#ifdef TEST_HTTP_PATH
+#	include <stdio.h>
+#	include <stdlib.h>
+#endif
 #include <string.h>
-#include <assert.h>
 
 #include "../tools.h"
 
@@ -116,7 +117,7 @@ char *simplify_request_path(const char *str) {
 	return simplified;
 }
 
-#if 0
+#if TEST_HTTP_PATH
 
 int test_simplify_request_path(const char *sample, const char *expected) {
 	char *result = simplify_request_path(sample);
diff --git a/src/http/server.c b/src/http/server.c
index a1fa097..7538b43 100644
--- a/src/http/server.c
+++ b/src/http/server.c
@@ -22,16 +22,17 @@
 
 #include "server.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdatomic.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <assert.h>
 
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <event2/event.h>
 #include <event2/thread.h>
diff --git a/src/http/server.h b/src/http/server.h
index 3b5b898..8ca842b 100644
--- a/src/http/server.h
+++ b/src/http/server.h
@@ -30,12 +30,9 @@
 #include <event2/http.h>
 #include <event2/util.h>
 
-#include "../tools.h"
 #include "../picture.h"
 #include "../stream.h"
 
-#include "blank.h"
-
 
 struct stream_client_t {
 	struct http_server_t	*server;
diff --git a/src/http/static.c b/src/http/static.c
index 9ac53fd..0801799 100644
--- a/src/http/static.c
+++ b/src/http/static.c
@@ -27,11 +27,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include "../tools.h"
-#include "../logging.h"
+// #include "../logging.h"
 
 #include "path.h"
 
diff --git a/src/http/unix.c b/src/http/unix.c
index 421338c..e9d7ebe 100644
--- a/src/http/unix.c
+++ b/src/http/unix.c
@@ -28,7 +28,6 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/stat.h>
diff --git a/src/http/uri.h b/src/http/uri.h
index 0b44b10..574fc25 100644
--- a/src/http/uri.h
+++ b/src/http/uri.h
@@ -25,6 +25,7 @@
 #include <stdbool.h>
 
 #include <event2/http.h>
+#include <event2/keyvalq_struct.h>
 
 
 bool uri_get_true(struct evkeyvalq *params, const char *key);
diff --git a/src/main.c b/src/main.c
index fa3f688..a337e30 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,8 +26,6 @@
 #endif
 
 #include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
 #include <signal.h>
 
 #include <pthread.h>
diff --git a/src/options.c b/src/options.c
index 5eefbdb..1edeae4 100644
--- a/src/options.c
+++ b/src/options.c
@@ -23,20 +23,21 @@
 #include "options.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdbool.h>
-#include <string.h>
+#ifdef WITH_OMX
+#	include <string.h>
+#endif
 #include <ctype.h>
 #include <limits.h>
-#include <signal.h>
 #include <getopt.h>
+#include <errno.h>
 #include <assert.h>
 
 #include "config.h"
-#include "tools.h"
 #include "logging.h"
 #include "device.h"
 #include "encoder.h"
-#include "stream.h"
 #include "http/server.h"
 #ifdef WITH_GPIO
 #	include "gpio.h"
diff --git a/src/stream.c b/src/stream.c
index 61cc216..fc82207 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -22,21 +22,18 @@
 
 #include "stream.h"
 
+#include <stdlib.h>
 #include <stdbool.h>
 #include <stdatomic.h>
 #include <unistd.h>
 #include <errno.h>
-#include <time.h>
 #include <assert.h>
 
 #include <pthread.h>
 
-#include <linux/videodev2.h>
-
 #include "tools.h"
 #include "threading.h"
 #include "logging.h"
-#include "xioctl.h"
 #include "picture.h"
 #include "device.h"
 #include "encoder.h"
diff --git a/src/stream.h b/src/stream.h
index 5880ba2..18cf130 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -22,8 +22,11 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include <stdatomic.h>
 
+#include <pthread.h>
+
 #include "picture.h"
 #include "device.h"
 #include "encoder.h"