pidgin/pidgin

Parents 7281920d8a66
Children ca141ea93b83
move all protocols, purple plugins, and purple tests to use purple.h instead of including files individually
  • +1 -1
    libpurple/plugins/keyrings/kwallet/purplekwallet.h
  • +1 -1
    libpurple/protocols/facebook/api.h
  • +1 -1
    libpurple/protocols/facebook/data.c
  • +1 -2
    libpurple/protocols/facebook/data.h
  • +1 -28
    libpurple/protocols/facebook/facebook.c
  • +1 -4
    libpurple/protocols/facebook/mqtt.c
  • +1 -1
    libpurple/protocols/facebook/mqtt.h
  • +1 -5
    libpurple/protocols/facebook/util.c
  • +1 -7
    libpurple/protocols/facebook/util.h
  • +0 -1
    libpurple/protocols/gg/account.c
  • +0 -2
    libpurple/protocols/gg/avatar.c
  • +0 -1
    libpurple/protocols/gg/blist.c
  • +1 -1
    libpurple/protocols/gg/blist.h
  • +0 -2
    libpurple/protocols/gg/chat.c
  • +0 -2
    libpurple/protocols/gg/edisc.c
  • +2 -1
    libpurple/protocols/gg/gg.h
  • +0 -2
    libpurple/protocols/gg/html.c
  • +0 -2
    libpurple/protocols/gg/image-prpl.c
  • +0 -2
    libpurple/protocols/gg/libgadu-events.c
  • +0 -2
    libpurple/protocols/gg/libgaduw.c
  • +0 -3
    libpurple/protocols/gg/message-prpl.c
  • +0 -2
    libpurple/protocols/gg/multilogon.c
  • +1 -1
    libpurple/protocols/gg/oauth/oauth-purple.c
  • +0 -3
    libpurple/protocols/gg/pubdir-prpl.c
  • +0 -3
    libpurple/protocols/gg/purplew.c
  • +0 -1
    libpurple/protocols/gg/resolver-purple.c
  • +0 -2
    libpurple/protocols/gg/roster.c
  • +0 -2
    libpurple/protocols/gg/servconn.c
  • +1 -1
    libpurple/protocols/gg/servconn.h
  • +0 -2
    libpurple/protocols/gg/status.c
  • +0 -3
    libpurple/protocols/gg/tcpsocket.c
  • +0 -2
    libpurple/protocols/gg/utils.c
  • +1 -1
    libpurple/protocols/gg/validator.h
  • +0 -2
    libpurple/protocols/gg/xml.c
  • +1 -1
    libpurple/protocols/gg/xml.h
  • +1 -2
    libpurple/protocols/jabber/adhoccommands.c
  • +1 -8
    libpurple/protocols/jabber/auth.c
  • +2 -1
    libpurple/protocols/jabber/auth.h
  • +1 -3
    libpurple/protocols/jabber/auth_cyrus.c
  • +1 -4
    libpurple/protocols/jabber/auth_digest_md5.c
  • +1 -6
    libpurple/protocols/jabber/auth_plain.c
  • +1 -2
    libpurple/protocols/jabber/auth_scram.c
  • +1 -6
    libpurple/protocols/jabber/auth_webex.c
  • +1 -2
    libpurple/protocols/jabber/bosh.c
  • +1 -7
    libpurple/protocols/jabber/buddy.c
  • +1 -1
    libpurple/protocols/jabber/buddy.h
  • +1 -2
    libpurple/protocols/jabber/caps.c
  • +1 -6
    libpurple/protocols/jabber/chat.c
  • +1 -4
    libpurple/protocols/jabber/chat.h
  • +2 -3
    libpurple/protocols/jabber/data.c
  • +2 -1
    libpurple/protocols/jabber/data.h
  • +1 -4
    libpurple/protocols/jabber/disco.c
  • +2 -1
    libpurple/protocols/jabber/google/gmail.c
  • +1 -1
    libpurple/protocols/jabber/google/google.c
  • +3 -3
    libpurple/protocols/jabber/google/google_p2p.c
  • +2 -1
    libpurple/protocols/jabber/google/google_presence.c
  • +2 -1
    libpurple/protocols/jabber/google/google_presence.h
  • +2 -2
    libpurple/protocols/jabber/google/google_roster.c
  • +2 -1
    libpurple/protocols/jabber/google/google_session.c
  • +2 -1
    libpurple/protocols/jabber/google/jingleinfo.c
  • +1 -1
    libpurple/protocols/jabber/google/relay.c
  • +2 -2
    libpurple/protocols/jabber/ibb.c
  • +1 -4
    libpurple/protocols/jabber/iq.c
  • +1 -21
    libpurple/protocols/jabber/jabber.c
  • +1 -8
    libpurple/protocols/jabber/jabber.h
  • +1 -1
    libpurple/protocols/jabber/jingle/content.c
  • +1 -1
    libpurple/protocols/jabber/jingle/iceudp.c
  • +1 -2
    libpurple/protocols/jabber/jingle/jingle.c
  • +1 -1
    libpurple/protocols/jabber/jingle/rawudp.c
  • +2 -2
    libpurple/protocols/jabber/jingle/rtp.h
  • +1 -1
    libpurple/protocols/jabber/jingle/session.c
  • +1 -1
    libpurple/protocols/jabber/jingle/transport.c
  • +1 -6
    libpurple/protocols/jabber/jutil.c
  • +1 -8
    libpurple/protocols/jabber/message.c
  • +2 -2
    libpurple/protocols/jabber/message.h
  • +1 -3
    libpurple/protocols/jabber/oob.c
  • +2 -4
    libpurple/protocols/jabber/parser.c
  • +1 -2
    libpurple/protocols/jabber/ping.c
  • +2 -1
    libpurple/protocols/jabber/ping.h
  • +1 -10
    libpurple/protocols/jabber/presence.c
  • +2 -1
    libpurple/protocols/jabber/presence.h
  • +1 -3
    libpurple/protocols/jabber/roster.c
  • +1 -7
    libpurple/protocols/jabber/si.c
  • +2 -1
    libpurple/protocols/jabber/tests/test_jabber_caps.c
  • +2 -1
    libpurple/protocols/jabber/tests/test_jabber_digest_md5.c
  • +2 -4
    libpurple/protocols/jabber/tests/test_jabber_jutil.c
  • +2 -2
    libpurple/protocols/jabber/tests/test_jabber_scram.c
  • +1 -1
    libpurple/protocols/jabber/useravatar.c
  • +2 -1
    libpurple/protocols/jabber/useravatar.h
  • +1 -3
    libpurple/protocols/jabber/usermood.c
  • +1 -3
    libpurple/protocols/jabber/usernick.c
  • +1 -3
    libpurple/protocols/jabber/usertune.c
  • +1 -2
    libpurple/protocols/jabber/xdata.c
  • +2 -1
    libpurple/protocols/jabber/xdata.h
  • +1 -1
    libpurple/protocols/novell/nmconn.c
  • +1 -1
    libpurple/protocols/novell/nmcontact.c
  • +1 -2
    libpurple/protocols/novell/nmrtf.c
  • +1 -1
    libpurple/protocols/novell/nmuser.c
  • +2 -1
    libpurple/protocols/novell/nmuser.h
  • +2 -13
    libpurple/protocols/novell/novell.c
  • +1 -1
    libpurple/protocols/novell/novell.h
  • +1 -2
    libpurple/protocols/sametime/im_mime.c
  • +1 -14
    libpurple/protocols/sametime/sametime.c
  • +1 -3
    libpurple/protocols/sametime/tests/test_sametime_im_mime.c
  • +0 -1
    libpurple/protocols/silc/ops.c
  • +0 -1
    libpurple/protocols/silc/silc.c
  • +1 -12
    libpurple/protocols/silc/silcpurple.h
  • +1 -2
    libpurple/protocols/silc/util.c
  • +0 -1
    libpurple/protocols/silc/wb.h
  • +1 -9
    libpurple/protocols/zephyr/zephyr.c
  • +1 -1
    libpurple/tests/test_queued_output_stream.c
  • +1 -1
    libpurple/tests/test_trie.c
  • +1 -1
    libpurple/tests/test_util.c
  • +1 -1
    libpurple/tests/test_xmlnode.c
  • --- a/libpurple/plugins/keyrings/kwallet/purplekwallet.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.h Fri May 01 04:42:52 2020 -0500
    @@ -19,7 +19,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    #include "internal.h"
    -#include "keyring.h"
    +#include <purple.h>
    #include <kwallet.h>
    #include <QQueue>
    --- a/libpurple/protocols/facebook/api.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/api.h Fri May 01 04:42:52 2020 -0500
    @@ -35,7 +35,7 @@
    #include <glib.h>
    -#include "connection.h"
    +#include <purple.h>
    #include "http.h"
    #include "id.h"
    --- a/libpurple/protocols/facebook/data.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/data.c Fri May 01 04:42:52 2020 -0500
    @@ -22,7 +22,7 @@
    #include <libsoup/soup.h>
    #include <string.h>
    -#include "account.h"
    +#include <purple.h>
    #include "api.h"
    #include "data.h"
    --- a/libpurple/protocols/facebook/data.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/data.h Fri May 01 04:42:52 2020 -0500
    @@ -33,8 +33,7 @@
    #include <glib.h>
    -#include "connection.h"
    -#include "roomlist.h"
    +#include <purple.h>
    #include "api.h"
    #include "http.h"
    --- a/libpurple/protocols/facebook/facebook.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/facebook.c Fri May 01 04:42:52 2020 -0500
    @@ -20,34 +20,7 @@
    */
    #include "internal.h"
    -
    -#include "account.h"
    -#include "action.h"
    -#include "blistnode.h"
    -#include "buddy.h"
    -#include "buddyicon.h"
    -#include "buddylist.h"
    -#include "cmds.h"
    -#include "connection.h"
    -#include "conversation.h"
    -#include "conversations.h"
    -#include "conversationtypes.h"
    -#include "image.h"
    -#include "image-store.h"
    -#include "message.h"
    -#include "notify.h"
    -#include "plugins.h"
    -#include "presence.h"
    -#include "protocol.h"
    -#include "protocols.h"
    -#include "purpleaccountoption.h"
    -#include "request.h"
    -#include "roomlist.h"
    -#include "server.h"
    -#include "signals.h"
    -#include "status.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "api.h"
    #include "data.h"
    --- a/libpurple/protocols/facebook/mqtt.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/mqtt.c Fri May 01 04:42:52 2020 -0500
    @@ -25,10 +25,7 @@
    #include <stdarg.h>
    #include <string.h>
    -#include "account.h"
    -#include "eventloop.h"
    -#include "purple-gio.h"
    -#include "queuedoutputstream.h"
    +#include <purple.h>
    #include "mqtt.h"
    #include "util.h"
    --- a/libpurple/protocols/facebook/mqtt.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/mqtt.h Fri May 01 04:42:52 2020 -0500
    @@ -34,7 +34,7 @@
    #include <glib.h>
    #include <string.h>
    -#include "connection.h"
    +#include <purple.h>
    #define FB_TYPE_MQTT fb_mqtt_get_type()
    #define FB_TYPE_MQTT_MESSAGE fb_mqtt_message_get_type()
    --- a/libpurple/protocols/facebook/util.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/util.c Fri May 01 04:42:52 2020 -0500
    @@ -25,11 +25,7 @@
    #include <stdarg.h>
    #include <string.h>
    -#include "buddylist.h"
    -#include "conversations.h"
    -#include "message.h"
    -#include "request.h"
    -#include "server.h"
    +#include <purple.h>
    #include "util.h"
    --- a/libpurple/protocols/facebook/util.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/facebook/util.h Fri May 01 04:42:52 2020 -0500
    @@ -33,13 +33,7 @@
    #include <glib.h>
    -#include <libpurple/util.h>
    -
    -#include "account.h"
    -#include "conversationtypes.h"
    -#include "debug.h"
    -#include "connection.h"
    -#include "conversation.h"
    +#include <purple.h>
    /**
    * FB_UTIL_DEBUG_INFO:
    --- a/libpurple/protocols/gg/account.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/account.c Fri May 01 04:42:52 2020 -0500
    @@ -30,7 +30,6 @@
    #include "account.h"
    #include <libgadu.h>
    -#include <debug.h>
    #include "purplew.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/avatar.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/avatar.c Fri May 01 04:42:52 2020 -0500
    @@ -29,8 +29,6 @@
    #include "avatar.h"
    -#include <debug.h>
    -
    #include "gg.h"
    #include "utils.h"
    #include "oauth/oauth-purple.h"
    --- a/libpurple/protocols/gg/blist.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/blist.c Fri May 01 04:42:52 2020 -0500
    @@ -22,7 +22,6 @@
    #include <libgadu.h>
    -#include <debug.h>
    #include "gg.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/blist.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/blist.h Fri May 01 04:42:52 2020 -0500
    @@ -23,7 +23,7 @@
    #ifndef PURPLE_GG_BLIST_H
    #define PURPLE_GG_BLIST_H
    -#include "connection.h"
    +#include <purple.h>
    void
    ggp_buddylist_send(PurpleConnection *gc);
    --- a/libpurple/protocols/gg/chat.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/chat.c Fri May 01 04:42:52 2020 -0500
    @@ -27,8 +27,6 @@
    */
    #include "chat.h"
    -#include <debug.h>
    -
    #include "gg.h"
    #include "utils.h"
    #include "message-prpl.h"
    --- a/libpurple/protocols/gg/edisc.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/edisc.c Fri May 01 04:42:52 2020 -0500
    @@ -27,8 +27,6 @@
    */
    #include "edisc.h"
    -#include <debug.h>
    -
    #include "gg.h"
    #include "libgaduw.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/gg.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/gg.h Fri May 01 04:42:52 2020 -0500
    @@ -31,7 +31,8 @@
    #include "internal.h"
    #include "search.h"
    -#include "connection.h"
    +
    +#include <purple.h>
    #include "image-prpl.h"
    #include "avatar.h"
    --- a/libpurple/protocols/gg/html.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/html.c Fri May 01 04:42:52 2020 -0500
    @@ -27,8 +27,6 @@
    */
    #include "html.h"
    -#include <debug.h>
    -
    typedef struct
    {
    GRegex *re_html_attr;
    --- a/libpurple/protocols/gg/image-prpl.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/image-prpl.c Fri May 01 04:42:52 2020 -0500
    @@ -29,8 +29,6 @@
    #include "image-prpl.h"
    -#include <debug.h>
    -
    #include "gg.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/libgadu-events.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/libgadu-events.c Fri May 01 04:42:52 2020 -0500
    @@ -29,8 +29,6 @@
    #include "libgadu-events.h"
    -#include <debug.h>
    -
    #include "avatar.h"
    #include "edisc.h"
    --- a/libpurple/protocols/gg/libgaduw.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/libgaduw.c Fri May 01 04:42:52 2020 -0500
    @@ -29,8 +29,6 @@
    #include "libgaduw.h"
    -#include <debug.h>
    -
    #include "purplew.h"
    #include "gg.h"
    --- a/libpurple/protocols/gg/message-prpl.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/message-prpl.c Fri May 01 04:42:52 2020 -0500
    @@ -27,9 +27,6 @@
    */
    #include "message-prpl.h"
    -#include <debug.h>
    -#include <image-store.h>
    -
    #include "gg.h"
    #include "chat.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/multilogon.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/multilogon.c Fri May 01 04:42:52 2020 -0500
    @@ -29,8 +29,6 @@
    #include "multilogon.h"
    -#include <debug.h>
    -
    #include "gg.h"
    #include "keymapper.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/oauth/oauth-purple.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/oauth/oauth-purple.c Fri May 01 04:42:52 2020 -0500
    @@ -34,7 +34,7 @@
    #include "../utils.h"
    #include "../xml.h"
    -#include <debug.h>
    +#include <purple.h>
    #define GGP_OAUTH_RESPONSE_MAX 10240
    --- a/libpurple/protocols/gg/pubdir-prpl.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/pubdir-prpl.c Fri May 01 04:42:52 2020 -0500
    @@ -30,9 +30,6 @@
    #include "pubdir-prpl.h"
    #include "gg.h"
    -#include <debug.h>
    -#include <request.h>
    -
    #include "oauth/oauth-purple.h"
    #include "xml.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/purplew.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/purplew.c Fri May 01 04:42:52 2020 -0500
    @@ -29,9 +29,6 @@
    #include "purplew.h"
    -#include <request.h>
    -#include <debug.h>
    -
    #include "tcpsocket.h"
    guint ggp_purplew_http_input_add(struct gg_http *http_req,
    --- a/libpurple/protocols/gg/resolver-purple.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/resolver-purple.c Fri May 01 04:42:52 2020 -0500
    @@ -28,7 +28,6 @@
    */
    #include <internal.h>
    -#include <debug.h>
    #include <libgadu.h>
    #include "resolver-purple.h"
    --- a/libpurple/protocols/gg/roster.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/roster.c Fri May 01 04:42:52 2020 -0500
    @@ -34,8 +34,6 @@
    #include "utils.h"
    #include "purplew.h"
    -#include <debug.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/servconn.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/servconn.c Fri May 01 04:42:52 2020 -0500
    @@ -31,8 +31,6 @@
    #include "utils.h"
    -#include <debug.h>
    -
    #define GGP_SERVCONN_HISTORY_PREF "/plugins/prpl/gg/server_history"
    #define GGP_SERVCONN_HISTORY_MAXLEN 15
    --- a/libpurple/protocols/gg/servconn.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/servconn.h Fri May 01 04:42:52 2020 -0500
    @@ -31,7 +31,7 @@
    #define PURPLE_GG_SERVCONN_H
    #include <internal.h>
    -#include <purpleaccountoption.h>
    +#include <purple.h>
    void ggp_servconn_setup(PurpleAccountOption *server_option);
    void ggp_servconn_cleanup(void);
    --- a/libpurple/protocols/gg/status.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/status.c Fri May 01 04:42:52 2020 -0500
    @@ -30,8 +30,6 @@
    #include "status.h"
    #include <libgadu.h>
    -#include <debug.h>
    -#include <request.h>
    #include "gg.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/tcpsocket.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/tcpsocket.c Fri May 01 04:42:52 2020 -0500
    @@ -29,9 +29,6 @@
    #include "gg.h"
    -#include "debug.h"
    -#include "purple-gio.h"
    -
    typedef struct {
    GSocketConnection *conn;
    GCancellable *cancellable;
    --- a/libpurple/protocols/gg/utils.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/utils.c Fri May 01 04:42:52 2020 -0500
    @@ -31,8 +31,6 @@
    #include "gg.h"
    -#include <debug.h>
    -
    uin_t ggp_str_to_uin(const char *str)
    {
    char *endptr;
    --- a/libpurple/protocols/gg/validator.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/validator.h Fri May 01 04:42:52 2020 -0500
    @@ -31,7 +31,7 @@
    #define PURPLE_GG_VALIDATOR_H
    #include <internal.h>
    -#include <request.h>
    +#include <purple.h>
    gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
    void *user_data);
    --- a/libpurple/protocols/gg/xml.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/xml.c Fri May 01 04:42:52 2020 -0500
    @@ -29,8 +29,6 @@
    #include "xml.h"
    -#include "debug.h"
    -
    gboolean ggp_xml_get_string(const PurpleXmlNode *xml, gchar *childName, gchar **var)
    {
    char *str;
    --- a/libpurple/protocols/gg/xml.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/gg/xml.h Fri May 01 04:42:52 2020 -0500
    @@ -31,7 +31,7 @@
    #define PURPLE_GG_XML_H
    #include <internal.h>
    -#include <xmlnode.h>
    +#include <purple.h>
    gboolean ggp_xml_get_string(const PurpleXmlNode *xml, gchar *childName, gchar **var);
    gboolean ggp_xml_get_bool(const PurpleXmlNode *xml, gchar *childName, gboolean *var);
    --- a/libpurple/protocols/jabber/adhoccommands.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/adhoccommands.c Fri May 01 04:42:52 2020 -0500
    @@ -22,13 +22,12 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "adhoccommands.h"
    #include <string.h>
    -#include "internal.h"
    #include "xdata.h"
    #include "iq.h"
    -#include "request.h"
    static void do_adhoc_ignoreme(JabberStream *js, ...) {
    /* we don't have to do anything */
    --- a/libpurple/protocols/jabber/auth.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/auth.c Fri May 01 04:42:52 2020 -0500
    @@ -21,14 +21,7 @@
    *
    */
    #include "internal.h"
    -
    -#include "account.h"
    -#include "debug.h"
    -#include "core.h"
    -#include "conversation.h"
    -#include "request.h"
    -#include "util.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "auth.h"
    #include "disco.h"
    --- a/libpurple/protocols/jabber/auth.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/auth.h Fri May 01 04:42:52 2020 -0500
    @@ -27,8 +27,9 @@
    typedef struct _JabberSaslMech JabberSaslMech;
    +#include <purple.h>
    +
    #include "jabber.h"
    -#include "xmlnode.h"
    typedef enum {
    JABBER_SASL_STATE_FAIL = -1, /* Abort, Retry, Fail? */
    --- a/libpurple/protocols/jabber/auth_cyrus.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/auth_cyrus.c Fri May 01 04:42:52 2020 -0500
    @@ -21,9 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "request.h"
    +#include <purple.h>
    #include "auth.h"
    #include "jabber.h"
    --- a/libpurple/protocols/jabber/auth_digest_md5.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/auth_digest_md5.c Fri May 01 04:42:52 2020 -0500
    @@ -21,10 +21,7 @@
    *
    */
    #include "internal.h"
    -
    -#include "debug.h"
    -#include "util.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "auth_digest_md5.h"
    #include "auth.h"
    --- a/libpurple/protocols/jabber/auth_plain.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/auth_plain.c Fri May 01 04:42:52 2020 -0500
    @@ -21,12 +21,7 @@
    *
    */
    #include "internal.h"
    -
    -#include "account.h"
    -#include "debug.h"
    -#include "request.h"
    -#include "util.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "jabber.h"
    #include "auth.h"
    --- a/libpurple/protocols/jabber/auth_scram.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/auth_scram.c Fri May 01 04:42:52 2020 -0500
    @@ -21,12 +21,11 @@
    *
    */
    #include "internal.h"
    +#include <purple.h>
    #include "auth.h"
    #include "auth_scram.h"
    -#include "debug.h"
    -
    static const JabberScramHash hashes[] = {
    { "-SHA-1", G_CHECKSUM_SHA1 },
    };
    --- a/libpurple/protocols/jabber/auth_webex.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/auth_webex.c Fri May 01 04:42:52 2020 -0500
    @@ -21,12 +21,7 @@
    *
    */
    #include "internal.h"
    -
    -#include "account.h"
    -#include "debug.h"
    -#include "request.h"
    -#include "util.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "jabber.h"
    #include "auth.h"
    --- a/libpurple/protocols/jabber/bosh.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/bosh.c Fri May 01 04:42:52 2020 -0500
    @@ -21,8 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "core.h"
    -#include "debug.h"
    +#include <purple.h>
    #include <libsoup/soup.h>
    --- a/libpurple/protocols/jabber/buddy.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/buddy.c Fri May 01 04:42:52 2020 -0500
    @@ -21,13 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "debug.h"
    -#include "image-store.h"
    -#include "protocol.h"
    -#include "notify.h"
    -#include "request.h"
    -#include "util.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "action.h"
    #include "buddy.h"
    --- a/libpurple/protocols/jabber/buddy.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/buddy.h Fri May 01 04:42:52 2020 -0500
    @@ -27,7 +27,7 @@
    typedef struct _JabberBuddy JabberBuddy;
    -#include "action.h"
    +#include <purple.h>
    #include "jabber.h"
    #include "caps.h"
    --- a/libpurple/protocols/jabber/caps.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/caps.c Fri May 01 04:42:52 2020 -0500
    @@ -22,12 +22,11 @@
    */
    #include "internal.h"
    +#include <purple.h>
    -#include "debug.h"
    #include "caps.h"
    #include "iq.h"
    #include "presence.h"
    -#include "util.h"
    #include "xdata.h"
    #define JABBER_CAPS_FILENAME "xmpp-caps.xml"
    --- a/libpurple/protocols/jabber/chat.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/chat.c Fri May 01 04:42:52 2020 -0500
    @@ -21,12 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "debug.h"
    -#include "protocol.h" /* for PurpleProtocolChatEntry */
    -#include "notify.h"
    -#include "request.h"
    -#include "roomlist.h"
    -#include "util.h"
    +#include <purple.h>
    #include "chat.h"
    #include "iq.h"
    --- a/libpurple/protocols/jabber/chat.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/chat.h Fri May 01 04:42:52 2020 -0500
    @@ -26,10 +26,7 @@
    #define PURPLE_JABBER_CHAT_H
    #include "internal.h"
    -#include "connection.h"
    -#include "conversation.h"
    -#include "request.h"
    -#include "roomlist.h"
    +#include <purple.h>
    #include "jabber.h"
    --- a/libpurple/protocols/jabber/data.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/data.c Fri May 01 04:42:52 2020 -0500
    @@ -27,10 +27,9 @@
    #include <glib.h>
    #include <string.h>
    +#include <purple.h>
    +
    #include "data.h"
    -#include "debug.h"
    -#include "xmlnode.h"
    -#include "util.h"
    #include "iq.h"
    static GHashTable *local_data_by_alt = NULL;
    --- a/libpurple/protocols/jabber/data.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/data.h Fri May 01 04:42:52 2020 -0500
    @@ -24,7 +24,8 @@
    #ifndef PURPLE_JABBER_DATA_H
    #define PURPLE_JABBER_DATA_H
    -#include "xmlnode.h"
    +#include <purple.h>
    +
    #include "jabber.h"
    #include <glib.h>
    --- a/libpurple/protocols/jabber/disco.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/disco.c Fri May 01 04:42:52 2020 -0500
    @@ -22,10 +22,7 @@
    */
    #include "internal.h"
    -#include "network.h"
    -#include "prefs.h"
    -#include "debug.h"
    -#include "request.h"
    +#include <purple.h>
    #include "adhoccommands.h"
    #include "buddy.h"
    --- a/libpurple/protocols/jabber/google/gmail.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/gmail.c Fri May 01 04:42:52 2020 -0500
    @@ -19,7 +19,8 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "jabber.h"
    #include "gmail.h"
    --- a/libpurple/protocols/jabber/google/google.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/google.c Fri May 01 04:42:52 2020 -0500
    @@ -19,7 +19,7 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "google.h"
    #include "jabber.h"
    --- a/libpurple/protocols/jabber/google/google_p2p.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/google_p2p.c Fri May 01 04:42:52 2020 -0500
    @@ -23,12 +23,12 @@
    */
    #include "internal.h"
    +#include <purple.h>
    +
    +#include <string.h>
    #include "google_p2p.h"
    #include "jingle/jingle.h"
    -#include "debug.h"
    -
    -#include <string.h>
    struct _JingleGoogleP2P
    {
    --- a/libpurple/protocols/jabber/google/google_presence.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/google_presence.c Fri May 01 04:42:52 2020 -0500
    @@ -19,7 +19,8 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "google_presence.h"
    void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
    --- a/libpurple/protocols/jabber/google/google_presence.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/google_presence.h Fri May 01 04:42:52 2020 -0500
    @@ -21,9 +21,10 @@
    #ifndef PURPLE_JABBER_GOOGLE_PRESENCE_H_
    #define PURPLE_JABBER_GOOGLE_PRESENCE_H_
    +#include <purple.h>
    +
    #include "jabber.h"
    #include "buddy.h"
    -#include "status.h"
    void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
    char *jabber_google_presence_outgoing(PurpleStatus *tune);
    --- a/libpurple/protocols/jabber/google/google_roster.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/google_roster.c Fri May 01 04:42:52 2020 -0500
    @@ -19,11 +19,11 @@
    */
    #include "internal.h"
    +#include <purple.h>
    +
    #include "google_roster.h"
    #include "jabber.h"
    #include "presence.h"
    -#include "debug.h"
    -#include "xmlnode.h"
    #include "roster.h"
    void jabber_google_roster_outgoing(JabberStream *js, PurpleXmlNode *query, PurpleXmlNode *item)
    --- a/libpurple/protocols/jabber/google/google_session.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/google_session.c Fri May 01 04:42:52 2020 -0500
    @@ -19,7 +19,8 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "google_session.h"
    #include "relay.h"
    --- a/libpurple/protocols/jabber/google/jingleinfo.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/jingleinfo.c Fri May 01 04:42:52 2020 -0500
    @@ -19,7 +19,8 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "jingleinfo.h"
    #include <gio/gio.h>
    --- a/libpurple/protocols/jabber/google/relay.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/google/relay.c Fri May 01 04:42:52 2020 -0500
    @@ -19,7 +19,7 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "relay.h"
    --- a/libpurple/protocols/jabber/ibb.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/ibb.c Fri May 01 04:42:52 2020 -0500
    @@ -22,9 +22,9 @@
    */
    #include "internal.h"
    +#include <purple.h>
    +
    #include "ibb.h"
    -#include "debug.h"
    -#include "xmlnode.h"
    #define JABBER_IBB_SESSION_DEFAULT_BLOCK_SIZE 4096
    --- a/libpurple/protocols/jabber/iq.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/iq.c Fri May 01 04:42:52 2020 -0500
    @@ -21,10 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "prefs.h"
    -#include "util.h"
    +#include <purple.h>
    #include "buddy.h"
    #include "disco.h"
    --- a/libpurple/protocols/jabber/jabber.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jabber.c Fri May 01 04:42:52 2020 -0500
    @@ -21,27 +21,7 @@
    *
    */
    #include "internal.h"
    -
    -#include "account.h"
    -#include "buddylist.h"
    -#include "core.h"
    -#include "cmds.h"
    -#include "connection.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "message.h"
    -#include "notify.h"
    -#include "pluginpref.h"
    -#include "proxy.h"
    -#include "protocol.h"
    -#include "purpleaccountoption.h"
    -#include "purple-gio.h"
    -#include "request.h"
    -#include "server.h"
    -#include "status.h"
    -#include "util.h"
    -#include "version.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "auth.h"
    #include "buddy.h"
    --- a/libpurple/protocols/jabber/jabber.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jabber.h Fri May 01 04:42:52 2020 -0500
    @@ -61,14 +61,7 @@
    #include <gio/gio.h>
    #include <libsoup/soup.h>
    -#include "attention.h"
    -#include "circularbuffer.h"
    -#include "connection.h"
    -#include "media.h"
    -#include "mediamanager.h"
    -#include "protocol.h"
    -#include "queuedoutputstream.h"
    -#include "roomlist.h"
    +#include <purple.h>
    #include "namespaces.h"
    --- a/libpurple/protocols/jabber/jingle/content.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/content.c Fri May 01 04:42:52 2020 -0500
    @@ -23,8 +23,8 @@
    */
    #include "internal.h"
    +#include <purple.h>
    -#include "debug.h"
    #include "content.h"
    #include "jingle.h"
    --- a/libpurple/protocols/jabber/jingle/iceudp.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/iceudp.c Fri May 01 04:42:52 2020 -0500
    @@ -23,10 +23,10 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "iceudp.h"
    #include "jingle.h"
    -#include "debug.h"
    #include <string.h>
    --- a/libpurple/protocols/jabber/jingle/jingle.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/jingle.c Fri May 01 04:42:52 2020 -0500
    @@ -24,10 +24,9 @@
    */
    #include "internal.h"
    -#include "network.h"
    +#include <purple.h>
    #include "content.h"
    -#include "debug.h"
    #include "jingle.h"
    #include "google/google_p2p.h"
    #include "session.h"
    --- a/libpurple/protocols/jabber/jingle/rawudp.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/rawudp.c Fri May 01 04:42:52 2020 -0500
    @@ -23,10 +23,10 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "rawudp.h"
    #include "jingle.h"
    -#include "debug.h"
    #include <string.h>
    --- a/libpurple/protocols/jabber/jingle/rtp.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/rtp.h Fri May 01 04:42:52 2020 -0500
    @@ -32,9 +32,9 @@
    #include <glib.h>
    #include <glib-object.h>
    +#include <purple.h>
    +
    #include "content.h"
    -#include "media.h"
    -#include "xmlnode.h"
    G_BEGIN_DECLS
    --- a/libpurple/protocols/jabber/jingle/session.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/session.c Fri May 01 04:42:52 2020 -0500
    @@ -23,9 +23,9 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "content.h"
    -#include "debug.h"
    #include "session.h"
    #include "jingle.h"
    --- a/libpurple/protocols/jabber/jingle/transport.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/transport.c Fri May 01 04:42:52 2020 -0500
    @@ -23,10 +23,10 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "transport.h"
    #include "jingle.h"
    -#include "debug.h"
    #include <string.h>
    --- a/libpurple/protocols/jabber/jutil.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/jutil.c Fri May 01 04:42:52 2020 -0500
    @@ -21,12 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "account.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "server.h"
    -#include "util.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "chat.h"
    #include "presence.h"
    --- a/libpurple/protocols/jabber/message.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/message.c Fri May 01 04:42:52 2020 -0500
    @@ -21,22 +21,15 @@
    *
    */
    #include "internal.h"
    +#include <purple.h>
    -#include "debug.h"
    -#include "notify.h"
    -#include "smiley-custom.h"
    -#include "smiley-parser.h"
    -#include "server.h"
    -#include "util.h"
    #include "adhoccommands.h"
    #include "buddy.h"
    #include "chat.h"
    #include "data.h"
    #include "google/google.h"
    #include "message.h"
    -#include "xmlnode.h"
    #include "pep.h"
    -#include "smiley.h"
    #include "iq.h"
    #include <string.h>
    --- a/libpurple/protocols/jabber/message.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/message.h Fri May 01 04:42:52 2020 -0500
    @@ -25,9 +25,9 @@
    #ifndef PURPLE_JABBER_MESSAGE_H
    #define PURPLE_JABBER_MESSAGE_H
    -#include "buddy.h"
    +#include <purple.h>
    +
    #include "jabber.h"
    -#include "xmlnode.h"
    typedef struct {
    JabberStream *js;
    --- a/libpurple/protocols/jabber/oob.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/oob.c Fri May 01 04:42:52 2020 -0500
    @@ -21,9 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "debug.h"
    -#include "xfer.h"
    -#include "util.h"
    +#include <purple.h>
    #include "jabber.h"
    #include "iq.h"
    --- a/libpurple/protocols/jabber/parser.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/parser.c Fri May 01 04:42:52 2020 -0500
    @@ -24,12 +24,10 @@
    #include <libxml/parser.h>
    -#include "connection.h"
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "jabber.h"
    #include "parser.h"
    -#include "util.h"
    -#include "xmlnode.h"
    static void
    jabber_parser_element_start_libxml(void *user_data,
    --- a/libpurple/protocols/jabber/ping.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/ping.c Fri May 01 04:42:52 2020 -0500
    @@ -23,8 +23,7 @@
    */
    #include "internal.h"
    -
    -#include "debug.h"
    +#include <purple.h>
    #include "jabber.h"
    #include "ping.h"
    --- a/libpurple/protocols/jabber/ping.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/ping.h Fri May 01 04:42:52 2020 -0500
    @@ -25,9 +25,10 @@
    #ifndef PURPLE_JABBER_PING_H
    #define PURPLE_JABBER_PING_H
    +#include <purple.h>
    +
    #include "jabber.h"
    #include "iq.h"
    -#include "xmlnode.h"
    void jabber_ping_parse(JabberStream *js, const char *from,
    JabberIqType, const char *id, PurpleXmlNode *child);
    --- a/libpurple/protocols/jabber/presence.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/presence.c Fri May 01 04:42:52 2020 -0500
    @@ -21,16 +21,7 @@
    *
    */
    #include "internal.h"
    -
    -#include "account.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "request.h"
    -#include "server.h"
    -#include "status.h"
    -#include "util.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "buddy.h"
    #include "chat.h"
    --- a/libpurple/protocols/jabber/presence.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/presence.h Fri May 01 04:42:52 2020 -0500
    @@ -39,11 +39,12 @@
    typedef struct _JabberPresenceChatInfo JabberPresenceChatInfo;
    typedef struct _JabberPresence JabberPresence;
    +#include <purple.h>
    +
    #include "buddy.h"
    #include "chat.h"
    #include "jabber.h"
    #include "jutil.h"
    -#include "xmlnode.h"
    struct _JabberPresenceChatInfo {
    GSList *codes;
    --- a/libpurple/protocols/jabber/roster.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/roster.c Fri May 01 04:42:52 2020 -0500
    @@ -21,9 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "debug.h"
    -#include "server.h"
    -#include "util.h"
    +#include <purple.h>
    #include "buddy.h"
    #include "chat.h"
    --- a/libpurple/protocols/jabber/si.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/si.c Fri May 01 04:42:52 2020 -0500
    @@ -23,13 +23,7 @@
    */
    #include "internal.h"
    -
    -#include "buddylist.h"
    -#include "debug.h"
    -#include "xfer.h"
    -#include "request.h"
    -#include "network.h"
    -#include "notify.h"
    +#include <purple.h>
    #include "buddy.h"
    #include "data.h"
    --- a/libpurple/protocols/jabber/tests/test_jabber_caps.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/tests/test_jabber_caps.c Fri May 01 04:42:52 2020 -0500
    @@ -1,6 +1,7 @@
    #include <glib.h>
    -#include "xmlnode.h"
    +#include <purple.h>
    +
    #include "protocols/jabber/caps.h"
    static void
    --- a/libpurple/protocols/jabber/tests/test_jabber_digest_md5.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/tests/test_jabber_digest_md5.c Fri May 01 04:42:52 2020 -0500
    @@ -1,6 +1,7 @@
    #include <glib.h>
    -#include "util.h"
    +#include <purple.h>
    +
    #include "protocols/jabber/auth_digest_md5.h"
    #include "protocols/jabber/jutil.h"
    --- a/libpurple/protocols/jabber/tests/test_jabber_jutil.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/tests/test_jabber_jutil.c Fri May 01 04:42:52 2020 -0500
    @@ -1,9 +1,7 @@
    #include <glib.h>
    -#include "account.h"
    -#include "conversation.h"
    -#include "tests.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    +
    #include "protocols/jabber/jutil.h"
    PurpleTestStringData test_jabber_util_get_resource_exists_data[] = {
    --- a/libpurple/protocols/jabber/tests/test_jabber_scram.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/tests/test_jabber_scram.c Fri May 01 04:42:52 2020 -0500
    @@ -1,7 +1,7 @@
    #include <string.h>
    -#include "tests.h"
    -#include "util.h"
    +#include <purple.h>
    +
    #include "protocols/jabber/auth_scram.h"
    #include "protocols/jabber/jutil.h"
    --- a/libpurple/protocols/jabber/useravatar.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/useravatar.c Fri May 01 04:42:52 2020 -0500
    @@ -22,12 +22,12 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include <libsoup/soup.h>
    #include "useravatar.h"
    #include "pep.h"
    -#include "debug.h"
    #define MAX_HTTP_BUDDYICON_BYTES (200 * 1024)
    --- a/libpurple/protocols/jabber/useravatar.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/useravatar.h Fri May 01 04:42:52 2020 -0500
    @@ -25,7 +25,8 @@
    #define PURPLE_JABBER_USERAVATAR_H
    #include "jabber.h"
    -#include "image.h"
    +
    +#include <purple.h>
    /* Implementation of XEP-0084 */
    --- a/libpurple/protocols/jabber/usermood.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/usermood.c Fri May 01 04:42:52 2020 -0500
    @@ -22,13 +22,11 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "usermood.h"
    #include "pep.h"
    #include <string.h>
    -#include "internal.h"
    -#include "request.h"
    -#include "debug.h"
    static PurpleMood moods[] = {
    {"afraid", N_("Afraid"), NULL},
    --- a/libpurple/protocols/jabber/usernick.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/usernick.c Fri May 01 04:42:52 2020 -0500
    @@ -22,13 +22,11 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "usernick.h"
    #include "pep.h"
    #include <string.h>
    -#include "internal.h"
    -#include "request.h"
    -#include "status.h"
    static void jabber_nick_cb(JabberStream *js, const char *from, PurpleXmlNode *items) {
    /* it doesn't make sense to have more than one item here, so let's just pick the first one */
    --- a/libpurple/protocols/jabber/usertune.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/usertune.c Fri May 01 04:42:52 2020 -0500
    @@ -22,13 +22,11 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "usertune.h"
    #include "pep.h"
    #include <string.h>
    -#include "internal.h"
    -#include "request.h"
    -#include "status.h"
    static void jabber_tune_cb(JabberStream *js, const char *from, PurpleXmlNode *items) {
    /* it doesn't make sense to have more than one item here, so let's just pick the first one */
    --- a/libpurple/protocols/jabber/xdata.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/xdata.c Fri May 01 04:42:52 2020 -0500
    @@ -21,8 +21,7 @@
    *
    */
    #include "internal.h"
    -#include "request.h"
    -#include "server.h"
    +#include <purple.h>
    #include "xdata.h"
    --- a/libpurple/protocols/jabber/xdata.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/jabber/xdata.h Fri May 01 04:42:52 2020 -0500
    @@ -26,7 +26,8 @@
    #define PURPLE_JABBER_XDATA_H
    #include "jabber.h"
    -#include "xmlnode.h"
    +
    +#include <purple.h>
    typedef struct {
    char *name;
    --- a/libpurple/protocols/novell/nmconn.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/novell/nmconn.c Fri May 01 04:42:52 2020 -0500
    @@ -23,7 +23,7 @@
    #include <string.h>
    #include <ctype.h>
    -#include "purple-gio.h"
    +#include <purple.h>
    #include "nmconn.h"
    --- a/libpurple/protocols/novell/nmcontact.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/novell/nmcontact.c Fri May 01 04:42:52 2020 -0500
    @@ -20,10 +20,10 @@
    #include <glib.h>
    #include <string.h>
    +#include <purple.h>
    #include "nmcontact.h"
    #include "nmfield.h"
    #include "nmuser.h"
    -#include "util.h"
    struct _NMContact
    {
    --- a/libpurple/protocols/novell/nmrtf.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/novell/nmrtf.c Fri May 01 04:42:52 2020 -0500
    @@ -28,9 +28,8 @@
    #include <stddef.h>
    #include <ctype.h>
    #include <string.h>
    +#include <purple.h>
    #include "nmrtf.h"
    -#include "debug.h"
    -#include "util.h"
    /* Internal RTF parser error codes */
    #define NMRTF_OK 0 /* Everything's fine! */
    --- a/libpurple/protocols/novell/nmuser.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/novell/nmuser.c Fri May 01 04:42:52 2020 -0500
    @@ -20,12 +20,12 @@
    #include "internal.h"
    #include <string.h>
    +#include <purple.h>
    #include "nmfield.h"
    #include "nmuser.h"
    #include "nmconn.h"
    #include "nmcontact.h"
    #include "nmuserrecord.h"
    -#include "util.h"
    /* This is the template that we wrap outgoing messages in, since the other
    * GW Messenger clients expect messages to be in RTF.
    --- a/libpurple/protocols/novell/nmuser.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/novell/nmuser.h Fri May 01 04:42:52 2020 -0500
    @@ -47,7 +47,8 @@
    } NMRequestType;
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "nmmessage.h"
    #include "nmconference.h"
    #include "nmcontact.h"
    --- a/libpurple/protocols/novell/novell.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/novell/novell.c Fri May 01 04:42:52 2020 -0500
    @@ -19,21 +19,10 @@
    */
    #include "internal.h"
    -
    -#include "action.h"
    -#include "debug.h"
    -#include "plugins.h"
    -#include "server.h"
    +#include <purple.h>
    +
    #include "nmuser.h"
    -#include "notify.h"
    #include "novell.h"
    -#include "purple-gio.h"
    -#include "purpleaccountoption.h"
    -#include "util.h"
    -#include "request.h"
    -#include "network.h"
    -#include "status.h"
    -#include "version.h"
    #define DEFAULT_PORT 8300
    #define NOVELL_CONNECT_STEPS 4
    --- a/libpurple/protocols/novell/novell.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/novell/novell.h Fri May 01 04:42:52 2020 -0500
    @@ -25,7 +25,7 @@
    #include <gmodule.h>
    -#include "protocol.h"
    +#include <purple.h>
    #define NOVELL_TYPE_PROTOCOL (novell_protocol_get_type())
    #define NOVELL_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NOVELL_TYPE_PROTOCOL, NovellProtocol))
    --- a/libpurple/protocols/sametime/im_mime.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/sametime/im_mime.c Fri May 01 04:42:52 2020 -0500
    @@ -26,8 +26,7 @@
    #include <glib.h>
    #include <gmime/gmime.h>
    -/* purple includes */
    -#include "image-store.h"
    +#include <purple.h>
    /* plugin includes */
    #include "sametime.h"
    --- a/libpurple/protocols/sametime/sametime.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/sametime/sametime.c Fri May 01 04:42:52 2020 -0500
    @@ -32,20 +32,7 @@
    #include <gmime/gmime.h>
    /* purple includes */
    -#include "account.h"
    -#include "action.h"
    -#include "circularbuffer.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "image-store.h"
    -#include "xfer.h"
    -#include "notify.h"
    -#include "plugins.h"
    -#include "protocol.h"
    -#include "purpleaccountoption.h"
    -#include "purpleaccountusersplit.h"
    -#include "request.h"
    -#include "version.h"
    +#include <purple.h>
    /* meanwhile includes */
    #include <mw_cipher.h>
    --- a/libpurple/protocols/sametime/tests/test_sametime_im_mime.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/sametime/tests/test_sametime_im_mime.c Fri May 01 04:42:52 2020 -0500
    @@ -25,9 +25,7 @@
    #include <gmime/gmime.h>
    #include <string.h>
    -#include "image.h"
    -#include "image-store.h"
    -#include "util.h"
    +#include <purple.h>
    #include "protocols/sametime/im_mime.h"
    --- a/libpurple/protocols/silc/ops.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/silc/ops.c Fri May 01 04:42:52 2020 -0500
    @@ -18,7 +18,6 @@
    */
    #include "internal.h"
    -#include "image-store.h"
    PURPLE_BEGIN_IGNORE_CAST_ALIGN
    #include "silc.h"
    PURPLE_END_IGNORE_CAST_ALIGN
    --- a/libpurple/protocols/silc/silc.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/silc/silc.c Fri May 01 04:42:52 2020 -0500
    @@ -26,7 +26,6 @@
    #include "silcclient.h"
    #include "silcpurple.h"
    #include "wb.h"
    -#include "core.h"
    extern SilcClientOperations ops;
    --- a/libpurple/protocols/silc/silcpurple.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/silc/silcpurple.h Fri May 01 04:42:52 2020 -0500
    @@ -24,18 +24,7 @@
    /* Purple includes */
    #include "internal.h"
    -#include "account.h"
    -#include "accountopt.h"
    -#include "cmds.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "xfer.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "roomlist.h"
    -#include "server.h"
    -#include "util.h"
    +#include <purple.h>
    #define SILCPURPLE_TYPE_PROTOCOL (silcpurple_protocol_get_type())
    #define SILCPURPLE_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SILCPURPLE_TYPE_PROTOCOL, SilcProtocol))
    --- a/libpurple/protocols/silc/util.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/silc/util.c Fri May 01 04:42:52 2020 -0500
    @@ -18,8 +18,7 @@
    */
    #include "internal.h"
    -#include "glibcompat.h" /* for purple_g_stat on win32 */
    -#include "image-store.h"
    +#include <purple.h>
    PURPLE_BEGIN_IGNORE_CAST_ALIGN
    #include "silc.h"
    --- a/libpurple/protocols/silc/wb.h Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/silc/wb.h Fri May 01 04:42:52 2020 -0500
    @@ -21,7 +21,6 @@
    #define PURPLE_SILC_WB_H
    #include "silcpurple.h"
    -#include "whiteboard.h"
    PurpleWhiteboard *
    silcpurple_wb_init(SilcPurple sg, SilcClientEntry client_entry);
    --- a/libpurple/protocols/zephyr/zephyr.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/protocols/zephyr/zephyr.c Fri May 01 04:42:52 2020 -0500
    @@ -28,15 +28,7 @@
    */
    #include "libpurple/internal.h"
    -#include "purpleaccountoption.h"
    -#include "action.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "plugins.h"
    -#include "server.h"
    -#include "util.h"
    -#include "cmds.h"
    -#include "version.h"
    +#include <purple.h>
    #include "internal.h"
    #include "zephyr.h"
    --- a/libpurple/tests/test_queued_output_stream.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/tests/test_queued_output_stream.c Fri May 01 04:42:52 2020 -0500
    @@ -23,7 +23,7 @@
    #include <glib.h>
    #include <string.h>
    -#include <queuedoutputstream.h>
    +#include <purple.h>
    static const gsize test_bytes_data_len = 5;
    static const guint8 test_bytes_data[] = "12345";
    --- a/libpurple/tests/test_trie.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/tests/test_trie.c Fri May 01 04:42:52 2020 -0500
    @@ -22,7 +22,7 @@
    #include <glib.h>
    -#include "../trie.h"
    +#include <purple.h>
    static gint find_sum;
    --- a/libpurple/tests/test_util.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/tests/test_util.c Fri May 01 04:42:52 2020 -0500
    @@ -22,7 +22,7 @@
    */
    #include <glib.h>
    -#include "../util.h"
    +#include <purple.h>
    /******************************************************************************
    * base 16 tests
    --- a/libpurple/tests/test_xmlnode.c Fri May 01 03:09:57 2020 -0500
    +++ b/libpurple/tests/test_xmlnode.c Fri May 01 04:42:52 2020 -0500
    @@ -22,7 +22,7 @@
    */
    #include <glib.h>
    -#include "../xmlnode.h"
    +#include <purple.h>
    /*
    * If we really wanted to test the billion laughs attack we would