Minor header file cleanup. Mostly I wanted to move some enums above some #includes

31 files changed, 274 insertions, 303 deletions

diff --git a/libpurple/protocols/msn/cmdproc.h b/libpurple/protocols/msn/cmdproc.h
index 509c8dfb06..4b13087861 100644
--- a/libpurple/protocols/msn/cmdproc.h
+++ b/libpurple/protocols/msn/cmdproc.h
@@ -21,17 +21,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_CMDPROC_H_
-#define _MSN_CMDPROC_H_
+#ifndef MSN_CMDPROC_H
+#define MSN_CMDPROC_H
 
 typedef struct _MsnCmdProc MsnCmdProc;
 
-#include "session.h"
-#include "servconn.h"
-#include "error.h"
 #include "command.h"
-#include "table.h"
+#include "error.h"
 #include "history.h"
+#include "servconn.h"
+#include "session.h"
+#include "table.h"
 
 struct _MsnCmdProc
 {
@@ -71,4 +71,4 @@ void msn_cmdproc_process_cmd_text(MsnCmdProc *cmdproc, const char *command);
 void msn_cmdproc_process_payload(MsnCmdProc *cmdproc,
 								 char *payload, int payload_len);
 
-#endif /* _MSN_CMDPROC_H_ */
+#endif /* MSN_CMDPROC_H */
diff --git a/libpurple/protocols/msn/command.h b/libpurple/protocols/msn/command.h
index 051f4ca8c4..fdd82f9324 100644
--- a/libpurple/protocols/msn/command.h
+++ b/libpurple/protocols/msn/command.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_COMMAND_H
-#define _MSN_COMMAND_H
+#ifndef MSN_COMMAND_H
+#define MSN_COMMAND_H
 
 typedef struct _MsnCommand MsnCommand;
 
@@ -59,4 +59,4 @@ void msn_command_destroy(MsnCommand *cmd);
 MsnCommand *msn_command_ref(MsnCommand *cmd);
 MsnCommand *msn_command_unref(MsnCommand *cmd);
 
-#endif /* _MSN_COMMAND_H */
+#endif /* MSN_COMMAND_H */
diff --git a/libpurple/protocols/msn/contact.h b/libpurple/protocols/msn/contact.h
index 6697acb8f6..720a58ffe6 100644
--- a/libpurple/protocols/msn/contact.h
+++ b/libpurple/protocols/msn/contact.h
@@ -22,8 +22,38 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#ifndef _MSN_CONTACT_H_
-#define _MSN_CONTACT_H_
+#ifndef MSN_CONTACT_H
+#define MSN_CONTACT_H
+
+typedef struct _MsnCallbackState MsnCallbackState;
+
+typedef enum
+{
+	MSN_ADD_BUDDY       = 0x01,
+	MSN_MOVE_BUDDY      = 0x02,
+	MSN_ACCEPTED_BUDDY  = 0x04,
+	MSN_DENIED_BUDDY    = 0x08,
+	MSN_ADD_GROUP       = 0x10,
+	MSN_DEL_GROUP       = 0x20,
+	MSN_RENAME_GROUP    = 0x40,
+	MSN_UPDATE_INFO     = 0x80
+} MsnCallbackAction;
+
+typedef enum
+{
+	MSN_UPDATE_DISPLAY,	/* Real display name */
+	MSN_UPDATE_ALIAS,	/* Aliased display name */
+	MSN_UPDATE_COMMENT
+} MsnContactUpdateType;
+
+typedef enum
+{
+	MSN_PS_INITIAL,
+	MSN_PS_SAVE_CONTACT,
+	MSN_PS_PENDING_LIST,
+	MSN_PS_CONTACT_API,
+	MSN_PS_BLOCK_UNBLOCK
+} MsnSoapPartnerScenario;
 
 #include "session.h"
 #include "soap.h"
@@ -609,29 +639,6 @@
 	"</soap:Body>"\
 "</soap:Envelope>"
 
-typedef enum
-{
-	MSN_ADD_BUDDY       = 0x01,
-	MSN_MOVE_BUDDY      = 0x02,
-	MSN_ACCEPTED_BUDDY  = 0x04,
-	MSN_DENIED_BUDDY    = 0x08,
-	MSN_ADD_GROUP       = 0x10,
-	MSN_DEL_GROUP       = 0x20,
-	MSN_RENAME_GROUP    = 0x40,
-	MSN_UPDATE_INFO     = 0x80
-} MsnCallbackAction;
-
-typedef enum
-{
-	MSN_PS_INITIAL,
-	MSN_PS_SAVE_CONTACT,
-	MSN_PS_PENDING_LIST,
-	MSN_PS_CONTACT_API,
-	MSN_PS_BLOCK_UNBLOCK
-} MsnSoapPartnerScenario;
-
-typedef struct _MsnCallbackState MsnCallbackState;
-
 struct _MsnCallbackState
 {
 	gchar * who;
@@ -651,13 +658,6 @@ struct _MsnCallbackState
 	MsnSoapPartnerScenario partner_scenario;
 };
 
-typedef enum
-{
-	MSN_UPDATE_DISPLAY,	/* Real display name */
-	MSN_UPDATE_ALIAS,	/* Aliased display name */
-	MSN_UPDATE_COMMENT
-} MsnContactUpdateType;
-
 /************************************************
  * function prototype
  ************************************************/
@@ -707,5 +707,4 @@ void msn_add_contact_to_list(MsnSession *session, MsnCallbackState *state,
 void msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
 			       const gchar *passport, const MsnListId list);
 
-#endif /* _MSN_CONTACT_H_ */
-
+#endif /* MSN_CONTACT_H */
diff --git a/libpurple/protocols/msn/dialog.h b/libpurple/protocols/msn/dialog.h
index b9580e065b..2fc9b23ada 100644
--- a/libpurple/protocols/msn/dialog.h
+++ b/libpurple/protocols/msn/dialog.h
@@ -21,10 +21,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_DIALOG_H_
-#define _MSN_DIALOG_H_
+#ifndef MSN_DIALOG_H
+#define MSN_DIALOG_H
 
 void msn_show_sync_issue(MsnSession *session, const char *passport,
 						 const char *group_name);
 
-#endif /* _MSN_DIALOG_H_ */
+#endif /* MSN_DIALOG_H */
diff --git a/libpurple/protocols/msn/directconn.h b/libpurple/protocols/msn/directconn.h
index 52c8de6119..f87c4b2153 100644
--- a/libpurple/protocols/msn/directconn.h
+++ b/libpurple/protocols/msn/directconn.h
@@ -21,14 +21,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_DIRECTCONN_H_
-#define _MSN_DIRECTCONN_H_
+#ifndef MSN_DIRECTCONN_H
+#define MSN_DIRECTCONN_H
 
 typedef struct _MsnDirectConn MsnDirectConn;
 
-#include "slplink.h"
-#include "slp.h"
 #include "msg.h"
+#include "slp.h"
+#include "slplink.h"
 
 struct _MsnDirectConn
 {
@@ -58,4 +58,4 @@ void msn_directconn_parse_nonce(MsnDirectConn *directconn, const char *nonce);
 void msn_directconn_destroy(MsnDirectConn *directconn);
 void msn_directconn_send_handshake(MsnDirectConn *directconn);
 
-#endif /* _MSN_DIRECTCONN_H_ */
+#endif /* MSN_DIRECTCONN_H */
diff --git a/libpurple/protocols/msn/error.h b/libpurple/protocols/msn/error.h
index 24b87c9be3..257bfe1414 100644
--- a/libpurple/protocols/msn/error.h
+++ b/libpurple/protocols/msn/error.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_ERROR_H_
-#define _MSN_ERROR_H_
+#ifndef MSN_ERROR_H
+#define MSN_ERROR_H
 
 #include "session.h"
 
@@ -44,4 +44,4 @@ const char *msn_error_get_text(unsigned int type, gboolean *debug);
  */
 void msn_error_handle(MsnSession *session, unsigned int type);
 
-#endif /* _MSN_ERROR_H_ */
+#endif /* MSN_ERROR_H */
diff --git a/libpurple/protocols/msn/group.h b/libpurple/protocols/msn/group.h
index 4fd7348349..14776c9b17 100644
--- a/libpurple/protocols/msn/group.h
+++ b/libpurple/protocols/msn/group.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_GROUP_H_
-#define _MSN_GROUP_H_
+#ifndef MSN_GROUP_H
+#define MSN_GROUP_H
 
 typedef struct _MsnGroup  MsnGroup;
 
@@ -106,5 +106,4 @@ char* msn_group_get_id(const MsnGroup *group);
  */
 const char *msn_group_get_name(const MsnGroup *group);
 
-#endif /* _MSN_GROUP_H_ */
-
+#endif /* MSN_GROUP_H */
diff --git a/libpurple/protocols/msn/history.h b/libpurple/protocols/msn/history.h
index 00018f5d43..8fdec6ec4d 100644
--- a/libpurple/protocols/msn/history.h
+++ b/libpurple/protocols/msn/history.h
@@ -21,16 +21,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_HISTORY_H
-#define _MSN_HISTORY_H
-
-#define MSN_NS_HIST_ELEMS 0x300
-#define MSN_SB_HIST_ELEMS 0x30
+#ifndef MSN_HISTORY_H
+#define MSN_HISTORY_H
 
 typedef struct _MsnHistory MsnHistory;
 
 #include "transaction.h"
 
+#define MSN_NS_HIST_ELEMS 0x300
+#define MSN_SB_HIST_ELEMS 0x30
+
 /**
  * The history.
  */
@@ -45,4 +45,4 @@ void msn_history_destroy(MsnHistory *history);
 MsnTransaction *msn_history_find(MsnHistory *history, unsigned int triId);
 void msn_history_add(MsnHistory *history, MsnTransaction *trans);
 
-#endif /* _MSN_HISTORY_H */
+#endif /* MSN_HISTORY_H */
diff --git a/libpurple/protocols/msn/httpconn.h b/libpurple/protocols/msn/httpconn.h
index 3839c00adf..a7bfd69e18 100644
--- a/libpurple/protocols/msn/httpconn.h
+++ b/libpurple/protocols/msn/httpconn.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_HTTPCONN_H_
-#define _MSN_HTTPCONN_H_
+#ifndef MSN_HTTPCONN_H
+#define MSN_HTTPCONN_H
 
 typedef struct _MsnHttpConn MsnHttpConn;
 
@@ -108,4 +108,4 @@ gboolean msn_httpconn_connect(MsnHttpConn *httpconn,
  */
 void msn_httpconn_disconnect(MsnHttpConn *httpconn);
 
-#endif /* _MSN_HTTPCONN_H_ */
+#endif /* MSN_HTTPCONN_H */
diff --git a/libpurple/protocols/msn/msg.h b/libpurple/protocols/msn/msg.h
index 6b63cadc2d..b75dbf19cc 100644
--- a/libpurple/protocols/msn/msg.h
+++ b/libpurple/protocols/msn/msg.h
@@ -21,32 +21,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_MSG_H_
-#define _MSN_MSG_H_
+#ifndef MSN_MSG_H
+#define MSN_MSG_H
 
 typedef struct _MsnMessage MsnMessage;
 
-#include "session.h"
-#include "user.h"
-
-#include "command.h"
-#include "transaction.h"
-
-typedef void (*MsnMsgCb)(MsnMessage *, void *data);
-
-#define MSG_BODY_DEM	"\r\n\r\n"
-#define MSG_LINE_DEM	"\r\n"
-
-#define MSG_OIM_BODY_DEM	"\n\n"
-#define MSG_OIM_LINE_DEM	"\n"
-
 /*
 typedef enum
 {
 	MSN_MSG_NORMAL,
 	MSN_MSG_SLP_SB,
 	MSN_MSG_SLP_DC
-
 } MsnMsgType;
 */
 
@@ -58,7 +43,6 @@ typedef enum
 	MSN_MSG_CAPS,
 	MSN_MSG_SLP,
 	MSN_MSG_NUDGE
-
 } MsnMsgType;
 
 typedef enum
@@ -68,9 +52,21 @@ typedef enum
 	MSN_MSG_ERROR_NAK, /**< The message could not be sent. */
 	MSN_MSG_ERROR_SB, /**< The error comes from the switchboard. */
 	MSN_MSG_ERROR_UNKNOWN /**< An unknown error occurred. */
-
 } MsnMsgErrorType;
 
+#include "command.h"
+#include "session.h"
+#include "transaction.h"
+#include "user.h"
+
+typedef void (*MsnMsgCb)(MsnMessage *, void *data);
+
+#define MSG_BODY_DEM	"\r\n\r\n"
+#define MSG_LINE_DEM	"\r\n"
+
+#define MSG_OIM_BODY_DEM	"\n\n"
+#define MSG_OIM_LINE_DEM	"\n"
+
 typedef struct
 {
 	guint32 session_id;
@@ -82,13 +78,11 @@ typedef struct
 	guint32 ack_id;
 	guint32 ack_sub_id;
 	guint64 ack_size;
-
 } MsnSlpHeader;
 
 typedef struct
 {
 	guint32 value;
-
 } MsnSlpFooter;
 
 /**
@@ -347,4 +341,4 @@ void msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 void msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
-#endif /* _MSN_MSG_H_ */
+#endif /* MSN_MSG_H */
diff --git a/libpurple/protocols/msn/msn.h b/libpurple/protocols/msn/msn.h
index aa4682dbdf..d989ff33eb 100644
--- a/libpurple/protocols/msn/msn.h
+++ b/libpurple/protocols/msn/msn.h
@@ -21,61 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_H_
-#define _MSN_H_
-
-#include "internal.h"
-
-#include "account.h"
-#include "accountopt.h"
-#include "blist.h"
-#include "connection.h"
-#include "conversation.h"
-#include "debug.h"
-#include "cipher.h"
-#include "notify.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
-#include "servconn.h"
-#include "sslconn.h"
-#include "util.h"
-
-#include "ft.h"
-
-#include "msg.h"
-
-#define MSN_BUF_LEN 8192
-
-/* Windows Live Messenger Server*/
-#define MSN_SERVER "messenger.hotmail.com"
-#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
-#define MSN_PORT 1863
-#define WLM_PROT_VER		15
-
-#define WLM_MAX_PROTOCOL	15
-#define WLM_MIN_PROTOCOL	15
-
-#define MSN_TYPING_RECV_TIMEOUT 6
-#define MSN_TYPING_SEND_TIMEOUT	4
-
-#define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
-#define PHOTO_URL	" contactparams:photopreauthurl=\""
-
-#define BUDDY_ALIAS_MAXLEN 387
-
-#define MSN_CAM_GUID "4BD96FC0-AB17-4425-A14A-439185962DC8"
-#define MSN_CAM_REQUEST_GUID "1C9AA97E-9C05-4583-A3BD-908A196F1E92"
-#define MSN_FT_GUID "5D3E02AB-6190-11D3-BBBB-00C04F795683"
-#define MSN_OBJ_GUID "A4268EEC-FEC5-49E5-95C3-F126696BDBF6"
-
-#define MSN_CLIENTINFO \
-	"Client-Name: Purple/" VERSION "\r\n" \
-	"Chat-Logging: Y\r\n"
-
-/* Index into attention_types */
-#define MSN_NUDGE 0
+#ifndef MSN_H
+#define MSN_H
 
 typedef enum
 {
@@ -84,7 +31,6 @@ typedef enum
 	MSN_LIST_BL_OP = 0x04,
 	MSN_LIST_RL_OP = 0x08,
 	MSN_LIST_PL_OP = 0x10
-
 } MsnListOp;
 #define MSN_LIST_OP_MASK	0x07
 
@@ -112,7 +58,6 @@ typedef enum
 	MSN_CLIENT_CAP_ONECARE    = 0x1000000,
 	MSN_CLIENT_CAP_P2P_TURN   = 0x2000000,
 	MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000,
-
 } MsnClientCaps;
 
 typedef enum
