Stop including internal.h everywhere when we really don't need it.

Testing Done:
Compiled, but didn't test on windows. As such I left all the networking stuff untouched as that's where windows will really need it and that can be done in another rr.

Reviewed at https://reviews.imfreedom.org/r/1764/

43 files changed, 14 insertions, 59 deletions

diff --git a/libpurple/account.c b/libpurple/account.c
index 92896eddcf..603efbd4dd 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -21,8 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "accounts.h"
 #include "core.h"
 #include "debug.h"
diff --git a/libpurple/accounts.c b/libpurple/accounts.c
index fbc8c5652e..a0db119233 100644
--- a/libpurple/accounts.c
+++ b/libpurple/accounts.c
@@ -21,7 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "accounts.h"
 #include "core.h"
 #include "debug.h"
diff --git a/libpurple/blistnode.c b/libpurple/blistnode.c
index 172b202009..24ce1b2288 100644
--- a/libpurple/blistnode.c
+++ b/libpurple/blistnode.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
 
 #include "blistnode.h"
 #include "buddy.h"
diff --git a/libpurple/buddy.c b/libpurple/buddy.c
index c6b2347937..fdc1e669a9 100644
--- a/libpurple/buddy.c
+++ b/libpurple/buddy.c
@@ -23,7 +23,6 @@
 #include "buddy.h"
 
 #include "debug.h"
-#include "internal.h"
 #include "purplebuddypresence.h"
 #include "purpleconversationmanager.h"
 #include "purpleprotocolclient.h"
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c
index 957c4da3a8..68acad8d34 100644
--- a/libpurple/buddyicon.c
+++ b/libpurple/buddyicon.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include "buddyicon.h"
 #include "debug.h"
 #include "image.h"
diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c
index b798de190b..f8df744d69 100644
--- a/libpurple/buddylist.c
+++ b/libpurple/buddylist.c
@@ -23,7 +23,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "account.h"
 #include "buddylist.h"
 #include "debug.h"
diff --git a/libpurple/chat.c b/libpurple/chat.c
index 42a2ece627..0dc1171f5e 100644
--- a/libpurple/chat.c
+++ b/libpurple/chat.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
 #include "chat.h"
 #include "purpleprotocolchat.h"
 #include "util.h"
diff --git a/libpurple/circularbuffer.c b/libpurple/circularbuffer.c
index 60c82b7072..1c9045a29e 100644
--- a/libpurple/circularbuffer.c
+++ b/libpurple/circularbuffer.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
 
 #include "circularbuffer.h"
 
diff --git a/libpurple/cmds.c b/libpurple/cmds.c
index 23128452fd..d248f11ed4 100644
--- a/libpurple/cmds.c
+++ b/libpurple/cmds.c
@@ -16,8 +16,6 @@
  *
  */
 
-#include "internal.h"
-
 #include "account.h"
 #include "purplemarkup.h"
 #include "cmds.h"
diff --git a/libpurple/connection.c b/libpurple/connection.c
index 466c4e77b1..884e09c31a 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -21,8 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "account.h"
 #include "buddylist.h"
 #include "connection.h"
diff --git a/libpurple/contact.c b/libpurple/contact.c
index 58510cbc04..7a06aa2feb 100644
--- a/libpurple/contact.c
+++ b/libpurple/contact.c
@@ -22,7 +22,6 @@
  */
 
 #include "contact.h"
-#include "internal.h" /* TODO: this needs to die */
 #include "purplebuddypresence.h"
 #include "purpleconversationmanager.h"
 #include "purpleprivate.h"
diff --git a/libpurple/conversations.c b/libpurple/conversations.c
index b3f161e608..43de5a73a1 100644
--- a/libpurple/conversations.c
+++ b/libpurple/conversations.c
@@ -19,7 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
 
 #include "conversations.h"
 #include "purpleprivate.h"
diff --git a/libpurple/core.c b/libpurple/core.c
index 662159b846..34a40a2e61 100644
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -23,7 +23,10 @@
 #define G_SETTINGS_ENABLE_BACKEND
 #include <gio/gsettingsbackend.h>
 
-#include "internal.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include "cmds.h"
 #include "connection.h"
 #include "conversations.h"
diff --git a/libpurple/countingnode.c b/libpurple/countingnode.c
index 47eeae7c3b..fa8ba22444 100644
--- a/libpurple/countingnode.c
+++ b/libpurple/countingnode.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
 #include "countingnode.h"
 
 typedef struct _PurpleCountingNodePrivate  PurpleCountingNodePrivate;
