remove gpl boilerplate from doxygen docs

176 files changed, 530 insertions, 354 deletions

diff --git a/finch/finch.h b/finch/finch.h
index 5118bbbce2..2677f80e09 100644
--- a/finch/finch.h
+++ b/finch/finch.h
@@ -1,7 +1,8 @@
 /**
  * @defgroup finch Finch (GNT User Interface)
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
index 3568991396..1fc8c6025c 100644
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -1,8 +1,9 @@
 /**
  * @file gntaccount.c GNT Account API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntaccount.h b/finch/gntaccount.h
index bc47f7e473..e1fd0378d6 100644
--- a/finch/gntaccount.h
+++ b/finch/gntaccount.h
@@ -1,8 +1,9 @@
 /**
  * @file gntaccount.h GNT Account API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntblist.c b/finch/gntblist.c
index e5b846fe9a..52964dc5d3 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -1,8 +1,9 @@
 /**
  * @file gntblist.c GNT BuddyList API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntblist.h b/finch/gntblist.h
index aaecdd9bc0..23968d357e 100644
--- a/finch/gntblist.h
+++ b/finch/gntblist.h
@@ -1,8 +1,9 @@
 /**
  * @file gntblist.h GNT BuddyList API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntcertmgr.c b/finch/gntcertmgr.c
index 968664fe49..fe6c884100 100644
--- a/finch/gntcertmgr.c
+++ b/finch/gntcertmgr.c
@@ -1,8 +1,9 @@
 /**
  * @file gntcertmgr.c GNT Certificate Manager API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntcertmgr.h b/finch/gntcertmgr.h
index 5786829bd9..bce818d454 100644
--- a/finch/gntcertmgr.h
+++ b/finch/gntcertmgr.h
@@ -1,8 +1,9 @@
 /**
  * @file gntcertmgr.h GNT Certificate Manager API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntconn.c b/finch/gntconn.c
index 1505b7d8c1..4e56f2220a 100644
--- a/finch/gntconn.c
+++ b/finch/gntconn.c
@@ -1,8 +1,9 @@
 /**
  * @file gntconn.c GNT Connection API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntconn.h b/finch/gntconn.h
index 237ca130d8..6d72791500 100644
--- a/finch/gntconn.h
+++ b/finch/gntconn.h
@@ -1,8 +1,9 @@
 /**
  * @file gntconn.h GNT Connection API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntconv.c b/finch/gntconv.c
index 4345111cc6..3363a336c2 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -1,8 +1,9 @@
 /**
  * @file gntconv.c GNT Conversation API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntconv.h b/finch/gntconv.h
index f713674a56..b188469bf5 100644
--- a/finch/gntconv.h
+++ b/finch/gntconv.h
@@ -1,8 +1,9 @@
 /**
  * @file gntconv.h GNT Conversation API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntdebug.c b/finch/gntdebug.c
index 5bcec104dc..43ee716e4f 100644
--- a/finch/gntdebug.c
+++ b/finch/gntdebug.c
@@ -1,8 +1,9 @@
 /**
  * @file gntdebug.c GNT Debug API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntdebug.h b/finch/gntdebug.h
index c11334ab77..d6bbfd656d 100644
--- a/finch/gntdebug.h
+++ b/finch/gntdebug.h
@@ -1,8 +1,9 @@
 /**
  * @file gntdebug.h GNT Debug API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntft.c b/finch/gntft.c
index b78febdd90..110da03aa1 100644
--- a/finch/gntft.c
+++ b/finch/gntft.c
@@ -1,8 +1,9 @@
 /**
  * @file gntft.c GNT File Transfer UI
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntft.h b/finch/gntft.h
index 67815e9ca5..67dec5e804 100644
--- a/finch/gntft.h
+++ b/finch/gntft.h
@@ -1,8 +1,9 @@
 /**
  * @file gntft.h GNT File Transfer UI
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntidle.h b/finch/gntidle.h
index bbb91e4d6b..d1fa11dda0 100644
--- a/finch/gntidle.h
+++ b/finch/gntidle.h
@@ -1,8 +1,9 @@
 /**
  * @file gntidle.h GNT Idle API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntnotify.c b/finch/gntnotify.c
index 33e9243c96..f086633ff1 100644
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -1,8 +1,9 @@
 /**
  * @file gntnotify.c GNT Notify API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntnotify.h b/finch/gntnotify.h
index fceb2c6e14..8d231d7aff 100644
--- a/finch/gntnotify.h
+++ b/finch/gntnotify.h
@@ -1,8 +1,9 @@
 /**
  * @file gntnotify.h GNT Notify API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntplugin.c b/finch/gntplugin.c
index 1818269c31..7c0e9216fd 100644
--- a/finch/gntplugin.c
+++ b/finch/gntplugin.c
@@ -1,8 +1,9 @@
 /**
  * @file gntplugin.c GNT Plugins API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntplugin.h b/finch/gntplugin.h
index 39a78ef16d..f4008ff661 100644
--- a/finch/gntplugin.h
+++ b/finch/gntplugin.h
@@ -1,8 +1,9 @@
 /**
  * @file gntplugin.h GNT Plugins API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntpounce.c b/finch/gntpounce.c
index fa289e7228..dc6815a4c5 100644
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -1,8 +1,9 @@
 /**
  * @file gntpounce.c GNT Buddy Pounce API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntpounce.h b/finch/gntpounce.h
index 41164cd070..6b72abe0ca 100644
--- a/finch/gntpounce.h
+++ b/finch/gntpounce.h
@@ -1,8 +1,9 @@
 /**
  * @file gntpounce.h GNT Buddy Pounce API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntprefs.c b/finch/gntprefs.c
index 97eb207f0c..ef52925ff1 100644
--- a/finch/gntprefs.c
+++ b/finch/gntprefs.c
@@ -1,8 +1,9 @@
 /**
  * @file gntprefs.c GNT Preferences API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntprefs.h b/finch/gntprefs.h
index dae39643f2..b11a3141f9 100644
--- a/finch/gntprefs.h
+++ b/finch/gntprefs.h
@@ -1,8 +1,9 @@
 /**
  * @file gntprefs.h GNT Preferences API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
index a85323d99d..a1157684bc 100644
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -1,8 +1,9 @@
 /**
  * @file gntrequest.c GNT Request API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntrequest.h b/finch/gntrequest.h
index 3c8628336b..cbd62a1b6c 100644
--- a/finch/gntrequest.h
+++ b/finch/gntrequest.h
@@ -1,8 +1,9 @@
 /**
  * @file gntrequest.h GNT Request API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntsound.c b/finch/gntsound.c
index ec6a96e3a3..c48c080f3a 100644
--- a/finch/gntsound.c
+++ b/finch/gntsound.c
@@ -1,8 +1,9 @@
 /**
  * @file gntsound.c GNT Sound API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntsound.h b/finch/gntsound.h
index d2a0e97766..bb816ff47f 100644
--- a/finch/gntsound.h
+++ b/finch/gntsound.h
@@ -1,8 +1,9 @@
 /**
  * @file gntsound.h GNT Sound API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntstatus.c b/finch/gntstatus.c
index 63b6f97a37..7bb115edbc 100644
--- a/finch/gntstatus.c
+++ b/finch/gntstatus.c
@@ -1,8 +1,9 @@
 /**
  * @file gntstatus.c GNT Status API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/finch/gntstatus.h b/finch/gntstatus.h
index 2b750927bf..71d9da8d9f 100644
--- a/finch/gntstatus.h
+++ b/finch/gntstatus.h
@@ -1,8 +1,9 @@
 /**
  * @file gntstatus.h GNT Status API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/account.c b/libpurple/account.c
index 75a239ee55..7f3d20dbf6 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -1,8 +1,9 @@
 /**
  * @file account.c Account API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/account.h b/libpurple/account.h
index a99ca8aef4..7cc0b07f0a 100644
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -1,8 +1,9 @@
 /**
  * @file account.h Account API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/accountopt.c b/libpurple/accountopt.c
index 697bda6ca1..92e12f88a2 100644
--- a/libpurple/accountopt.c
+++ b/libpurple/accountopt.c
@@ -1,8 +1,9 @@
 /**
  * @file accountopt.c Account Options API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/accountopt.h b/libpurple/accountopt.h
index 165d3a5264..c86b956f18 100644
--- a/libpurple/accountopt.h
+++ b/libpurple/accountopt.h
@@ -1,8 +1,9 @@
 /**
  * @file accountopt.h Account Options API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/blist.h b/libpurple/blist.h
index f1ebfa0293..c0c7293257 100644
--- a/libpurple/blist.h
+++ b/libpurple/blist.h
@@ -1,8 +1,9 @@
 /**
  * @file blist.h Buddy List API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c
index e7ce4f3892..c76a770ca4 100644
--- a/libpurple/buddyicon.c
+++ b/libpurple/buddyicon.c
@@ -1,8 +1,9 @@
 /**
  * @file icon.c Buddy Icon API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/buddyicon.h b/libpurple/buddyicon.h
index 7367951534..cdc0732862 100644
--- a/libpurple/buddyicon.h
+++ b/libpurple/buddyicon.h
@@ -1,8 +1,9 @@
 /**
  * @file buddyicon.h Buddy Icon API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/cipher.h b/libpurple/cipher.h
index 1e4e9b23a1..3b45445f12 100644
--- a/libpurple/cipher.h
+++ b/libpurple/cipher.h
@@ -1,8 +1,9 @@
 /**
  * @file cipher.h Purple Cipher API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/circbuffer.c b/libpurple/circbuffer.c
index 01a890ae19..0dbcd5c714 100644
--- a/libpurple/circbuffer.c
+++ b/libpurple/circbuffer.c
@@ -1,8 +1,9 @@
 /*
  * @file circbuffer.h Buffer Utility Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/libpurple/circbuffer.h b/libpurple/circbuffer.h
index 4de15f12f3..77e7724161 100644
--- a/libpurple/circbuffer.h
+++ b/libpurple/circbuffer.h
@@ -1,8 +1,9 @@
-/*
+/**
  * @file circbuffer.h Buffer Utility Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/libpurple/cmds.c b/libpurple/cmds.c
index b9bbd0dee8..f84d26f99c 100644
--- a/libpurple/cmds.c
+++ b/libpurple/cmds.c
@@ -1,8 +1,9 @@
 /**
  * @file cmds.c Commands API
  * @ingroup core
- *
- * Copyright (C) 2003-2004 Timothy Ringenbach <omarvo@hotmail.com
+ */
+
+/* Copyright (C) 2003-2004 Timothy Ringenbach <omarvo@hotmail.com
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libpurple/cmds.h b/libpurple/cmds.h
index dc334e67e7..9e676992d9 100644
--- a/libpurple/cmds.h
+++ b/libpurple/cmds.h
@@ -1,8 +1,9 @@
 /**
  * @file cmds.h Commands API
  * @ingroup core
- *
- * Copyright (C) 2003 Timothy Ringenbach <omarvo@hotmail.com>
+ */
+
+/* Copyright (C) 2003 Timothy Ringenbach <omarvo@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libpurple/connection.c b/libpurple/connection.c
index a518aecb15..b388defe9f 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -1,8 +1,9 @@
 /**
  * @file connection.c Connection API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/connection.h b/libpurple/connection.h
index 4fc5db6c68..feece9785c 100644
--- a/libpurple/connection.h
+++ b/libpurple/connection.h
@@ -1,8 +1,9 @@
 /**
  * @file connection.h Connection API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
index 317f91f6c2..f415367bd2 100644
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -1,8 +1,9 @@
 /**
  * @file conversation.h Conversation API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/core.c b/libpurple/core.c
index 71eca5fedd..ead13a2654 100644
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -1,8 +1,9 @@
 /**
  * @file core.c Purple Core API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/core.h b/libpurple/core.h
index ba80ad78ba..b0a0aa8837 100644
--- a/libpurple/core.h
+++ b/libpurple/core.h
@@ -1,7 +1,8 @@
 /**
  * @defgroup core libpurple
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/dbus-bindings.h b/libpurple/dbus-bindings.h
index 7a5ae25108..db5e426332 100644
--- a/libpurple/dbus-bindings.h
+++ b/libpurple/dbus-bindings.h
@@ -1,8 +1,9 @@
 /**
  * @file dbus-bindings.h Purple DBUS Bindings
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/dbus-server.h b/libpurple/dbus-server.h
index dac7798f80..01770b50de 100644
--- a/libpurple/dbus-server.h
+++ b/libpurple/dbus-server.h
@@ -1,8 +1,9 @@
 /**
  * @file dbus-server.h Purple DBUS Server
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/debug.c b/libpurple/debug.c
index 329dd7bf4e..3682c9e708 100644
--- a/libpurple/debug.c
+++ b/libpurple/debug.c
@@ -1,8 +1,9 @@
 /**
  * @file debug.c Debug API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/debug.h b/libpurple/debug.h
index 6d520e3846..76d0458de0 100644
--- a/libpurple/debug.h
+++ b/libpurple/debug.h
@@ -1,8 +1,9 @@
 /**
  * @file debug.h Debug API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/desktopitem.c b/libpurple/desktopitem.c
index 989aaf45d7..2ef08ab09f 100644
--- a/libpurple/desktopitem.c
+++ b/libpurple/desktopitem.c
@@ -1,8 +1,9 @@
 /**
  * @file purple-desktop-item.c Functions for managing .desktop files
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/libpurple/desktopitem.h b/libpurple/desktopitem.h
index 86f3574a2f..b47ac1b15e 100644
--- a/libpurple/desktopitem.h
+++ b/libpurple/desktopitem.h
@@ -1,8 +1,9 @@
 /**
  * @file desktopitem.h Functions for managing .desktop files
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/libpurple/dnsquery.c b/libpurple/dnsquery.c
index a52658c6e4..f66fbdc7ee 100644
--- a/libpurple/dnsquery.c
+++ b/libpurple/dnsquery.c
@@ -1,8 +1,9 @@
 /**
  * @file dnsquery.c DNS query API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/dnsquery.h b/libpurple/dnsquery.h
index 8f270731d5..fff47b16ee 100644
--- a/libpurple/dnsquery.h
+++ b/libpurple/dnsquery.h
@@ -1,8 +1,9 @@
 /**
  * @file dnsquery.h DNS query API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/dnssrv.c b/libpurple/dnssrv.c
index 16091fae84..3fa55fd5b5 100644
--- a/libpurple/dnssrv.c
+++ b/libpurple/dnssrv.c
@@ -1,7 +1,8 @@
 /**
  * @file dnssrv.c
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
  *
diff --git a/libpurple/dnssrv.h b/libpurple/dnssrv.h
index c16f4f0668..4e17ae068c 100644
--- a/libpurple/dnssrv.h
+++ b/libpurple/dnssrv.h
@@ -1,10 +1,11 @@
 /**
  * @file dnssrv.h
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de>
- *i
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/libpurple/eventloop.c b/libpurple/eventloop.c
index 2159213746..99d9bb2665 100644
--- a/libpurple/eventloop.c
+++ b/libpurple/eventloop.c
@@ -1,8 +1,9 @@
 /**
  * @file eventloop.c Purple Event Loop API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/eventloop.h b/libpurple/eventloop.h
index 35a9f8653b..31a630a1e0 100644
--- a/libpurple/eventloop.h
+++ b/libpurple/eventloop.h
@@ -1,8 +1,9 @@
 /**
  * @file eventloop.h Purple Event Loop API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/ft.c b/libpurple/ft.c
index fd5ef8272d..369fd05cea 100644
--- a/libpurple/ft.c
+++ b/libpurple/ft.c
@@ -1,7 +1,8 @@
 /**
  * @file ft.c File Transfer API
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/ft.h b/libpurple/ft.h
index cdc08232bb..4cf3764691 100644
--- a/libpurple/ft.h
+++ b/libpurple/ft.h
@@ -1,8 +1,9 @@
 /**
  * @file ft.h File Transfer API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/gaim-compat.h b/libpurple/gaim-compat.h
index bdec0d6490..c2a70543eb 100644
--- a/libpurple/gaim-compat.h
+++ b/libpurple/gaim-compat.h
@@ -1,8 +1,9 @@
 /**
  * @file gaim-compat.h Gaim Compat macros
  * @ingroup core
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/idle.h b/libpurple/idle.h
index 7a1bbd1395..486021c8c7 100644
--- a/libpurple/idle.h
+++ b/libpurple/idle.h
@@ -1,8 +1,9 @@
 /**
  * @file idle.h Idle API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/imgstore.c b/libpurple/imgstore.c
index ec88c5800b..06739bd68d 100644
--- a/libpurple/imgstore.c
+++ b/libpurple/imgstore.c
@@ -1,8 +1,9 @@
 /**
  * @file imgstore.h IM Image Store API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/imgstore.h b/libpurple/imgstore.h
index 57e05211a5..42f1410099 100644
--- a/libpurple/imgstore.h
+++ b/libpurple/imgstore.h
@@ -1,8 +1,9 @@
 /**
  * @file imgstore.h IM Image Store API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/internal.h b/libpurple/internal.h
index d80d980b5a..c998442013 100644
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -1,8 +1,9 @@
 /**
  * @file internal.h Internal definitions and includes
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/log.c b/libpurple/log.c
index 6468d1f154..2f96f32c99 100644
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -1,8 +1,9 @@
 /**
  * @file log.c Logging API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/log.h b/libpurple/log.h
index 6a296ffa36..2dab600ef5 100644
--- a/libpurple/log.h
+++ b/libpurple/log.h
@@ -1,8 +1,9 @@
 /**
  * @file log.h Logging API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/nat-pmp.c b/libpurple/nat-pmp.c
index 85e9b82240..40830df2e5 100644
--- a/libpurple/nat-pmp.c
+++ b/libpurple/nat-pmp.c
@@ -1,8 +1,9 @@
 /**
  * @file nat-pmp.c NAT-PMP Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/nat-pmp.h b/libpurple/nat-pmp.h
index 3680815489..077c74c30c 100644
--- a/libpurple/nat-pmp.h
+++ b/libpurple/nat-pmp.h
@@ -1,8 +1,9 @@
 /**
  * @file nat-pmp.h NAT-PMP Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/network.c b/libpurple/network.c
index a4c43a92d8..e5ba2a340c 100644
--- a/libpurple/network.c
+++ b/libpurple/network.c
@@ -1,8 +1,9 @@
 /**
  * @file network.c Network Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/network.h b/libpurple/network.h
index 06bcf45121..9d2702ff8a 100644
--- a/libpurple/network.h
+++ b/libpurple/network.h
@@ -1,8 +1,9 @@
 /**
  * @file network.h Network API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/notify.c b/libpurple/notify.c
index dbcbde2b27..7acc5856af 100644
--- a/libpurple/notify.c
+++ b/libpurple/notify.c
@@ -1,8 +1,9 @@
 /**
  * @file notify.c Notification API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/notify.h b/libpurple/notify.h
index 32696e8ef9..cd5d8e90e7 100644
--- a/libpurple/notify.h
+++ b/libpurple/notify.h
@@ -1,8 +1,9 @@
 /**
  * @file notify.h Notification API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/ntlm.c b/libpurple/ntlm.c
index 38e6c5670a..37e384eca4 100644
--- a/libpurple/ntlm.c
+++ b/libpurple/ntlm.c
@@ -1,7 +1,8 @@
 /**
  * @file ntlm.c
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
  *
diff --git a/libpurple/ntlm.h b/libpurple/ntlm.h
index adfdcf67f1..e8eb18cbe0 100644
--- a/libpurple/ntlm.h
+++ b/libpurple/ntlm.h
@@ -1,7 +1,8 @@
 /**
  * @file ntlm.h
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de>
  *
diff --git a/libpurple/plugin.h b/libpurple/plugin.h
index b6c3b67c82..2941889f18 100644
--- a/libpurple/plugin.h
+++ b/libpurple/plugin.h
@@ -1,8 +1,9 @@
 /**
  * @file plugin.h Plugin API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/pluginpref.h b/libpurple/pluginpref.h
index 478723fd0c..7df8ae4f8a 100644
--- a/libpurple/pluginpref.h
+++ b/libpurple/pluginpref.h
@@ -1,8 +1,9 @@
 /**
  * @file pluginpref.h Plugin Preferences API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/pounce.c b/libpurple/pounce.c
index fbfd572a72..fb0f65fbda 100644
--- a/libpurple/pounce.c
+++ b/libpurple/pounce.c
@@ -1,8 +1,9 @@
 /**
  * @file pounce.c Buddy Pounce API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/pounce.h b/libpurple/pounce.h
index aea6b77ce7..d4b4c4a4a6 100644
--- a/libpurple/pounce.h
+++ b/libpurple/pounce.h
@@ -1,8 +1,9 @@
 /**
  * @file pounce.h Buddy Pounce API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/prefs.h b/libpurple/prefs.h
index d554fd6361..6d98d1d175 100644
--- a/libpurple/prefs.h
+++ b/libpurple/prefs.h
@@ -1,8 +1,9 @@
 /**
  * @file prefs.h Prefs API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/privacy.h b/libpurple/privacy.h
index 3297f641e2..7caeb45e0f 100644
--- a/libpurple/privacy.h
+++ b/libpurple/privacy.h
@@ -1,8 +1,9 @@
 /**
  * @file privacy.h Privacy API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
index 6e17090ab9..b866b7f315 100644
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -1,8 +1,9 @@
 /**
  * @file proxy.c Proxy API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/proxy.h b/libpurple/proxy.h
index c6c8780cab..f72fedaaa2 100644
--- a/libpurple/proxy.h
+++ b/libpurple/proxy.h
@@ -1,8 +1,9 @@
 /**
  * @file proxy.h Proxy API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index 0310e38656..03b491620c 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -1,8 +1,9 @@
 /**
  * @file prpl.h Protocol Plugin functions
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/request.c b/libpurple/request.c
index e0417238d0..27d3cc8e89 100644
--- a/libpurple/request.c
+++ b/libpurple/request.c
@@ -1,8 +1,9 @@
 /**
  * @file request.c Request API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/request.h b/libpurple/request.h
index c797184a9d..799a90aae8 100644
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -1,8 +1,9 @@
 /**
  * @file request.h Request API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/roomlist.c b/libpurple/roomlist.c
index d88887a8e6..c8873069e6 100644
--- a/libpurple/roomlist.c
+++ b/libpurple/roomlist.c
@@ -1,8 +1,9 @@
 /**
  * @file roomlist.c Room List API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/roomlist.h b/libpurple/roomlist.h
index beb6a5b2cb..ed7ed16374 100644
--- a/libpurple/roomlist.h
+++ b/libpurple/roomlist.h
@@ -1,8 +1,9 @@
 /**
  * @file roomlist.h Room List API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/savedstatuses.c b/libpurple/savedstatuses.c
index 4c0e10aaa1..06c5cf62e7 100644
--- a/libpurple/savedstatuses.c
+++ b/libpurple/savedstatuses.c
@@ -1,8 +1,9 @@
 /**
  * @file savedstatuses.c Saved Status API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/savedstatuses.h b/libpurple/savedstatuses.h
index e62ddd2f07..f236e6966a 100644
--- a/libpurple/savedstatuses.h
+++ b/libpurple/savedstatuses.h
@@ -1,8 +1,9 @@
 /**
  * @file savedstatuses.h Saved Status API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/server.h b/libpurple/server.h
index 713690b241..348b630c0f 100644
--- a/libpurple/server.h
+++ b/libpurple/server.h
@@ -1,8 +1,9 @@
 /**
  * @file server.h Server API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/signals.c b/libpurple/signals.c
index ada8bb3d4e..d1c123ee8e 100644
--- a/libpurple/signals.c
+++ b/libpurple/signals.c
@@ -1,8 +1,9 @@
 /**
  * @file signals.c Signal API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/signals.h b/libpurple/signals.h
index b3b1c72562..842bf09d4e 100644
--- a/libpurple/signals.h
+++ b/libpurple/signals.h
@@ -1,8 +1,9 @@
 /**
  * @file signals.h Signal API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/sound.h b/libpurple/sound.h
index 798f05da08..7b697fa771 100644
--- a/libpurple/sound.h
+++ b/libpurple/sound.h
@@ -1,8 +1,9 @@
 /**
  * @file sound.h Sound API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/sslconn.c b/libpurple/sslconn.c
index 0c4f4384b3..45d7647898 100644
--- a/libpurple/sslconn.c
+++ b/libpurple/sslconn.c
@@ -1,8 +1,9 @@
 /**
  * @file sslconn.c SSL API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/sslconn.h b/libpurple/sslconn.h
index 8571d43dec..08fe713890 100644
--- a/libpurple/sslconn.h
+++ b/libpurple/sslconn.h
@@ -1,8 +1,9 @@
 /**
  * @file sslconn.h SSL API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/status.c b/libpurple/status.c
index c40de40937..5315ed8dfd 100644
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -1,8 +1,9 @@
 /**
  * @file status.c Status API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/stringref.c b/libpurple/stringref.c
index 6535be101c..1c54239141 100644
--- a/libpurple/stringref.c
+++ b/libpurple/stringref.c
@@ -1,8 +1,9 @@
 /**
  * @file stringref.c Reference-counted immutable strings
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/stringref.h b/libpurple/stringref.h
index 16d74b0e88..cbb9eecb19 100644
--- a/libpurple/stringref.h
+++ b/libpurple/stringref.h
@@ -3,8 +3,9 @@
 /**
  * @file stringref.h Reference-counted immutable strings
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/stun.c b/libpurple/stun.c
index 8464e1c16f..be2222e431 100644
--- a/libpurple/stun.c
+++ b/libpurple/stun.c
@@ -1,8 +1,9 @@
 /**
  * @file stun.c STUN (RFC3489) Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * STUN implementation inspired by jstun [http://jstun.javawi.de/]
  *
diff --git a/libpurple/stun.h b/libpurple/stun.h
index 9a8a9fd7f1..b51a61c7e5 100644
--- a/libpurple/stun.h
+++ b/libpurple/stun.h
@@ -1,8 +1,9 @@
 /**
  * @file stun.h STUN API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/upnp.c b/libpurple/upnp.c
index 94f28f52d2..8f8e5f4d72 100644
--- a/libpurple/upnp.c
+++ b/libpurple/upnp.c
@@ -1,8 +1,9 @@
 /**
  * @file upnp.c UPnP Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/upnp.h b/libpurple/upnp.h
index 4629277222..b0e4ab4e47 100644
--- a/libpurple/upnp.h
+++ b/libpurple/upnp.h
@@ -1,8 +1,9 @@
 /**
  * @file upnp.h Universal Plug N Play API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/util.c b/libpurple/util.c
index 824f6f6c4d..aa56f95bb1 100644
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -1,8 +1,9 @@
 /*
  * @file util.h Utility Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/libpurple/util.h b/libpurple/util.h
index 14bd989ec7..94c61cf67c 100644
--- a/libpurple/util.h
+++ b/libpurple/util.h
@@ -1,8 +1,9 @@
 /**
  * @file util.h Utility Functions
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/value.c b/libpurple/value.c
index f38050e52b..2bda09cfbd 100644
--- a/libpurple/value.c
+++ b/libpurple/value.c
@@ -1,8 +1,9 @@
 /**
  * @file value.c Value wrapper API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/value.h b/libpurple/value.h
index 47e131f73f..81ec6f3100 100644
--- a/libpurple/value.h
+++ b/libpurple/value.h
@@ -1,8 +1,9 @@
 /**
  * @file value.h Value wrapper API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/version.c b/libpurple/version.c
index 39e8f997bd..48857ee71e 100644
--- a/libpurple/version.c
+++ b/libpurple/version.c
@@ -1,8 +1,9 @@
 /*
  * @file version.c Version Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/libpurple/whiteboard.h b/libpurple/whiteboard.h
index dea8550293..7d5700dee9 100644
--- a/libpurple/whiteboard.h
+++ b/libpurple/whiteboard.h
@@ -1,7 +1,8 @@
 /**
  * @file whiteboard.h The PurpleWhiteboard core object
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
index df4f14b504..9186dce96c 100644
--- a/libpurple/xmlnode.c
+++ b/libpurple/xmlnode.c
@@ -1,7 +1,8 @@
 /**
  * @file xmlnode.c XML DOM functions
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/libpurple/xmlnode.h b/libpurple/xmlnode.h
index 0d913252ff..fdf30fe80e 100644
--- a/libpurple/xmlnode.h
+++ b/libpurple/xmlnode.h
@@ -1,8 +1,9 @@
 /**
  * @file xmlnode.h XML DOM functions
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
index 62d165c497..7b11e897d8 100644
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkaccount.c GTK+ Account Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkaccount.h b/pidgin/gtkaccount.h
index c615b7e2c8..d8da27a5e0 100644
--- a/pidgin/gtkaccount.h
+++ b/pidgin/gtkaccount.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkaccount.h GTK+ Account Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 9ade10409e..c0d25bfba7 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkblist.c GTK+ BuddyList API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkblist.h b/pidgin/gtkblist.h
index 695be1a964..62b6822736 100644
--- a/pidgin/gtkblist.h
+++ b/pidgin/gtkblist.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkblist.h GTK+ Buddy List API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkcellrendererexpander.c b/pidgin/gtkcellrendererexpander.c
index db8e883334..289e34143d 100644
--- a/pidgin/gtkcellrendererexpander.c
+++ b/pidgin/gtkcellrendererexpander.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkcellrendererexpander.c GTK+ Cell Renderer Expander
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkcellrendererprogress.c b/pidgin/gtkcellrendererprogress.c
index 518e643535..44b831e1ef 100644
--- a/pidgin/gtkcellrendererprogress.c
+++ b/pidgin/gtkcellrendererprogress.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkcellrendererprogress.c GTK+ Cell Renderer Progress
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkcertmgr.c b/pidgin/gtkcertmgr.c
index eea4fd24c7..e6cf3d3991 100644
--- a/pidgin/gtkcertmgr.c
+++ b/pidgin/gtkcertmgr.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkcertmgr.c GTK+ Certificate Manager API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkconn.c b/pidgin/gtkconn.c
index f07ed15fc3..2a020684de 100644
--- a/pidgin/gtkconn.c
+++ b/pidgin/gtkconn.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkconn.c GTK+ Connection API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkconn.h b/pidgin/gtkconn.h
index ef9c76fdba..9fda617259 100644
--- a/pidgin/gtkconn.h
+++ b/pidgin/gtkconn.h
@@ -1,7 +1,8 @@
 /**
  * @file gtkconn.h GTK+ Connection API
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 505e0c0a7a..cbf44d5425 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkconv.c GTK+ Conversation API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkconv.h b/pidgin/gtkconv.h
index eda7e2c543..46f1e77f64 100644
--- a/pidgin/gtkconv.h
+++ b/pidgin/gtkconv.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkconv.h GTK+ Conversation API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkconvwin.h b/pidgin/gtkconvwin.h
index 4b69d46b02..73107d2971 100644
--- a/pidgin/gtkconvwin.h
+++ b/pidgin/gtkconvwin.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkconvwin.h GTK+ Conversation Window API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkdebug.c b/pidgin/gtkdebug.c
index 374100b102..d93a112550 100644
--- a/pidgin/gtkdebug.c
+++ b/pidgin/gtkdebug.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkdebug.c GTK+ Debug API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkdebug.h b/pidgin/gtkdebug.h
index abd88af8a4..75f0a8535e 100644
--- a/pidgin/gtkdebug.h
+++ b/pidgin/gtkdebug.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkdebug.h GTK+ Debug API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index d2f3b37404..8acf9e52c6 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkdialogs.c GTK+ Dialogs
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkdialogs.h b/pidgin/gtkdialogs.h
index 7c35f92087..7bfaa9c3de 100644
--- a/pidgin/gtkdialogs.h
+++ b/pidgin/gtkdialogs.h
@@ -1,7 +1,8 @@
 /**
  * @defgroup pidgin Pidgin (GTK+ User Interface)
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkdnd-hints.c b/pidgin/gtkdnd-hints.c
index 3d2b49e21a..141724ee93 100644
--- a/pidgin/gtkdnd-hints.c
+++ b/pidgin/gtkdnd-hints.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkdnd-hints.c GTK+ Drag-and-Drop arrow hints
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkdnd-hints.h b/pidgin/gtkdnd-hints.h
index d199cddc21..c67ef17fed 100644
--- a/pidgin/gtkdnd-hints.h
+++ b/pidgin/gtkdnd-hints.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkdnd-hints.h GTK+ Drag-and-Drop arrow hints
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/pidgin/gtkeventloop.c b/pidgin/gtkeventloop.c
index 2f43f3fd44..4e7923a4c8 100644
--- a/pidgin/gtkeventloop.c
+++ b/pidgin/gtkeventloop.c
@@ -1,8 +1,9 @@
 /**
  * @file gtk_eventloop.c Purple Event Loop API (gtk implementation)
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkeventloop.h b/pidgin/gtkeventloop.h
index 18414a9bab..0593a0f9e2 100644
--- a/pidgin/gtkeventloop.h
+++ b/pidgin/gtkeventloop.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkeventloop.h Pidgin GTK+ Event Loop Implementation
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkft.c b/pidgin/gtkft.c
index 7e40c49448..01ff17cb87 100644
--- a/pidgin/gtkft.c
+++ b/pidgin/gtkft.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkft.c GTK+ File Transfer UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkft.h b/pidgin/gtkft.h
index 8028a5faa5..e4703cef55 100644
--- a/pidgin/gtkft.h
+++ b/pidgin/gtkft.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkft.h GTK+ File Transfer UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkgaim-compat.h b/pidgin/gtkgaim-compat.h
index ddb17ff55a..a3baffed7a 100644
--- a/pidgin/gtkgaim-compat.h
+++ b/pidgin/gtkgaim-compat.h
@@ -1,7 +1,8 @@
 /**
  * @file gtkgaim-compat.h Gtk Gaim Compat macros
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkidle.h b/pidgin/gtkidle.h
index 3f20867f13..d869584d28 100644
--- a/pidgin/gtkidle.h
+++ b/pidgin/gtkidle.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkidle.h GTK+ Idle API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
index d1324eb67a..8055f63a23 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkimhtml.c GTK+ IMHtml
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkimhtml.h b/pidgin/gtkimhtml.h
index 05fb53e645..2c7d2810b7 100644
--- a/pidgin/gtkimhtml.h
+++ b/pidgin/gtkimhtml.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkimhtml.h GTK+ IM/HTML rendering component
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index c6c9f068a3..8fa4138c71 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkimhtmltoolbar.c GTK+ IMHtml Toolbar
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtklog.c b/pidgin/gtklog.c
index 6cdd96a614..f7f804f211 100644
--- a/pidgin/gtklog.c
+++ b/pidgin/gtklog.c
@@ -1,8 +1,9 @@
 /**
  * @file gtklog.c GTK+ Log viewer
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtklog.h b/pidgin/gtklog.h
index 1b28903c85..0292351732 100644
--- a/pidgin/gtklog.h
+++ b/pidgin/gtklog.h
@@ -1,8 +1,9 @@
 /**
  * @file gtklog.h GTK+ Log viewer
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkmenutray.h b/pidgin/gtkmenutray.h
index 825de5fedb..3e94bcdc22 100644
--- a/pidgin/gtkmenutray.h
+++ b/pidgin/gtkmenutray.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkmenutray.h GTK+ Tray menu item
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/pidgin/gtknickcolors.h b/pidgin/gtknickcolors.h
index 0047146d71..c8802bdd84 100644
--- a/pidgin/gtknickcolors.h
+++ b/pidgin/gtknickcolors.h
@@ -1,8 +1,9 @@
 /**
  * @file gtknickcolors.h GTK+ Conversation API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
index b64f26259a..0f3b56c1ea 100644
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -1,8 +1,9 @@
 /**
  * @file gtknotify.c GTK+ Notification API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtknotify.h b/pidgin/gtknotify.h
index 0bebd6beae..d134d9957b 100644
--- a/pidgin/gtknotify.h
+++ b/pidgin/gtknotify.h
@@ -1,8 +1,9 @@
 /**
  * @file gtknotify.h GTK+ Notification API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
index d037faa08a..f37bb5669a 100644
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkplugin.c GTK+ Plugins support
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkplugin.h b/pidgin/gtkplugin.h
index 85e8dbdd2b..8b07be4f12 100644
--- a/pidgin/gtkplugin.h
+++ b/pidgin/gtkplugin.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkplugin.h GTK+ Plugin API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkpluginpref.c b/pidgin/gtkpluginpref.c
index 672c61171c..2ae8f9e3fa 100644
--- a/pidgin/gtkpluginpref.c
+++ b/pidgin/gtkpluginpref.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkpluginpref.c GTK+ Plugin preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkpluginpref.h b/pidgin/gtkpluginpref.h
index d76cddf868..d0f9add1c4 100644
--- a/pidgin/gtkpluginpref.h
+++ b/pidgin/gtkpluginpref.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkpluginpref.h GTK+ Plugin Preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
index 4d02f10c1d..99014f5a9b 100644
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkpounce.c GTK+ Buddy Pounce API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkpounce.h b/pidgin/gtkpounce.h
index a5071558c1..7d62a22030 100644
--- a/pidgin/gtkpounce.h
+++ b/pidgin/gtkpounce.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkpounce.h GTK+ Buddy Pounce API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index d9be9fc88b..9e9e4c2771 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkprefs.c GTK+ Preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkprefs.h b/pidgin/gtkprefs.h
index 54a019f555..e2baefc397 100644
--- a/pidgin/gtkprefs.h
+++ b/pidgin/gtkprefs.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkprefs.h GTK+ Preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkprivacy.c b/pidgin/gtkprivacy.c
index 1546c1ec77..58e9ab7a28 100644
--- a/pidgin/gtkprivacy.c
+++ b/pidgin/gtkprivacy.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkprivacy.c GTK+ Privacy UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkprivacy.h b/pidgin/gtkprivacy.h
index 98828ae55d..0be6a05483 100644
--- a/pidgin/gtkprivacy.h
+++ b/pidgin/gtkprivacy.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkprivacy.h GTK+ Privacy UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index ec78d4984a..050bf10f4a 100644
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkrequest.c GTK+ Request API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkrequest.h b/pidgin/gtkrequest.h
index 1220e25032..83e466f6aa 100644
--- a/pidgin/gtkrequest.h
+++ b/pidgin/gtkrequest.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkrequest.h GTK+ Request API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkroomlist.c b/pidgin/gtkroomlist.c
index 14e5c9cb87..8105b05910 100644
--- a/pidgin/gtkroomlist.c
+++ b/pidgin/gtkroomlist.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkroomlist.c GTK+ Room List UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkroomlist.h b/pidgin/gtkroomlist.h
index 48b3ac0b82..ed905e5c6b 100644
--- a/pidgin/gtkroomlist.h
+++ b/pidgin/gtkroomlist.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkroomlist.h GTK+ Room List UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c
index 0d2b9ee660..54e8aca249 100644
--- a/pidgin/gtksavedstatuses.c
+++ b/pidgin/gtksavedstatuses.c
@@ -1,8 +1,9 @@
 /**
  * @file gtksavedstatus.c GTK+ Saved Status Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtksavedstatuses.h b/pidgin/gtksavedstatuses.h
index c70bd46f9a..144fd052c7 100644
--- a/pidgin/gtksavedstatuses.h
+++ b/pidgin/gtksavedstatuses.h
@@ -1,8 +1,9 @@
 /**
  * @file gtksavedstatuses.h GTK+ Saved Status Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkscrollbook.c b/pidgin/gtkscrollbook.c
index d5ab19e6fa..b594030f7a 100644
--- a/pidgin/gtkscrollbook.c
+++ b/pidgin/gtkscrollbook.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkscrollbook.c GTK+ Scrolling notebook widget 
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkscrollbook.h b/pidgin/gtkscrollbook.h
index 50247f361d..9ac4388ae1 100644
--- a/pidgin/gtkscrollbook.h
+++ b/pidgin/gtkscrollbook.h
@@ -1,8 +1,9 @@
 /*
  * @file gtkscrollbook  GTK+ Scrolling notebook Widget
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtksession.c b/pidgin/gtksession.c
index 45e8d6f69b..aac2a4fa82 100644
--- a/pidgin/gtksession.c
+++ b/pidgin/gtksession.c
@@ -1,8 +1,9 @@
 /*
  * @file gtksession.c X Windows session management API
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
diff --git a/pidgin/gtksession.h b/pidgin/gtksession.h
index e2b1e8824b..fb7711329e 100644
--- a/pidgin/gtksession.h
+++ b/pidgin/gtksession.h
@@ -1,8 +1,9 @@
 /**
  * @file gtksession.h X Windows session management API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c
index 81162183ae..9adee83a07 100644
--- a/pidgin/gtksound.c
+++ b/pidgin/gtksound.c
@@ -1,8 +1,9 @@
 /*
  * @file gtksound.c GTK+ Sound
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtksound.h b/pidgin/gtksound.h
index 1b1eea47c5..c1bb91d7e8 100644
--- a/pidgin/gtksound.h
+++ b/pidgin/gtksound.h
@@ -1,8 +1,9 @@
 /**
  * @file gtksound.h GTK+ Sound API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
index 8d52073609..1993702487 100644
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -1,8 +1,9 @@
 /*
  * @file gtkstatusbox.c GTK+ Status Selection Widget
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkstatusbox.h b/pidgin/gtkstatusbox.h
index ef041e0b83..bd116b72b1 100644
--- a/pidgin/gtkstatusbox.h
+++ b/pidgin/gtkstatusbox.h
@@ -1,8 +1,9 @@
 /*
  * @file gtkstatusbox.c GTK+ Status Selection Widget
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkthemes.h b/pidgin/gtkthemes.h
index 5b24918263..dd2b8cdab9 100644
--- a/pidgin/gtkthemes.h
+++ b/pidgin/gtkthemes.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkthemes.h GTK+ Smiley Theme API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 0a87c55d48..b20a717aa2 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -1,8 +1,9 @@
 /**
  * @file gtkutils.c GTK+ utility functions
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
index 5ebcfc003b..cfd11d1fe5 100644
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -1,8 +1,9 @@
 /**
  * @file gtkutils.h GTK+ utility functions
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/gtkwhiteboard.h b/pidgin/gtkwhiteboard.h
index 768504eea9..d5bad34a36 100644
--- a/pidgin/gtkwhiteboard.h
+++ b/pidgin/gtkwhiteboard.h
@@ -1,7 +1,8 @@
 /**
  * @file gtkwhiteboard.h The PidginWhiteboard frontend object
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/pidgin.h b/pidgin/pidgin.h
index 386a0d0077..2074ff6453 100644
--- a/pidgin/pidgin.h
+++ b/pidgin/pidgin.h
@@ -1,8 +1,9 @@
 /**
  * @file pidgin.h UI definitions and includes
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
index a2d147fe09..fd695926cd 100644
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -1,8 +1,9 @@
 /**
  * @file pidginstock.c GTK+ Stock resources
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
diff --git a/pidgin/pidginstock.h b/pidgin/pidginstock.h
index 38b90dba9e..eb4c895a50 100644
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -1,8 +1,9 @@
 /**
  * @file pidginstock.h GTK+ Stock resources
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this