@@ -134,9 +79,61 @@ typedef enum
 	MSN_CLIENT_VER_8_5  = 0x80,	/* MSNC8 */
 	MSN_CLIENT_VER_9_0  = 0x90,	/* MSNC9 */
 	MSN_CLIENT_VER_14_0 = 0xA0	/* MSNC10 */
-
 } MsnClientVerId;
 
+#include "internal.h"
+
+#include "account.h"
+#include "accountopt.h"
+#include "blist.h"
+#include "connection.h"
+#include "conversation.h"
+#include "debug.h"
+#include "cipher.h"
+#include "notify.h"
+#include "privacy.h"
+#include "proxy.h"
+#include "prpl.h"
+#include "request.h"
+#include "servconn.h"
+#include "sslconn.h"
+#include "util.h"
+
+#include "ft.h"
+
+#include "msg.h"
+
+#define MSN_BUF_LEN 8192
+
+/* Windows Live Messenger Server*/
+#define MSN_SERVER "messenger.hotmail.com"
+#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
+#define MSN_PORT 1863
+#define WLM_PROT_VER		15
+
+#define WLM_MAX_PROTOCOL	15
+#define WLM_MIN_PROTOCOL	15
+
+#define MSN_TYPING_RECV_TIMEOUT 6
+#define MSN_TYPING_SEND_TIMEOUT	4
+
+#define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
+#define PHOTO_URL	" contactparams:photopreauthurl=\""
+
+#define BUDDY_ALIAS_MAXLEN 387
+
+#define MSN_CAM_GUID "4BD96FC0-AB17-4425-A14A-439185962DC8"
+#define MSN_CAM_REQUEST_GUID "1C9AA97E-9C05-4583-A3BD-908A196F1E92"
+#define MSN_FT_GUID "5D3E02AB-6190-11D3-BBBB-00C04F795683"
+#define MSN_OBJ_GUID "A4268EEC-FEC5-49E5-95C3-F126696BDBF6"
+
+#define MSN_CLIENTINFO \
+	"Client-Name: Purple/" VERSION "\r\n" \
+	"Chat-Logging: Y\r\n"
+
+/* Index into attention_types */
+#define MSN_NUDGE 0
+
 #define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_7_0
 #define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM)
 
