rewtguy/pidgin

Merged in default (pull request #688)

2020-05-10, Gary Kramlich
1edaee25f763
Parents d0bd0ccdf2a2048bae6f2298
Children 924a47d2652de9838d634d5e190b65759b4c
Merged in default (pull request #688)

Make everything that isn't libpurple itself use the purple.h include

Approved-by: Richard Laager
Approved-by: Elliott Sales de Andrade
242 files changed, 259 insertions(+), 805 deletions(-)
  • +1 -1
    finch/finch.c
  • +1 -1
    finch/gntaccount.h
  • +1 -13
    finch/gntblist.c
  • +2 -1
    finch/gntblist.h
  • +1 -5
    finch/gntconn.c
  • +1 -1
    finch/gntconn.h
  • +1 -5
    finch/gntconv.c
  • +1 -1
    finch/gntconv.h
  • +1 -2
    finch/gntdebug.c
  • +1 -1
    finch/gntdebug.h
  • +1 -2
    finch/gntidle.c
  • +1 -1
    finch/gntidle.h
  • +1 -6
    finch/gntlog.c
  • +2 -2
    finch/gntlog.h
  • +1 -4
    finch/gntmedia.c
  • +1 -1
    finch/gntmenuutil.h
  • +1 -2
    finch/gntnotify.c
  • +1 -1
    finch/gntnotify.h
  • +1 -2
    finch/gntplugin.h
  • +1 -8
    finch/gntpounce.c
  • +1 -1
    finch/gntpounce.h
  • +1 -2
    finch/gntprefs.c
  • +2 -1
    finch/gntrequest.h
  • +0 -2
    finch/gntroomlist.c
  • +1 -1
    finch/gntroomlist.h
  • +1 -5
    finch/gntsound.c
  • +1 -1
    finch/gntsound.h
  • +1 -2
    finch/gntstatus.c
  • +1 -2
    finch/gntstatus.h
  • +1 -1
    finch/gntui.c
  • +1 -6
    finch/gntxfer.c
  • +1 -2
    finch/gntxfer.h
  • +1 -16
    finch/libfinch.c
  • +2 -4
    finch/plugins/gntclipboard.c
  • +1 -7
    finch/plugins/gntgf.c
  • +1 -8
    finch/plugins/gnthistory.c
  • +1 -7
    finch/plugins/gnttinyurl.c
  • +1 -1
    finch/plugins/grouping.c
  • +1 -5
    finch/plugins/lastlog.c
  • +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 -1
    libpurple/protocols/zephyr/ZOpenPort.c
  • +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
  • +1 -1
    pidgin/gtkaccount.h
  • +1 -3
    pidgin/gtkblist-theme-loader.c
  • +2 -1
    pidgin/gtkblist-theme-loader.h
  • +1 -1
    pidgin/gtkblist-theme.h
  • +2 -15
    pidgin/gtkblist.c
  • +2 -1
    pidgin/gtkblist.h
  • +2 -5
    pidgin/gtkconn.c
  • +2 -24
    pidgin/gtkconv.c
  • +2 -1
    pidgin/gtkconv.h
  • +1 -7
    pidgin/gtkdialogs.c
  • +1 -2
    pidgin/gtkdialogs.h
  • +1 -2
    pidgin/gtkicon-theme-loader.c
  • +2 -1
    pidgin/gtkicon-theme-loader.h
  • +2 -1
    pidgin/gtkicon-theme.h
  • +1 -1
    pidgin/gtkidle.c
  • +1 -1
    pidgin/gtkidle.h
  • +2 -6
    pidgin/gtkmedia.c
  • +1 -6
    pidgin/gtknotify.c
  • +1 -2
    pidgin/gtknotify.h
  • +1 -5
    pidgin/gtkpluginpref.c
  • +1 -1
    pidgin/gtkpluginpref.h
  • +1 -8
    pidgin/gtkpounce.c
  • +1 -1
    pidgin/gtkpounce.h
  • +1 -1
    pidgin/gtkprefs.h
  • +1 -4
    pidgin/gtkprivacy.c
  • +1 -1
    pidgin/gtkprivacy.h
  • +1 -1
    pidgin/gtkrequest.h
  • +1 -4
    pidgin/gtkroomlist.c
  • +1 -1
    pidgin/gtkroomlist.h
  • +1 -6
    pidgin/gtksavedstatuses.c
  • +1 -2
    pidgin/gtksavedstatuses.h
  • +1 -5
    pidgin/gtksmiley-manager.c
  • +1 -1
    pidgin/gtksmiley-theme.c
  • +2 -1
    pidgin/gtksmiley-theme.h
  • +1 -7
    pidgin/gtksound.c
  • +1 -1
    pidgin/gtksound.h
  • +1 -8
    pidgin/gtkstatusbox.c
  • +1 -3
    pidgin/gtkstatusbox.h
  • +1 -9
    pidgin/gtkutils.c
  • +2 -3
    pidgin/gtkutils.h
  • +1 -4
    pidgin/gtkwhiteboard.c
  • +1 -5
    pidgin/gtkxfer.c
  • +1 -1
    pidgin/gtkxfer.h
  • +1 -17
    pidgin/libpidgin.c
  • +1 -1
    pidgin/minidialog.c
  • +1 -4
    pidgin/pidgindebug.c
  • +1 -1
    pidgin/pidgindebug.h
  • +1 -6
    pidgin/pidginlog.c
  • +1 -2
    pidgin/pidginlog.h
  • +0 -2
    pidgin/pidginmenutray.c
  • +1 -1
    pidgin/pidginstock.c
  • +1 -1
    pidgin/pidgintalkatu.h
  • +2 -2
    pidgin/pidgintooltip.c
  • +1 -8
    pidgin/plugins/cap/cap.h
  • +1 -1
    pidgin/plugins/cap/cap_statistics.h
  • +3 -3
    pidgin/plugins/contact_priority.c
  • +2 -2
    pidgin/plugins/disco/gtkdisco.c
  • +1 -3
    pidgin/plugins/disco/xmppdisco.c
  • +1 -1
    pidgin/plugins/disco/xmppdisco.h
  • +2 -2
    pidgin/plugins/extplacement.c
  • +1 -4
    pidgin/plugins/gestures/gestures.c
  • +0 -2
    pidgin/plugins/gevolution/add_buddy_dialog.c
  • +0 -2
    pidgin/plugins/gevolution/assoc-buddy.c
  • +0 -1
    pidgin/plugins/gevolution/eds-utils.c
  • +1 -7
    pidgin/plugins/gevolution/gevolution.c
  • +0 -2
    pidgin/plugins/gevolution/new_person_dialog.c
  • +1 -2
    pidgin/plugins/gtk-signals-test.c
  • +1 -2
    pidgin/plugins/gtkbuddynote.c
  • +1 -8
    pidgin/plugins/history.c
  • +1 -3
    pidgin/plugins/iconaway.c
  • +1 -2
    pidgin/plugins/imgupload.c
  • +1 -3
    pidgin/plugins/mailchk.c
  • +1 -5
    pidgin/plugins/musicmessaging/musicmessaging.c
  • +1 -5
    pidgin/plugins/notify.c
  • +0 -2
    pidgin/plugins/pidgininc.c
  • +1 -4
    pidgin/plugins/raw.c
  • +2 -7
    pidgin/plugins/relnot.c
  • +1 -2
    pidgin/plugins/screencap.c
  • +1 -5
    pidgin/plugins/spellchk.c
  • +1 -6
    pidgin/plugins/ticker/ticker.c
  • +1 -3
    pidgin/plugins/transparency.c
  • +1 -3
    pidgin/plugins/unity.c
  • +0 -1
    pidgin/plugins/win32/winprefs/gtkappbar.c
  • +1 -5
    pidgin/plugins/win32/winprefs/winprefs.c
  • +2 -4
    pidgin/plugins/xmppconsole/xmppconsole.c
  • +1 -4
    pidgin/win32/gtkwin32dep.c
  • +2 -1
    pidgin/win32/gtkwin32dep.h
  • +0 -1
    pidgin/win32/untar.c
    • --- a/finch/finch.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/finch.c Sun May 10 13:43:52 2020 +0000
    @@ -21,7 +21,7 @@
    */
    #include "internal.h"
    -#include "core.h"
    +#include <purple.h>
    #include "finch.h"
    #include "gnt.h"
    --- a/finch/gntaccount.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntaccount.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Account API
    */
    -#include "account.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Account API
    --- a/finch/gntblist.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntblist.c Sun May 10 13:43:52 2020 +0000
    @@ -25,19 +25,7 @@
    #include NCURSES_HEADER
    -#include <account.h>
    -#include <action.h>
    -#include <buddylist.h>
    -#include <log.h>
    -#include <notify.h>
    -#include <request.h>
    -#include <plugins.h>
    -#include <savedstatuses.h>
    -#include <server.h>
    -#include <signal.h>
    -#include <status.h>
    -#include <util.h>
    -#include "debug.h"
    +#include <purple.h>
    #include "gntbox.h"
    #include "gntcolors.h"
    --- a/finch/gntblist.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntblist.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,8 @@
    * @title: Buddy List API
    */
    -#include "buddylist.h"
    +#include <purple.h>
    +
    #include "gnt.h"
    #include "gnttree.h"
    --- a/finch/gntconn.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntconn.c Sun May 10 13:43:52 2020 +0000
    @@ -23,11 +23,7 @@
    #include <internal.h>
    #include "finch.h"
    -#include "account.h"
    -#include "core.h"
    -#include "connection.h"
    -#include "debug.h"
    -#include "request.h"
    +#include <purple.h>
    #include "gntaccount.h"
    #include "gntconn.h"
    --- a/finch/gntconn.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntconn.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Connection API
    */
    -#include "connection.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Connection API
    --- a/finch/gntconv.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntconv.c Sun May 10 13:43:52 2020 +0000
    @@ -25,11 +25,7 @@
    #include NCURSES_HEADER
    -#include <cmds.h>
    -#include <core.h>
    -#include <idle.h>
    -#include <prefs.h>
    -#include <util.h>
    +#include <purple.h>
    #include "gntaccount.h"
    #include "gntblist.h"
    --- a/finch/gntconv.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntconv.h Sun May 10 13:43:52 2020 +0000
    @@ -34,7 +34,7 @@
    #include <gntwidget.h>
    #include <gntmenuitem.h>
    -#include "conversation.h"
    +#include <purple.h>
    /* Grabs the conv out of a PurpleConverstation */
    #define FINCH_CONV(conv) ((FinchConv *)purple_conversation_get_ui_data(conv))
    --- a/finch/gntdebug.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntdebug.c Sun May 10 13:43:52 2020 +0000
    @@ -21,6 +21,7 @@
    */
    #include <internal.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gntbox.h>
    @@ -34,8 +35,6 @@
    #include "gntdebug.h"
    #include "finch.h"
    -#include "notify.h"
    -#include "util.h"
    #include <stdio.h>
    #include <string.h>
    --- a/finch/gntdebug.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntdebug.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Debug API
    */
    -#include "debug.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/finch/gntidle.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntidle.c Sun May 10 13:43:52 2020 +0000
    @@ -21,14 +21,13 @@
    */
    #include <internal.h>
    +#include <purple.h>
    #include "finch.h"
    #include "gntidle.h"
    #include "gnt.h"
    #include "gntwm.h"
    -#include "idle.h"
    -
    static time_t
    finch_get_idle_time(void)
    {
    --- a/finch/gntidle.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntidle.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Idle API
    */
    -#include "idle.h"
    +#include <purple.h>
    /**************************************************************************/
    /* GNT Idle API */
    --- a/finch/gntlog.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntlog.c Sun May 10 13:43:52 2020 +0000
    @@ -32,12 +32,7 @@
    #include <gnttree.h>
    #include <gntwindow.h>
    -#include "account.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "request.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntlog.h"
    --- a/finch/gntlog.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntlog.h Sun May 10 13:43:52 2020 +0000
    @@ -30,8 +30,8 @@
    * @title: Log Viewer
    */
    -#include "log.h"
    -#include "account.h"
    +#include <purple.h>
    +
    #include "gntwidget.h"
    typedef struct _FinchLogViewer FinchLogViewer;
    --- a/finch/gntmedia.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntmedia.c Sun May 10 13:43:52 2020 +0000
    @@ -30,10 +30,7 @@
    #include "gntbox.h"
    #include "gntlabel.h"
    -#include "cmds.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "mediamanager.h"
    +#include <purple.h>
    /* An incredibly large part of the following is from gtkmedia.c */
    #ifdef USE_VV
    --- a/finch/gntmenuutil.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntmenuutil.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Menu Utility functions
    */
    -#include <action.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gntmenu.h>
    --- a/finch/gntnotify.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntnotify.c Sun May 10 13:43:52 2020 +0000
    @@ -32,10 +32,9 @@
    #include "finch.h"
    -#include <util.h>
    +#include <purple.h>
    #include "gntnotify.h"
    -#include "debug.h"
    static struct
    {
    --- a/finch/gntnotify.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntnotify.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Notify API
    */
    -#include "notify.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Notify API
    --- a/finch/gntplugin.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntplugin.h Sun May 10 13:43:52 2020 +0000
    @@ -32,8 +32,7 @@
    #include <gnt.h>
    -#include <plugins.h>
    -#include <pluginpref.h>
    +#include <purple.h>
    #include <string.h>
    --- a/finch/gntpounce.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntpounce.c Sun May 10 13:43:52 2020 +0000
    @@ -37,14 +37,7 @@
    #include "finch.h"
    -#include "account.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "server.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntpounce.h"
    --- a/finch/gntpounce.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntpounce.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Buddy Pounce API
    */
    -#include "pounce.h"
    +#include <purple.h>
    /**
    * finch_pounce_editor_show:
    --- a/finch/gntprefs.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntprefs.c Sun May 10 13:43:52 2020 +0000
    @@ -23,8 +23,7 @@
    #include "finch.h"
    #include <internal.h>
    -#include <prefs.h>
    -#include <savedstatuses.h>
    +#include <purple.h>
    #include "gntprefs.h"
    #include "gntrequest.h"
    --- a/finch/gntrequest.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntrequest.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,8 @@
    * @title: Request API
    */
    -#include "request.h"
    +#include <purple.h>
    +
    #include "gnt.h"
    /**********************************************************************
    --- a/finch/gntroomlist.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntroomlist.c Sun May 10 13:43:52 2020 +0000
    @@ -33,8 +33,6 @@
    #include "gnttree.h"
    #include "gntwindow.h"
    -#include "debug.h"
    -
    #define PREF_ROOT "/finch/roomlist"
    --- a/finch/gntroomlist.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntroomlist.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Room List API
    */
    -#include "roomlist.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Room List API
    --- a/finch/gntsound.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntsound.c Sun May 10 13:43:52 2020 +0000
    @@ -34,11 +34,7 @@
    #include <gst/gst.h>
    #endif /* USE_GSTREAMER */
    -#include "debug.h"
    -#include "notify.h"
    -#include "prefs.h"
    -#include "sound.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntconv.h"
    --- a/finch/gntsound.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntsound.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,7 @@
    * @title: Sound API
    */
    -#include "sound.h"
    +#include <purple.h>
    /**********************************************************************/
    /* GNT Sound API */
    --- a/finch/gntstatus.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntstatus.c Sun May 10 13:43:52 2020 +0000
    @@ -34,8 +34,7 @@
    #include "finch.h"
    -#include <notify.h>
    -#include <request.h>
    +#include <purple.h>
    #include "gntstatus.h"
    --- a/finch/gntstatus.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntstatus.h Sun May 10 13:43:52 2020 +0000
    @@ -30,8 +30,7 @@
    * @title: Status API
    */
    -#include <status.h>
    -#include <savedstatuses.h>
    +#include <purple.h>
    /**********************************************************************
    * GNT BuddyList API
    --- a/finch/gntui.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntui.c Sun May 10 13:43:52 2020 +0000
    @@ -42,7 +42,7 @@
    #include "gntstatus.h"
    #include "gntsound.h"
    -#include <prefs.h>
    +#include <purple.h>
    void finch_ui_init()
    {
    --- a/finch/gntxfer.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntxfer.c Sun May 10 13:43:52 2020 +0000
    @@ -30,14 +30,9 @@
    #include <gntlabel.h>
    #include <gnttree.h>
    -#include "debug.h"
    -#include "notify.h"
    -#include "xfer.h"
    -#include "protocol.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntxfer.h"
    -#include "prefs.h"
    typedef struct
    {
    --- a/finch/gntxfer.h Mon May 04 06:03:00 2020 +0000
    +++ b/finch/gntxfer.h Sun May 10 13:43:52 2020 +0000
    @@ -30,8 +30,7 @@
    * @title: File Transfer UI
    */
    -#include "xfer.h"
    -
    +#include <purple.h>
    /**************************************************************************/
    /* GNT File Transfer Dialog API */
    --- a/finch/libfinch.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/libfinch.c Sun May 10 13:43:52 2020 +0000
    @@ -24,22 +24,7 @@
    #include <locale.h>
    #include "finch.h"
    -#include "account.h"
    -#include "conversation.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "options.h"
    -#include "plugins.h"
    -#include "protocol.h"
    -#include "pounce.h"
    -#include "savedstatuses.h"
    -#include "sound.h"
    -#include "status.h"
    -#include "util.h"
    -#include "whiteboard.h"
    -#include "xfer.h"
    +#include <purple.h>
    #include "gntdebug.h"
    #include "gntprefs.h"
    --- a/finch/plugins/gntclipboard.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/plugins/gntclipboard.c Sun May 10 13:43:52 2020 +0000
    @@ -34,10 +34,8 @@
    #include <glib.h>
    -#include <plugins.h>
    -#include <version.h>
    -#include <debug.h>
    -#include <notify.h>
    +#include <purple.h>
    +
    #include <gnt.h>
    #include <gntwm.h>
    --- a/finch/plugins/gntgf.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/plugins/gntgf.c Sun May 10 13:43:52 2020 +0000
    @@ -41,13 +41,7 @@
    #include <glib.h>
    -#include <plugins.h>
    -#include <version.h>
    -#include <buddylist.h>
    -#include <conversation.h>
    -#include <debug.h>
    -#include <eventloop.h>
    -#include <util.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gntbox.h>
    --- a/finch/plugins/gnthistory.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/plugins/gnthistory.c Sun May 10 13:43:52 2020 +0000
    @@ -20,14 +20,7 @@
    #include "internal.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "request.h"
    -#include "prefs.h"
    -#include "signals.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gntconv.h"
    #include "gntplugin.h"
    --- a/finch/plugins/gnttinyurl.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/plugins/gnttinyurl.c Sun May 10 13:43:52 2020 +0000
    @@ -25,16 +25,10 @@
    #define PREF_LENGTH PREFS_BASE "/length"
    #define PREF_URL PREFS_BASE "/url"
    -#include <conversation.h>
    -#include <signals.h>
    +#include <purple.h>
    #include <glib.h>
    -#include <plugins.h>
    -#include <version.h>
    -#include <debug.h>
    -#include <notify.h>
    -
    #include <gntconv.h>
    #include <gntplugin.h>
    --- a/finch/plugins/grouping.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/plugins/grouping.c Sun May 10 13:43:52 2020 +0000
    @@ -16,7 +16,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
    */
    #include "internal.h"
    -#include "purple.h"
    +#include <purple.h>
    #include "gntblist.h"
    #include "gntplugin.h"
    --- a/finch/plugins/lastlog.c Mon May 04 06:03:00 2020 +0000
    +++ b/finch/plugins/lastlog.c Sun May 10 13:43:52 2020 +0000
    @@ -19,11 +19,7 @@
    #define PLUGIN_STATIC_NAME GntLastlog
    #include "internal.h"
    -
    -#include <plugins.h>
    -#include <version.h>
    -
    -#include <cmds.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gnttextview.h>
    --- a/libpurple/plugins/keyrings/kwallet/purplekwallet.h Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/api.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/data.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/data.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/facebook.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/mqtt.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/mqtt.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/util.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/facebook/util.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/account.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/avatar.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/blist.c Sun May 10 13:43:52 2020 +0000
    @@ -22,7 +22,6 @@
    #include <libgadu.h>
    -#include <debug.h>
    #include "gg.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/blist.h Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/blist.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/chat.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/edisc.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/gg.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/html.c Sun May 10 13:43:52 2020 +0000
    @@ -27,8 +27,6 @@
    */
    #include "html.h"
    -#include <debug.h>
    -
    typedef struct
    {
    GRegex *re_html_attr;
    --- a/libpurple/protocols/gg/image-prpl.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/image-prpl.c Sun May 10 13:43:52 2020 +0000
    @@ -29,8 +29,6 @@
    #include "image-prpl.h"
    -#include <debug.h>
    -
    #include "gg.h"
    #include "utils.h"
    --- a/libpurple/protocols/gg/libgadu-events.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/libgadu-events.c Sun May 10 13:43:52 2020 +0000
    @@ -29,8 +29,6 @@
    #include "libgadu-events.h"
    -#include <debug.h>
    -
    #include "avatar.h"
    #include "edisc.h"
    --- a/libpurple/protocols/gg/libgaduw.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/libgaduw.c Sun May 10 13:43:52 2020 +0000
    @@ -29,8 +29,6 @@
    #include "libgaduw.h"
    -#include <debug.h>
    -
    #include "purplew.h"
    #include "gg.h"
    --- a/libpurple/protocols/gg/message-prpl.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/message-prpl.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/multilogon.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/oauth/oauth-purple.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/pubdir-prpl.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/purplew.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/resolver-purple.c Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,6 @@
    */
    #include <internal.h>
    -#include <debug.h>
    #include <libgadu.h>
    #include "resolver-purple.h"
    --- a/libpurple/protocols/gg/roster.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/roster.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/servconn.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/servconn.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/status.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/tcpsocket.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/utils.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/validator.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/xml.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/gg/xml.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/adhoccommands.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/auth.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/auth.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/auth_cyrus.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/auth_digest_md5.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/auth_plain.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/auth_scram.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/auth_webex.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/bosh.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/buddy.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/buddy.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/caps.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/chat.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/chat.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/data.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/data.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/disco.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/gmail.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/google.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/google_p2p.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/google_presence.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/google_presence.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/google_roster.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/google_session.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/jingleinfo.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/google/relay.c Sun May 10 13:43:52 2020 +0000
    @@ -19,7 +19,7 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "relay.h"
    --- a/libpurple/protocols/jabber/ibb.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/ibb.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/iq.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jabber.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jabber.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/content.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/iceudp.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/jingle.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/rawudp.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/rtp.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/session.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jingle/transport.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/jutil.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/message.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/message.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/oob.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/parser.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/ping.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/ping.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/presence.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/presence.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/roster.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/si.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/tests/test_jabber_caps.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/tests/test_jabber_digest_md5.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/tests/test_jabber_jutil.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/tests/test_jabber_scram.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/useravatar.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/useravatar.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/usermood.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/usernick.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/usertune.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/xdata.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/jabber/xdata.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/novell/nmconn.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/novell/nmcontact.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/novell/nmrtf.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/novell/nmuser.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/novell/nmuser.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/novell/novell.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/novell/novell.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/sametime/im_mime.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/sametime/sametime.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/sametime/tests/test_sametime_im_mime.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/silc/ops.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/silc/silc.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/silc/silcpurple.h Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/silc/util.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/silc/wb.h Sun May 10 13:43:52 2020 +0000
    @@ -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/ZOpenPort.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/zephyr/ZOpenPort.c Sun May 10 13:43:52 2020 +0000
    @@ -9,7 +9,7 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    #ifdef WIN32
    #include <winsock2.h>
    #else
    --- a/libpurple/protocols/zephyr/zephyr.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/protocols/zephyr/zephyr.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/tests/test_queued_output_stream.c Sun May 10 13:43:52 2020 +0000
    @@ -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 Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/tests/test_trie.c Sun May 10 13:43:52 2020 +0000
    @@ -22,7 +22,7 @@
    #include <glib.h>
    -#include "../trie.h"
    +#include <purple.h>
    static gint find_sum;
    --- a/libpurple/tests/test_util.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/tests/test_util.c Sun May 10 13:43:52 2020 +0000
    @@ -22,7 +22,7 @@
    */
    #include <glib.h>
    -#include "../util.h"
    +#include <purple.h>
    /******************************************************************************
    * base 16 tests
    --- a/libpurple/tests/test_xmlnode.c Mon May 04 06:03:00 2020 +0000
    +++ b/libpurple/tests/test_xmlnode.c Sun May 10 13:43:52 2020 +0000
    @@ -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
    --- a/pidgin/gtkaccount.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkaccount.h Sun May 10 13:43:52 2020 +0000
    @@ -29,7 +29,7 @@
    * @see_also: <link linkend="chapter-signals-gtkaccount">Account signals</link>
    */
    -#include "accounts.h"
    +#include <purple.h>
    typedef enum
    {
    --- a/pidgin/gtkblist-theme-loader.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkblist-theme-loader.c Sun May 10 13:43:52 2020 +0000
    @@ -25,9 +25,7 @@
    #include <stdlib.h>
    #include <string.h>
    -#include "xmlnode.h"
    -#include "debug.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkblist-theme-loader.h"
    #include "gtkblist-theme.h"
    --- a/pidgin/gtkblist-theme-loader.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkblist-theme-loader.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,8 @@
    #include <glib.h>
    #include <glib-object.h>
    -#include "theme-loader.h"
    +
    +#include <purple.h>
    #define PIDGIN_TYPE_BLIST_THEME_LOADER pidgin_blist_theme_loader_get_type()
    --- a/pidgin/gtkblist-theme.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkblist-theme.h Sun May 10 13:43:52 2020 +0000
    @@ -32,7 +32,7 @@
    #include <glib-object.h>
    #include <gtk/gtk.h>
    -#include "theme.h"
    +#include <purple.h>
    #define PIDGIN_TYPE_BLIST_THEME (pidgin_blist_theme_get_type ())
    --- a/pidgin/gtkblist.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkblist.c Sun May 10 13:43:52 2020 +0000
    @@ -22,21 +22,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "account.h"
    -#include "action.h"
    -#include "connection.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "prefs.h"
    -#include "plugins.h"
    -#include "request.h"
    -#include "signals.h"
    -#include "pidginstock.h"
    -#include "theme-loader.h"
    -#include "theme-manager.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkaccount.h"
    #include "gtkblist.h"
    @@ -65,6 +51,7 @@
    #include "pidgin/pidginpluginsdialog.h"
    #include "pidgin/pidgintooltip.h"
    #include "pidginmenutray.h"
    +#include "pidginstock.h"
    #include <gdk/gdkkeysyms.h>
    #include <gtk/gtk.h>
    --- a/pidgin/gtkblist.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkblist.h Sun May 10 13:43:52 2020 +0000
    @@ -61,8 +61,9 @@
    } PidginStatusIconSize;
    +#include <purple.h>
    +
    #include "pidgin.h"
    -#include "buddylist.h"
    #include "gtkblist-theme.h"
    /**************************************************************************
    --- a/pidgin/gtkconn.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkconn.c Sun May 10 13:43:52 2020 +0000
    @@ -21,17 +21,14 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "account.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "prefs.h"
    +#include <purple.h>
    +
    #include "gtkblist.h"
    #include "gtkconn.h"
    #include "gtkdialogs.h"
    #include "gtkstatusbox.h"
    #include "pidginstock.h"
    #include "gtkutils.h"
    -#include "util.h"
    #define INITIAL_RECON_DELAY_MIN 8000
    #define INITIAL_RECON_DELAY_MAX 60000
    --- a/pidgin/gtkconv.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkconv.c Sun May 10 13:43:52 2020 +0000
    @@ -31,22 +31,7 @@
    #include <talkatu.h>
    -#include "account.h"
    -#include "attention.h"
    -#include "action.h"
    -#include "cmds.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "idle.h"
    -#include "image-store.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "plugins.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "smiley-parser.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkinternal.h"
    #include "gtkdnd-hints.h"
    @@ -6803,14 +6788,7 @@
    #include <gdk/gdkkeysyms.h>
    -#include "account.h"
    -#include "cmds.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkdnd-hints.h"
    #include "gtkblist.h"
    --- a/pidgin/gtkconv.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkconv.h Sun May 10 13:43:52 2020 +0000
    @@ -73,8 +73,9 @@
    (purple_conversation_get_ui_ops(conv) == \
    pidgin_conversations_get_conv_ui_ops())
    +#include <purple.h>
    +
    #include "pidgin.h"
    -#include "conversation.h"
    #include "gtkconvwin.h"
    /**************************************************************************
    --- a/pidgin/gtkdialogs.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkdialogs.c Sun May 10 13:43:52 2020 +0000
    @@ -28,13 +28,7 @@
    #include "meson-config.h"
    #endif
    -#include "debug.h"
    -#include "notify.h"
    -#include "plugins.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "util.h"
    -#include "core.h"
    +#include <purple.h>
    #include "gtkblist.h"
    #include "gtkdialogs.h"
    --- a/pidgin/gtkdialogs.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkdialogs.h Sun May 10 13:43:52 2020 +0000
    @@ -30,8 +30,7 @@
    #include "pidgin.h"
    -#include "account.h"
    -#include "conversation.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkicon-theme-loader.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkicon-theme-loader.c Sun May 10 13:43:52 2020 +0000
    @@ -23,8 +23,7 @@
    #include "gtkicon-theme-loader.h"
    #include "gtkstatus-icon-theme.h"
    -#include "xmlnode.h"
    -#include "debug.h"
    +#include <purple.h>
    /**
    * PidginIconThemeLoader:
    --- a/pidgin/gtkicon-theme-loader.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkicon-theme-loader.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,8 @@
    #include <glib.h>
    #include <glib-object.h>
    -#include "theme-loader.h"
    +
    +#include <purple.h>
    #define PIDGIN_TYPE_ICON_THEME_LOADER pidgin_icon_theme_loader_get_type()
    --- a/pidgin/gtkicon-theme.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkicon-theme.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,8 @@
    #include <glib.h>
    #include <glib-object.h>
    -#include "theme.h"
    +
    +#include <purple.h>
    #define PIDGIN_TYPE_ICON_THEME pidgin_icon_theme_get_type()
    --- a/pidgin/gtkidle.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkidle.c Sun May 10 13:43:52 2020 +0000
    @@ -40,7 +40,7 @@
    # include "win32/gtkwin32dep.h"
    #endif
    -#include "idle.h"
    +#include <purple.h>
    #if !defined(HAVE_IOKIT) && !defined(_WIN32)
    typedef struct {
    --- a/pidgin/gtkidle.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkidle.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: Idle API
    */
    -#include "idle.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkmedia.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkmedia.c Sun May 10 13:43:52 2020 +0000
    @@ -20,13 +20,9 @@
    */
    #include "internal.h"
    -#include "debug.h"
    -#include "connection.h"
    -#include "media.h"
    -#include "mediamanager.h"
    +#include <purple.h>
    +
    #include "pidgin.h"
    -#include "request.h"
    -
    #include "gtkmedia.h"
    #include "gtkutils.h"
    #include "pidginstock.h"
    --- a/pidgin/gtknotify.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtknotify.c Sun May 10 13:43:52 2020 +0000
    @@ -24,14 +24,9 @@
    #include "internal.h"
    #include "pidgin.h"
    +#include <purple.h>
    -#include "account.h"
    -#include "connection.h"
    -#include "debug.h"
    -#include "prefs.h"
    #include "pidginstock.h"
    -#include "util.h"
    -
    #include "gtkblist.h"
    #include "gtknotify.h"
    #include "gtkpounce.h"
    --- a/pidgin/gtknotify.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtknotify.h Sun May 10 13:43:52 2020 +0000
    @@ -28,8 +28,7 @@
    * @title: Notification API
    */
    -#include "notify.h"
    -#include "pounce.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkpluginpref.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkpluginpref.c Sun May 10 13:43:52 2020 +0000
    @@ -24,11 +24,7 @@
    # include <config.h>
    #endif
    -#include "debug.h"
    -#include "internal.h"
    -#include "pidgin.h"
    -#include "pluginpref.h"
    -#include "prefs.h"
    +#include <purple.h>
    #include "gtkpluginpref.h"
    #include "gtkprefs.h"
    --- a/pidgin/gtkpluginpref.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkpluginpref.h Sun May 10 13:43:52 2020 +0000
    @@ -29,7 +29,7 @@
    * @title: Plugin Preferences
    */
    -#include "pluginpref.h"
    +#include <purple.h>
    #include "pidgin.h"
    --- a/pidgin/gtkpounce.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkpounce.c Sun May 10 13:43:52 2020 +0000
    @@ -24,14 +24,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "account.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "server.h"
    -#include "sound.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkblist.h"
    #include "gtkdialogs.h"
    --- a/pidgin/gtkpounce.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkpounce.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: Buddy Pounce API
    */
    -#include "pounce.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkprefs.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkprefs.h Sun May 10 13:43:52 2020 +0000
    @@ -29,7 +29,7 @@
    * @title: Preferences
    */
    -#include "prefs.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkprivacy.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkprivacy.c Sun May 10 13:43:52 2020 +0000
    @@ -21,10 +21,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "connection.h"
    -#include "debug.h"
    -#include "request.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkaccount.h"
    #include "gtkblist.h"
    --- a/pidgin/gtkprivacy.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkprivacy.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: Privacy UI
    */
    -#include "account.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkrequest.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkrequest.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: Request API
    */
    -#include "request.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkroomlist.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkroomlist.c Sun May 10 13:43:52 2020 +0000
    @@ -26,10 +26,7 @@
    #include "pidginstock.h"
    #include "pidgintooltip.h"
    -#include "debug.h"
    -#include "account.h"
    -#include "connection.h"
    -#include "notify.h"
    +#include <purple.h>
    #include "gtkroomlist.h"
    --- a/pidgin/gtkroomlist.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkroomlist.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: Room List UI
    */
    -#include "roomlist.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtksavedstatuses.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtksavedstatuses.c Sun May 10 13:43:52 2020 +0000
    @@ -23,12 +23,7 @@
    #include "internal.h"
    -#include "account.h"
    -#include "notify.h"
    -#include "request.h"
    -#include "savedstatuses.h"
    -#include "status.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkblist.h"
    #include "pidgin.h"
    --- a/pidgin/gtksavedstatuses.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtksavedstatuses.h Sun May 10 13:43:52 2020 +0000
    @@ -28,8 +28,7 @@
    * @title: Saved Status Editor UI
    */
    -#include "savedstatuses.h"
    -#include "status.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtksmiley-manager.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtksmiley-manager.c Sun May 10 13:43:52 2020 +0000
    @@ -22,11 +22,7 @@
    #include "internal.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "smiley.h"
    -#include "smiley-custom.h"
    -#include "smiley-list.h"
    +#include <purple.h>
    #include "gtksmiley-manager.h"
    #include "gtkutils.h"
    --- a/pidgin/gtksmiley-theme.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtksmiley-theme.c Sun May 10 13:43:52 2020 +0000
    @@ -23,7 +23,7 @@
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "gtkutils.h"
    --- a/pidgin/gtksmiley-theme.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtksmiley-theme.h Sun May 10 13:43:52 2020 +0000
    @@ -34,7 +34,8 @@
    #include <glib-object.h>
    #include <gdk-pixbuf/gdk-pixbuf.h>
    -#include "conversation.h"
    +#include <purple.h>
    +
    #include "smiley-theme.h"
    G_BEGIN_DECLS
    --- a/pidgin/gtksound.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtksound.c Sun May 10 13:43:52 2020 +0000
    @@ -31,13 +31,7 @@
    # include <gst/gst.h>
    #endif /* USE_GSTREAMER */
    -#include "debug.h"
    -#include "notify.h"
    -#include "prefs.h"
    -#include "sound.h"
    -#include "sound-theme.h"
    -#include "theme-manager.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtksound.h"
    --- a/pidgin/gtksound.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtksound.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: Sound API
    */
    -#include "sound.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkstatusbox.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkstatusbox.c Sun May 10 13:43:52 2020 +0000
    @@ -39,14 +39,7 @@
    #include "internal.h"
    -#include "account.h"
    -#include "buddyicon.h"
    -#include "core.h"
    -#include "network.h"
    -#include "request.h"
    -#include "savedstatuses.h"
    -#include "status.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "pidgin.h"
    #include "gtksavedstatuses.h"
    --- a/pidgin/gtkstatusbox.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkstatusbox.h Sun May 10 13:43:52 2020 +0000
    @@ -32,9 +32,7 @@
    #include <talkatu.h>
    -#include "account.h"
    -#include "savedstatuses.h"
    -#include "status.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkutils.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkutils.c Sun May 10 13:43:52 2020 +0000
    @@ -32,15 +32,7 @@
    #include <talkatu.h>
    -#include "conversation.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "prefs.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "signals.h"
    -#include "sound.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkaccount.h"
    #include "gtkprefs.h"
    --- a/pidgin/gtkutils.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkutils.h Sun May 10 13:43:52 2020 +0000
    @@ -30,9 +30,8 @@
    #include "gtkconv.h"
    #include "pidgin.h"
    -#include "action.h"
    -#include "protocol.h"
    -#include "util.h"
    +
    +#include <purple.h>
    typedef enum
    {
    --- a/pidgin/gtkwhiteboard.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkwhiteboard.c Sun May 10 13:43:52 2020 +0000
    @@ -22,10 +22,7 @@
    */
    #include "internal.h"
    -#include "buddylist.h"
    -#include "debug.h"
    -#include "pidgin.h"
    -#include "whiteboard.h"
    +#include <purple.h>
    #include "gtkwhiteboard.h"
    #include "gtkutils.h"
    --- a/pidgin/gtkxfer.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkxfer.c Sun May 10 13:43:52 2020 +0000
    @@ -21,11 +21,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "xfer.h"
    -#include "protocol.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkxfer.h"
    #include "prefs.h"
    --- a/pidgin/gtkxfer.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/gtkxfer.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: File Transfer UI
    */
    -#include "xfer.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/libpidgin.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/libpidgin.c Sun May 10 13:43:52 2020 +0000
    @@ -25,23 +25,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "account.h"
    -#include "conversation.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "glibcompat.h" /* for purple_g_stat on win32 */
    -#include "log.h"
    -#include "network.h"
    -#include "notify.h"
    -#include "options.h"
    -#include "prefs.h"
    -#include "protocol.h"
    -#include "pounce.h"
    -#include "sound.h"
    -#include "status.h"
    -#include "util.h"
    -#include "whiteboard.h"
    -#include "xfer.h"
    +#include <purple.h>
    #include "gtkaccount.h"
    #include "gtkblist.h"
    --- a/pidgin/minidialog.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/minidialog.c Sun May 10 13:43:52 2020 +0000
    @@ -23,7 +23,7 @@
    #include <gtk/gtk.h>
    -#include "libpurple/prefs.h"
    +#include <purple.h>
    #include "pidgin/minidialog.h"
    #include "pidgin/pidgin.h"
    --- a/pidgin/pidgindebug.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidgindebug.c Sun May 10 13:43:52 2020 +0000
    @@ -21,10 +21,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "notify.h"
    -#include "prefs.h"
    -#include "request.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gtkdialogs.h"
    #include "gtkutils.h"
    --- a/pidgin/pidgindebug.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidgindebug.h Sun May 10 13:43:52 2020 +0000
    @@ -28,7 +28,7 @@
    * @title: Debug API
    */
    -#include "debug.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/pidginlog.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidginlog.c Sun May 10 13:43:52 2020 +0000
    @@ -23,12 +23,7 @@
    #include <talkatu.h>
    -#include "account.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "request.h"
    -#include "util.h"
    +#include <purple.h>
    #include "pidginstock.h"
    #include "gtkblist.h"
    --- a/pidgin/pidginlog.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidginlog.h Sun May 10 13:43:52 2020 +0000
    @@ -30,9 +30,8 @@
    */
    #include "pidgin.h"
    -#include "log.h"
    -#include "account.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/pidginmenutray.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidginmenutray.c Sun May 10 13:43:52 2020 +0000
    @@ -19,8 +19,6 @@
    */
    #include "internal.h"
    -#include "debug.h"
    -
    #include "pidginmenutray.h"
    struct _PidginMenuTray {
    --- a/pidgin/pidginstock.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidginstock.c Sun May 10 13:43:52 2020 +0000
    @@ -21,7 +21,7 @@
    */
    #include "internal.h"
    #include "pidgin.h"
    -#include "prefs.h"
    +#include <purple.h>
    #include "gtkicon-theme-loader.h"
    #include "theme-manager.h"
    --- a/pidgin/pidgintalkatu.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidgintalkatu.h Sun May 10 13:43:52 2020 +0000
    @@ -33,7 +33,7 @@
    #include <talkatu.h>
    -#include "connection.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/pidgintooltip.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/pidgintooltip.c Sun May 10 13:43:52 2020 +0000
    @@ -20,10 +20,10 @@
    */
    #include "internal.h"
    -#include "prefs.h"
    +#include <purple.h>
    +
    #include "pidgin.h"
    #include "pidgintooltip.h"
    -#include "debug.h"
    static gboolean enable_tooltips;
    static int tooltip_delay = -1;
    --- a/pidgin/plugins/cap/cap.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/cap/cap.h Sun May 10 13:43:52 2020 +0000
    @@ -25,20 +25,13 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "conversation.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtkblist.h"
    #include "gtkplugin.h"
    #include "gtkutils.h"
    -#include "buddylist.h"
    -#include "notify.h"
    -#include "version.h"
    -#include "debug.h"
    -
    -#include "util.h"
    -
    #include <glib.h>
    #include <time.h>
    #include <sqlite3.h>
    --- a/pidgin/plugins/cap/cap_statistics.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/cap/cap_statistics.h Sun May 10 13:43:52 2020 +0000
    @@ -22,7 +22,7 @@
    #ifndef _CAP_STATISTICS_H_
    #define _CAP_STATISTICS_H_
    -#include "buddylist.h"
    +#include <purple.h>
    #include <gdk/gdk.h>
    #include <glib.h>
    #include <time.h>
    --- a/pidgin/plugins/contact_priority.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/contact_priority.c Sun May 10 13:43:52 2020 +0000
    @@ -22,10 +22,10 @@
    #include "pidgin.h"
    #include "gtkutils.h"
    #include "pidginplugininfo.h"
    -#include "prefs.h"
    -#include "version.h"
    +#include "pidginaccountchooser.h"
    -#include "pidginaccountchooser.h"
    +#include <purple.h>
    +
    #define CONTACT_PRIORITY_PLUGIN_ID "gtk-contact-priority"
    --- a/pidgin/plugins/disco/gtkdisco.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/disco/gtkdisco.c Sun May 10 13:43:52 2020 +0000
    @@ -25,10 +25,10 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "gtkutils.h"
    #include "pidgin.h"
    -#include "request.h"
    #include "pidginaccountchooser.h"
    #include "pidgintooltip.h"
    --- a/pidgin/plugins/disco/xmppdisco.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/disco/xmppdisco.c Sun May 10 13:43:52 2020 +0000
    @@ -39,9 +39,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "debug.h"
    -#include "signals.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "pidginplugininfo.h"
    --- a/pidgin/plugins/disco/xmppdisco.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/disco/xmppdisco.h Sun May 10 13:43:52 2020 +0000
    @@ -35,7 +35,7 @@
    #define PLUGIN_ID "gtk-xmppdisco"
    #define PLUGIN_DOMAIN (g_quark_from_static_string(PLUGIN_ID))
    -#include "plugins.h"
    +#include <purple.h>
    extern PurplePlugin *my_plugin;
    /**
    --- a/pidgin/plugins/extplacement.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/extplacement.c Sun May 10 13:43:52 2020 +0000
    @@ -22,8 +22,8 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "conversation.h"
    -#include "version.h"
    +#include <purple.h>
    +
    #include "pidginplugininfo.h"
    #include "gtkconv.h"
    #include "gtkconvwin.h"
    --- a/pidgin/plugins/gestures/gestures.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gestures/gestures.c Sun May 10 13:43:52 2020 +0000
    @@ -21,10 +21,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "debug.h"
    -#include "prefs.h"
    -#include "signals.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtkplugin.h"
    --- a/pidgin/plugins/gevolution/add_buddy_dialog.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Sun May 10 13:43:52 2020 +0000
    @@ -24,8 +24,6 @@
    #include "gtkutils.h"
    -#include "debug.h"
    -
    #include "gevolution.h"
    #include <stdlib.h>
    --- a/pidgin/plugins/gevolution/assoc-buddy.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gevolution/assoc-buddy.c Sun May 10 13:43:52 2020 +0000
    @@ -24,8 +24,6 @@
    #include "gtkutils.h"
    -#include "debug.h"
    -
    #include "gevolution.h"
    #include <stdlib.h>
    --- a/pidgin/plugins/gevolution/eds-utils.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gevolution/eds-utils.c Sun May 10 13:43:52 2020 +0000
    @@ -24,7 +24,6 @@
    #include "pidgin.h"
    #include "gtkutils.h"
    -#include "debug.h"
    #include "gevolution.h"
    GtkTreeModel *
    --- a/pidgin/plugins/gevolution/gevolution.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gevolution/gevolution.c Sun May 10 13:43:52 2020 +0000
    @@ -21,13 +21,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "connection.h"
    -#include "debug.h"
    -#include "prefs.h"
    -#include "notify.h"
    -#include "signals.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkblist.h"
    #include "gtkconv.h"
    --- a/pidgin/plugins/gevolution/new_person_dialog.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gevolution/new_person_dialog.c Sun May 10 13:43:52 2020 +0000
    @@ -24,8 +24,6 @@
    #include "gtkutils.h"
    #include "pidginaccountchooser.h"
    -#include "debug.h"
    -
    #include "gevolution.h"
    static GtkWidget *
    --- a/pidgin/plugins/gtk-signals-test.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gtk-signals-test.c Sun May 10 13:43:52 2020 +0000
    @@ -24,8 +24,7 @@
    #include <gtk/gtk.h>
    -#include "debug.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkaccount.h"
    #include "gtkblist.h"
    --- a/pidgin/plugins/gtkbuddynote.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/gtkbuddynote.c Sun May 10 13:43:52 2020 +0000
    @@ -21,8 +21,7 @@
    #include <gtkblist.h>
    #include <pidginplugininfo.h>
    -#include <debug.h>
    -#include <version.h>
    +#include <purple.h>
    static void
    append_to_tooltip(PurpleBlistNode *node, GString *text, gboolean full)
    --- a/pidgin/plugins/history.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/history.c Sun May 10 13:43:52 2020 +0000
    @@ -4,14 +4,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "prefs.h"
    -#include "signals.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtkplugin.h"
    --- a/pidgin/plugins/iconaway.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/iconaway.c Sun May 10 13:43:52 2020 +0000
    @@ -21,9 +21,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "conversation.h"
    -#include "signals.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "pidginplugininfo.h"
    --- a/pidgin/plugins/imgupload.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/imgupload.c Sun May 10 13:43:52 2020 +0000
    @@ -21,8 +21,7 @@
    #include "internal.h"
    -#include "debug.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtkplugin.h"
    --- a/pidgin/plugins/mailchk.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/mailchk.c Sun May 10 13:43:52 2020 +0000
    @@ -1,8 +1,6 @@
    #include "internal.h"
    -#include "debug.h"
    -#include "sound.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkblist.h"
    #include "gtkplugin.h"
    --- a/pidgin/plugins/musicmessaging/musicmessaging.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Sun May 10 13:43:52 2020 +0000
    @@ -26,16 +26,12 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "conversation.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtkplugin.h"
    #include "gtkutils.h"
    -#include "notify.h"
    -#include "version.h"
    -#include "debug.h"
    -
    #define DBUS_API_SUBJECT_TO_CHANGE
    #include <dbus/dbus.h>
    #include "dbus-maybe.h"
    --- a/pidgin/plugins/notify.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/notify.c Sun May 10 13:43:52 2020 +0000
    @@ -87,11 +87,7 @@
    #include "pidgin.h"
    #include "gtkprefs.h"
    -#include "conversation.h"
    -#include "prefs.h"
    -#include "signals.h"
    -#include "version.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "gtkplugin.h"
    #include "gtkutils.h"
    --- a/pidgin/plugins/pidgininc.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/pidgininc.c Sun May 10 13:43:52 2020 +0000
    @@ -2,8 +2,6 @@
    * included below. This file is for internal libpurple use only. We're including
    * it here for our own convenience. */
    #include "internal.h"
    -
    -/* This file includes all the libpurple headers */
    #include <purple.h>
    /* include UI for pidgin_dialogs_about() */
    --- a/pidgin/plugins/raw.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/raw.c Sun May 10 13:43:52 2020 +0000
    @@ -24,10 +24,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "protocol.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkplugin.h"
    #include "gtkutils.h"
    --- a/pidgin/plugins/relnot.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/relnot.c Sun May 10 13:43:52 2020 +0000
    @@ -28,17 +28,12 @@
    #include <libsoup/soup.h>
    #include <string.h>
    -#include "connection.h"
    -#include "core.h"
    -#include "debug.h"
    +#include <purple.h>
    +
    #include "gtkblist.h"
    #include "gtkutils.h"
    -#include "notify.h"
    #include "pidginicon.h"
    #include "pidginplugininfo.h"
    -#include "prefs.h"
    -#include "util.h"
    -#include "version.h"
    #include "pidgin.h"
    --- a/pidgin/plugins/screencap.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/screencap.c Sun May 10 13:43:52 2020 +0000
    @@ -23,8 +23,7 @@
    #include <gdk/gdkkeysyms.h>
    -#include "debug.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtkplugin.h"
    --- a/pidgin/plugins/spellchk.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/spellchk.c Sun May 10 13:43:52 2020 +0000
    @@ -33,11 +33,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "signals.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkplugin.h"
    #include "gtkprefs.h"
    --- a/pidgin/plugins/ticker/ticker.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/ticker/ticker.c Sun May 10 13:43:52 2020 +0000
    @@ -27,12 +27,7 @@
    #include "internal.h"
    #include "pidgin.h"
    -#include "buddylist.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "protocol.h"
    -#include "signals.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkblist.h"
    #include "gtkutils.h"
    --- a/pidgin/plugins/transparency.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/transparency.c Sun May 10 13:43:52 2020 +0000
    @@ -23,9 +23,7 @@
    */
    #include "internal.h"
    -#include "core.h"
    -#include "prefs.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "gtkconv.h"
    #include "gtkplugin.h"
    --- a/pidgin/plugins/unity.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/unity.c Sun May 10 13:43:52 2020 +0000
    @@ -17,9 +17,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    #include "internal.h"
    -#include "account.h"
    -#include "savedstatuses.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkplugin.h"
    #include "gtkconv.h"
    --- a/pidgin/plugins/win32/winprefs/gtkappbar.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/win32/winprefs/gtkappbar.c Sun May 10 13:43:52 2020 +0000
    @@ -33,7 +33,6 @@
    #include <gtk/gtk.h>
    #include <gdk/gdkwin32.h>
    #include "gtkappbar.h"
    -#include "debug.h"
    #define APPBAR_CALLBACK WM_USER + 1010
    --- a/pidgin/plugins/win32/winprefs/winprefs.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/win32/winprefs/winprefs.c Sun May 10 13:43:52 2020 +0000
    @@ -24,11 +24,7 @@
    #include "pidgin.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "prefs.h"
    -#include "signals.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gtkappbar.h"
    #include "gtkblist.h"
    --- a/pidgin/plugins/xmppconsole/xmppconsole.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/plugins/xmppconsole/xmppconsole.c Sun May 10 13:43:52 2020 +0000
    @@ -22,12 +22,10 @@
    */
    #include "internal.h"
    -#include "pidginplugininfo.h"
    -#include "version.h"
    -#include "protocol.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "gtkutils.h"
    +#include "pidginplugininfo.h"
    #include <gdk/gdkkeysyms.h>
    --- a/pidgin/win32/gtkwin32dep.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/win32/gtkwin32dep.c Sun May 10 13:43:52 2020 +0000
    @@ -31,9 +31,7 @@
    #include <gtk/gtk.h>
    #include <gdk/gdkwin32.h>
    -#include "debug.h"
    -#include "notify.h"
    -#include "network.h"
    +#include <purple.h>
    #include "resource.h"
    #include "untar.h"
    @@ -42,7 +40,6 @@
    #include "gtkblist.h"
    #include "gtkconv.h"
    #include "gtkconn.h"
    -#include "util.h"
    /*
    * GLOBALS
    --- a/pidgin/win32/gtkwin32dep.h Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/win32/gtkwin32dep.h Sun May 10 13:43:52 2020 +0000
    @@ -30,7 +30,8 @@
    #include <windows.h>
    #include <gtk/gtk.h>
    -#include "conversation.h"
    +
    +#include <purple.h>
    HINSTANCE winpidgin_dll_hinstance(void);
    HINSTANCE winpidgin_exe_hinstance(void);
    --- a/pidgin/win32/untar.c Mon May 04 06:03:00 2020 +0000
    +++ b/pidgin/win32/untar.c Sun May 10 13:43:52 2020 +0000
    @@ -76,7 +76,6 @@
    # include <unistd.h>
    # endif
    #endif
    -#include "debug.h"
    #include "untar.h"
    #include <glib.h>