Run include-what-you-use.

diff --git a/config.cpp b/config.cpp
index d47bfec0fbb72fc4fe668939805ad54d7249d861..f17302a4e92c4b136a2d1c182d8aef4ff313c8dd 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -1,8 +1,11 @@
+#include <arpa/inet.h>
 #include <assert.h>
 #include <ctype.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <map>
 #include <string>
 #include <utility>

diff --git a/config.h b/config.h
index 8de6704ddd4e5e9c5292bca64b85740fa31faeeb..cf3fdfbfb189d9d936e83c9cc2860decc9450937 100644 (file)
--- a/config.h
+++ b/config.h
@@ -4,6 +4,7 @@
 // Various routines that deal with parsing the configuration file.
 
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stddef.h>
 #include <string>
 #include <vector>

diff --git a/serverpool.cpp b/serverpool.cpp
index 590e0f53b30a5c095e3b57a7a1a5a470093574fb..be47aa99139c17e4048cc82a9b6becac369e8348 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -1,12 +1,17 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 #include "client.h"
+#include "log.h"
 #include "server.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "udpstream.h"
 #include "util.h"
 
+struct sockaddr_in6;
+
 using namespace std;
 
 ServerPool::ServerPool(int size)

diff --git a/serverpool.h b/serverpool.h
index 5b7fca3d5e5ebcd2a67e3db34bb6445027d1169b..9a8e171e36ff620637695bf99e6a980a2d5f41a9 100644 (file)
--- a/serverpool.h
+++ b/serverpool.h
@@ -12,7 +12,9 @@
 
 class MarkPool;
 class Server;
+class UDPStream;
 struct ClientStats;
+struct sockaddr_in6;
 
 // Provides services such as load-balancing between a number of Server instances.
 class ServerPool {

diff --git a/udpinput.cpp b/udpinput.cpp
index 887850c91355d17b50d1f2f07a50be5bdd91c72c..7caf8e196bd46db7ae6b7355815e567c96d52102 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -2,7 +2,6 @@
 #include <errno.h>
 #include <poll.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <unistd.h>

diff --git a/udpstream.cpp b/udpstream.cpp
index 18522435ba82b6174c8e7d5a0045b10ec0cb05e2..5ed16df2f177d22a72ff008937b5e68f0d45743a 100644 (file)
--- a/udpstream.cpp
+++ b/udpstream.cpp
@@ -1,3 +1,6 @@
+#include <sys/socket.h>
+#include <sys/types.h>
+
 #include "log.h"
 #include "markpool.h"
 #include "udpstream.h"

diff --git a/udpstream.h b/udpstream.h
index 3424b984955ded48e1f17c620b60d429b4efa8ac..e30c9481a365e3d0e8d3700f0c44c2cf0b413bc4 100644 (file)
--- a/udpstream.h
+++ b/udpstream.h
@@ -7,6 +7,7 @@
 // that there is no state (UDP itself is, of course, stateless).
 
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>