headers sanity

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 {

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

src/encoder.h

@@ -26,7 +26,6 @@
 
 #include <pthread.h>
 
-#include "tools.h"
 #include "device.h"
 
 #ifdef WITH_OMX

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"

src/http/base64.c

@@ -24,7 +24,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "../tools.h"
 

src/http/base64.h

@@ -22,7 +22,5 @@
 
 #pragma once
 
-#include <stdlib.h>
-
 
 char *base64_encode(const unsigned char *str);

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"
 

src/http/blank.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include <stdlib.h>
-
 #include "../picture.h"
 
 

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);

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>

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;

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"
 

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>

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);

src/main.c

@@ -26,8 +26,6 @@
 #endif
 
 #include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
 #include <signal.h>
 
 #include <pthread.h>

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"

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"

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"