--- a/libpurple/account.h	Tue Jan 03 19:29:43 2012 +0000
+++ b/libpurple/account.h	Tue Jan 03 23:32:59 2012 +0000
@@ -171,9 +171,7 @@
 	PurpleConnectionErrorInfo *current_error;	/**< Errors */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**************************************************************************/
 /** @name Account API                                                     */
@@ -1191,8 +1189,6 @@
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PURPLE_ACCOUNT_H_ */