@@ -151,4 +148,4 @@ void msn_act_id(PurpleConnection *gc, const char *entry);
 void msn_send_privacy(PurpleConnection *gc);
 void msn_send_im_message(MsnSession *session, MsnMessage *msg);
 
-#endif /* _MSN_H_ */
+#endif /* MSN_H */
diff --git a/libpurple/protocols/msn/msnutils.h b/libpurple/protocols/msn/msnutils.h
index 51730d5dc5..08c7f44bab 100644
--- a/libpurple/protocols/msn/msnutils.h
+++ b/libpurple/protocols/msn/msnutils.h
@@ -21,16 +21,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_UTILS_H_
-#define _MSN_UTILS_H_
+#ifndef MSN_UTILS_H
+#define MSN_UTILS_H
 
 /*encode the str to RFC2047 style*/
-char * msn_encode_mime(const char *str);
+char *msn_encode_mime(const char *str);
 
 /**
  * Generate the Random GUID
  */
-char * rand_guid(void);
+char *rand_guid(void);
 
 /**
  * Parses the MSN message formatting into a format compatible with Purple.
@@ -57,4 +57,4 @@ void msn_import_html(const char *html, char **attributes, char **message);
 void msn_parse_socket(const char *str, char **ret_host, int *ret_port);
 void msn_handle_chl(char *input, char *output);
 
-#endif /* _MSN_UTILS_H_ */
+#endif /* MSN_UTILS_H */
diff --git a/libpurple/protocols/msn/nexus.h b/libpurple/protocols/msn/nexus.h
index 44eca30869..ab6f7f4ffa 100644
--- a/libpurple/protocols/msn/nexus.h
+++ b/libpurple/protocols/msn/nexus.h
@@ -21,8 +21,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_NEXUS_H_
-#define _MSN_NEXUS_H_
+#ifndef MSN_NEXUS_H
+#define MSN_NEXUS_H
+
+typedef struct _MsnNexus MsnNexus;
+typedef struct _MsnTicketToken MsnTicketToken;
+typedef struct _MsnUsrKey MsnUsrKey;
 
 /* Index into ticket_tokens in nexus.c Keep updated! */
 typedef enum
