Mercurial > pidgin3 / changeset

--- a/finch/finch.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/finch.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "finch.h"

--- a/finch/gntaccount.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntaccount.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <purple.h>
 
 #include <gnt.h>
 #include <gntbox.h>
@@ -36,8 +36,6 @@
 
 #include "finch.h"
 
-#include <purple.h>
-
 #include "gntaccount.h"
 #include "gntblist.h"
 

--- a/finch/gntblist.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntblist.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
 #include "finch.h"
 
 #include NCURSES_HEADER

--- a/finch/gntconn.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntconn.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
 #include "finch.h"
 
 #include <purple.h>

--- a/finch/gntconv.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntconv.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
 #include "finch.h"
 
 #include NCURSES_HEADER

--- a/finch/gntdebug.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntdebug.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gstdio.h>
+
 #include <purple.h>
 
 #include <gnt.h>

--- a/finch/gntidle.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntidle.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
 #include <purple.h>
 
 #include "finch.h"

--- a/finch/gntlog.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntlog.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <purple.h>
+
 #include "finch.h"
 
 #include <gnt.h>
@@ -32,8 +33,6 @@
 #include <gnttree.h>
 #include <gntwindow.h>
 
-#include <purple.h>
-
 #include "gntlog.h"
 
 static GHashTable *log_viewers = NULL;

--- a/finch/gntmedia.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntmedia.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
+#include <purple.h>
+
 #include "finch.h"
 #include "gntconv.h"
 #include "gntmedia.h"
@@ -30,8 +37,6 @@
 #include "gntbox.h"
 #include "gntlabel.h"
 
-#include <purple.h>
-
 /* An incredibly large part of the following is from gtkmedia.c */
 #ifdef USE_VV
 #include "media-gst.h"

--- a/finch/gntmedia.h	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntmedia.h	Fri May 01 12:13:35 2020 -0500
@@ -30,10 +30,6 @@
  * @title: Media API
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 G_BEGIN_DECLS
 
 void finch_media_manager_init(void);

--- a/finch/gntmenuutil.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntmenuutil.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <purple.h>
+
 #include "finch.h"
 
 #include "gnt.h"

--- a/finch/gntnotify.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntnotify.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <glib/gi18n-lib.h>
+
+#include <purple.h>
 
 #include <gnt.h>
 #include <gntbox.h>
@@ -32,8 +34,6 @@
 
 #include "finch.h"
 
-#include <purple.h>
-
 #include "gntnotify.h"
 
 static struct

--- a/finch/gntplugin.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntplugin.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <purple.h>
 
 #include <gnt.h>
 #include <gntbox.h>
@@ -32,8 +32,6 @@
 
 #include "finch.h"
 
-#include <purple.h>
-
 #include "gntplugin.h"
 #include "gntrequest.h"
 

--- a/finch/gntpounce.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntpounce.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <glib/gi18n-lib.h>
+
+#include <purple.h>
 
 #include NCURSES_HEADER
 
@@ -37,8 +39,6 @@
 
 #include "finch.h"
 
-#include <purple.h>
-
 #include "gntpounce.h"
 
 

--- a/finch/gntprefs.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntprefs.c	Fri May 01 12:13:35 2020 -0500
@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <glib/gi18n-lib.h>
+
 #include "finch.h"
-#include <internal.h>
 
 #include <purple.h>
 

--- a/finch/gntrequest.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntrequest.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <glib/gi18n-lib.h>
+
+#include <purple.h>
 
 #include <gnt.h>
 #include <gntbox.h>
@@ -36,8 +38,6 @@
 #include "finch.h"
 #include "gntrequest.h"
 
