slirp: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1454089805-5470-10-git-send-email-peter.maydell@linaro.org

19 files changed, 19 insertions, 3 deletions

diff --git a/arp_table.c b/arp_table.c
index cabd87e..ad76531 100644
--- a/arp_table.c
+++ b/arp_table.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "slirp.h"
 
 void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN])
diff --git a/bootp.c b/bootp.c
index 63e66a0..23870b4 100644
--- a/bootp.c
+++ b/bootp.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include <slirp.h>
 
 #if defined(_WIN32)
diff --git a/cksum.c b/cksum.c
index a791770..9f60443 100644
--- a/cksum.c
+++ b/cksum.c
@@ -30,6 +30,7 @@
  * in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 
 /*
diff --git a/dnssearch.c b/dnssearch.c
index 522249e..75d8b5e 100644
--- a/dnssearch.c
+++ b/dnssearch.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "slirp.h"
 
diff --git a/if.c b/if.c
index e127767..6f14e60 100644
--- a/if.c
+++ b/if.c
@@ -5,6 +5,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include "qemu/timer.h"
 
diff --git a/ip_icmp.c b/ip_icmp.c
index cd45b99..99aad54 100644
--- a/ip_icmp.c
+++ b/ip_icmp.c
@@ -30,6 +30,7 @@
  * ip_icmp.c,v 1.7 1995/05/30 08:09:42 rgrimes Exp
  */
 
+#include "qemu/osdep.h"
 #include "slirp.h"
 #include "ip_icmp.h"
 
diff --git a/ip_input.c b/ip_input.c
index bc1861b..808dd42 100644
--- a/ip_input.c
+++ b/ip_input.c
@@ -38,6 +38,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include <qemu/osdep.h>
 #include "ip_icmp.h"
diff --git a/ip_output.c b/ip_output.c
index 346e142..6da0b7c 100644
--- a/ip_output.c
+++ b/ip_output.c
@@ -38,6 +38,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 
 /* Number of packets queued before we start sending
diff --git a/mbuf.c b/mbuf.c
index daedec8..bdda609 100644
--- a/mbuf.c
+++ b/mbuf.c
@@ -15,6 +15,7 @@
  * the flags
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 
 #define MBUF_THRESH 30
diff --git a/misc.c b/misc.c
index 8d4f5c7..22efe69 100644
--- a/misc.c
+++ b/misc.c
@@ -5,6 +5,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include <libslirp.h>
 
diff --git a/sbuf.c b/sbuf.c
index 51d7a13..d01ef3d 100644
--- a/sbuf.c
+++ b/sbuf.c
@@ -5,6 +5,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include <qemu/main-loop.h>
 
diff --git a/slirp.c b/slirp.c
index 879dd4e..e758a92 100644
--- a/slirp.c
+++ b/slirp.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"
diff --git a/socket.c b/socket.c
index 6f62c09..49a69df 100644
--- a/socket.c
+++ b/socket.c
@@ -5,6 +5,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include <slirp.h>
 #include "ip_icmp.h"
diff --git a/tcp_input.c b/tcp_input.c
index 524e78f..8860262 100644
--- a/tcp_input.c
+++ b/tcp_input.c
@@ -38,6 +38,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include "ip_icmp.h"
 
diff --git a/tcp_output.c b/tcp_output.c
index 35c00e3..cbe4fa6 100644
--- a/tcp_output.c
+++ b/tcp_output.c
@@ -38,6 +38,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 
 static const u_char tcp_outflags[TCP_NSTATES] = {
diff --git a/tcp_subr.c b/tcp_subr.c
index 82aae39..5d1d3be 100644
--- a/tcp_subr.c
+++ b/tcp_subr.c
@@ -38,6 +38,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 
 /* patchable/settable parameters for tcp */
diff --git a/tcp_timer.c b/tcp_timer.c
index 5589fa4..13db569 100644
--- a/tcp_timer.c
+++ b/tcp_timer.c
@@ -30,6 +30,7 @@
  * tcp_timer.c,v 1.2 1994/08/02 07:49:10 davidg Exp
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 
 static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer);
diff --git a/tftp.c b/tftp.c
index cfdb46e..fa70c0f 100644
--- a/tftp.c
+++ b/tftp.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include "qemu-common.h"
 
diff --git a/udp.c b/udp.c
index 8b96c76..72beab1 100644
--- a/udp.c
+++ b/udp.c
@@ -38,6 +38,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include "ip_icmp.h"