@@ -183,7 +187,6 @@ typedef enum
 	"</Body>"\
 "</Envelope>"
 
-typedef struct _MsnUsrKey MsnUsrKey;
 struct _MsnUsrKey
 {
 	int size; /* 28. Does not count data */
@@ -199,7 +202,6 @@ struct _MsnUsrKey
 	char cipher[72];
 };
 
-typedef struct _MsnTicketToken MsnTicketToken;
 struct _MsnTicketToken {
 	GHashTable *token;
 	char *secret;
@@ -207,8 +209,6 @@ struct _MsnTicketToken {
 	GSList *updates;
 };
 
-typedef struct _MsnNexus MsnNexus;
-
 struct _MsnNexus
 {
 	MsnSession *session;
@@ -230,5 +230,5 @@ void msn_nexus_destroy(MsnNexus *nexus);
 GHashTable *msn_nexus_get_token(MsnNexus *nexus, MsnAuthDomains id);
 const char *msn_nexus_get_token_str(MsnNexus *nexus, MsnAuthDomains id);
 void msn_nexus_update_token(MsnNexus *nexus, int id, GSourceFunc cb, gpointer data);
-#endif /* _MSN_NEXUS_H_ */
 
+#endif /* MSN_NEXUS_H */
diff --git a/libpurple/protocols/msn/notification.h b/libpurple/protocols/msn/notification.h
index d762ffc78b..96991e4952 100644
--- a/libpurple/protocols/msn/notification.h
+++ b/libpurple/protocols/msn/notification.h
@@ -21,27 +21,29 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_NOTIFICATION_H_
-#define _MSN_NOTIFICATION_H_
+#ifndef MSN_NOTIFICATION_H
+#define MSN_NOTIFICATION_H
 
-/*MSN protocol challenge info*/
+typedef struct _MsnNotification MsnNotification;
+
+/* MSN protocol challenge info */
 
-/*MSNP15 challenge: WLM 8.5.1288.816*/
+/* MSNP15 challenge: WLM 8.5.1288.816 */
 #define MSNP15_WLM_PRODUCT_KEY "ILTXC!4IXB5FB*PX"
 #define MSNP15_WLM_PRODUCT_ID "PROD0119GSJUC$18"
 
-/*MSNP13 challenge*/
+/* MSNP13 challenge */
 #define MSNP13_WLM_PRODUCT_KEY	"O4BG@C7BWLYQX?5G"
 #define MSNP13_WLM_PRODUCT_ID	"PROD01065C%ZFN6F"
 
 #define MSNP10_PRODUCT_KEY		"VT6PX?UQTM4WM%YR"
 #define MSNP10_PRODUCT_ID		"PROD0038W!61ZTF9"
 
-typedef struct _MsnNotification MsnNotification;
-
+#include "cmdproc.h"
+#include "msg.h"
 #include "session.h"
 #include "servconn.h"
-#include "cmdproc.h"
+#include "state.h"
 #include "user.h"
 
 struct _MsnNotification
@@ -60,8 +62,7 @@ struct _MsnNotification
 
 typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network, gpointer data);
 
-#include "state.h"
-void uum_send_msg(MsnSession *session,MsnMessage *msg);
+void uum_send_msg(MsnSession *session, MsnMessage *msg);
 
 void msn_notification_end(void);
 void msn_notification_init(void);
@@ -93,4 +94,4 @@ void msn_notification_close(MsnNotification *notification);
 
 void msn_got_login_params(MsnSession *session, const char *ticket, const char *response);
 
-#endif /* _MSN_NOTIFICATION_H_ */
+#endif /* MSN_NOTIFICATION_H */
diff --git a/libpurple/protocols/msn/object.h b/libpurple/protocols/msn/object.h
index 3771d378b9..7bcab67514 100644
--- a/libpurple/protocols/msn/object.h
+++ b/libpurple/protocols/msn/object.h
@@ -21,12 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_OBJECT_H_
-#define _MSN_OBJECT_H_
-
-#include "imgstore.h"
-
-#include "internal.h"
+#ifndef MSN_OBJECT_H
+#define MSN_OBJECT_H
 
 typedef enum
 {
@@ -36,9 +32,12 @@ typedef enum
 	MSN_OBJECT_USERTILE   =  3, /**< UserTile (buddy icon) */
 	MSN_OBJECT_RESERVED2  =  4, /**< Reserved              */
 	MSN_OBJECT_BACKGROUND =  5  /**< Background            */
-
 } MsnObjectType;
 
+#include "internal.h"
+
+#include "imgstore.h"
+
 typedef struct
 {
 	gboolean local;
@@ -51,7 +50,6 @@ typedef struct
 	char *friendly;
 	char *sha1d;
 	char *sha1c;
-
 } MsnObject;
 
 /**
@@ -239,4 +237,4 @@ PurpleStoredImage *msn_object_get_image(const MsnObject *obj);
 
 void msn_object_set_local(MsnObject *obj);
 
-#endif /* _MSN_OBJECT_H_ */
+#endif /* MSN_OBJECT_H */
diff --git a/libpurple/protocols/msn/oim.h b/libpurple/protocols/msn/oim.h
index 87a35ffba5..17751ea27b 100644
--- a/libpurple/protocols/msn/oim.h
+++ b/libpurple/protocols/msn/oim.h
@@ -22,8 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#ifndef _MSN_OIM_H_
-#define _MSN_OIM_H_
+#ifndef MSN_OIM_H
+#define MSN_OIM_H
+
+typedef struct _MsnOim MsnOim;
 
 /* OIM Retrieval Info */
 #define MSN_OIM_RETRIEVE_HOST	"rsi.hotmail.com"
@@ -131,8 +133,6 @@
 	"</soap:Body>"\
 "</soap:Envelope>"
 
-typedef struct _MsnOim MsnOim;
-
 struct _MsnOim
 {
 	MsnSession *session;
@@ -160,4 +160,4 @@ void msn_oim_prep_send_msg_info(MsnOim *oim, const char *membername,
 
 void msn_oim_send_msg(MsnOim *oim);
 
-#endif/* _MSN_OIM_H_*/
+#endif/* MSN_OIM_H*/
diff --git a/libpurple/protocols/msn/page.h b/libpurple/protocols/msn/page.h
index 3b40fb4ebb..4fb89f5380 100644
--- a/libpurple/protocols/msn/page.h
+++ b/libpurple/protocols/msn/page.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_PAGE_H_
-#define _MSN_PAGE_H_
+#ifndef MSN_PAGE_H
+#define MSN_PAGE_H
 
 typedef struct _MsnPage MsnPage;
 
@@ -78,4 +78,4 @@ void msn_page_set_body(MsnPage *page, const char *body);
  */
 const char *msn_page_get_body(const MsnPage *page);
 
-#endif /* _MSN_PAGE_H_ */
+#endif /* MSN_PAGE_H */
diff --git a/libpurple/protocols/msn/servconn.h b/libpurple/protocols/msn/servconn.h
index 70a9cbb3ad..0c1434077e 100644
--- a/libpurple/protocols/msn/servconn.h
+++ b/libpurple/protocols/msn/servconn.h
@@ -21,17 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SERVCONN_H_
-#define _MSN_SERVCONN_H_
+#ifndef MSN_SERVCONN_H
+#define MSN_SERVCONN_H
 
 typedef struct _MsnServConn MsnServConn;
 
-#include "session.h"
-#include "cmdproc.h"
-
-#include "proxy.h"
-#include "httpconn.h"
-
 /**
  * Connection error types.
  */
@@ -41,7 +35,6 @@ typedef enum
 	MSN_SERVCONN_ERROR_CONNECT,
 	MSN_SERVCONN_ERROR_WRITE,
 	MSN_SERVCONN_ERROR_READ
-
 } MsnServConnError;
 
 /**
@@ -51,9 +44,14 @@ typedef enum
 {
 	MSN_SERVCONN_NS,
 	MSN_SERVCONN_SB
-
 } MsnServConnType;
 
+#include "proxy.h"
+
+#include "cmdproc.h"
+#include "httpconn.h"
+#include "session.h"
+
 /**
  * A Connection.
  */
@@ -191,4 +189,4 @@ MsnServConn *msn_servconn_process_data(MsnServConn *servconn);
  */
 void msn_servconn_set_idle_timeout(MsnServConn *servconn, guint seconds);
 
-#endif /* _MSN_SERVCONN_H_ */
+#endif /* MSN_SERVCONN_H */
diff --git a/libpurple/protocols/msn/session.h b/libpurple/protocols/msn/session.h
index 36ea2ff026..116c6bf184 100644
--- a/libpurple/protocols/msn/session.h
+++ b/libpurple/protocols/msn/session.h
@@ -21,27 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SESSION_H_
-#define _MSN_SESSION_H_
+#ifndef MSN_SESSION_H
+#define MSN_SESSION_H
 
 typedef struct _MsnSession MsnSession;
 
-#include "sslconn.h"
-
-#include "user.h"
-#include "slpcall.h"
-
-#include "notification.h"
-#include "switchboard.h"
-#include "group.h"
-
-#include "nexus.h"
-#include "httpconn.h"
-#include "oim.h"
-
-#include "userlist.h"
-#include "sync.h"
-
 /**
  * Types of errors.
  */
@@ -55,7 +39,6 @@ typedef enum
 	MSN_ERROR_SIGN_OTHER,
 	MSN_ERROR_SERV_DOWN,
 	MSN_ERROR_SERV_UNAVAILABLE
-
 } MsnErrorType;
 
 /**
@@ -73,11 +56,22 @@ typedef enum
 	MSN_LOGIN_STEP_AUTH_END,
 	MSN_LOGIN_STEP_SYN,
 	MSN_LOGIN_STEP_END
-
 } MsnLoginStep;
 
 #define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END
 
+#include "group.h"
+#include "httpconn.h"
+#include "nexus.h"
+#include "notification.h"
+#include "oim.h"
+#include "slpcall.h"
+#include "sslconn.h"
+#include "switchboard.h"
+#include "sync.h"
+#include "user.h"
+#include "userlist.h"
+
 struct _MsnSession
 {
 	PurpleAccount *account;
@@ -238,4 +232,4 @@ void msn_session_finish_login(MsnSession *session);
 void msn_session_report_user(MsnSession *session,const char *passport,
 							const char *msg,PurpleMessageFlags flags);
 
-#endif /* _MSN_SESSION_H_ */
+#endif /* MSN_SESSION_H */
diff --git a/libpurple/protocols/msn/slp.h b/libpurple/protocols/msn/slp.h
index baba1eef78..2b7ef672e8 100644
--- a/libpurple/protocols/msn/slp.h
+++ b/libpurple/protocols/msn/slp.h
@@ -21,13 +21,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SLP_H_
-#define _MSN_SLP_H_
+#ifndef MSN_SLP_H
+#define MSN_SLP_H
 
-#include "slpcall.h"
-#include "session.h"
 #include "internal.h"
+
 #include "ft.h"
+#include "session.h"
+#include "slpcall.h"
 
 MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
 							  const char *body);