-#include <purple.h>
-
 typedef struct
 {
 	void *user_data;

--- a/finch/gntroomlist.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntroomlist.c	Fri May 01 12:13:35 2020 -0500
@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <glib/gi18n-lib.h>
+
 #include "finch.h"
-#include <internal.h>
 
 #include "gntrequest.h"
 #include "gntroomlist.h"

--- a/finch/gntsound.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntsound.c	Fri May 01 12:13:35 2020 -0500
@@ -20,8 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "finch.h"
-#include <internal.h>
 
 #include NCURSES_HEADER
 

--- a/finch/gntstatus.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntstatus.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <glib/gi18n-lib.h>
+
+#include <purple.h>
 
 #include <gnt.h>
 #include <gntbox.h>
@@ -34,8 +36,6 @@
 
 #include "finch.h"
 
-#include <purple.h>
-
 #include "gntstatus.h"
 
 static struct

--- a/finch/gntui.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntui.c	Fri May 01 12:13:35 2020 -0500
@@ -20,8 +20,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
+#include <purple.h>
+
 #include "finch.h"
-#include <internal.h>
 
 #include "gntui.h"
 
@@ -42,8 +49,6 @@
 #include "gntstatus.h"
 #include "gntsound.h"
 
-#include <purple.h>
-
 void finch_ui_init()
 {
 #ifdef STANDALONE

--- a/finch/gntxfer.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/gntxfer.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <glib/gi18n-lib.h>
+
+#include <purple.h>
+
 #include "finch.h"
 
 #include <gnt.h>
@@ -30,7 +33,6 @@
 #include <gntlabel.h>
 #include <gnttree.h>
 
-#include <purple.h>
 
 #include "gntxfer.h"
 

--- a/finch/libfinch.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/libfinch.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
+
 #include <locale.h>
 #include "finch.h"
 

--- a/finch/plugins/gntclipboard.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/plugins/gntclipboard.c	Fri May 01 12:13:35 2020 -0500
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 
 #define PLUGIN_ID           "gntclipboard"
 #define PLUGIN_DOMAIN       (g_quark_from_static_string(PLUGIN_ID))

--- a/finch/plugins/gntgf.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/plugins/gntgf.c	Fri May 01 12:13:35 2020 -0500
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
-
 #include NCURSES_HEADER
 
 #define PLUGIN_STATIC_NAME	GntGf

--- a/finch/plugins/gnthistory.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/plugins/gnthistory.c	Fri May 01 12:13:35 2020 -0500
@@ -18,8 +18,6 @@
 
 /* Ripped from gtk/plugins/history.c */
 
-#include "internal.h"
-
 #include <purple.h>
 
 #include "gntconv.h"

--- a/finch/plugins/gnttinyurl.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/plugins/gnttinyurl.c	Fri May 01 12:13:35 2020 -0500
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <glib.h>
 #include <libsoup/soup.h>
 

--- a/finch/plugins/grouping.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/plugins/grouping.c	Fri May 01 12:13:35 2020 -0500
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#include "internal.h"
 #include <purple.h>
 
 #include "gntblist.h"

--- a/finch/plugins/lastlog.c	Sun May 10 13:43:52 2020 +0000
+++ b/finch/plugins/lastlog.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,6 @@
 
 #define PLUGIN_STATIC_NAME	GntLastlog
 
-#include "internal.h"
 #include <purple.h>
 
 #include <gnt.h>

--- a/libpurple/account.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/account.c	Fri May 01 12:13:35 2020 -0500
@@ -27,6 +27,7 @@
 #include "notify.h"
 #include "pounce.h"
 #include "prefs.h"
+#include "purpleprivate.h"
 #include "request.h"
 #include "server.h"
 #include "signals.h"

--- a/libpurple/accounts.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/accounts.c	Fri May 01 12:13:35 2020 -0500
@@ -25,6 +25,7 @@
 #include "enums.h"
 #include "network.h"
 #include "pounce.h"
+#include "purpleprivate.h"
 
 static PurpleAccountUiOps *account_ui_ops = NULL;
 
@@ -223,14 +224,14 @@
 		switch (G_VALUE_TYPE(attr_value))
 		{
 			case G_TYPE_STRING:
-				g_hash_table_insert(attrs, id, (char *)value);
+				g_hash_table_insert(attrs, (char *)id, (char *)value);
 				break;
 			case G_TYPE_INT:
 			case G_TYPE_BOOLEAN:
 			{
 				int v;
 				if (sscanf(value, "%d", &v) == 1) {
-					g_hash_table_insert(attrs, id, GINT_TO_POINTER(v));
+					g_hash_table_insert(attrs, (char *)id, GINT_TO_POINTER(v));
 				}
 				break;
 			}

--- a/libpurple/blistnode.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/blistnode.c	Fri May 01 12:13:35 2020 -0500
@@ -22,6 +22,9 @@
  */
 #include "internal.h"
 
+#include "blistnode.h"
+#include "buddy.h"
+
 typedef struct _PurpleBlistNodePrivate  PurpleBlistNodePrivate;
 
 /* Private data of a buddy list node */

--- a/libpurple/buddyicon.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/buddyicon.c	Fri May 01 12:13:35 2020 -0500
@@ -24,6 +24,7 @@
 #include "conversation.h"
 #include "debug.h"
 #include "image.h"
+#include "purpleprivate.h"
 #include "util.h"
 
 /* NOTE: Instances of this struct are allocated without zeroing the memory, so

--- a/libpurple/buddylist.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/buddylist.c	Fri May 01 12:13:35 2020 -0500
@@ -28,6 +28,7 @@
 #include "pounce.h"
 #include "prefs.h"
 #include "protocol.h"
+#include "purpleprivate.h"
 #include "server.h"
 #include "signals.h"
 #include "util.h"

--- a/libpurple/buddylist.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/buddylist.h	Fri May 01 12:13:35 2020 -0500
@@ -22,6 +22,8 @@
 #ifndef PURPLE_BUDDY_LIST_H
 #define PURPLE_BUDDY_LIST_H
 
+#include <glib/gi18n-lib.h>
+
 /**
  * SECTION:buddylist
  * @section_id: libpurple-buddylist
@@ -40,6 +42,7 @@
 #define PURPLE_BLIST_DEFAULT_GROUP_NAME _("Buddies")
 
 #include "chat.h"
+#include "contact.h"
 
 /**
  * PurpleBlistWalkFunc:

--- a/libpurple/connection.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/connection.c	Fri May 01 12:13:35 2020 -0500
@@ -30,6 +30,7 @@
 #include "notify.h"
 #include "prefs.h"
 #include "proxy.h"
+#include "purpleprivate.h"
 #include "purpleprotocolfactory.h"
 #include "request.h"
 #include "server.h"

--- a/libpurple/contact.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/contact.c	Fri May 01 12:13:35 2020 -0500
@@ -23,6 +23,7 @@
 
 #include "contact.h"
 #include "internal.h" /* TODO: this needs to die */
+#include "purpleprivate.h"
 #include "util.h"
 
 typedef struct _PurpleContactPrivate    PurpleContactPrivate;

--- a/libpurple/conversation.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/conversation.c	Fri May 01 12:13:35 2020 -0500
@@ -29,6 +29,7 @@
 #include "notify.h"
 #include "prefs.h"
 #include "protocol.h"
+#include "purpleprivate.h"
 #include "request.h"
 #include "signals.h"
 #include "smiley-list.h"

--- a/libpurple/conversations.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/conversations.c	Fri May 01 12:13:35 2020 -0500
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
+#include "purpleprivate.h"
+
 #include "conversations.h"
 
 static GList *conversations = NULL;

--- a/libpurple/conversationtypes.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/conversationtypes.c	Fri May 01 12:13:35 2020 -0500
@@ -23,6 +23,7 @@
 #include "conversationtypes.h"
 #include "debug.h"
 #include "enums.h"
+#include "purpleprivate.h"
 
 #define SEND_TYPED_TIMEOUT_SECONDS 5
 

--- a/libpurple/core.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/core.c	Fri May 01 12:13:35 2020 -0500
@@ -35,6 +35,7 @@
 #include "pounce.h"
 #include "prefs.h"
 #include "proxy.h"
+#include "purpleprivate.h"
 #include "savedstatuses.h"
 #include "signals.h"
 #include "smiley-custom.h"

--- a/libpurple/enums.c.in	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/enums.c.in	Fri May 01 12:13:35 2020 -0500
@@ -19,9 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #include "enums.h"
 

--- a/libpurple/group.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/group.c	Fri May 01 12:13:35 2020 -0500
@@ -23,6 +23,7 @@
 
 #include "group.h"
 #include "internal.h" /* TODO: we need to kill this */
+#include "purpleprivate.h"
 
 typedef struct _PurpleGroupPrivate      PurpleGroupPrivate;
 

--- a/libpurple/idle.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/idle.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
 
 #include "connection.h"
 #include "debug.h"

--- a/libpurple/image.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/image.c	Fri May 01 12:13:35 2020 -0500
@@ -23,6 +23,7 @@
 
 #include "debug.h"
 #include "image.h"
+#include "util.h"
 
 typedef struct {
 	gchar *path;

--- a/libpurple/internal.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/internal.h	Fri May 01 12:13:35 2020 -0500
@@ -28,21 +28,21 @@
  * @title: Internal definitions and includes
  */
 
+#if !defined(PURPLE_COMPILATION)
+#error "internal.h included outside of libpurple"
+#endif
+
 #ifndef GLIB_VERSION_MIN_REQUIRED
 #define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_28)
 #endif
 
 #ifdef HAVE_CONFIG_H
+# ifdef GETTEXT_PACKAGE
+#  undef GETTEXT_PACKAGE
+# endif
 # include <config.h>
 #endif
 
-/* for SIOCGIFCONF  in SKYOS */
-#ifdef SKYOS
-#include <net/sockios.h>
-#endif
-
-#include <glib/gi18n-lib.h>
-
 #ifdef HAVE_ENDIAN_H
 # include <endian.h>
 #endif
@@ -55,11 +55,13 @@
 #define BUF_LONG BUF_LEN * 2
 
 #include <sys/types.h>
+
 #ifndef _WIN32
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/time.h>
+# include <sys/time.h>
+# include <sys/wait.h>
+# include <sys/time.h>
 #endif
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -70,11 +72,11 @@
 #include <time.h>
 
 #ifdef HAVE_ICONV
-#include <iconv.h>
+# include <iconv.h>
 #endif
 
 #ifdef HAVE_LANGINFO_CODESET
-#include <langinfo.h>
+# include <langinfo.h>
 #endif
 
 #ifndef _WIN32
@@ -92,11 +94,8 @@
 # define HOST_NAME_MAX 255
 #endif
 
-#include <glib.h>
-#include <glib/gstdio.h>
-
 #ifdef _WIN32
-#include "win32/win32dep.h"
+# include "win32/win32dep.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -109,16 +108,6 @@
 #endif
 #endif
 
-#define PURPLE_STATIC_ASSERT(condition, message) \
-	{ typedef char static_assertion_failed_ ## message \
-	[(condition) ? 1 : -1]; static_assertion_failed_ ## message dummy; \
-	(void)dummy; }
-
-/* This is meant to track use-after-free errors.
- * TODO: it should be disabled in released code. */
-#define PURPLE_ASSERT_CONNECTION_IS_VALID(gc) \
-	_purple_assert_connection_is_valid(gc, __FILE__, __LINE__)
-
 #ifdef __clang__
 
 #define PURPLE_BEGIN_IGNORE_CAST_ALIGN \
@@ -145,232 +134,4 @@
 
 #endif
 
-typedef union
-{
-	struct sockaddr sa;
-	struct sockaddr_in in;
-	struct sockaddr_in6 in6;
-	struct sockaddr_storage storage;
-} common_sockaddr_t;
-
-#define PURPLE_WEBSITE "https://pidgin.im/"
-#define PURPLE_DEVEL_WEBSITE "https://developer.pidgin.im/"
-
-
-/* INTERNAL FUNCTIONS */
-
-#include "accounts.h"
-#include "connection.h"
-
-/**
- * _purple_account_set_current_error:
- * @account:  The account to set the error for.
- * @new_err:  The #PurpleConnectionErrorInfo instance representing the
- *                 error.
- *
- * Sets an error for an account.
- */
-void _purple_account_set_current_error(PurpleAccount *account,
-                                       PurpleConnectionErrorInfo *new_err);
-
-/**
- * _purple_account_to_xmlnode:
- * @account:  The account
- *
- * Get an XML description of an account.
- *
- * Returns:  The XML description of the account.
- */
-PurpleXmlNode *_purple_account_to_xmlnode(PurpleAccount *account);
-
-/**
- * _purple_blist_get_last_child:
- * @node:  The node whose last child is to be retrieved.
- *
- * Returns the last child of a particular node.
- *
- * Returns: The last child of the node.
- */
-PurpleBlistNode *_purple_blist_get_last_child(PurpleBlistNode *node);
-
-/* This is for the accounts code to notify the buddy icon code that
- * it's done loading.  We may want to replace this with a signal. */
-void
-_purple_buddy_icons_account_loaded_cb(void);
-
-/* This is for the buddy list to notify the buddy icon code that
- * it's done loading.  We may want to replace this with a signal. */
-void
-_purple_buddy_icons_blist_loaded_cb(void);
-
-/**
- * _purple_connection_new:
- * @account:  The account the connection should be connecting to.
- * @regist:   Whether we are registering a new account or just
- *                 trying to do a normal signon.
- * @password: The password to use.
- *
- * Creates a connection to the specified account and either connects
- * or attempts to register a new account.  If you are logging in,
- * the connection uses the current active status for this account.
- * So if you want to sign on as "away," for example, you need to
- * have called purple_account_set_status(account, "away").
- * (And this will call purple_account_connect() automatically).
- *
- * Note: This function should only be called by purple_account_connect()
- *       in account.c.  If you're trying to sign on an account, use that
- *       function instead.
- */
-void _purple_connection_new(PurpleAccount *account, gboolean regist,
-                            const char *password);
-/**
- * _purple_connection_new_unregister:
- * @account:  The account to unregister
- * @password: The password to use.
- * @cb: Optional callback to be called when unregistration is complete
- * @user_data: user data to pass to the callback
- *
- * Tries to unregister the account on the server. If the account is not
- * connected, also creates a new connection.
- *
- * Note: This function should only be called by purple_account_unregister()
- *       in account.c.
- */
-void _purple_connection_new_unregister(PurpleAccount *account, const char *password,
-                                       PurpleAccountUnregistrationCb cb, void *user_data);
-/**
- * _purple_connection_wants_to_die:
- * @gc:  The connection to check
- *
- * Checks if a connection is disconnecting, and should not attempt to reconnect.
- *
- * Note: This function should only be called by purple_account_set_enabled()
- *       in account.c.
- */
-gboolean _purple_connection_wants_to_die(PurpleConnection *gc);
-
-/**
- * _purple_connection_add_active_chat:
- * @gc:    The connection
- * @chat:  The chat conversation to add
- *
- * Adds a chat to the active chats list of a connection
- *
- * Note: This function should only be called by purple_serv_got_joined_chat()
- *       in server.c.
- */
-void _purple_connection_add_active_chat(PurpleConnection *gc,
-                                        PurpleChatConversation *chat);
-/**
- * _purple_connection_remove_active_chat:
- * @gc:    The connection
- * @chat:  The chat conversation to remove
- *
- * Removes a chat from the active chats list of a connection
- *
- * Note: This function should only be called by purple_serv_got_chat_left()
- *       in server.c.
- */
-void _purple_connection_remove_active_chat(PurpleConnection *gc,
-                                           PurpleChatConversation *chat);
-
-/**
- * _purple_conversations_update_cache:
- * @conv:    The conversation.
- * @name:    The new name. If no change, use %NULL.
- * @account: The new account. If no change, use %NULL.
- *
- * Updates the conversation cache to use a new conversation name and/or
- * account. This function only updates the conversation cache. It is the
- * caller's responsibility to actually update the conversation.
- *
- * Note: This function should only be called by purple_conversation_set_name()
- *       and purple_conversation_set_account() in conversation.c.
- */
-void _purple_conversations_update_cache(PurpleConversation *conv,
-		const char *name, PurpleAccount *account);
-
-/**
- * _purple_statuses_get_primitive_scores:
- *
- * Note: This function should only be called by
- *       purple_buddy_presence_compute_score() in presence.c.
- *
- * Returns: The primitive scores array from status.c.
- */
-int *_purple_statuses_get_primitive_scores(void);
-
-/**
- * _purple_blist_get_localized_default_group_name:
- *
- * Returns the name of default group for previously used non-English
- * localization. It's used for merging default group, in case when roster
- * contains localized name.
- *
- * Please note, prpls shouldn't save default group name depending on current
- * locale. So, this function is mostly for libpurple2 compatibility. And for
- * improperly written prpls.
- */
-const gchar *
-_purple_blist_get_localized_default_group_name(void);
-
-/**
- * Sets most commonly used socket flags: O_NONBLOCK and FD_CLOEXEC.
- *
- * @param fd The file descriptor for the socket.
- *
- * @return TRUE if succeeded, FALSE otherwise.
- */
-gboolean
-_purple_network_set_common_socket_flags(int fd);
-
-/**
- * A fstat alternative, like g_stat for stat.
- *
- * @param fd The file descriptor.
- * @param st The stat buffer.
- *
- * @return the result just like for fstat.
- */
-int
-_purple_fstat(int fd, GStatBuf *st);
-
-/**
- * _purple_message_init: (skip)
- *
- * Initializes the #PurpleMessage subsystem.
- */
-void
-_purple_message_init(void);
-
-/**
- * _purple_message_uninit: (skip)
- *
- * Uninitializes the #PurpleMessage subsystem.
- */
-void
-_purple_message_uninit(void);
-
-void
-_purple_assert_connection_is_valid(PurpleConnection *gc,
-	const gchar *file, int line);
-
-/**
- * _purple_conversation_write_common:
- * @conv:    The conversation.
- * @msg:     The message.
- *
- * Writes to a conversation window.
- *
- * This function should not be used to write IM or chat messages. Use
- * purple_conversation_write_message() instead. This function will
- * most likely call this anyway, but it may do it's own formatting,
- * sound playback, etc. depending on whether the conversation is a chat or an
- * IM.
- *
- * See purple_conversation_write_message().
- */
-void
-_purple_conversation_write_common(PurpleConversation *conv, PurpleMessage *msg);
-
 #endif /* PURPLE_INTERNAL_H */

--- a/libpurple/log.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/log.c	Fri May 01 12:13:35 2020 -0500
@@ -20,9 +20,14 @@
  */
 
 #include "internal.h"
+
+#include <glib.h>
+#include <glib/gstdio.h>
+
+#include "glibcompat.h" /* for purple_g_stat on win32 */
+
 #include "account.h"
 #include "debug.h"
-#include "glibcompat.h" /* for purple_g_stat on win32 */
 #include "image-store.h"
 #include "log.h"
 #include "prefs.h"

--- a/libpurple/media/backend-iface.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/media/backend-iface.h	Fri May 01 12:13:35 2020 -0500
@@ -30,6 +30,7 @@
 
 #include "codec.h"
 #include "enum-types.h"
+#include "media.h"
 
 #include <glib-object.h>
 

--- a/libpurple/meson.build	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/meson.build	Fri May 01 12:13:35 2020 -0500
@@ -258,6 +258,8 @@
 libpurple = library('purple',
                     purple_coresources + purple_builtsources +
                     purple_builtheaders,
+                    'purpleprivate.h',
+                    c_args : ['-DPURPLE_COMPILATION'],
                     include_directories : [toplevel_inc, libpurple_inc],
                     install : true,
                     version : PURPLE_LIB_VERSION,

--- a/libpurple/message.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/message.c	Fri May 01 12:13:35 2020 -0500
@@ -24,6 +24,7 @@
 #include "debug.h"
 #include "enums.h"
 #include "message.h"
+#include "purpleprivate.h"
 
 /**
  * PurpleMessage:

--- a/libpurple/message.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/message.h	Fri May 01 12:13:35 2020 -0500
@@ -46,6 +46,11 @@
  */
 G_DECLARE_FINAL_TYPE(PurpleMessage, purple_message, PURPLE, MESSAGE, GObject)
 
+/* conversations.h depends on PurpleMessage and currently PurpleMessageFlag is
+ * in conversations.h.
+ */
+#include <conversation.h>
+
 /**
  * purple_message_new_outgoing:
  * @who: Message's recipient.

--- a/libpurple/network.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/network.c	Fri May 01 12:13:35 2020 -0500
@@ -20,6 +20,7 @@
  */
 
 #include "internal.h"
+#include "purpleprivate.h"
 
 #include <gio/gio.h>
 

--- a/libpurple/network.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/network.h	Fri May 01 12:13:35 2020 -0500
@@ -31,6 +31,19 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#ifndef _WIN32
+# include <netinet/in.h>
+# include <sys/socket.h>
+#endif
+
+typedef union
+{
+	struct sockaddr sa;
+	struct sockaddr_in in;
+	struct sockaddr_in6 in6;
+	struct sockaddr_storage storage;
+} common_sockaddr_t;
+
 G_BEGIN_DECLS
 
 /**************************************************************************/

--- a/libpurple/options.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/options.c	Fri May 01 12:13:35 2020 -0500
@@ -23,7 +23,9 @@
 
 #include "options.h"
 
+#include "debug.h"
 #include "network.h"
+#include "util.h"
 
 /******************************************************************************
  * Callbacks

--- a/libpurple/pluginpref.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/pluginpref.c	Fri May 01 12:13:35 2020 -0500
@@ -19,14 +19,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <glib.h>
 
+#include "internal.h"
+
 #include "debug.h"
-#include "internal.h"
 #include "pluginpref.h"
 #include "prefs.h"
 #include "purplekeyvaluepair.h"

--- a/libpurple/plugins.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins.c	Fri May 01 12:13:35 2020 -0500
@@ -25,6 +25,8 @@
 #include "debug.h"
 #include "enums.h"
 #include "plugins.h"
+#include "signals.h"
+#include "util.h"
 
 typedef struct _PurplePluginInfoPrivate  PurplePluginInfoPrivate;
 

--- a/libpurple/plugins/autoaccept.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/autoaccept.c	Fri May 01 12:13:35 2020 -0500
@@ -17,7 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1301, USA.
  */
-#include "internal.h"
+
+#include <glib/gi18n-lib.h>
 
 #define PLUGIN_ID			"core-plugin_pack-autoaccept"
 #define PLUGIN_NAME			N_("Autoaccept")

--- a/libpurple/plugins/buddynote.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/buddynote.c	Fri May 01 12:13:35 2020 -0500
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <purple.h>
 

--- a/libpurple/plugins/codeinline.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/codeinline.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <purple.h>
 

--- a/libpurple/plugins/debug_example.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/debug_example.c	Fri May 01 12:13:35 2020 -0500
@@ -20,10 +20,7 @@
  *
  */
 
-/* When writing a third-party plugin, do not include libpurple's internal.h
- * included below. This file is for internal libpurple use only. We're including
- * it here for our own convenience. */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 /* This file includes all the libpurple headers */
 #include <purple.h>

--- a/libpurple/plugins/helloworld.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/helloworld.c	Fri May 01 12:13:35 2020 -0500
@@ -21,10 +21,7 @@
  *
  */
 
-/* When writing a third-party plugin, do not include libpurple's internal.h
- * included below. This file is for internal libpurple use only. We're including
- * it here for our own convenience. */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 /* This file includes all the libpurple headers */
 #include <purple.h>

--- a/libpurple/plugins/idle.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/idle.c	Fri May 01 12:13:35 2020 -0500
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <purple.h>
 

--- a/libpurple/plugins/joinpart.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/joinpart.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #define JOINPART_PLUGIN_ID "core-rlaager-joinpart"

--- a/libpurple/plugins/keyrings/internalkeyring.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/keyrings/internalkeyring.c	Fri May 01 12:13:35 2020 -0500
@@ -24,7 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include <nettle/aes.h>

--- a/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp	Fri May 01 12:13:35 2020 -0500
@@ -24,7 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include <QQueue>

--- a/libpurple/plugins/keyrings/kwallet/purplekwallet.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.h	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,6 @@
  * along with this program ; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
  */
-#include "internal.h"
 #include <purple.h>
 
 #include <kwallet.h>

--- a/libpurple/plugins/keyrings/secretservice.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/keyrings/secretservice.c	Fri May 01 12:13:35 2020 -0500
@@ -32,7 +32,8 @@
  * to resolve this if desired.
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include <libsecret/secret.h>

--- a/libpurple/plugins/log_reader.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/log_reader.c	Fri May 01 12:13:35 2020 -0500
@@ -15,8 +15,11 @@
  * 02111-1301, USA.
  */
 
-#include "internal.h"
-
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
+
+#include <ctype.h>
 #include <stdio.h>
 
 #include <purple.h>

--- a/libpurple/plugins/notify_example.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/notify_example.c	Fri May 01 12:13:35 2020 -0500
@@ -20,10 +20,7 @@
  *
  */
 
-/* When writing a third-party plugin, do not include libpurple's internal.h
- * included below. This file is for internal libpurple use only. We're including
- * it here for our own convenience. */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 /* This file includes all the libpurple headers */
 #include <purple.h>

--- a/libpurple/plugins/offlinemsg.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/offlinemsg.c	Fri May 01 12:13:35 2020 -0500
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1301, USA.
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #define PLUGIN_ID			"core-plugin_pack-offlinemsg"
 #define PLUGIN_NAME			N_("Offline Message Emulation")

--- a/libpurple/plugins/one_time_password.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/one_time_password.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1301, USA.
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #define PLUGIN_ID "core-one_time_password"

--- a/libpurple/plugins/pluginpref_example.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/pluginpref_example.c	Fri May 01 12:13:35 2020 -0500
@@ -19,10 +19,7 @@
  * 02111-1301, USA.
  */
 
-/* When writing a third-party plugin, do not include libpurple's internal.h
- * included below. This file is for internal libpurple use only. We're including
- * it here for our own convenience. */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 /* This file includes all the libpurple headers */
 #include <purple.h>

--- a/libpurple/plugins/psychic.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/psychic.c	Fri May 01 12:13:35 2020 -0500
@@ -15,7 +15,8 @@
  * 02111-1301, USA.
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #define PLUGIN_ID       "core-psychic"

--- a/libpurple/plugins/signals-test.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/signals-test.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  */
 #define SIGNAL_TEST_PLUGIN_ID "core-signals-test"
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include <stdio.h>

--- a/libpurple/plugins/simple.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/simple.c	Fri May 01 12:13:35 2020 -0500
@@ -15,7 +15,8 @@
  * 02111-1301, USA.
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 /** Plugin id : type-author-name (to guarantee uniqueness) */

--- a/libpurple/plugins/statenotify.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/statenotify.c	Fri May 01 12:13:35 2020 -0500
@@ -15,7 +15,8 @@
  * 02111-1301, USA.
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #define STATENOTIFY_PLUGIN_ID "core-statenotify"

--- a/libpurple/plugins/test-request-input.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/plugins/test-request-input.c	Fri May 01 12:13:35 2020 -0500
@@ -20,8 +20,8 @@
  */
 
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include <purple.h>
 
 #define PREF_ROOT "/plugins"

--- a/libpurple/prefs.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/prefs.c	Fri May 01 12:13:35 2020 -0500
@@ -21,16 +21,15 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
+
 #include <glib.h>
+
 #include "internal.h"
+
 #include "prefs.h"
 #include "debug.h"
 #include "util.h"

--- a/libpurple/presence.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/presence.c	Fri May 01 12:13:35 2020 -0500
@@ -21,6 +21,7 @@
 #include "internal.h"
 #include "debug.h"
 #include "presence.h"
+#include "purpleprivate.h"
 
 /**************************************************************************
  * PurplePresence

--- a/libpurple/protocol.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocol.h	Fri May 01 12:13:35 2020 -0500
@@ -41,6 +41,7 @@
 #include "account.h"
 #include "buddyicon.h"
 #include "buddylist.h"
+#include "chat.h"
 #include "connection.h"
 #include "conversations.h"
 #include "debug.h"

--- a/libpurple/protocols/bonjour/bonjour.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,6 @@
 #include "dns_sd_proxy.h"
 #endif
 
-#include "internal.h"
 #include <purple.h>
 
 #include "bonjour.h"

--- a/libpurple/protocols/bonjour/bonjour.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/bonjour.h	Fri May 01 12:13:35 2020 -0500
@@ -28,7 +28,6 @@
 
 #include <gmodule.h>
 
-#include "internal.h"
 #include <purple.h>
 
 #include "mdns_common.h"

--- a/libpurple/protocols/bonjour/bonjour_ft.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.c	Fri May 01 12:13:35 2020 -0500
@@ -19,9 +19,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#include "internal.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+#ifndef _WIN32
+# include <arpa/inet.h>
+# include <netdb.h>
+# include <sys/socket.h>
+#endif
+
 #include <purple.h>
 
+#include "purpleprivate.h"
+
 #include "bonjour.h"
 #include "bonjour_ft.h"
 

--- a/libpurple/protocols/bonjour/buddy.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/buddy.c	Fri May 01 12:13:35 2020 -0500
@@ -17,7 +17,6 @@
 #include <glib.h>
 #include <stdlib.h>
 
-#include "internal.h"
 #include <purple.h>
 
 #include "buddy.h"

--- a/libpurple/protocols/bonjour/mdns_avahi.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/mdns_avahi.c	Fri May 01 12:13:35 2020 -0500
@@ -14,7 +14,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "mdns_interface.h"

--- a/libpurple/protocols/bonjour/mdns_common.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/mdns_common.c	Fri May 01 12:13:35 2020 -0500
@@ -16,7 +16,6 @@
 
 #include <string.h>
 
-#include "internal.h"
 #include <purple.h>
 
 #include "mdns_common.h"

--- a/libpurple/protocols/bonjour/parser.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/parser.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
 #include <purple.h>
 
 #include <libxml/parser.h>

--- a/libpurple/protocols/bonjour/xmpp.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/bonjour/xmpp.c	Fri May 01 12:13:35 2020 -0500
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
+#include "purpleprivate.h"
 
 #ifndef _WIN32
 #include <net/if.h>

--- a/libpurple/protocols/facebook/api.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/facebook/api.c	Fri May 01 12:13:35 2020 -0500
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <glib/gi18n-lib.h>
+
 #include <json-glib/json-glib.h>
 #include <libsoup/soup.h>
 #include <stdarg.h>

--- a/libpurple/protocols/facebook/api.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/facebook/api.h	Fri May 01 12:13:35 2020 -0500
@@ -31,8 +31,6 @@
  * The API for interacting with the Facebook Messenger protocol.
  */
 
-#include "internal.h"
-
 #include <glib.h>
 
 #include <purple.h>

--- a/libpurple/protocols/facebook/facebook.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/facebook/facebook.c	Fri May 01 12:13:35 2020 -0500
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "api.h"

--- a/libpurple/protocols/facebook/http.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/facebook/http.c	Fri May 01 12:13:35 2020 -0500
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 

--- a/libpurple/protocols/facebook/json.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/facebook/json.c	Fri May 01 12:13:35 2020 -0500
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdarg.h>
 #include <string.h>

--- a/libpurple/protocols/facebook/mqtt.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/facebook/mqtt.c	Fri May 01 12:13:35 2020 -0500
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <glib/gprintf.h>
 #include <stdarg.h>

--- a/libpurple/protocols/facebook/util.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/facebook/util.c	Fri May 01 12:13:35 2020 -0500
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <gio/gio.h>
 #include <stdarg.h>

--- a/libpurple/protocols/gg/account.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/account.h	Fri May 01 12:13:35 2020 -0500
@@ -32,7 +32,7 @@
 
 #error "This file is outdated"
 
-#include <internal.h>
+#include <purple.h>
 
 typedef struct
 {

--- a/libpurple/protocols/gg/avatar.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/avatar.c	Fri May 01 12:13:35 2020 -0500
@@ -33,6 +33,8 @@
 #include "utils.h"
 #include "oauth/oauth-purple.h"
 
+#include "purpleprivate.h"
+
 /* Common */
 
 #define GGP_AVATAR_USERAGENT "GG Client build 11.0.0.7562"

--- a/libpurple/protocols/gg/avatar.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/avatar.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_AVATAR_H
 #define PURPLE_GG_AVATAR_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef struct _ggp_avatar_session_data ggp_avatar_session_data;

--- a/libpurple/protocols/gg/chat.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/chat.c	Fri May 01 12:13:35 2020 -0500
@@ -25,6 +25,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <glib/gi18n-lib.h>
+
 #include "chat.h"
 
 #include "gg.h"

--- a/libpurple/protocols/gg/chat.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/chat.h	Fri May 01 12:13:35 2020 -0500
@@ -29,7 +29,7 @@
 #ifndef PURPLE_GG_CHAT_H
 #define PURPLE_GG_CHAT_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef struct _ggp_chat_session_data ggp_chat_session_data;

--- a/libpurple/protocols/gg/edisc.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/edisc.c	Fri May 01 12:13:35 2020 -0500
@@ -33,6 +33,10 @@
 
 #include <json-glib/json-glib.h>
 
+#include <glib/gi18n-lib.h>
+
+#include "purpleprivate.h"
+
 #define GGP_EDISC_OS "WINNT x86-msvc"
 #define GGP_EDISC_TYPE "desktop"
 #define GGP_EDISC_API "6"

--- a/libpurple/protocols/gg/edisc.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/edisc.h	Fri May 01 12:13:35 2020 -0500
@@ -29,7 +29,7 @@
 #ifndef PURPLE_GG_EDISC_H
 #define PURPLE_GG_EDISC_H
 
-#include <internal.h>
+#include <purple.h>
 
 typedef struct _ggp_edisc_session_data ggp_edisc_session_data;
 

--- a/libpurple/protocols/gg/gg.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/gg.c	Fri May 01 12:13:35 2020 -0500
@@ -26,9 +26,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
-
 #include <purple.h>
+#include "purpleprivate.h"
 
 #include "gg.h"
 #include "chat.h"

--- a/libpurple/protocols/gg/gg.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/gg.h	Fri May 01 12:13:35 2020 -0500
@@ -29,7 +29,6 @@
 #include <libgadu.h>
 #include <libsoup/soup.h>
 
-#include "internal.h"
 #include "search.h"
 
 #include <purple.h>

--- a/libpurple/protocols/gg/html.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/html.h	Fri May 01 12:13:35 2020 -0500
@@ -29,7 +29,7 @@
 #ifndef PURPLE_GG_HTML_H
 #define PURPLE_GG_HTML_H
 
-#include <internal.h>
+#include <purple.h>
 
 typedef enum
 {

--- a/libpurple/protocols/gg/image-prpl.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/image-prpl.c	Fri May 01 12:13:35 2020 -0500
@@ -27,12 +27,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <glib/gi18n-lib.h>
+
 #include "image-prpl.h"
 
 #include "gg.h"
 #include "utils.h"
 
-#include <image-store.h>
+#include <purple.h>
 
 struct _ggp_image_session_data
 {

--- a/libpurple/protocols/gg/image-prpl.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/image-prpl.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_IMAGE_PRPL_H
 #define PURPLE_GG_IMAGE_PRPL_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 #define GGP_IMAGE_SIZE_MAX 255000

--- a/libpurple/protocols/gg/libgadu-events.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/libgadu-events.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_LIBGADU_EVENTS_H
 #define PURPLE_GG_LIBGADU_EVENTS_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 #include "gg.h"

--- a/libpurple/protocols/gg/libgaduw.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/libgaduw.c	Fri May 01 12:13:35 2020 -0500
@@ -32,6 +32,8 @@
 #include "purplew.h"
 #include "gg.h"
 
+#include <ctype.h>
+
 static void ggp_libgaduw_debug_handler(int level, const char * format,
 	va_list args);
 

--- a/libpurple/protocols/gg/libgaduw.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/libgaduw.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_LIBGADUW_H
 #define PURPLE_GG_LIBGADUW_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 #include "purplew.h"

--- a/libpurple/protocols/gg/message-prpl.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/message-prpl.h	Fri May 01 12:13:35 2020 -0500
@@ -29,7 +29,7 @@
 #ifndef PURPLE_GG_MESSAGE_PRPL_H
 #define PURPLE_GG_MESSAGE_PRPL_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef struct _ggp_message_session_data ggp_message_session_data;

--- a/libpurple/protocols/gg/multilogon.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/multilogon.c	Fri May 01 12:13:35 2020 -0500
@@ -29,6 +29,8 @@
 
 #include "multilogon.h"
 
+#include <glib/gi18n-lib.h>
+
 #include "gg.h"
 #include "keymapper.h"
 #include "utils.h"

--- a/libpurple/protocols/gg/multilogon.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/multilogon.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_MULTILOGON_H
 #define PURPLE_GG_MULTILOGON_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef struct _ggp_multilogon_session_data ggp_multilogon_session_data;

--- a/libpurple/protocols/gg/oauth/oauth-parameter.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-parameter.c	Fri May 01 12:13:35 2020 -0500
@@ -25,6 +25,8 @@
 
 #include "oauth-parameter.h"
 
+#include <glib.h>
+
 struct gg_oauth_parameter {
 	char *key;
 	char *value;

--- a/libpurple/protocols/gg/oauth/oauth-parameter.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-parameter.h	Fri May 01 12:13:35 2020 -0500
@@ -26,8 +26,6 @@
 #ifndef _GGP_OAUTH_PARAMETER_H
 #define _GGP_OAUTH_PARAMETER_H
 
-#include <internal.h>
-
 typedef struct gg_oauth_parameter gg_oauth_parameter_t;
 
 int gg_oauth_parameter_set(gg_oauth_parameter_t **list, const char *key, const char *value);

--- a/libpurple/protocols/gg/oauth/oauth-purple.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-purple.c	Fri May 01 12:13:35 2020 -0500
@@ -35,6 +35,7 @@
 #include "../xml.h"
 
 #include <purple.h>
+#include "purpleprivate.h"
 
 #define GGP_OAUTH_RESPONSE_MAX 10240
 

--- a/libpurple/protocols/gg/oauth/oauth-purple.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-purple.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef _GGP_OAUTH_PURPLE_H
 #define _GGP_OAUTH_PURPLE_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef void (*ggp_oauth_request_cb)(PurpleConnection *gc, const gchar *token,

--- a/libpurple/protocols/gg/oauth/oauth.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth.c	Fri May 01 12:13:35 2020 -0500
@@ -27,6 +27,10 @@
 
 #include "oauth-parameter.h"
 
+#include <time.h>
+
+#include <glib.h>
+
 char *gg_oauth_static_nonce;		/* dla unit testów */
 char *gg_oauth_static_timestamp;	/* dla unit testów */
 

--- a/libpurple/protocols/gg/oauth/oauth.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth.h	Fri May 01 12:13:35 2020 -0500
@@ -26,7 +26,6 @@
 #ifndef _GGP_OAUTH_H
 #define _GGP_OAUTH_H
 
-#include <internal.h>
 #include <libgadu.h>
 
 char * gg_oauth_generate_header(const char *method, const char *url,

--- a/libpurple/protocols/gg/pubdir-prpl.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/pubdir-prpl.c	Fri May 01 12:13:35 2020 -0500
@@ -27,6 +27,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <glib/gi18n-lib.h>
+
 #include "pubdir-prpl.h"
 #include "gg.h"
 
@@ -35,6 +37,8 @@
 #include "utils.h"
 #include "status.h"
 
+#include "purpleprivate.h"
+
 typedef struct
 {
 	PurpleConnection *gc;

--- a/libpurple/protocols/gg/pubdir-prpl.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/pubdir-prpl.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_PUBDIR_PRPL_H
 #define PURPLE_GG_PUBDIR_PRPL_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef enum

--- a/libpurple/protocols/gg/purplew.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/purplew.c	Fri May 01 12:13:35 2020 -0500
@@ -31,6 +31,8 @@
 
 #include "tcpsocket.h"
 
+#include <glib/gi18n-lib.h>
+
 guint ggp_purplew_http_input_add(struct gg_http *http_req,
 	PurpleInputFunction func, gpointer user_data)
 {

--- a/libpurple/protocols/gg/purplew.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/purplew.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_PURPLEW_H
 #define PURPLE_GG_PURPLEW_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 /**

--- a/libpurple/protocols/gg/resolver-purple.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/resolver-purple.c	Fri May 01 12:13:35 2020 -0500
@@ -27,7 +27,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <internal.h>
+#include <purple.h>
 
 #include <libgadu.h>
 #include "resolver-purple.h"

--- a/libpurple/protocols/gg/roster.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/roster.c	Fri May 01 12:13:35 2020 -0500
@@ -29,11 +29,15 @@
 
 #include "roster.h"
 
+#include <glib/gi18n-lib.h>
+
 #include "gg.h"
 #include "xml.h"
 #include "utils.h"
 #include "purplew.h"
 
+#include "purpleprivate.h"
+
 #define GGP_ROSTER_SYNC_SETT "gg-synchronized"
 #define GGP_ROSTER_DEBUG 0
 #define GGP_ROSTER_GROUPID_DEFAULT "00000000-0000-0000-0000-000000000000"

--- a/libpurple/protocols/gg/roster.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/roster.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_ROSTER_H
 #define PURPLE_GG_ROSTER_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef struct

--- a/libpurple/protocols/gg/servconn.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/servconn.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,6 @@
 #ifndef PURPLE_GG_SERVCONN_H
 #define PURPLE_GG_SERVCONN_H
 
-#include <internal.h>
 #include <purple.h>
 
 void ggp_servconn_setup(PurpleAccountOption *server_option);

--- a/libpurple/protocols/gg/status.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/status.c	Fri May 01 12:13:35 2020 -0500
@@ -27,10 +27,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "status.h"
+#include <glib/gi18n-lib.h>
 
 #include <libgadu.h>
 
+#include "status.h"
+
 #include "gg.h"
 #include "utils.h"
 

--- a/libpurple/protocols/gg/status.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/status.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,7 @@
 #ifndef PURPLE_GG_STATUS_H
 #define PURPLE_GG_STATUS_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 typedef struct _ggp_status_session_data ggp_status_session_data;

--- a/libpurple/protocols/gg/tcpsocket.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/tcpsocket.c	Fri May 01 12:13:35 2020 -0500
@@ -29,6 +29,9 @@
 
 #include "gg.h"
 
+#include <purple.h>
+#include "purpleprivate.h"
+
 typedef struct {
 	GSocketConnection *conn;
 	GCancellable *cancellable;

--- a/libpurple/protocols/gg/tcpsocket.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/tcpsocket.h	Fri May 01 12:13:35 2020 -0500
@@ -29,7 +29,7 @@
 #ifndef PURPLE_GG_TCPSOCKET_H
 #define PURPLE_GG_TCPSOCKET_H
 
-#include <internal.h>
+#include <purple.h>
 #include <libgadu.h>
 
 void

--- a/libpurple/protocols/gg/utils.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/utils.c	Fri May 01 12:13:35 2020 -0500
@@ -31,6 +31,8 @@
 
 #include "gg.h"
 
+#include <purple.h>
+
 uin_t ggp_str_to_uin(const char *str)
 {
 	char *endptr;

--- a/libpurple/protocols/gg/utils.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/utils.h	Fri May 01 12:13:35 2020 -0500
@@ -30,10 +30,11 @@
 #ifndef PURPLE_GG_UTILS_H
 #define PURPLE_GG_UTILS_H
 
-#include <internal.h>
 #include <libgadu.h>
 #include <json-glib/json-glib.h>
 
+#include <purple.h>
+
 /**
  * Converts stringified UIN to uin_t.
  *

--- a/libpurple/protocols/gg/validator.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/validator.c	Fri May 01 12:13:35 2020 -0500
@@ -31,6 +31,8 @@
 
 #include "utils.h"
 
+#include <glib/gi18n-lib.h>
+
 gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
 	void *user_data)
 {

--- a/libpurple/protocols/gg/validator.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/validator.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,6 @@
 #ifndef PURPLE_GG_VALIDATOR_H
 #define PURPLE_GG_VALIDATOR_H
 
-#include <internal.h>
 #include <purple.h>
 
 gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,

--- a/libpurple/protocols/gg/xml.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/gg/xml.h	Fri May 01 12:13:35 2020 -0500
@@ -30,7 +30,6 @@
 #ifndef PURPLE_GG_XML_H
 #define PURPLE_GG_XML_H
 
-#include <internal.h>
 #include <purple.h>
 
 gboolean ggp_xml_get_string(const PurpleXmlNode *xml, gchar *childName, gchar **var);

--- a/libpurple/protocols/irc/cmds.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/irc/cmds.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "irc.h"

--- a/libpurple/protocols/irc/dcc_send.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/irc/dcc_send.c	Fri May 01 12:13:35 2020 -0500
@@ -19,8 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#ifndef _WIN32
+# include <arpa/inet.h>
+#endif
+
 #include <purple.h>
+#include "purpleprivate.h"
 
 #include "irc.h"
 

--- a/libpurple/protocols/irc/irc.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/irc/irc.c	Fri May 01 12:13:35 2020 -0500
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "irc.h"

--- a/libpurple/protocols/irc/msgs.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/irc/msgs.c	Fri May 01 12:13:35 2020 -0500
@@ -24,7 +24,8 @@
  * possible for a malicious server or man-in-the-middle to trigger a crash.
  */
 
-#include "internal.h"
+#include <ctype.h>
+
 #include <purple.h>
 
 #include "irc.h"

--- a/libpurple/protocols/irc/parse.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/irc/parse.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "irc.h"

--- a/libpurple/protocols/jabber/adhoccommands.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/adhoccommands.c	Fri May 01 12:13:35 2020 -0500
@@ -21,7 +21,6 @@
  *
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "adhoccommands.h"

--- a/libpurple/protocols/jabber/auth.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/auth.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "auth.h"
@@ -30,6 +31,8 @@
 #include "iq.h"
 #include "notify.h"
 
+#include "purpleprivate.h"
+
 static GSList *auth_mechs = NULL;
 
 static void auth_old_result_cb(JabberStream *js, const char *from,

--- a/libpurple/protocols/jabber/auth_cyrus.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Fri May 01 12:13:35 2020 -0500
@@ -20,9 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
+#include "purpleprivate.h"
+
 #include "auth.h"
 #include "jabber.h"
 

--- a/libpurple/protocols/jabber/auth_digest_md5.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/auth_digest_md5.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "auth_digest_md5.h"

--- a/libpurple/protocols/jabber/auth_digest_md5.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/auth_digest_md5.h	Fri May 01 12:13:35 2020 -0500
@@ -25,8 +25,6 @@
 #ifndef PURPLE_JABBER_AUTH_DIGEST_MD5_H
 #define PURPLE_JABBER_AUTH_DIGEST_MD5_H
 
-#include "internal.h"
-
 /*
  * Every function in this file is ONLY exposed for tests.
  * DO NOT USE ANYTHING HERE OR YOU WILL BE SENT TO THE PIT OF DESPAIR.

--- a/libpurple/protocols/jabber/auth_plain.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/auth_plain.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "jabber.h"

--- a/libpurple/protocols/jabber/auth_scram.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/auth_scram.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "auth.h"

--- a/libpurple/protocols/jabber/auth_webex.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/auth_webex.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
 #include <purple.h>
 
 #include "jabber.h"

--- a/libpurple/protocols/jabber/bosh.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include <libsoup/soup.h>

--- a/libpurple/protocols/jabber/buddy.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "action.h"

--- a/libpurple/protocols/jabber/caps.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/caps.c	Fri May 01 12:13:35 2020 -0500
@@ -21,7 +21,8 @@
  *
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "caps.h"

--- a/libpurple/protocols/jabber/chat.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/chat.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "chat.h"

--- a/libpurple/protocols/jabber/chat.h	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/chat.h	Fri May 01 12:13:35 2020 -0500
@@ -25,7 +25,6 @@
 #ifndef PURPLE_JABBER_CHAT_H
 #define PURPLE_JABBER_CHAT_H
 
-#include "internal.h"
 #include <purple.h>
 
 #include "jabber.h"

--- a/libpurple/protocols/jabber/data.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/data.c	Fri May 01 12:13:35 2020 -0500
@@ -21,7 +21,7 @@
  *
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdlib.h>
 #include <glib.h>

--- a/libpurple/protocols/jabber/disco.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/disco.c	Fri May 01 12:13:35 2020 -0500
@@ -21,7 +21,6 @@
  *
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "adhoccommands.h"

--- a/libpurple/protocols/jabber/google/gmail.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/gmail.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "jabber.h"

--- a/libpurple/protocols/jabber/google/google.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/google.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "google.h"

--- a/libpurple/protocols/jabber/google/google_p2p.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_p2p.c	Fri May 01 12:13:35 2020 -0500
@@ -22,7 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include <string.h>

--- a/libpurple/protocols/jabber/google/google_presence.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_presence.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "google_presence.h"

--- a/libpurple/protocols/jabber/google/google_roster.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_roster.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "google_roster.h"

--- a/libpurple/protocols/jabber/google/google_session.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/google_session.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <purple.h>
 
 #include "google_session.h"

--- a/libpurple/protocols/jabber/google/jingleinfo.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/jingleinfo.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "jingleinfo.h"

--- a/libpurple/protocols/jabber/google/relay.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/google/relay.c	Fri May 01 12:13:35 2020 -0500
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "relay.h"

--- a/libpurple/protocols/jabber/gtalk.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/gtalk.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,6 @@
  *
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "gtalk.h"

--- a/libpurple/protocols/jabber/ibb.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/ibb.c	Fri May 01 12:13:35 2020 -0500
@@ -21,7 +21,8 @@
  *
  */
 
-#include "internal.h"
+#include <math.h>
+
 #include <purple.h>
 
 #include "ibb.h"

--- a/libpurple/protocols/jabber/iq.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/iq.c	Fri May 01 12:13:35 2020 -0500
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "buddy.h"

--- a/libpurple/protocols/jabber/jabber.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Fri May 01 12:13:35 2020 -0500
@@ -20,8 +20,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
+#include "purpleprivate.h"
 
 #include "auth.h"
 #include "buddy.h"

--- a/libpurple/protocols/jabber/jingle/content.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/content.c	Fri May 01 12:13:35 2020 -0500
@@ -22,7 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "content.h"

--- a/libpurple/protocols/jabber/jingle/iceudp.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/iceudp.c	Fri May 01 12:13:35 2020 -0500
@@ -22,7 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "iceudp.h"

--- a/libpurple/protocols/jabber/jingle/jingle.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c	Fri May 01 12:13:35 2020 -0500
@@ -23,7 +23,6 @@
  *
  */
 
-#include "internal.h"
 #include <purple.h>
 
 #include "content.h"

--- a/libpurple/protocols/jabber/jingle/rawudp.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/rawudp.c	Fri May 01 12:13:35 2020 -0500
@@ -22,7 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "rawudp.h"

--- a/libpurple/protocols/jabber/jingle/rtp.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Fri May 01 12:13:35 2020 -0500
@@ -22,10 +22,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #ifdef USE_VV
 
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "jabber.h"

--- a/libpurple/protocols/jabber/jingle/session.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/session.c	Fri May 01 12:13:35 2020 -0500
@@ -22,7 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "content.h"

--- a/libpurple/protocols/jabber/jingle/transport.c	Sun May 10 13:43:52 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/transport.c	Fri May 01 12:13:35 2020 -0500
@@ -22,7 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
+#include <glib/gi18n-lib.h>
+
 #include <purple.h>
 
 #include "transport.h"