diff -r 08ec2e6e0174 -r 4523af5dc59c libpurple/protocols/irc/irc.h
--- a/libpurple/protocols/irc/irc.h	Fri Apr 29 03:09:36 2016 -0500
+++ b/libpurple/protocols/irc/irc.h	Fri Apr 29 02:31:02 2016 -0500
@@ -32,6 +32,7 @@
 
 #include "circularbuffer.h"
 #include "xfer.h"
+#include "queuedoutputstream.h"
 #include "roomlist.h"
 #include "sslconn.h"
 
@@ -74,17 +75,16 @@
 	GHashTable *msgs;
 	GHashTable *cmds;
 	char *server;
-	int fd;
-	guint inpa;
+	GSocketConnection *conn;
+	GCancellable *cancellable;
 	guint timer;
 	GHashTable *buddies;
 
 	gboolean ison_outstanding;
 	GList *buddies_outstanding;
 
-	char *inbuf;
-	int inbuflen;
-	int inbufused;
+	GDataInputStream *input;
+	PurpleQueuedOutputStream *output;
 
 	GString *motd;
 	GString *names;
@@ -104,13 +104,9 @@
 		time_t signon;
 	} whois;
 	PurpleRoomlist *roomlist;
-	PurpleSslConnection *gsc;
 
 	gboolean quitting;
 
-	PurpleCircularBuffer *outbuf;
-	guint writeh;
-
 	time_t recv_time;
 
 	char *mode_chars;