@@ -45,4 +46,4 @@ void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
 
 void msn_queue_buddy_icon_request(MsnUser *user);
 
-#endif /* _MSN_SLP_H_ */
+#endif /* MSN_SLP_H */
diff --git a/libpurple/protocols/msn/slpcall.h b/libpurple/protocols/msn/slpcall.h
index 5c7664a7da..58da0f7e62 100644
--- a/libpurple/protocols/msn/slpcall.h
+++ b/libpurple/protocols/msn/slpcall.h
@@ -21,26 +21,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SLPCALL_H_
-#define _MSN_SLPCALL_H_
-
-#include "internal.h"
-#include "ft.h"
+#ifndef MSN_SLPCALL_H
+#define MSN_SLPCALL_H
 
 typedef struct _MsnSlpCall MsnSlpCall;
 
-#include "slplink.h"
-
-/* The official client seems to timeout slp calls after 5 minutes */
-#define MSN_SLPCALL_TIMEOUT 300
-
 typedef enum
 {
 	MSN_SLPCALL_ANY,
 	MSN_SLPCALL_DC
-
 } MsnSlpCallType;
 
+#include "internal.h"
+
+#include "ft.h"
+
+#include "slplink.h"
+
+/* The official client seems to timeout slp calls after 5 minutes */
+#define MSN_SLPCALL_TIMEOUT 300
+
 struct _MsnSlpCall
 {
 	/* Our parent slplink */
@@ -95,4 +95,4 @@ void msn_slpcall_invite(MsnSlpCall *slpcall, const char *euf_guid,
 						 int app_id, const char *context);
 void msn_slpcall_close(MsnSlpCall *slpcall);
 
-#endif /* _MSN_SLPCALL_H_ */
+#endif /* MSN_SLPCALL_H */
diff --git a/libpurple/protocols/msn/slplink.h b/libpurple/protocols/msn/slplink.h
index ea8ca2e5f6..4059ea9216 100644
--- a/libpurple/protocols/msn/slplink.h
+++ b/libpurple/protocols/msn/slplink.h
@@ -21,21 +21,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SLPLINK_H_
-#define _MSN_SLPLINK_H_
+#ifndef MSN_SLPLINK_H
+#define MSN_SLPLINK_H
 
 typedef struct _MsnSlpLink MsnSlpLink;
 
+#include "ft.h"
+
 #include "directconn.h"
+#include "session.h"
 #include "slpcall.h"
 #include "slpmsg.h"
-
 #include "switchboard.h"
 
-#include "ft.h"
-
-#include "session.h"
-
 typedef void (*MsnSlpCb)(MsnSlpCall *slpcall,
 						 const guchar *data, gsize size);
 typedef void (*MsnSlpEndCb)(MsnSlpCall *slpcall, MsnSession *session);
@@ -95,4 +93,4 @@ void msn_slplink_request_object(MsnSlpLink *slplink,
 
 MsnSlpCall *msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
 
-#endif /* _MSN_SLPLINK_H_ */
+#endif /* MSN_SLPLINK_H */
diff --git a/libpurple/protocols/msn/soap.h b/libpurple/protocols/msn/soap.h
index 61881c369d..de4d50e3dd 100644
--- a/libpurple/protocols/msn/soap.h
+++ b/libpurple/protocols/msn/soap.h
@@ -22,17 +22,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
+#ifndef MSN_SOAP_H
+#define MSN_SOAP_H
 
-#ifndef _MSN_SOAP_H
-#define _MSN_SOAP_H
+typedef struct _MsnSoapMessage MsnSoapMessage;
+
+#include <glib.h>
 
-#include "session.h"
-#include "sslconn.h"
 #include "xmlnode.h"
 
-#include <glib.h>
+#include "session.h"
+#include "sslconn.h"
 
-typedef struct _MsnSoapMessage MsnSoapMessage;
 typedef void (*MsnSoapCallback)(MsnSoapMessage *request,
 	MsnSoapMessage *response, gpointer cb_data);
 
@@ -48,4 +49,4 @@ void msn_soap_message_send(MsnSession *session, MsnSoapMessage *message,
 	const char *host, const char *path, gboolean secure,
 	MsnSoapCallback cb, gpointer cb_data);
 
-#endif
+#endif /* MSN_SOAP_H */
diff --git a/libpurple/protocols/msn/state.c b/libpurple/protocols/msn/state.c
index c561e69764..319f568e4e 100644
--- a/libpurple/protocols/msn/state.c
+++ b/libpurple/protocols/msn/state.c
@@ -23,6 +23,7 @@
  */
 
 #include "internal.h"
+
 #include "core.h"
 
 #include "msn.h"
diff --git a/libpurple/protocols/msn/state.h b/libpurple/protocols/msn/state.h
index 38586e42aa..7e31afefea 100644
--- a/libpurple/protocols/msn/state.h
+++ b/libpurple/protocols/msn/state.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_STATE_H_
-#define _MSN_STATE_H_
+#ifndef MSN_STATE_H
+#define MSN_STATE_H
 
 /**
  * Away types.
@@ -38,7 +38,6 @@ typedef enum
 	MSN_LUNCH   = 7,
 	MSN_OFFLINE = 8,
 	MSN_HIDDEN  = 9
-
 } MsnAwayType;
 
 /**
@@ -62,11 +61,11 @@ const char *msn_state_get_text(MsnAwayType state);
 void msn_set_psm(MsnSession *session);
 
 /* Get the CurrentMedia info from the XML string */
-char * msn_get_currentmedia(char *xml_str,gsize len);
+char *msn_get_currentmedia(char *xml_str, gsize len);
 
 /*get the PSM info from the XML string*/
-char * msn_get_psm(char *xml_str,gsize len);
+char *msn_get_psm(char *xml_str, gsize len);
 
 MsnAwayType msn_state_from_account(PurpleAccount *account);
 
-#endif /* _MSN_STATE_H_ */
+#endif /* MSN_STATE_H */
diff --git a/libpurple/protocols/msn/switchboard.h b/libpurple/protocols/msn/switchboard.h
index 891d31902d..1a6c958914 100644
--- a/libpurple/protocols/msn/switchboard.h
+++ b/libpurple/protocols/msn/switchboard.h
@@ -21,20 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SWITCHBOARD_H_
-#define _MSN_SWITCHBOARD_H_
+#ifndef MSN_SWITCHBOARD_H
+#define MSN_SWITCHBOARD_H
 
 typedef struct _MsnSwitchBoard MsnSwitchBoard;
 
-#include "conversation.h"
-
-#include "msg.h"
-#include "user.h"
-
-#include "servconn.h"
-
-#include "slplink.h"
-
 /**
  * A switchboard error.
  */
@@ -48,7 +39,6 @@ typedef enum
 	MSN_SB_ERROR_TOO_FAST, /**< We are sending too fast */
 	MSN_SB_ERROR_AUTHFAILED, /**< Authentication failed joining the switchboard session */
 	MSN_SB_ERROR_UNKNOWN /**< An unknown error occurred. */
-
 } MsnSBErrorType;
 
 /**
@@ -58,9 +48,15 @@ typedef enum
 {
 	MSN_SB_FLAG_IM = 0x01, /**< This switchboard is being used for a conversation. */
 	MSN_SB_FLAG_FT = 0x02  /**< This switchboard is being used for file transfer. */
-
 } MsnSBFlag;
 
