diff -r 414d71c431a2 -r 9efd0301a05a libpurple/protocols/msn/msg.h
--- a/libpurple/protocols/msn/msg.h	Thu Jun 03 21:18:53 2010 +0000
+++ b/libpurple/protocols/msn/msg.h	Thu Jun 03 21:41:43 2010 +0000
@@ -58,6 +58,7 @@
 #include "session.h"
 #include "transaction.h"
 #include "user.h"
+#include "p2p.h"
 
 typedef void (*MsnMsgCb)(MsnMessage *, void *data);
 
@@ -69,19 +70,6 @@
 
 typedef struct
 {
-	guint32 session_id;
-	guint32 id;
-	guint64 offset;
-	guint64 total_size;
-	guint32 length;
-	guint32 flags;
-	guint32 ack_id;
-	guint32 ack_sub_id;
-	guint64 ack_size;
-} MsnSlpHeader;
-
-typedef struct
-{
 	guint32 value;
 } MsnSlpFooter;
 
@@ -106,7 +94,7 @@
 	guint total_chunks;   /**< How many chunks in this multi-part message */
 	guint received_chunks; /**< How many chunks we've received so far */
 
-	MsnSlpHeader msnslp_header;
+	MsnP2PBinaryHeader msnslp_header;
 	MsnSlpFooter msnslp_footer;
 
 	GHashTable *header_table;