Re-run include-what-you-use.

diff --git a/acceptor.cpp b/acceptor.cpp
index 32a89fa7670d7221b54e7c98ffa0f8ce7e255abd..d4d4efb29d668a252b3427ab347e7fa2197f2566 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -7,7 +7,6 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "acceptor.h"

diff --git a/httpinput.cpp b/httpinput.cpp
index c9231453e1e919062024073d1d73efa1dc1fd487..c975a2497007c1d45605ce73103f5405be4c78ed 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 #include <map>
@@ -22,6 +23,7 @@
 #include "parse.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "stream.h"
 #include "util.h"
 #include "version.h"
 

diff --git a/httpinput.h b/httpinput.h
index 2273e7dd2782535684fa92be5c4b5ad86140d52a..6b0c87512dffee116dea7c86c89404a5e0090e56 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,6 +1,7 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
+#include <pthread.h>
 #include <stddef.h>
 #include <string>
 #include <vector>

diff --git a/input.h b/input.h
index a00113da80250100fa7917d0ec5c62d8c93fdf2f..5b3bbd2744d144a3bc9b71fdc6bbc37aeadbb6c9 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,6 +1,8 @@
 #ifndef _INPUT_H
 #define _INPUT_H 1
 
+#include <stddef.h>
+#include <time.h>
 #include <string>
 
 #include "thread.h"

diff --git a/input_stats.cpp b/input_stats.cpp
index e3e89e635d24b392c23d1ac3b02e3564878aad44..92a6718c4cc8cc987b1753fc5b90123a08ff7131 100644 (file)
--- a/input_stats.cpp
+++ b/input_stats.cpp
@@ -7,10 +7,9 @@
 #include <unistd.h>
 #include <vector>
 
-#include "client.h"
-#include "log.h"
 #include "input.h"
 #include "input_stats.h"
+#include "log.h"
 #include "util.h"
 
 using namespace std;

diff --git a/input_stats.h b/input_stats.h
index 1149b7cce2412b3bc5bee670c8fe4ad213358fa3..9b875069b10b3997a0fc5a0acc75092e211bae45 100644 (file)
--- a/input_stats.h
+++ b/input_stats.h
@@ -1,10 +1,13 @@
 #ifndef _INPUT_STATS_H
 #define _INPUT_STATS_H 1
 
-#include "thread.h"
 #include <string>
 #include <vector>
 
+#include "thread.h"
+
+class Input;
+
 // A thread that regularly writes out input statistics, ie. a list of all inputs
 // with some information about each. Very similar to StatsThread, but for inputs instead
 // of clients.

diff --git a/log.cpp b/log.cpp
index d481cc43496a3ab962b6f7c19239bcaf471c21b7..b20a89f89b6f75678c3eb55f04c1e5362f231d1c 100644 (file)
--- a/log.cpp
+++ b/log.cpp
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
+#include <time.h>
 #include <string>
 #include <vector>
 

diff --git a/metacube2.cpp b/metacube2.cpp
index f7e4ce20c9468c572b97390a8a320008474fda39..9473dced414b62fd5d93548d7d81b43745b81143 100644 (file)
--- a/metacube2.cpp
+++ b/metacube2.cpp
@@ -5,8 +5,6 @@
  * in other projects.
  */
 
-#include <stdlib.h>
-
 #include "metacube2.h"
 
 /*

diff --git a/stream.cpp b/stream.cpp
index 42edee95aae01176e94c3a63ab47704a95b19a36..4840b06b070b84eaf20e70053eff4c38efb86240 100644 (file)
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,10 +1,11 @@
 #include <assert.h>
 #include <errno.h>
-#include <limits.h>
 #include <netinet/in.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#include <algorithm>
 #include <string>
 #include <vector>
 

diff --git a/udpinput.cpp b/udpinput.cpp
index 96e0607d7d27dcb5071d2e14202e09eedd547179..f4c78fec4a7c8ddbf3f03e6304c5626b396c686e 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -4,6 +4,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <time.h>
 #include <unistd.h>
 #include <string>
 
@@ -12,6 +13,7 @@
 #include "mutexlock.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "stream.h"
 #include "udpinput.h"
 #include "util.h"
 #include "version.h"

diff --git a/udpinput.h b/udpinput.h
index caff008793842cdce2b601e10ea8c61041ae889e..11a369073ad0ce000fdb5ec680f6e7d4b4a159c9 100644 (file)
--- a/udpinput.h
+++ b/udpinput.h
@@ -1,6 +1,7 @@
 #ifndef _UDPINPUT_H
 #define _UDPINPUT_H 1
 
+#include <pthread.h>
 #include <string>
 #include <vector>