+#include "conversation.h"
+
+#include "msg.h"
+#include "servconn.h"
+#include "slplink.h"
+#include "user.h"
+
 /**
  * A switchboard.
  *
@@ -290,4 +286,4 @@ void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 void msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport,
                               const char *data);
 
-#endif /* _MSN_SWITCHBOARD_H_ */
+#endif /* MSN_SWITCHBOARD_H */
diff --git a/libpurple/protocols/msn/sync.h b/libpurple/protocols/msn/sync.h
index 69ce7757d9..12ca1cc963 100644
--- a/libpurple/protocols/msn/sync.h
+++ b/libpurple/protocols/msn/sync.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SYNC_H_
-#define _MSN_SYNC_H_
+#ifndef MSN_SYNC_H
+#define MSN_SYNC_H
 
 typedef struct _MsnSync MsnSync;
 
@@ -51,7 +51,7 @@ struct _MsnSync
 void msn_sync_init(void);
 void msn_sync_end(void);
 
-MsnSync * msn_sync_new(MsnSession *session);
+MsnSync *msn_sync_new(MsnSession *session);
 void msn_sync_destroy(MsnSync *sync);
 
-#endif /* _MSN_SYNC_H_ */
+#endif /* MSN_SYNC_H */
diff --git a/libpurple/protocols/msn/table.h b/libpurple/protocols/msn/table.h
index d4e7a555ee..f6a7b64478 100644
--- a/libpurple/protocols/msn/table.h
+++ b/libpurple/protocols/msn/table.h
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_TABLE_H_
-#define _MSN_TABLE_H_
+#ifndef MSN_TABLE_H
+#define MSN_TABLE_H
 
 typedef struct _MsnTable MsnTable;
 