diff --git a/libpurple/eventloop.c b/libpurple/eventloop.c
index 23847356db..bab9596f0d 100644
--- a/libpurple/eventloop.c
+++ b/libpurple/eventloop.c
@@ -18,7 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
+
+#include <unistd.h>
+
 #include "eventloop.h"
 
 #define PURPLE_GLIB_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
diff --git a/libpurple/group.c b/libpurple/group.c
index c1c11db80b..401bf568e3 100644
--- a/libpurple/group.c
+++ b/libpurple/group.c
@@ -24,7 +24,6 @@
 #include "group.h"
 
 #include "debug.h"
-#include "internal.h" /* TODO: we need to kill this */
 #include "purpleprivate.h"
 #include "purpleprotocolserver.h"
 
diff --git a/libpurple/image.c b/libpurple/image.c
index 1512ea0441..1bfd313444 100644
--- a/libpurple/image.c
+++ b/libpurple/image.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
-
 #include "debug.h"
 #include "image.h"
 #include "util.h"
diff --git a/libpurple/media.c b/libpurple/media.c
index 22e9f788f7..34007295ee 100644
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -18,8 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
-
 #include "account.h"
 #include "media.h"
 #include "media/backend-iface.h"
diff --git a/libpurple/media/backend-iface.c b/libpurple/media/backend-iface.c
index fcd1925052..5977810cad 100644
--- a/libpurple/media/backend-iface.c
+++ b/libpurple/media/backend-iface.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
-
 #include "backend-iface.h"
 
 enum {
diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c
index e238874db9..f70253f5f4 100644
--- a/libpurple/media/codec.c
+++ b/libpurple/media/codec.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include "codec.h"
 
 struct _PurpleMediaCodec
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
index a64c0708c0..5312eae996 100644
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -21,8 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "account.h"
 #include "debug.h"
 #include "glibcompat.h"
diff --git a/libpurple/notify.c b/libpurple/notify.c
index cc59620700..de4aee7cf4 100644
--- a/libpurple/notify.c
+++ b/libpurple/notify.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include "notify.h"
 
 static PurpleNotifyUiOps *notify_ui_ops = NULL;
diff --git a/libpurple/pluginpref.c b/libpurple/pluginpref.c
index 2369c227a0..03980757d3 100644
--- a/libpurple/pluginpref.c
+++ b/libpurple/pluginpref.c
@@ -21,8 +21,6 @@
  */
 #include <glib.h>
 
-#include "internal.h"
-
 #include "debug.h"
 #include "pluginpref.h"
 #include "prefs.h"
diff --git a/libpurple/plugins.c b/libpurple/plugins.c
index 7f1b08965a..a669bfe632 100644
--- a/libpurple/plugins.c
+++ b/libpurple/plugins.c
@@ -22,7 +22,9 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #include "core.h"
 #include "debug.h"
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
index de93282fde..f34995b674 100644
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,8 +32,6 @@
 
 #include <glib.h>
 
-#include "internal.h"
-
 #include "prefs.h"
 #include "debug.h"
 #include "purplepath.h"
diff --git a/libpurple/protocols.c b/libpurple/protocols.c
index da65e602ea..dc661c7727 100644
--- a/libpurple/protocols.c
+++ b/libpurple/protocols.c
@@ -23,7 +23,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "debug.h"
 #include "network.h"
 #include "notify.h"
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
index d442de6685..546fa6a305 100644
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -22,7 +22,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "debug.h"
 #include "notify.h"
 #include "prefs.h"
diff --git a/libpurple/purpleaccountoption.c b/libpurple/purpleaccountoption.c
index 54f61d4910..b0ed9ac1d9 100644
--- a/libpurple/purpleaccountoption.c
+++ b/libpurple/purpleaccountoption.c
@@ -18,7 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
 
 #include "prefs.h"
 #include "purpleaccountoption.h"
diff --git a/libpurple/purpleconversation.c b/libpurple/purpleconversation.c
index 7100440abf..c15c7f052c 100644
--- a/libpurple/purpleconversation.c
+++ b/libpurple/purpleconversation.c
@@ -22,8 +22,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "buddylist.h"
 #include "cmds.h"
 #include "conversations.h"
diff --git a/libpurple/purplegio.c b/libpurple/purplegio.c
index 8ecfdbfca5..4180d4e8d4 100644
--- a/libpurple/purplegio.c
+++ b/libpurple/purplegio.c
@@ -24,7 +24,6 @@
 #include "purplegio.h"
 
 #include "debug.h"
-#include "internal.h"
 #include "proxy.h"
 
 typedef struct {
diff --git a/libpurple/purplemessage.c b/libpurple/purplemessage.c
index 3da344dc3d..4c8e4d0551 100644
--- a/libpurple/purplemessage.c
+++ b/libpurple/purplemessage.c
@@ -22,8 +22,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "debug.h"
 #include "purpleenums.h"
 #include "purplemessage.h"
diff --git a/libpurple/purpleplugininfo.c b/libpurple/purpleplugininfo.c
index 0299a354d0..1039c4e276 100644
--- a/libpurple/purpleplugininfo.c
+++ b/libpurple/purpleplugininfo.c
@@ -17,8 +17,6 @@
  */
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "core.h"
 #include "debug.h"
 #include "purpleenums.h"
diff --git a/libpurple/purplewhiteboard.c b/libpurple/purplewhiteboard.c
index dd662a3f15..c0d854140e 100644
--- a/libpurple/purplewhiteboard.c
+++ b/libpurple/purplewhiteboard.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include "internal.h"
 #include "purplewhiteboard.h"
 
 #include "purpleprotocol.h"
diff --git a/libpurple/queuedoutputstream.c b/libpurple/queuedoutputstream.c
index 030ba16778..92ea72f0c1 100644
--- a/libpurple/queuedoutputstream.c
+++ b/libpurple/queuedoutputstream.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
 #include "queuedoutputstream.h"
 
 struct _PurpleQueuedOutputStream
diff --git a/libpurple/request.c b/libpurple/request.c
index 41ea6004aa..6d1d48e8d6 100644
--- a/libpurple/request.c
+++ b/libpurple/request.c
@@ -21,8 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "glibcompat.h"
 #include "notify.h"
 #include "purplemarkup.h"
diff --git a/libpurple/roomlist.c b/libpurple/roomlist.c
index 1c0722f41d..53b5720fa9 100644
--- a/libpurple/roomlist.c
+++ b/libpurple/roomlist.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
-
 #include "account.h"
 #include "connection.h"
 #include "debug.h"
diff --git a/libpurple/savedstatuses.c b/libpurple/savedstatuses.c
index 29d4c3c1a7..7669ad7ff2 100644
--- a/libpurple/savedstatuses.c
+++ b/libpurple/savedstatuses.c
@@ -21,8 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
-
 #include "accounts.h"
 #include "debug.h"
 #include "idle.h"
diff --git a/libpurple/server.c b/libpurple/server.c
index 43be3f3dc8..77f06a6d1b 100644
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -25,7 +25,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "buddylist.h"
 #include "debug.h"
 #include "notify.h"
diff --git a/libpurple/signals.c b/libpurple/signals.c
index 2d300ae367..b2fd362488 100644
--- a/libpurple/signals.c
+++ b/libpurple/signals.c
@@ -18,7 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
 
 #include "debug.h"
 #include "signals.h"
diff --git a/libpurple/status.c b/libpurple/status.c
index 2e2e69c187..ab52d0043b 100644
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -21,7 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "purpleprivate.h"
 
 #include "buddylist.h"
diff --git a/libpurple/upnp.c b/libpurple/upnp.c
index 8f9001a6bc..a531742800 100644
--- a/libpurple/upnp.c
+++ b/libpurple/upnp.c
@@ -21,8 +21,6 @@
 #include <gio/gio.h>
 #include <libsoup/soup.h>
 
-#include "internal.h"
-
 #include "upnp.h"
 
 #include "glibcompat.h"
diff --git a/libpurple/xfer.c b/libpurple/xfer.c
index 24404c7427..7605c5e8cc 100644
--- a/libpurple/xfer.c
+++ b/libpurple/xfer.c
@@ -22,7 +22,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "glibcompat.h" /* for purple_g_stat on win32 */
 
 #include <glib/gstdio.h>
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
index e141514173..929bf5e018 100644
--- a/libpurple/xmlnode.c
+++ b/libpurple/xmlnode.c
@@ -26,7 +26,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "internal.h"
 #include "debug.h"
 
 #include <libxml/parser.h>