Run include-what-you-use.

diff --git a/greprotocol.cpp b/greprotocol.cpp
index 4a634156789f0aa3848d8ac1aaf5172a65d0bd4d..0e6b945c371f377ea6506717a0fbd5e8c954f257 100644 (file)
--- a/greprotocol.cpp
+++ b/greprotocol.cpp
@@ -1,9 +1,11 @@
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include "greprotocol.h"
-#include "reorderer.h"
 
 using namespace std;
 

diff --git a/greprotocol.h b/greprotocol.h
index 621553400ca2365fc3636fe4cebd746a492da5e3..9cec54b7658897e0a98f158d2ff130998e0cc9e7 100644 (file)
--- a/greprotocol.h
+++ b/greprotocol.h
@@ -1,12 +1,13 @@
 #ifndef _GREPROTOCOL_H
 #define _GREPROTOCOL_H
 
-#include "protocol.h"
-
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stdint.h>
 #include <string>
 
+#include "protocol.h"
+
 class Reorderer;
 
 class GREProtocol : public Protocol {

diff --git a/greproxy.cpp b/greproxy.cpp
index fa116b63da7e7175774b584a9751e5c130f3e463..030ea1f335da90ea4a9b3704db8d9cd8e7e151f5 100644 (file)
--- a/greproxy.cpp
+++ b/greproxy.cpp
@@ -1,18 +1,12 @@
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <sys/select.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-
-#include <map>
-#include <string>
-#include <queue>
 
 #include "greprotocol.h"
-#include "protocol.h"
 #include "reorderer.h"
-#include "tunprotocol.h"
 
 using namespace std;
 

diff --git a/tungre.cpp b/tungre.cpp
index 6b4ffb876c4b455314721edee14c10869c22057f..89339bba2455aa9ab4616f99f18ce0736e3f6ea0 100644 (file)
--- a/tungre.cpp
+++ b/tungre.cpp
@@ -1,17 +1,11 @@
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <map>
-#include <string>
-#include <queue>
+#include <sys/select.h>
+#include <sys/socket.h>
 
 #include "greprotocol.h"
-#include "protocol.h"
 #include "reorderer.h"
 #include "tunprotocol.h"
 

diff --git a/tunprotocol.cpp b/tunprotocol.cpp
index cc1065169b2235dff022abe2ba883829be0e0a25..534c8bdabfc77bb8aaad6a642fa1a196676f10bd 100644 (file)
--- a/tunprotocol.cpp
+++ b/tunprotocol.cpp
@@ -1,9 +1,10 @@
-#include <string.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
 #include <linux/if.h>
 #include <linux/if_tun.h>