@@ -50,4 +50,4 @@ void msn_table_add_cmd(MsnTable *table, char *command, char *answer,
 void msn_table_add_error(MsnTable *table, char *answer, MsnErrorCb cb);
 void msn_table_add_msg_type(MsnTable *table, char *type, MsnMsgTypeCb cb);
 
-#endif /* _MSN_TABLE_H_ */
+#endif /* MSN_TABLE_H */
diff --git a/libpurple/protocols/msn/transaction.h b/libpurple/protocols/msn/transaction.h
index 61181dd93d..2e977fa3f8 100644
--- a/libpurple/protocols/msn/transaction.h
+++ b/libpurple/protocols/msn/transaction.h
@@ -21,13 +21,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_TRANSACTION_H
-#define _MSN_TRANSACTION_H
+#ifndef MSN_TRANSACTION_H
+#define MSN_TRANSACTION_H
 
 typedef struct _MsnTransaction MsnTransaction;
 
-#include "command.h"
 #include "cmdproc.h"
+#include "command.h"
 
 typedef void (*MsnTransCb)(MsnCmdProc *cmdproc, MsnCommand *cmd);
 typedef void (*MsnTimeoutCb)(MsnCmdProc *cmdproc, MsnTransaction *trans);
@@ -79,4 +79,4 @@ void msn_transaction_add_cb(MsnTransaction *trans, char *answer,
 void msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb);
 void msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb);
 
