pidgin/pidgin

Make it so only libpurple can directly include libpurple header files.

2020-06-21, Gary Kramlich
1341be8e3402
Parents b94aff775501
Children 1f2fe8523511
Make it so only libpurple can directly include libpurple header files.

This is part of our on going effort to make it easier to develop against libpurple as well as making our filenames not part of our api.

Make it so only libpurple can directly include libpurple header files.

Testing Done:
Just a normal compile to make sure everything builds again.

Reviewed at https://reviews.imfreedom.org/r/8/
122 files changed, 406 insertions(+), 91 deletions(-)
  • +0 -1
    finch/gntmedia.c
  • +4 -0
    libpurple/account.h
  • +4 -0
    libpurple/accounts.h
  • +4 -0
    libpurple/action.h
  • +4 -0
    libpurple/attention.h
  • +4 -0
    libpurple/blistnode.h
  • +4 -0
    libpurple/buddy.h
  • +4 -0
    libpurple/buddyicon.h
  • +18 -0
    libpurple/buddylist.h
  • +4 -0
    libpurple/chat.h
  • +4 -0
    libpurple/circularbuffer.h
  • +4 -0
    libpurple/cmds.h
  • +17 -0
    libpurple/connection.h
  • +4 -0
    libpurple/contact.h
  • +4 -0
    libpurple/conversation.h
  • +4 -0
    libpurple/conversations.h
  • +4 -0
    libpurple/conversationtypes.h
  • +4 -0
    libpurple/core.h
  • +4 -0
    libpurple/countingnode.h
  • +4 -0
    libpurple/debug.h
  • +4 -0
    libpurple/enums.h.in
  • +4 -0
    libpurple/eventloop.h
  • +4 -0
    libpurple/glibcompat.h
  • +4 -0
    libpurple/group.h
  • +4 -0
    libpurple/idle.h
  • +4 -0
    libpurple/image-store.h
  • +4 -0
    libpurple/image.h
  • +2 -2
    libpurple/internal.h
  • +4 -0
    libpurple/keyring.h
  • +4 -0
    libpurple/log.h
  • +4 -0
    libpurple/media-gst.h
  • +4 -0
    libpurple/media.h
  • +4 -0
    libpurple/media/backend-fs2.h
  • +4 -0
    libpurple/media/backend-iface.h
  • +4 -0
    libpurple/media/candidate.h
  • +5 -0
    libpurple/media/codec.h
  • +4 -0
    libpurple/media/enum-types.h
  • +4 -0
    libpurple/mediamanager.h
  • +4 -0
    libpurple/memorypool.h
  • +1 -1
    libpurple/meson.build
  • +4 -0
    libpurple/message.h
  • +4 -0
    libpurple/nat-pmp.h
  • +22 -0
    libpurple/network.h
  • +4 -0
    libpurple/notify.h
  • +4 -0
    libpurple/options.h
  • +4 -0
    libpurple/pluginpref.h
  • +4 -0
    libpurple/plugins.h
  • +4 -0
    libpurple/pounce.h
  • +4 -0
    libpurple/prefs.h
  • +4 -0
    libpurple/presence.h
  • +4 -0
    libpurple/protocol.h
  • +4 -0
    libpurple/protocols.h
  • +0 -2
    libpurple/protocols/bonjour/bonjour_ft.c
  • +0 -1
    libpurple/protocols/bonjour/xmpp.c
  • +0 -2
    libpurple/protocols/gg/avatar.c
  • +1 -1
    libpurple/protocols/gg/edisc.c
  • +0 -1
    libpurple/protocols/gg/gg.c
  • +0 -1
    libpurple/protocols/gg/oauth/oauth-purple.c
  • +2 -2
    libpurple/protocols/gg/pubdir-prpl.c
  • +0 -2
    libpurple/protocols/gg/roster.c
  • +0 -1
    libpurple/protocols/gg/tcpsocket.c
  • +0 -1
    libpurple/protocols/irc/dcc_send.c
  • +0 -3
    libpurple/protocols/jabber/auth.c
  • +0 -2
    libpurple/protocols/jabber/auth_cyrus.c
  • +0 -1
    libpurple/protocols/jabber/buddy.c
  • +2 -1
    libpurple/protocols/jabber/iq.h
  • +0 -1
    libpurple/protocols/jabber/jabber.c
  • +0 -1
    libpurple/protocols/jabber/jabber.h
  • +2 -1
    libpurple/protocols/jabber/jingle/transport.h
  • +0 -2
    libpurple/protocols/jabber/presence.c
  • +0 -1
    libpurple/protocols/jabber/roster.c
  • +0 -1
    libpurple/protocols/jabber/si.c
  • +1 -1
    libpurple/protocols/jabber/si.h
  • +0 -2
    libpurple/protocols/novell/nmconn.c
  • +0 -1
    libpurple/protocols/simple/simple.c
  • +2 -1
    libpurple/protocols/zephyr/ZAsyncLocate.c
  • +2 -1
    libpurple/protocols/zephyr/ZLocations.c
  • +2 -1
    libpurple/protocols/zephyr/ZRetSubs.c
  • +2 -1
    libpurple/protocols/zephyr/ZVariables.c
  • +1 -1
    libpurple/protocols/zephyr/zephyr.h
  • +4 -0
    libpurple/proxy.h
  • +4 -0
    libpurple/purple-gio.h
  • +4 -0
    libpurple/purpleaccountoption.h
  • +4 -0
    libpurple/purpleaccountusersplit.h
  • +4 -0
    libpurple/purplekeyvaluepair.h
  • +4 -41
    libpurple/purpleprivate.h
  • +4 -0
    libpurple/purpleprotocolfactory.h
  • +4 -0
    libpurple/purpleuiinfo.h
  • +4 -0
    libpurple/queuedoutputstream.h
  • +4 -0
    libpurple/request-datasheet.h
  • +4 -0
    libpurple/request.h
  • +4 -0
    libpurple/roomlist.h
  • +4 -0
    libpurple/savedstatuses.h
  • +4 -0
    libpurple/server.h
  • +4 -0
    libpurple/signals.h
  • +4 -0
    libpurple/smiley-custom.h
  • +4 -0
    libpurple/smiley-list.h
  • +4 -0
    libpurple/smiley-parser.h
  • +4 -0
    libpurple/smiley-theme.h
  • +4 -0
    libpurple/smiley.h
  • +4 -0
    libpurple/sound-theme-loader.h
  • +4 -0
    libpurple/sound-theme.h
  • +4 -0
    libpurple/sound.h
  • +4 -0
    libpurple/status.h
  • +4 -0
    libpurple/stun.h
  • +4 -0
    libpurple/theme-loader.h
  • +4 -0
    libpurple/theme-manager.h
  • +4 -0
    libpurple/theme.h
  • +4 -0
    libpurple/trie.h
  • +4 -0
    libpurple/upnp.h
  • +4 -0
    libpurple/util.h
  • +4 -0
    libpurple/version.h.in
  • +4 -0
    libpurple/whiteboard.h
  • +4 -0
    libpurple/xfer.h
  • +4 -0
    libpurple/xmlnode.h
  • +0 -1
    pidgin/gtkmedia.c
  • +0 -1
    pidgin/gtkprefs.c
  • +0 -2
    pidgin/gtksmiley-theme.h
  • +2 -1
    pidgin/gtkutils.c
  • +0 -1
    pidgin/gtkxfer.c
  • +2 -2
    pidgin/pidginaccountchooser.h
  • +0 -1
    pidgin/pidginstock.c
    • --- a/finch/gntmedia.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/finch/gntmedia.c Sun Jun 21 04:16:15 2020 -0500
    @@ -37,7 +37,6 @@
    /* An incredibly large part of the following is from gtkmedia.c */
    #ifdef USE_VV
    -#include "media-gst.h"
    #undef hangup
    --- a/libpurple/account.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/account.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ACCOUNT_H
    #define PURPLE_ACCOUNT_H
    /**
    --- a/libpurple/accounts.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/accounts.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ACCOUNTS_H
    #define PURPLE_ACCOUNTS_H
    /**
    --- a/libpurple/action.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/action.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ACTION
    #define PURPLE_ACTION
    --- a/libpurple/attention.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/attention.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ATTENTION_H
    #define PURPLE_ATTENTION_H
    --- a/libpurple/blistnode.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/blistnode.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_BLIST_NODE_H
    #define PURPLE_BLIST_NODE_H
    /**
    --- a/libpurple/buddy.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/buddy.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_BUDDY_H
    #define PURPLE_BUDDY_H
    --- a/libpurple/buddyicon.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/buddyicon.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_BUDDYICON_H
    #define PURPLE_BUDDYICON_H
    /**
    --- a/libpurple/buddylist.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/buddylist.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_BUDDY_LIST_H
    #define PURPLE_BUDDY_LIST_H
    @@ -43,6 +47,20 @@
    #include "contact.h"
    /**
    + * _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 cases 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);
    +
    +/**
    * PurpleBlistWalkFunc:
    * @node: The node that's being iterated
    * @data: User supplied data.
    --- a/libpurple/chat.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/chat.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CHAT_H
    #define PURPLE_CHAT_H
    --- a/libpurple/circularbuffer.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/circularbuffer.h Sun Jun 21 04:16:15 2020 -0500
    @@ -17,6 +17,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CIRCULAR_BUFFER_H
    #define PURPLE_CIRCULAR_BUFFER_H
    /**
    --- a/libpurple/cmds.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/cmds.h Sun Jun 21 04:16:15 2020 -0500
    @@ -16,6 +16,10 @@
    *
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CMDS_H
    #define PURPLE_CMDS_H
    --- a/libpurple/connection.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/connection.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CONNECTION_H
    #define PURPLE_CONNECTION_H
    /**
    @@ -43,6 +47,12 @@
    typedef struct _PurpleConnectionErrorInfo PurpleConnectionErrorInfo;
    +/* 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__)
    +
    +
    /**
    * PurpleConnectionFlags:
    * @PURPLE_CONNECTION_FLAG_HTML: Connection sends/receives in 'HTML'
    @@ -283,6 +293,13 @@
    G_BEGIN_DECLS
    +/******************************************************************************
    + * To be deleted in the future
    + *****************************************************************************/
    +void
    +_purple_assert_connection_is_valid(PurpleConnection *gc,
    + const gchar *file, int line);
    +
    /**************************************************************************/
    /* Connection API */
    /**************************************************************************/
    --- a/libpurple/contact.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/contact.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CONTACT_H
    #define PURPLE_CONTACT_H
    /**
    --- a/libpurple/conversation.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/conversation.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CONVERSATION_H
    #define PURPLE_CONVERSATION_H
    /**
    --- a/libpurple/conversations.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/conversations.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CONVERSATIONS_H
    #define PURPLE_CONVERSATIONS_H
    /**
    --- a/libpurple/conversationtypes.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/conversationtypes.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CONVERSATION_TYPES_H
    #define PURPLE_CONVERSATION_TYPES_H
    /**
    --- a/libpurple/core.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/core.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_CORE_H
    #define PURPLE_CORE_H
    /**
    --- a/libpurple/countingnode.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/countingnode.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_COUNTING_NODE_H
    #define PURPLE_COUNTING_NODE_H
    /**
    --- a/libpurple/debug.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/debug.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_DEBUG_H
    #define PURPLE_DEBUG_H
    /**
    --- a/libpurple/enums.h.in Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/enums.h.in Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ENUMS_H
    #define PURPLE_ENUMS_H
    /**
    --- a/libpurple/eventloop.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/eventloop.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_EVENTLOOP_H
    #define PURPLE_EVENTLOOP_H
    /**
    --- a/libpurple/glibcompat.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/glibcompat.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_GLIBCOMPAT_H
    #define PURPLE_GLIBCOMPAT_H
    /*
    --- a/libpurple/group.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/group.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_GROUP_H
    #define PURPLE_GROUP_H
    /**
    --- a/libpurple/idle.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/idle.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_IDLE_H
    #define PURPLE_IDLE_H
    /**
    --- a/libpurple/image-store.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/image-store.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_IMAGE_STORE_H
    #define PURPLE_IMAGE_STORE_H
    /**
    --- a/libpurple/image.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/image.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_IMAGE_H
    #define PURPLE_IMAGE_H
    --- a/libpurple/internal.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/internal.h Sun Jun 21 04:16:15 2020 -0500
    @@ -28,8 +28,8 @@
    * @title: Internal definitions and includes
    */
    -#if !defined(PURPLE_COMPILATION)
    -#error "internal.h included outside of libpurple"
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef GLIB_VERSION_MIN_REQUIRED
    --- a/libpurple/keyring.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/keyring.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_KEYRING_H
    #define PURPLE_KEYRING_H
    /**
    --- a/libpurple/log.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/log.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_LOG_H
    #define PURPLE_LOG_H
    /**
    --- a/libpurple/media-gst.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/media-gst.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_GST_H
    #define PURPLE_MEDIA_GST_H
    /**
    --- a/libpurple/media.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/media.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_H
    #define PURPLE_MEDIA_H
    /**
    --- a/libpurple/media/backend-fs2.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/media/backend-fs2.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_BACKEND_FS2_H
    #define PURPLE_MEDIA_BACKEND_FS2_H
    /*
    --- a/libpurple/media/backend-iface.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/media/backend-iface.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_BACKEND_IFACE_H
    #define PURPLE_MEDIA_BACKEND_IFACE_H
    /**
    --- a/libpurple/media/candidate.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/media/candidate.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_CANDIDATE_H
    #define PURPLE_MEDIA_CANDIDATE_H
    /**
    --- a/libpurple/media/codec.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/media/codec.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,8 +19,13 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_CODEC_H
    #define PURPLE_MEDIA_CODEC_H
    +
    /**
    * SECTION:codec
    * @section_id: libpurple-codec
    --- a/libpurple/media/enum-types.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/media/enum-types.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_ENUM_TYPES_H
    #define PURPLE_MEDIA_ENUM_TYPES_H
    /**
    --- a/libpurple/mediamanager.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/mediamanager.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEDIA_MANAGER_H
    #define PURPLE_MEDIA_MANAGER_H
    /**
    --- a/libpurple/memorypool.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/memorypool.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MEMORY_POOL_H
    #define PURPLE_MEMORY_POOL_H
    /**
    --- a/libpurple/meson.build Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/meson.build Sun Jun 21 04:16:15 2020 -0500
    @@ -316,7 +316,7 @@
    gplugin_include_directories,
    ],
    install : true,
    - extra_args : ['--quiet'])
    + extra_args : ['-DPURPLE_COMPILATION', '--quiet'])
    endif
    subdir('tests')
    --- a/libpurple/message.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/message.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_MESSAGE_H
    #define PURPLE_MESSAGE_H
    /**
    --- a/libpurple/nat-pmp.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/nat-pmp.h Sun Jun 21 04:16:15 2020 -0500
    @@ -24,6 +24,10 @@
    * OF SUCH DAMAGE.
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_NAT_PMP_H
    #define PURPLE_NAT_PMP_H
    /**
    --- a/libpurple/network.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/network.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_NETWORK_H
    #define PURPLE_NETWORK_H
    /**
    @@ -36,6 +40,14 @@
    # 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
    /**************************************************************************/
    @@ -324,6 +336,16 @@
    void purple_network_remove_port_mapping(gint fd);
    /**
    + * 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);
    +
    +/**
    * purple_network_init:
    *
    * Initializes the network subsystem.
    --- a/libpurple/notify.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/notify.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_NOTIFY_H
    #define PURPLE_NOTIFY_H
    /**
    --- a/libpurple/options.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/options.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_OPTIONS_H
    #define PURPLE_OPTIONS_H
    --- a/libpurple/pluginpref.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/pluginpref.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    *
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PLUGINPREF_H
    #define PURPLE_PLUGINPREF_H
    /**
    --- a/libpurple/plugins.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/plugins.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PLUGINS_H
    #define PURPLE_PLUGINS_H
    /**
    --- a/libpurple/pounce.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/pounce.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_POUNCE_H
    #define PURPLE_POUNCE_H
    /**
    --- a/libpurple/prefs.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/prefs.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    *
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PREFS_H
    #define PURPLE_PREFS_H
    /**
    --- a/libpurple/presence.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/presence.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PRESENCE_H
    #define PURPLE_PRESENCE_H
    /**
    --- a/libpurple/protocol.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocol.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PROTOCOL_H
    #define PURPLE_PROTOCOL_H
    /**
    --- a/libpurple/protocols.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PROTOCOLS_H
    #define PURPLE_PROTOCOLS_H
    /**
    --- a/libpurple/protocols/bonjour/bonjour_ft.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/bonjour/bonjour_ft.c Sun Jun 21 04:16:15 2020 -0500
    @@ -31,8 +31,6 @@
    #include <purple.h>
    -#include "purpleprivate.h"
    -
    #include "bonjour.h"
    #include "bonjour_ft.h"
    --- a/libpurple/protocols/bonjour/xmpp.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/bonjour/xmpp.c Sun Jun 21 04:16:15 2020 -0500
    @@ -23,7 +23,6 @@
    #include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "purpleprivate.h"
    #ifndef _WIN32
    #include <net/if.h>
    --- a/libpurple/protocols/gg/avatar.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/gg/avatar.c Sun Jun 21 04:16:15 2020 -0500
    @@ -33,8 +33,6 @@
    #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/edisc.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/gg/edisc.c Sun Jun 21 04:16:15 2020 -0500
    @@ -35,7 +35,7 @@
    #include <glib/gi18n-lib.h>
    -#include "purpleprivate.h"
    +#include <purple.h>
    #define GGP_EDISC_OS "WINNT x86-msvc"
    #define GGP_EDISC_TYPE "desktop"
    --- a/libpurple/protocols/gg/gg.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/gg/gg.c Sun Jun 21 04:16:15 2020 -0500
    @@ -29,7 +29,6 @@
    #include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "purpleprivate.h"
    #include "gg.h"
    #include "chat.h"
    --- a/libpurple/protocols/gg/oauth/oauth-purple.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/gg/oauth/oauth-purple.c Sun Jun 21 04:16:15 2020 -0500
    @@ -35,7 +35,6 @@
    #include "../xml.h"
    #include <purple.h>
    -#include "purpleprivate.h"
    #define GGP_OAUTH_RESPONSE_MAX 10240
    --- a/libpurple/protocols/gg/pubdir-prpl.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/gg/pubdir-prpl.c Sun Jun 21 04:16:15 2020 -0500
    @@ -29,6 +29,8 @@
    #include <glib/gi18n-lib.h>
    +#include <purple.h>
    +
    #include "pubdir-prpl.h"
    #include "gg.h"
    @@ -37,8 +39,6 @@
    #include "utils.h"
    #include "status.h"
    -#include "purpleprivate.h"
    -
    typedef struct
    {
    PurpleConnection *gc;
    --- a/libpurple/protocols/gg/roster.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/gg/roster.c Sun Jun 21 04:16:15 2020 -0500
    @@ -36,8 +36,6 @@
    #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/tcpsocket.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/gg/tcpsocket.c Sun Jun 21 04:16:15 2020 -0500
    @@ -30,7 +30,6 @@
    #include "gg.h"
    #include <purple.h>
    -#include "purpleprivate.h"
    typedef struct {
    GSocketConnection *conn;
    --- a/libpurple/protocols/irc/dcc_send.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/irc/dcc_send.c Sun Jun 21 04:16:15 2020 -0500
    @@ -28,7 +28,6 @@
    #endif
    #include <purple.h>
    -#include "purpleprivate.h"
    #include "irc.h"
    --- a/libpurple/protocols/jabber/auth.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/auth.c Sun Jun 21 04:16:15 2020 -0500
    @@ -29,9 +29,6 @@
    #include "jabber.h"
    #include "jutil.h"
    #include "iq.h"
    -#include "notify.h"
    -
    -#include "purpleprivate.h"
    static GSList *auth_mechs = NULL;
    --- a/libpurple/protocols/jabber/auth_cyrus.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/auth_cyrus.c Sun Jun 21 04:16:15 2020 -0500
    @@ -27,8 +27,6 @@
    #include <purple.h>
    -#include "purpleprivate.h"
    -
    #include "auth.h"
    #include "jabber.h"
    --- a/libpurple/protocols/jabber/buddy.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/buddy.c Sun Jun 21 04:16:15 2020 -0500
    @@ -24,7 +24,6 @@
    #include <purple.h>
    -#include "action.h"
    #include "buddy.h"
    #include "chat.h"
    #include "jabber.h"
    --- a/libpurple/protocols/jabber/iq.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/iq.h Sun Jun 21 04:16:15 2020 -0500
    @@ -25,6 +25,8 @@
    #ifndef PURPLE_JABBER_IQ_H
    #define PURPLE_JABBER_IQ_H
    +#include <purple.h>
    +
    typedef enum {
    JABBER_IQ_SET,
    JABBER_IQ_GET,
    @@ -34,7 +36,6 @@
    } JabberIqType;
    #include "jabber.h"
    -#include "connection.h"
    typedef struct _JabberIq JabberIq;
    typedef struct _JabberIqCallbackData JabberIqCallbackData;
    --- a/libpurple/protocols/jabber/jabber.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/jabber.c Sun Jun 21 04:16:15 2020 -0500
    @@ -28,7 +28,6 @@
    #include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "purpleprivate.h"
    #include "auth.h"
    #include "buddy.h"
    --- a/libpurple/protocols/jabber/jabber.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/jabber.h Sun Jun 21 04:16:15 2020 -0500
    @@ -68,7 +68,6 @@
    #include "auth.h"
    #include "iq.h"
    #include "jutil.h"
    -#include "xmlnode.h"
    #include "buddy.h"
    #include "bosh.h"
    --- a/libpurple/protocols/jabber/jingle/transport.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/transport.h Sun Jun 21 04:16:15 2020 -0500
    @@ -28,8 +28,9 @@
    #include <glib.h>
    #include <glib-object.h>
    +#include <purple.h>
    +
    #include "jingle.h"
    -#include "xmlnode.h"
    G_BEGIN_DECLS
    --- a/libpurple/protocols/jabber/presence.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/presence.c Sun Jun 21 04:16:15 2020 -0500
    @@ -33,8 +33,6 @@
    #include "jutil.h"
    #include "adhoccommands.h"
    -#include "purpleprivate.h"
    -
    #include "usermood.h"
    #include "usertune.h"
    --- a/libpurple/protocols/jabber/roster.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/roster.c Sun Jun 21 04:16:15 2020 -0500
    @@ -21,7 +21,6 @@
    *
    */
    #include <purple.h>
    -#include "purpleprivate.h"
    #include "buddy.h"
    #include "chat.h"
    --- a/libpurple/protocols/jabber/si.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/si.c Sun Jun 21 04:16:15 2020 -0500
    @@ -33,7 +33,6 @@
    #include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "purpleprivate.h"
    #include "buddy.h"
    #include "data.h"
    --- a/libpurple/protocols/jabber/si.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/jabber/si.h Sun Jun 21 04:16:15 2020 -0500
    @@ -25,7 +25,7 @@
    #ifndef PURPLE_JABBER_SI_H
    #define PURPLE_JABBER_SI_H
    -#include "xfer.h"
    +#include <purple.h>
    #include "jabber.h"
    --- a/libpurple/protocols/novell/nmconn.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/novell/nmconn.c Sun Jun 21 04:16:15 2020 -0500
    @@ -31,8 +31,6 @@
    #include <windows.h>
    #endif
    -#include "util.h"
    -
    #define NO_ESCAPE(ch) ((ch == 0x20) || (ch >= 0x30 && ch <= 0x39) || \
    (ch >= 0x41 && ch <= 0x5a) || (ch >= 0x61 && ch <= 0x7a))
    --- a/libpurple/protocols/simple/simple.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/simple/simple.c Sun Jun 21 04:16:15 2020 -0500
    @@ -25,7 +25,6 @@
    #include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "purpleprivate.h"
    #include "http.h"
    #include "ntlm.h"
    --- a/libpurple/protocols/zephyr/ZAsyncLocate.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/zephyr/ZAsyncLocate.c Sun Jun 21 04:16:15 2020 -0500
    @@ -9,7 +9,8 @@
    */
    #include "internal.h"
    -#include "util.h"
    +
    +#include <purple.h>
    Code_t
    ZRequestLocations(const char *user, ZAsyncLocateData_t *zald,
    --- a/libpurple/protocols/zephyr/ZLocations.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/zephyr/ZLocations.c Sun Jun 21 04:16:15 2020 -0500
    @@ -10,7 +10,8 @@
    */
    #include "internal.h"
    -#include "util.h"
    +
    +#include <purple.h>
    #ifndef WIN32
    #include <pwd.h>
    --- a/libpurple/protocols/zephyr/ZRetSubs.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/zephyr/ZRetSubs.c Sun Jun 21 04:16:15 2020 -0500
    @@ -10,7 +10,8 @@
    */
    #include "internal.h"
    -#include "util.h"
    +
    +#include <purple.h>
    static Code_t Z_RetSubs(ZNotice_t *notice, int *nsubs, Z_AuthProc auth_routine);
    --- a/libpurple/protocols/zephyr/ZVariables.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/zephyr/ZVariables.c Sun Jun 21 04:16:15 2020 -0500
    @@ -13,7 +13,8 @@
    #include <glib/gstdio.h>
    #include "internal.h"
    -#include "util.h"
    +
    +#include <purple.h>
    #include <ctype.h>
    #ifndef WIN32
    --- a/libpurple/protocols/zephyr/zephyr.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/protocols/zephyr/zephyr.h Sun Jun 21 04:16:15 2020 -0500
    @@ -25,7 +25,7 @@
    #include <gmodule.h>
    -#include "protocol.h"
    +#include <purple.h>
    #define ZEPHYR_TYPE_PROTOCOL (zephyr_protocol_get_type())
    #define ZEPHYR_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ZEPHYR_TYPE_PROTOCOL, ZephyrProtocol))
    --- a/libpurple/proxy.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/proxy.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PROXY_H
    #define PURPLE_PROXY_H
    /**
    --- a/libpurple/purple-gio.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/purple-gio.h Sun Jun 21 04:16:15 2020 -0500
    @@ -21,6 +21,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_GIO_H
    #define PURPLE_GIO_H
    /**
    --- a/libpurple/purpleaccountoption.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/purpleaccountoption.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ACCOUNT_OPTION_H
    #define PURPLE_ACCOUNT_OPTION_H
    --- a/libpurple/purpleaccountusersplit.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/purpleaccountusersplit.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ACCOUNT_USER_SPLIT_H
    #define PURPLE_ACCOUNT_USER_SPLIT_H
    --- a/libpurple/purplekeyvaluepair.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/purplekeyvaluepair.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * along with this program. If not, see <http://www.gnu.org/licenses/>.
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_KEY_VALUE_PAIR_H
    #define PURPLE_KEY_VALUE_PAIR_H
    --- a/libpurple/purpleprivate.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/purpleprivate.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * along with this program. If not, see <http://www.gnu.org/licenses/>.
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PRIVATE_H
    #define PURPLE_PRIVATE_H
    @@ -33,19 +37,6 @@
    [(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__)
    -
    -typedef union
    -{
    - struct sockaddr sa;
    - struct sockaddr_in in;
    - struct sockaddr_in6 in6;
    - struct sockaddr_storage storage;
    -} common_sockaddr_t;
    -
    G_BEGIN_DECLS
    /**
    @@ -187,30 +178,6 @@
    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.
    @@ -237,10 +204,6 @@
    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.
    --- a/libpurple/purpleprotocolfactory.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/purpleprotocolfactory.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_PROTOCOL_FACTORY_H
    #define PURPLE_PROTOCOL_FACTORY_H
    --- a/libpurple/purpleuiinfo.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/purpleuiinfo.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_UI_INFO_H
    #define PURPLE_UI_INFO_H
    --- a/libpurple/queuedoutputstream.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/queuedoutputstream.h Sun Jun 21 04:16:15 2020 -0500
    @@ -21,6 +21,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_QUEUED_OUTPUT_STREAM_H
    #define PURPLE_QUEUED_OUTPUT_STREAM_H
    /**
    --- a/libpurple/request-datasheet.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/request-datasheet.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_REQUEST_DATA_H
    #define PURPLE_REQUEST_DATA_H
    /**
    --- a/libpurple/request.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/request.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_REQUEST_H
    #define PURPLE_REQUEST_H
    /**
    --- a/libpurple/roomlist.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/roomlist.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ROOMLIST_H
    #define PURPLE_ROOMLIST_H
    /**
    --- a/libpurple/savedstatuses.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/savedstatuses.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SAVEDSTATUSES_H
    #define PURPLE_SAVEDSTATUSES_H
    /**
    --- a/libpurple/server.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/server.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SERVER_H
    #define PURPLE_SERVER_H
    /**
    --- a/libpurple/signals.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/signals.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SIGNALS_H
    #define PURPLE_SIGNALS_H
    /**
    --- a/libpurple/smiley-custom.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/smiley-custom.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SMILEY_CUSTOM_H
    #define PURPLE_SMILEY_CUSTOM_H
    /**
    --- a/libpurple/smiley-list.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/smiley-list.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SMILEY_LIST_H
    #define PURPLE_SMILEY_LIST_H
    --- a/libpurple/smiley-parser.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/smiley-parser.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SMILEY_PARSER_H
    #define PURPLE_SMILEY_PARSER_H
    /**
    --- a/libpurple/smiley-theme.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/smiley-theme.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SMILEY_THEME_H
    #define PURPLE_SMILEY_THEME_H
    /**
    --- a/libpurple/smiley.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/smiley.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SMILEY_H
    #define PURPLE_SMILEY_H
    --- a/libpurple/sound-theme-loader.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/sound-theme-loader.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SOUND_THEME_LOADER_H
    #define PURPLE_SOUND_THEME_LOADER_H
    /**
    --- a/libpurple/sound-theme.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/sound-theme.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SOUND_THEME_H
    #define PURPLE_SOUND_THEME_H
    /**
    --- a/libpurple/sound.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/sound.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_SOUND_H
    #define PURPLE_SOUND_H
    /**
    --- a/libpurple/status.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/status.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_STATUS_H
    #define PURPLE_STATUS_H
    /**
    --- a/libpurple/stun.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/stun.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_STUN_H
    #define PURPLE_STUN_H
    /**
    --- a/libpurple/theme-loader.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/theme-loader.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_THEME_LOADER_H
    #define PURPLE_THEME_LOADER_H
    /**
    --- a/libpurple/theme-manager.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/theme-manager.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_THEME_MANAGER_H
    #define PURPLE_THEME_MANAGER_H
    /**
    --- a/libpurple/theme.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/theme.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_THEME_H
    #define PURPLE_THEME_H
    /**
    --- a/libpurple/trie.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/trie.h Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_TRIE_H
    #define PURPLE_TRIE_H
    /**
    --- a/libpurple/upnp.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/upnp.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_UPNP_H
    #define PURPLE_UPNP_H
    /**
    --- a/libpurple/util.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/util.h Sun Jun 21 04:16:15 2020 -0500
    @@ -22,6 +22,10 @@
    * namespace.
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_UTIL_H
    #define PURPLE_UTIL_H
    /**
    --- a/libpurple/version.h.in Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/version.h.in Sun Jun 21 04:16:15 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_VERSION_H
    #define PURPLE_VERSION_H
    --- a/libpurple/whiteboard.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/whiteboard.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_WHITEBOARD_H
    #define PURPLE_WHITEBOARD_H
    /**
    --- a/libpurple/xfer.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/xfer.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_XFER_H
    #define PURPLE_XFER_H
    /**
    --- a/libpurple/xmlnode.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/libpurple/xmlnode.h Sun Jun 21 04:16:15 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_XMLNODE_H
    #define PURPLE_XMLNODE_H
    /**
    --- a/pidgin/gtkmedia.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/pidgin/gtkmedia.c Sun Jun 21 04:16:15 2020 -0500
    @@ -33,7 +33,6 @@
    #include "pidginstock.h"
    #ifdef USE_VV
    -#include "media-gst.h"
    #ifdef GDK_WINDOWING_WIN32
    #include <gdk/gdkwin32.h>
    --- a/pidgin/gtkprefs.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/pidgin/gtkprefs.c Sun Jun 21 04:16:15 2020 -0500
    @@ -48,7 +48,6 @@
    #include "pidgindebug.h"
    #include "pidginstock.h"
    #ifdef USE_VV
    -#include "media-gst.h"
    #include <gst/video/videooverlay.h>
    #ifdef GDK_WINDOWING_WIN32
    #include <gdk/gdkwin32.h>
    --- a/pidgin/gtksmiley-theme.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/pidgin/gtksmiley-theme.h Sun Jun 21 04:16:15 2020 -0500
    @@ -36,8 +36,6 @@
    #include <purple.h>
    -#include "smiley-theme.h"
    -
    G_BEGIN_DECLS
    #define PIDGIN_TYPE_SMILEY_THEME pidgin_smiley_theme_get_type()
    --- a/pidgin/gtkutils.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/pidgin/gtkutils.c Sun Jun 21 04:16:15 2020 -0500
    @@ -28,7 +28,8 @@
    #include <glib/gi18n-lib.h>
    #include <glib/gstdio.h>
    -#include "glibcompat.h" /* for purple_g_stat on win32 */
    +#include <purple.h>
    +
    #include "pidgin.h"
    #ifdef _WIN32
    --- a/pidgin/gtkxfer.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/pidgin/gtkxfer.c Sun Jun 21 04:16:15 2020 -0500
    @@ -26,7 +26,6 @@
    #include <purple.h>
    #include "gtkxfer.h"
    -#include "prefs.h"
    #include "pidginstock.h"
    #include "gtkutils.h"
    --- a/pidgin/pidginaccountchooser.h Thu Jun 18 09:03:17 2020 +0000
    +++ b/pidgin/pidginaccountchooser.h Sun Jun 21 04:16:15 2020 -0500
    @@ -30,9 +30,9 @@
    #include <gtk/gtk.h>
    -#include "pidgin.h"
    +#include <purple.h>
    -#include "account.h"
    +#include "pidgin.h"
    G_BEGIN_DECLS
    --- a/pidgin/pidginstock.c Thu Jun 18 09:03:17 2020 +0000
    +++ b/pidgin/pidginstock.c Sun Jun 21 04:16:15 2020 -0500
    @@ -30,7 +30,6 @@
    #include "pidgin.h"
    #include "gtkicon-theme-loader.h"
    -#include "theme-manager.h"
    #include "pidginstock.h"