Remove unnecessary struct tags.

This is basically three sed's:

fd '\.[ch]$' -exec \
    sed -i 's/typedef struct _[A-Za-z0-9_]\+ {/typedef struct {/g'

fd '\.[ch]$' -exec \
    sed -i 's/typedef struct _[A-Za-z0-9_]\+$/typedef struct/g'

sed -i 's/struct _pidgin_blist_node/PidginBlistNode/g' pidgin/gtkblist.c

56 files changed, 134 insertions, 134 deletions

diff --git a/libpurple/cmds.c b/libpurple/cmds.c
index b312a36f29..8f4d2ebfd3 100644
--- a/libpurple/cmds.c
+++ b/libpurple/cmds.c
@@ -26,7 +26,7 @@ static PurpleCommandsUiOps *cmds_ui_ops = NULL;
 static GList *cmds = NULL;
 static guint next_id = 1;
 
-typedef struct _PurpleCmd {
+typedef struct {
 	PurpleCmdId id;
 	gchar *cmd;
 	gchar *args;
diff --git a/libpurple/connection.c b/libpurple/connection.c
index a1038328a8..41e053749d 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -51,7 +51,7 @@ struct _PurpleConnection
 };
 
 /* Private data for a connection */
-typedef struct _PurpleConnectionPrivate
+typedef struct
 {
 	PurpleProtocol *protocol;     /* The protocol.                     */
 	PurpleConnectionFlags flags;  /* Connection flags.                 */
diff --git a/libpurple/conversationtypes.c b/libpurple/conversationtypes.c
index 328f5d6893..b913848610 100644
--- a/libpurple/conversationtypes.c
+++ b/libpurple/conversationtypes.c
@@ -34,7 +34,7 @@
 /*
  * Data specific to Instant Messages.
  */
-typedef struct _PurpleIMConversationPrivate
+typedef struct
 {
 	PurpleIMTypingState typing_state;  /* The current typing state.    */
 	guint  typing_timeout;             /* The typing timer handle.     */
@@ -63,7 +63,7 @@ G_DEFINE_TYPE_WITH_PRIVATE(PurpleIMConversation, purple_im_conversation,
 /*
  * Data specific to Chats.
  */
-typedef struct _PurpleChatConversationPrivate
+typedef struct
 {
 	GList *ignored;     /* Ignored users.                            */
 	char  *who;         /* The person who set the topic.             */
@@ -111,7 +111,7 @@ struct _PurpleChatUser
 /*
  * Data for "Chat Buddies"
  */
-typedef struct _PurpleChatUserPrivate
+typedef struct
 {
 	PurpleChatConversation *chat;  /* The chat                              */
 	char *name;                    /* The chat participant's name in the
diff --git a/libpurple/eventloop.c b/libpurple/eventloop.c
index f9e141ed47..23847356db 100644
--- a/libpurple/eventloop.c
+++ b/libpurple/eventloop.c
@@ -24,7 +24,7 @@
 #define PURPLE_GLIB_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
 #define PURPLE_GLIB_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
-typedef struct _PurpleIOClosure {
+typedef struct {
 	PurpleInputFunction function;
 	guint result;
 	gpointer data;
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
index 921f85422d..961677e4f0 100644
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -146,7 +146,7 @@ struct _PurpleMediaBackendFs2Session
 	PurpleMediaSessionType type;
 };
 
-typedef struct _PurpleMediaBackendFs2Private
+typedef struct
 {
 	PurpleMedia *media;
 	GstElement *confbin;
diff --git a/libpurple/media/candidate.c b/libpurple/media/candidate.c
index 1fd0366036..9b382589ad 100644
--- a/libpurple/media/candidate.c
+++ b/libpurple/media/candidate.c
@@ -32,7 +32,7 @@ struct _PurpleMediaCandidate
 	GObject parent;
 };
 
-typedef struct _PurpleMediaCandidatePrivate
+typedef struct
 {
 	gchar *foundation;
 	guint component_id;
diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c
index 70de7bf74b..f02c5b97d9 100644
--- a/libpurple/media/codec.c
+++ b/libpurple/media/codec.c
@@ -28,7 +28,7 @@ struct _PurpleMediaCodec
 	GObject parent;
 };
 
-typedef struct _PurpleMediaCodecPrivate
+typedef struct
 {
 	gint id;
 	char *encoding_name;
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
index 8e9adf172f..b0b2230597 100644
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -58,7 +58,7 @@ struct _PurpleMediaOutputWindow
 #endif
 };
 
-typedef struct _PurpleMediaManagerPrivate
+typedef struct
 {
 #ifdef USE_GSTREAMER
 	GstElement *pipeline;
diff --git a/libpurple/presence.c b/libpurple/presence.c
index d4f6d4bfd8..6dd8323c58 100644
--- a/libpurple/presence.c
+++ b/libpurple/presence.c
@@ -28,7 +28,7 @@
  **************************************************************************/
 
 /** Private data for a presence */
-typedef struct _PurplePresencePrivate
+typedef struct
 {
 	gboolean idle;
 	time_t idle_time;
@@ -71,7 +71,7 @@ struct _PurpleAccountPresence
 };
 
 /** Private data for an account presence */
-typedef struct _PurpleAccountPresencePrivate
+typedef struct
 {
 	PurpleAccount *account;
 } PurpleAccountPresencePrivate;
@@ -104,7 +104,7 @@ struct _PurpleBuddyPresence
 };
 
 /** Private data for a buddy presence */
-typedef struct _PurpleBuddyPresencePrivate
+typedef struct
 {
 	PurpleBuddy *buddy;
 } PurpleBuddyPresencePrivate;
diff --git a/libpurple/protocols/bonjour/bonjour.h b/libpurple/protocols/bonjour/bonjour.h
index 42b89fc50b..81070d0a72 100644
--- a/libpurple/protocols/bonjour/bonjour.h
+++ b/libpurple/protocols/bonjour/bonjour.h
@@ -51,17 +51,17 @@
 #define BONJOUR_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), BONJOUR_TYPE_PROTOCOL))
 #define BONJOUR_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), BONJOUR_TYPE_PROTOCOL, BonjourProtocolClass))
 
-typedef struct _BonjourProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } BonjourProtocol;
 
-typedef struct _BonjourProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } BonjourProtocolClass;
 
-typedef struct _BonjourData
+typedef struct
 {
 	BonjourDnsSd *dns_sd_data;
 	BonjourJabber *jabber_data;
diff --git a/libpurple/protocols/bonjour/buddy.h b/libpurple/protocols/bonjour/buddy.h
index c1388889da..1509e06c12 100644
--- a/libpurple/protocols/bonjour/buddy.h
+++ b/libpurple/protocols/bonjour/buddy.h
@@ -22,7 +22,7 @@
 #include "account.h"
 #include "jabber.h"
 
-typedef struct _BonjourBuddy
+typedef struct
 {
 	PurpleAccount *account;
 
diff --git a/libpurple/protocols/bonjour/jabber.h b/libpurple/protocols/bonjour/jabber.h
index 390e76367a..97dbab0cbe 100644
--- a/libpurple/protocols/bonjour/jabber.h
+++ b/libpurple/protocols/bonjour/jabber.h
@@ -33,7 +33,7 @@
 #include "account.h"
 #include "circularbuffer.h"
 
-typedef struct _BonjourJabber
+typedef struct
 {
 	gint port;
 	gint socket;
@@ -44,7 +44,7 @@ typedef struct _BonjourJabber
 	GSList *pending_conversations;
 } BonjourJabber;
 
-typedef struct _BonjourJabberConversation
+typedef struct
 {
 	gint socket;
 	guint rx_handler;
@@ -99,7 +99,7 @@ typedef enum {
 	XEP_IQ_NONE
 } XepIqType;
 
-typedef struct _XepIq {
+typedef struct {
 	XepIqType type;
 	char *id;
 	PurpleXmlNode *node;
diff --git a/libpurple/protocols/bonjour/mdns_avahi.c b/libpurple/protocols/bonjour/mdns_avahi.c
index bdd394c4a6..7d9e0516b3 100644
--- a/libpurple/protocols/bonjour/mdns_avahi.c
+++ b/libpurple/protocols/bonjour/mdns_avahi.c
@@ -39,7 +39,7 @@
 #endif
 
 /* data used by avahi bonjour implementation */
-typedef struct _avahi_session_impl_data {
+typedef struct {
 	AvahiClient *client;
 	AvahiGLibPoll *glib_poll;
 	AvahiServiceBrowser *sb;
@@ -47,7 +47,7 @@ typedef struct _avahi_session_impl_data {
 	AvahiEntryGroup *buddy_icon_group;
 } AvahiSessionImplData;
 
-typedef struct _avahi_buddy_service_resolver_data {
+typedef struct {
 	AvahiServiceResolver *resolver;
 	AvahiIfIndex interface;
 	AvahiProtocol protocol;
@@ -58,7 +58,7 @@ typedef struct _avahi_buddy_service_resolver_data {
 	const char *ip;
 } AvahiSvcResolverData;
 
-typedef struct _avahi_buddy_impl_data {
+typedef struct {
 	GSList *resolvers;
 	AvahiRecordBrowser *buddy_icon_rec_browser;
 } AvahiBuddyImplData;
diff --git a/libpurple/protocols/bonjour/mdns_dns_sd.c b/libpurple/protocols/bonjour/mdns_dns_sd.c
index b39f4a7c10..e8d0de1fa1 100644
--- a/libpurple/protocols/bonjour/mdns_dns_sd.c
+++ b/libpurple/protocols/bonjour/mdns_dns_sd.c
@@ -34,20 +34,20 @@
 
 static GSList *pending_buddies = NULL;
 
-typedef struct _dnssd_service_ref_handler {
+typedef struct {
 	DNSServiceRef sdRef;
 	PurpleAccount *account;
 	guint input_handler;
 } DnsSDServiceRefHandlerData;
 
 /* data used by win32 bonjour implementation */
-typedef struct _win32_session_impl_data {
+typedef struct {
 	DnsSDServiceRefHandlerData *presence_query;
 	DnsSDServiceRefHandlerData *browser_query;
 	DNSRecordRef buddy_icon_rec;
 } Win32SessionImplData;
 
-typedef struct _win32_buddy_service_resolver_data {
+typedef struct {
 	DnsSDServiceRefHandlerData *txt_query;
 	uint32_t if_idx;
 	gchar *name;
@@ -57,13 +57,13 @@ typedef struct _win32_buddy_service_resolver_data {
 	const char *ip;
 } Win32SvcResolverData;
 
-typedef struct _win32_buddy_impl_data {
+typedef struct {
 	GSList *resolvers;
 	DnsSDServiceRefHandlerData *null_query;
 } Win32BuddyImplData;
 
 /* data structure for the resolve callback */
-typedef struct _ResolveCallbackArgs {
+typedef struct {
 	DnsSDServiceRefHandlerData *resolver_query;
 	PurpleAccount *account;
 	BonjourBuddy *bb;
diff --git a/libpurple/protocols/bonjour/mdns_types.h b/libpurple/protocols/bonjour/mdns_types.h
index b8ec2d2857..7870e5c1b6 100644
--- a/libpurple/protocols/bonjour/mdns_types.h
+++ b/libpurple/protocols/bonjour/mdns_types.h
@@ -25,7 +25,7 @@
 /**
  * Data to be used by the dns-sd connection.
  */
-typedef struct _BonjourDnsSd {
+typedef struct {
 	gpointer mdns_impl_data;
 	PurpleAccount *account;
 	gchar *first;
diff --git a/libpurple/protocols/facebook/api.c b/libpurple/protocols/facebook/api.c
index 21c5aed218..9c109aecea 100644
--- a/libpurple/protocols/facebook/api.c
+++ b/libpurple/protocols/facebook/api.c
@@ -47,7 +47,7 @@ enum
 	PROP_N
 };
 
-typedef struct _FbApiPrivate
+typedef struct
 {
 	FbMqtt *mqtt;
 	FbHttpConns *cons;
diff --git a/libpurple/protocols/facebook/data.c b/libpurple/protocols/facebook/data.c
index 357a848ab1..8c7bd7ac13 100644
--- a/libpurple/protocols/facebook/data.c
+++ b/libpurple/protocols/facebook/data.c
@@ -27,7 +27,7 @@
 #include "api.h"
 #include "data.h"
 
-typedef struct _FbDataPrivate
+typedef struct
 {
 	FbApi *api;
 	FbHttpConns *cons;
@@ -50,7 +50,7 @@ struct _FbData
 	FbDataPrivate *priv;
 };
 
-typedef struct _FbDataImagePrivate
+typedef struct
 {
 	FbData *fata;
 	gchar *url;
diff --git a/libpurple/protocols/facebook/json.c b/libpurple/protocols/facebook/json.c
index 67fa299768..a8e50e0822 100644
--- a/libpurple/protocols/facebook/json.c
+++ b/libpurple/protocols/facebook/json.c
@@ -37,7 +37,7 @@ struct _FbJsonValue
 	GValue value;
 };
 
-typedef struct _FbJsonValuesPrivate
+typedef struct
 {
 	JsonNode *root;
 	GQueue *queue;
diff --git a/libpurple/protocols/facebook/mqtt.c b/libpurple/protocols/facebook/mqtt.c
index ad733c6d53..f6332c1ef5 100644
--- a/libpurple/protocols/facebook/mqtt.c
+++ b/libpurple/protocols/facebook/mqtt.c
@@ -34,7 +34,7 @@
 #include "mqtt.h"
 #include "util.h"
 
-typedef struct _FbMqttPrivate
+typedef struct
 {
 	PurpleConnection *gc;
 	GIOStream *conn;
@@ -63,7 +63,7 @@ struct _FbMqtt
 
 G_DEFINE_TYPE_WITH_PRIVATE(FbMqtt, fb_mqtt, G_TYPE_OBJECT);
 
-typedef struct _FbMqttMessagePrivate
+typedef struct
 {
 	FbMqttMessageType type;
 	FbMqttMessageFlags flags;
diff --git a/libpurple/protocols/facebook/thrift.c b/libpurple/protocols/facebook/thrift.c
index fe3f99b81c..d9995ea7ce 100644
--- a/libpurple/protocols/facebook/thrift.c
+++ b/libpurple/protocols/facebook/thrift.c
@@ -23,7 +23,7 @@
 
 #include "thrift.h"
 
-typedef struct _FbThriftPrivate
+typedef struct
 {
 	GByteArray *bytes;
 	gboolean internal;
diff --git a/libpurple/protocols/gg/gg.h b/libpurple/protocols/gg/gg.h
index 5d8e110a22..4511276c48 100644
--- a/libpurple/protocols/gg/gg.h
+++ b/libpurple/protocols/gg/gg.h
@@ -49,12 +49,12 @@
 #define GGP_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), GGP_TYPE_PROTOCOL))
 #define GGP_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GGP_TYPE_PROTOCOL, GGPProtocolClass))
 
-typedef struct _GGPProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } GGPProtocol;
 
-typedef struct _GGPProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } GGPProtocolClass;
diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h
index 063356efe0..c7e7f419d2 100644
--- a/libpurple/protocols/irc/irc.h
+++ b/libpurple/protocols/irc/irc.h
@@ -62,12 +62,12 @@
 enum { IRC_USEROPT_SERVER, IRC_USEROPT_PORT, IRC_USEROPT_CHARSET };
 enum irc_state { IRC_STATE_NEW, IRC_STATE_ESTABLISHED };
 
-typedef struct _IRCProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } IRCProtocol;
 
-typedef struct _IRCProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } IRCProtocolClass;
diff --git a/libpurple/protocols/jabber/adhoccommands.c b/libpurple/protocols/jabber/adhoccommands.c
index 3c215e6732..fd25bbd0f7 100644
--- a/libpurple/protocols/jabber/adhoccommands.c
+++ b/libpurple/protocols/jabber/adhoccommands.c
@@ -34,7 +34,7 @@ static void do_adhoc_ignoreme(JabberStream *js, ...) {
 	/* we don't have to do anything */
 }
 
-typedef struct _JabberAdHocActionInfo {
+typedef struct {
 	char *sessionid;
 	char *who;
 	char *node;
diff --git a/libpurple/protocols/jabber/buddy.h b/libpurple/protocols/jabber/buddy.h
index e60e7dd38f..566ba2140a 100644
--- a/libpurple/protocols/jabber/buddy.h
+++ b/libpurple/protocols/jabber/buddy.h
@@ -57,13 +57,13 @@ struct _JabberBuddy {
 	} subscription;
 };
 
-typedef struct _JabberAdHocCommands {
+typedef struct {
 	char *jid;
 	char *node;
 	char *name;
 } JabberAdHocCommands;
 
-typedef struct _JabberBuddyResource {
+typedef struct {
 	JabberBuddy *jb;
 	char *name;
 	int priority;
diff --git a/libpurple/protocols/jabber/caps.c b/libpurple/protocols/jabber/caps.c
index a52c9efa94..a049eb6912 100644
--- a/libpurple/protocols/jabber/caps.c
+++ b/libpurple/protocols/jabber/caps.c
@@ -32,7 +32,7 @@
 
 #define JABBER_CAPS_FILENAME "xmpp-caps.xml"
 
-typedef struct _JabberDataFormField {
+typedef struct {
 	gchar *var;
 	GList *values;
 } JabberDataFormField;
@@ -367,7 +367,7 @@ gboolean jabber_caps_exts_known(const JabberCapsClientInfo *info,
 	return TRUE;
 }
 
-typedef struct _jabber_caps_cbplususerdata {
+typedef struct {
 	guint ref;
 
 	jabber_caps_get_info_cb cb;
diff --git a/libpurple/protocols/jabber/caps.h b/libpurple/protocols/jabber/caps.h
index e2acfbca9f..9c74a08154 100644
--- a/libpurple/protocols/jabber/caps.h
+++ b/libpurple/protocols/jabber/caps.h
@@ -32,7 +32,7 @@ typedef struct _JabberCapsClientInfo JabberCapsClientInfo;
 
 typedef struct _JabberCapsNodeExts JabberCapsNodeExts;
 
-typedef struct _JabberCapsTuple {
+typedef struct {
 	const char *node;
 	const char *ver;
 	const char *hash;
diff --git a/libpurple/protocols/jabber/chat.h b/libpurple/protocols/jabber/chat.h
index 90aab8b2fe..f3973b8549 100644
--- a/libpurple/protocols/jabber/chat.h
+++ b/libpurple/protocols/jabber/chat.h
@@ -32,13 +32,13 @@
 
 #include "jabber.h"
 
-typedef struct _JabberChatMember {
+typedef struct {
 	char *handle;
 	char *jid;
 } JabberChatMember;
 
 
-typedef struct _JabberChat {
+typedef struct {
 	JabberStream *js;
 	char *room;
 	char *server;
diff --git a/libpurple/protocols/jabber/disco.h b/libpurple/protocols/jabber/disco.h
index 02e0577c78..181869f89b 100644
--- a/libpurple/protocols/jabber/disco.h
+++ b/libpurple/protocols/jabber/disco.h
@@ -26,7 +26,7 @@
 
 #include "jabber.h"
 
-typedef struct _JabberDiscoItem {
+typedef struct {
 	const char *jid;  /* MUST */
 	const char *node; /* SHOULD */
 	const char *name; /* MAY */
diff --git a/libpurple/protocols/jabber/gtalk.h b/libpurple/protocols/jabber/gtalk.h
index d7bbd6a901..317a7dc319 100644
--- a/libpurple/protocols/jabber/gtalk.h
+++ b/libpurple/protocols/jabber/gtalk.h
@@ -31,12 +31,12 @@
 #define GTALK_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), GTALK_TYPE_PROTOCOL))
 #define GTALK_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GTALK_TYPE_PROTOCOL, GTalkProtocolClass))
 
-typedef struct _GTalkProtocol
+typedef struct
 {
 	JabberProtocol parent;
 } GTalkProtocol;
 
-typedef struct _GTalkProtocolClass
+typedef struct
 {
 	JabberProtocolClass parent_class;
 } GTalkProtocolClass;
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 732e39bd98..5f7c24431c 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -1243,7 +1243,7 @@ jabber_unregistration_result_cb(JabberStream *js, const char *from,
 	g_free(to);
 }
 
-typedef struct _JabberRegisterCBData {
+typedef struct {
 	JabberStream *js;
 	char *who;
 } JabberRegisterCBData;
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index c9cfaca00e..8496e9623b 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -106,12 +106,12 @@ typedef enum {
 	JABBER_STREAM_CONNECTED
 } JabberStreamState;
 
-typedef struct _JabberProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } JabberProtocol;
 
-typedef struct _JabberProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } JabberProtocolClass;
@@ -293,13 +293,13 @@ struct _JabberStream
 
 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
 
-typedef struct _JabberFeature
+typedef struct
 {
 	gchar *namespace;
 	JabberFeatureEnabled *is_enabled;
 } JabberFeature;
 
-typedef struct _JabberIdentity
+typedef struct
 {
 	gchar *category;
 	gchar *type;
@@ -307,7 +307,7 @@ typedef struct _JabberIdentity
 	gchar *lang;
 } JabberIdentity;
 
-typedef struct _JabberBytestreamsStreamhost {
+typedef struct {
 	char *jid;
 	char *host;
 	guint16 port;
diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h
index 595e5eff00..b858a6ffa0 100644
--- a/libpurple/protocols/jabber/jutil.h
+++ b/libpurple/protocols/jabber/jutil.h
@@ -24,7 +24,7 @@
 #ifndef PURPLE_JABBER_JUTIL_H_
 #define PURPLE_JABBER_JUTIL_H_
 
-typedef struct _JabberID {
+typedef struct {
 	char *node;
 	char *domain;
 	char *resource;
diff --git a/libpurple/protocols/jabber/message.h b/libpurple/protocols/jabber/message.h
index a1496e2beb..441ca95780 100644
--- a/libpurple/protocols/jabber/message.h
+++ b/libpurple/protocols/jabber/message.h
@@ -28,7 +28,7 @@
 #include "jabber.h"
 #include "xmlnode.h"
 
-typedef struct _JabberMessage {
+typedef struct {
 	JabberStream *js;
 	enum {
 		JABBER_MESSAGE_NORMAL,
diff --git a/libpurple/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index 7425853a79..c551866a4b 100644
--- a/libpurple/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
@@ -30,7 +30,7 @@
 #include "iq.h"
 #include "oob.h"
 
-typedef struct _JabberOOBXfer {
+typedef struct {
 	JabberStream *js;
 	gchar *iq_id;
 	gchar *url;
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index 390b4d6f51..11e4ed5c33 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -472,7 +472,7 @@ jabber_vcard_parse_avatar(JabberStream *js, const char *from,
 	}
 }
 
-typedef struct _JabberPresenceCapabilities {
+typedef struct {
 	JabberStream *js;
 	JabberBuddy *jb;
 	char *from;
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index 452ffb807a..78b92ab7ca 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -42,7 +42,7 @@
 #define STREAMHOST_CONNECT_TIMEOUT 15
 #define ENABLE_FT_THUMBNAILS 0
 
-typedef struct _JabberSIXfer {
+typedef struct {
 	JabberStream *js;
 
 	PurpleProxyConnectData *connect_data;
diff --git a/libpurple/protocols/jabber/useravatar.c b/libpurple/protocols/jabber/useravatar.c
index 2a58822dd6..9db3dc9af6 100644
--- a/libpurple/protocols/jabber/useravatar.c
+++ b/libpurple/protocols/jabber/useravatar.c
@@ -235,7 +235,7 @@ void jabber_avatar_fetch_mine(JabberStream *js)
 	}
 }
 
-typedef struct _JabberBuddyAvatarUpdateURLInfo {
+typedef struct {
 	JabberStream *js;
 	char *from;
 	char *id;
diff --git a/libpurple/protocols/jabber/xdata.h b/libpurple/protocols/jabber/xdata.h
index 855b0460c6..4af74d71f8 100644
--- a/libpurple/protocols/jabber/xdata.h
+++ b/libpurple/protocols/jabber/xdata.h
@@ -27,7 +27,7 @@
 #include "jabber.h"
 #include "xmlnode.h"
 
-typedef struct _JabberXDataAction {
+typedef struct {
 	char *name;
 	char *handle;
 } JabberXDataAction;
diff --git a/libpurple/protocols/jabber/xmpp.h b/libpurple/protocols/jabber/xmpp.h
index 750fe7a8c7..df542aaf67 100644
--- a/libpurple/protocols/jabber/xmpp.h
+++ b/libpurple/protocols/jabber/xmpp.h
@@ -31,12 +31,12 @@
 #define XMPP_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), XMPP_TYPE_PROTOCOL))
 #define XMPP_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), XMPP_TYPE_PROTOCOL, XMPPProtocolClass))
 
-typedef struct _XMPPProtocol
+typedef struct
 {
 	JabberProtocol parent;
 } XMPPProtocol;
 
-typedef struct _XMPPProtocolClass
+typedef struct
 {
 	JabberProtocolClass parent_class;
 } XMPPProtocolClass;
diff --git a/libpurple/protocols/novell/nmrtf.c b/libpurple/protocols/novell/nmrtf.c
index ae27b8ca7a..13cfaa620a 100644
--- a/libpurple/protocols/novell/nmrtf.c
+++ b/libpurple/protocols/novell/nmrtf.c
@@ -84,7 +84,7 @@ typedef enum
 	NMRTF_KWD_SPEC
 } NMRtfKeywordType;
 
-typedef struct _NMRTFCharProp
+typedef struct
 {
 	/* All we care about for now is the font.
 	 * bold, italic, underline, etc. should be
@@ -94,14 +94,14 @@ typedef struct _NMRTFCharProp
 	int	font_charset;
 } NMRtfCharProp;
 
-typedef struct _NMRtfStateSave
+typedef struct
 {
     NMRtfCharProp chp;
     NMRtfState rds;
     NMRtfState ris;
 } NMRtfStateSave;
 
-typedef struct _NMRtfSymbol
+typedef struct
 {
     char *keyword;          	/* RTF keyword */
     int  default_val;          	/* default value to use */
@@ -113,7 +113,7 @@ typedef struct _NMRtfSymbol
 } NMRtfSymbol;
 
 
-typedef struct _NMRtfFont
+typedef struct
 {
 	int number;
 	char *name;
diff --git a/libpurple/protocols/novell/novell.h b/libpurple/protocols/novell/novell.h
index 63d8a07203..9ae9132efe 100644
--- a/libpurple/protocols/novell/novell.h
+++ b/libpurple/protocols/novell/novell.h
@@ -33,12 +33,12 @@
 #define NOVELL_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), NOVELL_TYPE_PROTOCOL))
 #define NOVELL_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), NOVELL_TYPE_PROTOCOL, NovellProtocolClass))
 
-typedef struct _NovellProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } NovellProtocol;
 
-typedef struct _NovellProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } NovellProtocolClass;
diff --git a/libpurple/protocols/null/nullprpl.h b/libpurple/protocols/null/nullprpl.h
index cf79fce416..df0aca9fb2 100644
--- a/libpurple/protocols/null/nullprpl.h
+++ b/libpurple/protocols/null/nullprpl.h
@@ -31,12 +31,12 @@
 #define NULL_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), NULL_TYPE_PROTOCOL))
 #define NULL_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), NULL_TYPE_PROTOCOL, NullProtocolClass))
 
-typedef struct _NullProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } NullProtocol;
 
-typedef struct _NullProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } NullProtocolClass;
diff --git a/libpurple/protocols/oscar/aim.h b/libpurple/protocols/oscar/aim.h
index 0b0c9b3f52..2311a05dd5 100644
--- a/libpurple/protocols/oscar/aim.h
+++ b/libpurple/protocols/oscar/aim.h
@@ -31,12 +31,12 @@
 #define AIM_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), AIM_TYPE_PROTOCOL))
 #define AIM_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), AIM_TYPE_PROTOCOL, AIMProtocolClass))
 
-typedef struct _AIMProtocol
+typedef struct
 {
 	OscarProtocol parent;
 } AIMProtocol;
 
-typedef struct _AIMProtocolClass
+typedef struct
 {
 	OscarProtocolClass parent_class;
 } AIMProtocolClass;
diff --git a/libpurple/protocols/oscar/icq.h b/libpurple/protocols/oscar/icq.h
index b450d4696d..d02c5be771 100644
--- a/libpurple/protocols/oscar/icq.h
+++ b/libpurple/protocols/oscar/icq.h
@@ -31,12 +31,12 @@
 #define ICQ_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), ICQ_TYPE_PROTOCOL))
 #define ICQ_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ICQ_TYPE_PROTOCOL, ICQProtocolClass))
 
-typedef struct _ICQProtocol
+typedef struct
 {
 	OscarProtocol parent;
 } ICQProtocol;
 
-typedef struct _ICQProtocolClass
+typedef struct
 {
 	OscarProtocolClass parent_class;
 } ICQProtocolClass;
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index 5e46181685..c9b2e943a6 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -228,12 +228,12 @@ typedef enum
 #define OSCAR_STATUS_ID_ATWORK      "atwork"
 #define OSCAR_STATUS_ID_LUNCH       "lunch"
 
-typedef struct _OscarProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } OscarProtocol;
 
-typedef struct _OscarProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } OscarProtocolClass;
diff --git a/libpurple/protocols/sametime/sametime.h b/libpurple/protocols/sametime/sametime.h
index d76350fe9a..7fff6c3b6a 100644
--- a/libpurple/protocols/sametime/sametime.h
+++ b/libpurple/protocols/sametime/sametime.h
@@ -36,12 +36,12 @@
 /* ISO-8859-1 */
 
 
-typedef struct _mwProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } mwProtocol;
 
-typedef struct _mwProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } mwProtocolClass;
diff --git a/libpurple/protocols/silc/silcpurple.h b/libpurple/protocols/silc/silcpurple.h
index 599a311e2c..0295d877c2 100644
--- a/libpurple/protocols/silc/silcpurple.h
+++ b/libpurple/protocols/silc/silcpurple.h
@@ -66,12 +66,12 @@
 #define SILCPURPLE_STATUS_ID_INDISPOSED "indisposed"
 #define SILCPURPLE_STATUS_ID_PAGE		"page"
 
-typedef struct _SilcProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } SilcProtocol;
 
-typedef struct _SilcProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } SilcProtocolClass;
diff --git a/libpurple/protocols/simple/simple.h b/libpurple/protocols/simple/simple.h
index a9bad5801c..b748062462 100644
--- a/libpurple/protocols/simple/simple.h
+++ b/libpurple/protocols/simple/simple.h
@@ -52,12 +52,12 @@
 #define SIMPLE_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), SIMPLE_TYPE_PROTOCOL))
 #define SIMPLE_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), SIMPLE_TYPE_PROTOCOL, SIMPLEProtocolClass))
 
-typedef struct _SIMPLEProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } SIMPLEProtocol;
 
-typedef struct _SIMPLEProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } SIMPLEProtocolClass;
diff --git a/libpurple/protocols/zephyr/zephyr.h b/libpurple/protocols/zephyr/zephyr.h
index 4d0e17e3a4..82df7b9b42 100644
--- a/libpurple/protocols/zephyr/zephyr.h
+++ b/libpurple/protocols/zephyr/zephyr.h
@@ -33,12 +33,12 @@
 #define ZEPHYR_IS_PROTOCOL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), ZEPHYR_TYPE_PROTOCOL))
 #define ZEPHYR_PROTOCOL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ZEPHYR_TYPE_PROTOCOL, ZephyrProtocolClass))
 
-typedef struct _ZephyrProtocol
+typedef struct
 {
 	PurpleProtocol parent;
 } ZephyrProtocol;
 
-typedef struct _ZephyrProtocolClass
+typedef struct
 {
 	PurpleProtocolClass parent_class;
 } ZephyrProtocolClass;
diff --git a/libpurple/protocols/zephyr/zephyr_internal.h b/libpurple/protocols/zephyr/zephyr_internal.h
index 4fc2422f0a..46fa82d554 100644
--- a/libpurple/protocols/zephyr/zephyr_internal.h
+++ b/libpurple/protocols/zephyr/zephyr_internal.h
@@ -77,7 +77,7 @@ typedef enum {
 extern ZCONST char *ZNoticeKinds[9];
 
 /* Unique ID format */
-typedef struct _ZUnique_Id_t {
+typedef struct {
     struct	in_addr zuid_addr;
     struct	timeval	tv;
 } ZUnique_Id_t;
@@ -86,7 +86,7 @@ typedef struct _ZUnique_Id_t {
 typedef unsigned long ZChecksum_t;
 
 /* Notice definition */
-typedef struct _ZNotice_t {
+typedef struct {
     char		*z_packet;
     char		*z_version;
     ZNotice_Kind_t	z_kind;
@@ -114,7 +114,7 @@ typedef struct _ZNotice_t {
 } ZNotice_t;
 
 /* Subscription structure */
-typedef struct _ZSubscriptions_t {
+typedef struct {
     char	*zsub_recipient;
     char	*zsub_class;
     char	*zsub_classinst;
@@ -124,13 +124,13 @@ typedef struct _ZSubscriptions_t {
 typedef int Code_t;
 
 /* Locations structure */
-typedef struct _ZLocations_t {
+typedef struct {
     char	*host;
     char	*time;
     char	*tty;
 } ZLocations_t;
 
-typedef struct _ZAsyncLocateData_t {
+typedef struct {
     char		*user;
     ZUnique_Id_t	uid;
     char		*version;
diff --git a/libpurple/queuedoutputstream.c b/libpurple/queuedoutputstream.c
index ff14d5fb56..be5dfd5491 100644
--- a/libpurple/queuedoutputstream.c
+++ b/libpurple/queuedoutputstream.c
@@ -46,7 +46,7 @@ struct _PurpleQueuedOutputStream
 	GFilterOutputStream parent;
 };
 
-typedef struct _PurpleQueuedOutputStreamPrivate
+typedef struct
 {
 	GAsyncQueue *queue;
 	gboolean pending_queued;
diff --git a/libpurple/status.h b/libpurple/status.h
index df6f5b0a0c..eb942111f0 100644
--- a/libpurple/status.h
+++ b/libpurple/status.h
@@ -54,7 +54,7 @@ typedef struct _PurpleStatusAttribute  PurpleStatusAttribute;
 
 #define PURPLE_TYPE_MOOD               (purple_mood_get_type())
 
-typedef struct _PurpleMood {
+typedef struct {
 	const char *mood;
 	const char *description;
 	gpointer *padding;
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index d18d33c8b6..10a17f33a5 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -179,7 +179,7 @@ typedef enum {
 	PIDGIN_BLIST_CHAT_HAS_PENDING_MESSAGE_WITH_NICK	 =  1 << 1,  /* Whether there's a pending message in a chat that mentions our nick */
 } PidginBlistNodeFlags;
 
-typedef struct _pidgin_blist_node {
+typedef struct {
 	GtkTreeRowReference *row;
 	gboolean contact_expanded;
 	gboolean recent_signonoff;
@@ -563,8 +563,8 @@ static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *a
 
 	if (PURPLE_IS_CONTACT(node)) {
 		PurpleContact *contact = PURPLE_CONTACT(node);
-		struct _pidgin_blist_node *gtknode =
-				(struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node);
+		PidginBlistNode *gtknode =
+				(PidginBlistNode *)purple_blist_node_get_ui_data(node);
 
 		/*
 		 * Using purple_contact_get_alias here breaks because we
@@ -908,7 +908,7 @@ set_sensitive_if_input_buddy_cb(GtkWidget *entry, gpointer user_data)
 static void
 pidgin_blist_update_privacy_cb(PurpleBuddy *buddy)
 {
-	struct _pidgin_blist_node *ui_data = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(buddy));
+	PidginBlistNode *ui_data = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(buddy));
 	if (ui_data == NULL || ui_data->row == NULL)
 		return;
 	pidgin_blist_update_buddy(purple_blist_get_buddy_list(), PURPLE_BLIST_NODE(buddy), TRUE);
@@ -1177,7 +1177,7 @@ static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTr
 
 	if (PURPLE_IS_GROUP(node)) {
 		char *title;
-		struct _pidgin_blist_node *gtknode;
+		PidginBlistNode *gtknode;
 		PurpleBlistNode *cnode;
 
 		title = pidgin_get_group_title(node, FALSE);
@@ -1310,7 +1310,7 @@ scroll_to_expanded_cell(gpointer data)
 static void
 pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node)
 {
-	struct _pidgin_blist_node *gtknode;
+	PidginBlistNode *gtknode;
 	GtkTreeIter iter, parent;
 	PurpleBlistNode *bnode;
 	GtkTreePath *path;
@@ -1346,7 +1346,7 @@ static void
 pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node)
 {
 	PurpleBlistNode *bnode;
-	struct _pidgin_blist_node *gtknode;
+	PidginBlistNode *gtknode;
 
 	if(!PURPLE_IS_CONTACT(node))
 		return;
@@ -1796,7 +1796,7 @@ create_contact_menu (PurpleBlistNode *node)
 static GtkWidget *
 create_buddy_menu(PurpleBlistNode *node, PurpleBuddy *b)
 {
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
 	GtkWidget *menu;
 	GtkWidget *menuitem;
 	gboolean show_offline = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies");
@@ -1860,7 +1860,7 @@ create_buddy_menu(PurpleBlistNode *node, PurpleBuddy *b)
 static gboolean
 pidgin_blist_show_context_menu(GtkWidget *tv, PurpleBlistNode *node, GdkEvent *event)
 {
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
 	GtkWidget *menu = NULL;
 	gboolean handled = FALSE;
 
@@ -1922,7 +1922,7 @@ gtk_blist_button_press_cb(GtkWidget *tv, GdkEventButton *event, gpointer user_da
 	GtkTreeIter iter;
 	GtkTreeSelection *sel;
 	PurpleProtocol *protocol = NULL;
-	struct _pidgin_blist_node *gtknode;
+	PidginBlistNode *gtknode;
 	gboolean handled = FALSE;
 
 	/* Here we figure out which node was clicked */
@@ -2337,7 +2337,7 @@ static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc,
 			/* if we're here, I think it means the drop is ok */
 			GtkTreeIter iter;
 			PurpleBlistNode *node;
-			struct _pidgin_blist_node *gtknode;
+			PidginBlistNode *gtknode;
 
 			gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel),
 					&iter, path);
@@ -3164,7 +3164,7 @@ static gboolean pidgin_blist_expand_timeout(GtkWidget *tv)
 	GtkTreePath *path;
 	GtkTreeIter iter;
 	PurpleBlistNode *node;
-	struct _pidgin_blist_node *gtknode;
+	PidginBlistNode *gtknode;
 
 	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y + (gtkblist->tip_rect.height/2),
 		&path, NULL, NULL, NULL))
@@ -3202,7 +3202,7 @@ static gboolean pidgin_blist_expand_timeout(GtkWidget *tv)
 
 static gboolean buddy_is_displayable(PurpleBuddy *buddy)
 {
-	struct _pidgin_blist_node *gtknode;
+	PidginBlistNode *gtknode;
 
 	if(!buddy)
 		return FALSE;
@@ -3888,7 +3888,7 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 		/* Last Seen */
 		if (full && c && !PURPLE_BUDDY_IS_ONLINE(b))
 		{
-			struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(c));
+			PidginBlistNode *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(c));
 			PurpleBlistNode *bnode;
 			int lastseen = 0;
 
@@ -4018,7 +4018,7 @@ GdkPixbuf *
 pidgin_blist_get_emblem(PurpleBlistNode *node)
 {
 	PurpleBuddy *buddy = NULL;
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
 	PurpleProtocol *protocol;
 	const char *name = NULL;
 	char *filename, *path;
@@ -4040,7 +4040,7 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 			return _pidgin_blist_get_cached_emblem(path);
 		}
 
-		if (((struct _pidgin_blist_node*)purple_blist_node_get_ui_data(node->parent))->contact_expanded) {
+		if (((PidginBlistNode*)purple_blist_node_get_ui_data(node->parent))->contact_expanded) {
 			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"))
 				return NULL;
 			return pidgin_create_protocol_icon(purple_buddy_get_account((PurpleBuddy*)node), PIDGIN_PROTOCOL_ICON_SMALL);
@@ -4129,8 +4129,8 @@ pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 {
 	GdkPixbuf *ret;
 	const char *icon = NULL;
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
-	struct _pidgin_blist_node *gtkbuddynode = NULL;
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtkbuddynode = NULL;
 	PurpleBuddy *buddy = NULL;
 	PurpleChat *chat = NULL;
 	GtkIconSize icon_size = gtk_icon_size_from_name((size == PIDGIN_STATUS_ICON_LARGE) ? PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL :
@@ -4247,7 +4247,7 @@ pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased
 	PurpleProtocol *protocol = NULL;
 	PurpleContact *contact;
 	PurplePresence *presence;
-	struct _pidgin_blist_node *gtkcontactnode = NULL;
+	PidginBlistNode *gtkcontactnode = NULL;
 	char *idletime = NULL, *statustext = NULL, *nametext = NULL;
 	PurpleConversation *conv = find_conversation_with_buddy(b);
 	gboolean hidden_conv = FALSE;
@@ -4491,7 +4491,7 @@ static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list)
 
 static void pidgin_blist_hide_node(PurpleBuddyList *list, PurpleBlistNode *node, gboolean update)
 {
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
 	GtkTreeIter iter;
 
 	if (!gtknode || !gtknode->row || !gtkblist)
@@ -4708,7 +4708,7 @@ conversation_deleting_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
 }
 
 static void
-conversation_deleted_update_ui_cb(PurpleConversation *conv, struct _pidgin_blist_node *ui)
+conversation_deleted_update_ui_cb(PurpleConversation *conv, PidginBlistNode *ui)
 {
 	if (ui->conv.conv != conv)
 		return;
@@ -4757,7 +4757,7 @@ conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
 		GSList *buddies = purple_blist_find_buddies(account, purple_conversation_get_name(conv));
 		while (buddies) {
 			PurpleBlistNode *buddy = buddies->data;
-			struct _pidgin_blist_node *ui = purple_blist_node_get_ui_data(buddy);
+			PidginBlistNode *ui = purple_blist_node_get_ui_data(buddy);
 			buddies = g_slist_delete_link(buddies, buddies);
 			if (!ui)
 				continue;
@@ -4772,7 +4772,7 @@ conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
 		}
 	} else if (PURPLE_IS_CHAT_CONVERSATION(conv)) {
 		PurpleChat *chat = purple_blist_find_chat(account, purple_conversation_get_name(conv));
-		struct _pidgin_blist_node *ui;
+		PidginBlistNode *ui;
 		if (!chat)
 			return;
 		ui = purple_blist_node_get_ui_data(&(chat->node));
@@ -4850,7 +4850,7 @@ static void pidgin_blist_new_list(PurpleBuddyList *blist)
 
 static void pidgin_blist_new_node(PurpleBlistNode *node)
 {
-	purple_blist_node_set_ui_data(node, g_new0(struct _pidgin_blist_node, 1));
+	purple_blist_node_set_ui_data(node, g_new0(PidginBlistNode, 1));
 }
 
 gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node)
@@ -4863,7 +4863,7 @@ gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node)
 
 	g_return_val_if_fail(PURPLE_IS_CONTACT(node), FALSE);
 
-	return ((struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node))->contact_expanded;
+	return ((PidginBlistNode *)purple_blist_node_get_ui_data(node))->contact_expanded;
 }
 
 enum {
@@ -4910,7 +4910,7 @@ static void _prefs_change_redo_list(const char *name, PurplePrefType type,
 
 	if (node)
 	{
-		struct _pidgin_blist_node *gtknode;
+		PidginBlistNode *gtknode;
 		GtkTreePath *path;
 
 		gtknode = purple_blist_node_get_ui_data(node);
@@ -6153,7 +6153,7 @@ pidgin_blist_update_refresh_timeout()
 }
 
 static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter) {
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
 	GtkTreePath *path;
 
 	if (!gtknode) {
@@ -6182,7 +6182,7 @@ static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter) {
 
 static void pidgin_blist_remove(PurpleBuddyList *list, PurpleBlistNode *node)
 {
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
 
 	purple_request_close_with_handle(node);
 
@@ -6251,7 +6251,7 @@ static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer
 static gboolean insert_node(PurpleBuddyList *list, PurpleBlistNode *node, GtkTreeIter *iter)
 {
 	GtkTreeIter parent_iter = {0, NULL, NULL, NULL}, cur, *curptr = NULL;
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(node);
 	GtkTreePath *newpath;
 
 	if(!iter)
@@ -6294,7 +6294,7 @@ static gboolean insert_node(PurpleBuddyList *list, PurpleBlistNode *node, GtkTre
 
 	if(node->parent) {
 		GtkTreePath *expand = NULL;
-		struct _pidgin_blist_node *gtkparentnode = purple_blist_node_get_ui_data(node->parent);
+		PidginBlistNode *gtkparentnode = purple_blist_node_get_ui_data(node->parent);
 
 		if(PURPLE_IS_GROUP(node->parent)) {
 			if(!purple_blist_node_get_bool(node->parent, "collapsed"))
@@ -6488,7 +6488,7 @@ static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBlistNode *n
 	GdkRGBA *color = NULL;
 	char *mark;
 	char *idle = NULL;
-	gboolean expanded = ((struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node->parent))->contact_expanded;
+	gboolean expanded = ((PidginBlistNode *)purple_blist_node_get_ui_data(node->parent))->contact_expanded;
 	gboolean selected = (gtkblist->selected_node == node);
 	gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
 	PidginBlistTheme *theme;
@@ -6596,7 +6596,7 @@ static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *
 	PurpleContact *contact;
 	PurpleBuddy *buddy;
 	gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
-	struct _pidgin_blist_node *gtknode;
+	PidginBlistNode *gtknode;
 
 	if (editing_blist)
 		return;
@@ -6689,7 +6689,7 @@ static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *
 static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change)
 {
 	PurpleBuddy *buddy;
-	struct _pidgin_blist_node *gtkparentnode;
+	PidginBlistNode *gtkparentnode;
 
 	g_return_if_fail(PURPLE_IS_BUDDY(node));
 
@@ -7450,7 +7450,7 @@ pidgin_blist_get_handle() {
 
 static gboolean buddy_signonoff_timeout_cb(PurpleBuddy *buddy)
 {
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(buddy));
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(buddy));
 
 	gtknode->recent_signonoff = FALSE;
 	gtknode->recent_signonoff_timer = 0;
@@ -7463,7 +7463,7 @@ static gboolean buddy_signonoff_timeout_cb(PurpleBuddy *buddy)
 
 static void buddy_signonoff_cb(PurpleBuddy *buddy)
 {
-	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(buddy));
+	PidginBlistNode *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(buddy));
 
 	if(!gtknode) {
 		pidgin_blist_new_node(PURPLE_BLIST_NODE(buddy));
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
index 7f0a25ea42..f75e445b61 100644
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -99,7 +99,7 @@ enum
 };
 
 
-typedef struct _PidginNotifyDialog
+typedef struct
 {
 	/*
 	 * This must be first so PidginNotifyDialog can masquerade as the
diff --git a/pidgin/gtkroomlist.c b/pidgin/gtkroomlist.c
index 11be8ee93c..b9eb17494e 100644
--- a/pidgin/gtkroomlist.c
+++ b/pidgin/gtkroomlist.c
@@ -33,7 +33,7 @@
 #include "gtk3compat.h"
 #include "gtkroomlist.h"
 
-typedef struct _PidginRoomlistDialog {
+typedef struct {
 	GtkWidget *window;
 	GtkWidget *account_widget;
 	GtkWidget *progress;
@@ -52,7 +52,7 @@ typedef struct _PidginRoomlistDialog {
 	guint pg_update_to;
 } PidginRoomlistDialog;
 
-typedef struct _PidginRoomlist {
+typedef struct {
 	PidginRoomlistDialog *dialog;
 	GtkTreeStore *model;
 	GtkWidget *tree;
diff --git a/pidgin/minidialog.c b/pidgin/minidialog.c
index 972ab98e50..d436aebb03 100644
--- a/pidgin/minidialog.c
+++ b/pidgin/minidialog.c
@@ -80,7 +80,7 @@ enum
 
 static GParamSpec *properties[LAST_PROPERTY];
 
-typedef struct _PidginMiniDialogPrivate
+typedef struct
 {
 	GtkImage *icon;
 	GtkBox *title_box;