From f7005889d1fca836c56e9c5ec03f07d0edcf9000 Mon Sep 17 00:00:00 2001
From: Jordan Lee <jordan@transmissionbt.com>
Date: Thu, 24 Mar 2011 22:45:04 +0000
Subject: [PATCH] (trunk libT) copyediting: clean up the "#include <event2/*>"
 directives in libtransmission's header files

---
 libtransmission/handshake.c       | 1 +
 libtransmission/peer-io.c         | 2 ++
 libtransmission/peer-io.h         | 5 +----
 libtransmission/peer-mgr.h        | 2 +-
 libtransmission/peer-msgs.c       | 1 +
 libtransmission/port-forwarding.h | 1 -
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
index e670e2ffa..66cb5e7e1 100644
--- a/libtransmission/handshake.c
+++ b/libtransmission/handshake.c
@@ -16,6 +16,7 @@
 #include <limits.h> /* UCHAR_MAX */
 #include <string.h>
 
+#include <event2/buffer.h>
 #include <event2/event.h>
 
 #include "transmission.h"
diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index a352fa36e..874b9f274 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -22,7 +22,9 @@
 #endif
 
 #include <event2/event.h>
+#include <event2/buffer.h>
 #include <event2/bufferevent.h>
+
 #include <libutp/utp.h>
 
 #include "transmission.h"
diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index 2f4dd4ed7..f444f1763 100644
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -23,12 +23,8 @@
 
 #include <assert.h>
 
-#include <event2/buffer.h>
-#include <event2/event.h>
-
 #include "transmission.h"
 #include "bandwidth.h"
-#include "list.h" /* tr_list */
 #include "net.h" /* tr_address */
 #include "utils.h" /* tr_time() */
 
@@ -36,6 +32,7 @@ struct evbuffer;
 struct tr_bandwidth;
 struct tr_crypto;
 struct tr_peerIo;
+struct tr_list;
 
 /**
  * @addtogroup networked_io Networked IO
diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 764ece9fc..ae1028b76 100644
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -26,7 +26,7 @@
 #include "bitfield.h"
 #include "bitset.h"
 #include "history.h"
-#include "net.h"
+#include "net.h" /* tr_address */
 #include "peer-common.h" /* struct peer_request */
 
 /**
diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 787c25d8e..a38a2dcbd 100644
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <event2/buffer.h>
 #include <event2/bufferevent.h>
 #include <event2/event.h>
 
diff --git a/libtransmission/port-forwarding.h b/libtransmission/port-forwarding.h
index dcdfb1b6f..f73b07c55 100644
--- a/libtransmission/port-forwarding.h
+++ b/libtransmission/port-forwarding.h
@@ -18,7 +18,6 @@
 #define SHARED_H 1
 
 #include "transmission.h"
-#include "net.h"
 
 /**
  * @addtogroup port_forwarding Port Forwarding