Move part of http/ into util/http/

cmd/camera-streamer/http.c

@@ -1,4 +1,4 @@
-#include "http/http.h"
+#include "util/http/http.h"
 #include "util/opts/opts.h"
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"

cmd/camera-streamer/main.c

@@ -1,4 +1,4 @@
-#include "http/http.h"
+#include "util/http/http.h"
 #include "util/opts/opts.h"
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"

cmd/camera-streamer/opts.c

@@ -1,4 +1,4 @@
-#include "http/http.h"
+#include "util/http/http.h"
 #include "util/opts/opts.h"
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"

device/camera/camera_isp.c

@@ -7,7 +7,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
-#include "http/http.h"
+#include "util/http/http.h"
 
 int camera_configure_isp(camera_t *camera, buffer_list_t *src_capture, float high_div, float low_div)
 {

device/camera/camera_output.c

@@ -7,7 +7,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
-#include "http/http.h"
+#include "util/http/http.h"
 #include "rtsp/rtsp.h"
 
 static const char *jpeg_names[2] = {

http/http_ffmpeg.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "util/opts/log.h"
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
 #include "device/buffer_list.h"

http/http_h264.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "util/opts/log.h"
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
 #include "device/buffer_list.h"

http/http_jpeg.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
 

rtsp/rtsp.cc

@@ -1,6 +1,6 @@
 extern "C" {
 
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"

util/http/http.c

@@ -11,7 +11,7 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include "http/http.h"
+#include "http.h"
 #include "util/opts/log.h"
 
 static int http_listen(int port, int maxcons)

util/http/http_methods.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "http/http.h"
+#include "http.h"
 
 static void http_write_response(
   FILE *stream,