Use #include "..." for our own headers, <...> for others

Tracked down with an ugly, brittle and probably buggy Perl script.

Also move includes converted to <...> up so they get included before
ours where that's obviously okay.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>

15 files changed, 17 insertions, 18 deletions

diff --git a/bootp.c b/bootp.c
index 23870b4..baa6380 100644
--- a/bootp.c
+++ b/bootp.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 #if defined(_WIN32)
 /* Windows ntohl() returns an u_long value.
diff --git a/cksum.c b/cksum.c
index b308d47..c09b616 100644
--- a/cksum.c
+++ b/cksum.c
@@ -31,7 +31,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 /*
  * Checksum routine for Internet Protocol family headers (Portable Version).
diff --git a/if.c b/if.c
index 3a7d364..3af4ecc 100644
--- a/if.c
+++ b/if.c
@@ -6,7 +6,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 #include "qemu/timer.h"
 
 static void ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
diff --git a/ip_input.c b/ip_input.c
index 567b591..39407c8 100644
--- a/ip_input.c
+++ b/ip_input.c
@@ -39,7 +39,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 #include "ip_icmp.h"
 
 static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
diff --git a/ip_output.c b/ip_output.c
index 6da0b7c..296c8f7 100644
--- a/ip_output.c
+++ b/ip_output.c
@@ -39,7 +39,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 /* Number of packets queued before we start sending
  * (to prevent allocing too many mbufs) */
diff --git a/mbuf.c b/mbuf.c
index 498fa52..26bf605 100644
--- a/mbuf.c
+++ b/mbuf.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 #define MBUF_THRESH 30
 
diff --git a/misc.c b/misc.c
index b8282cd..c72b4b2 100644
--- a/misc.c
+++ b/misc.c
@@ -6,9 +6,8 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
-#include <libslirp.h>
-
+#include "slirp.h"
+#include "libslirp.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
diff --git a/sbuf.c b/sbuf.c
index d01ef3d..8a0a6a9 100644
--- a/sbuf.c
+++ b/sbuf.c
@@ -6,8 +6,8 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
-#include <qemu/main-loop.h>
+#include "slirp.h"
+#include "qemu/main-loop.h"
 
 static void sbappendsb(struct sbuf *sb, struct mbuf *m);
 
diff --git a/socket.c b/socket.c
index 04ed414..bc9af2f 100644
--- a/socket.c
+++ b/socket.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include <slirp.h>
+#include "slirp.h"
 #include "ip_icmp.h"
 #ifdef __sun__
 #include <sys/filio.h>
diff --git a/tcp_input.c b/tcp_input.c
index 0d7b48c..9b075d0 100644
--- a/tcp_input.c
+++ b/tcp_input.c
@@ -39,7 +39,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 #include "ip_icmp.h"
 
 #define TCPREXMTTHRESH 3
diff --git a/tcp_output.c b/tcp_output.c
index e0061c3..2528016 100644
--- a/tcp_output.c
+++ b/tcp_output.c
@@ -39,7 +39,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 static const u_char tcp_outflags[TCP_NSTATES] = {
     TH_RST | TH_ACK, 0,      TH_SYN,          TH_SYN | TH_ACK,
diff --git a/tcp_subr.c b/tcp_subr.c
index 2a82c35..5fc6aa4 100644
--- a/tcp_subr.c
+++ b/tcp_subr.c
@@ -39,7 +39,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 /* patchable/settable parameters for tcp */
 /* Don't do rfc1323 performance enhancements */
diff --git a/tcp_timer.c b/tcp_timer.c
index a264d9e..36c4dbd 100644
--- a/tcp_timer.c
+++ b/tcp_timer.c
@@ -31,7 +31,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer);
 
diff --git a/tftp.c b/tftp.c
index 260e549..4f76743 100644
--- a/tftp.c
+++ b/tftp.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 #include "qemu-common.h"
 #include "qemu/cutils.h"
 
diff --git a/udp.c b/udp.c
index 478221e..fde0585 100644
--- a/udp.c
+++ b/udp.c
@@ -39,7 +39,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 #include "ip_icmp.h"
 
 static uint8_t udp_tos(struct socket *so);