-#endif /* _MSN_TRANSACTION_H */
+#endif /* MSN_TRANSACTION_H */
diff --git a/libpurple/protocols/msn/user.h b/libpurple/protocols/msn/user.h
index b90f068a99..1baf02cad9 100644
--- a/libpurple/protocols/msn/user.h
+++ b/libpurple/protocols/msn/user.h
@@ -21,16 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_USER_H_
-#define _MSN_USER_H_
+#ifndef MSN_USER_H
+#define MSN_USER_H
 
 typedef struct _MsnUser  MsnUser;
 
-#include "session.h"
-#include "object.h"
-
-#include "userlist.h"
-
 typedef enum
 {
 	MSN_NETWORK_UNKNOWN      = 0x00,
@@ -53,6 +48,10 @@ typedef enum
 	CURRENT_MEDIA_OFFICE
 } CurrentMediaType;
 
+#include "object.h"
+#include "session.h"
+#include "userlist.h"
+
 /**
  * Contains optional info about a user that is fairly uncommon.  We
  * put this info in in a separate struct to save memory because we
@@ -394,19 +393,16 @@ const char *msn_user_get_invite_message(const MsnUser *user);
 /**
  * check to see if user is online
  */
-gboolean
-msn_user_is_online(PurpleAccount *account, const char *name);
+gboolean msn_user_is_online(PurpleAccount *account, const char *name);
 
 /**
  * check to see if user is Yahoo User
  */
-gboolean
-msn_user_is_yahoo(PurpleAccount *account ,const char *name);
+gboolean msn_user_is_yahoo(PurpleAccount *account ,const char *name);
 
 void msn_user_set_op(MsnUser *user, int list_op);
 void msn_user_unset_op(MsnUser *user, int list_op);
 
 /*@}*/
 
-
-#endif /* _MSN_USER_H_ */
+#endif /* MSN_USER_H */
diff --git a/libpurple/protocols/msn/userlist.h b/libpurple/protocols/msn/userlist.h
index dd6342b9b2..f98fb28efe 100644
--- a/libpurple/protocols/msn/userlist.h
+++ b/libpurple/protocols/msn/userlist.h
@@ -21,14 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_USERLIST_H_
-#define _MSN_USERLIST_H_
+#ifndef MSN_USERLIST_H
+#define MSN_USERLIST_H
 
 typedef struct _MsnUserList MsnUserList;
 
-#include "user.h"
-#include "group.h"
-
 typedef enum
 {
 	MSN_LIST_FL, /**< Forward list */
@@ -38,6 +35,8 @@ typedef enum
 	MSN_LIST_PL  /**< Pending list */
 } MsnListId;
 
+#include "group.h"
+#include "user.h"
 
 struct _MsnUserList
 {
@@ -101,4 +100,4 @@ void msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
 
 void msn_userlist_load(MsnSession *session);
 
-#endif /* _MSN_USERLIST_H_ */
+#endif /* MSN_USERLIST_H */