diff --git a/msglog.c b/msglog.c
index b828253..fcf6508 100644
--- a/msglog.c
+++ b/msglog.c
@@ -19,7 +19,6 @@
 */
 #include <stdio.h>
 #include <stdarg.h>
-#include <debug.h>
 #include "telegram-purple.h"
 
 /*
diff --git a/telegram-base.c b/telegram-base.c
index 148f0ad..6c2a624 100644
--- a/telegram-base.c
+++ b/telegram-base.c
@@ -21,32 +21,12 @@
 #define _GNU_SOURCE
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include <tgl.h>
-#include <tgl-binlog.h>
-#include <tgl-methods-in.h>
-#include <tgl-queries.h>
-
-#include <glib.h>
-#include <request.h>
 #include <gcrypt.h>
 
 #include "telegram-base.h"
-#include "telegram-purple.h"
-#include "msglog.h"
-#include "tgp-2prpl.h"
-#include "tgp-structs.h"
-#include "tgp-utils.h"
-#include "tgp-chat.h"
-#include "tgp-request.h"
 #include "lodepng/lodepng.h"
 
-
 // O_BINARY exists on windows and must be defined, but doesn't exist on unix-based systems
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/telegram-purple.c b/telegram-purple.c
index 836d78c..7a1b39a 100644
--- a/telegram-purple.c
+++ b/telegram-purple.c
@@ -20,54 +20,10 @@
 
 #include "telegram-purple.h"
 
-#include <glib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <assert.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include "accountopt.h"
-#include "blist.h"
-#include "cmds.h"
-#include "conversation.h"
-#include "debug.h"
-#include "privacy.h"
-#include "prpl.h"
-#include "roomlist.h"
-#include "status.h"
-#include "util.h"
-#include "prpl.h"
-#include "prefs.h"
-#include "util.h"
-#include "eventloop.h"
-#include "request.h"
 #ifdef WIN32
 #include "win32/win32dep.h"
 #endif
 
-#include <tgl.h>
-#include <tgl-binlog.h>
-#include <tgl-queries.h>
-#include <tools.h>
-#include <tgl-methods-in.h>
-
-#include "msglog.h"
-#include "telegram-base.h"
-#include "tgp-2prpl.h"
-#include "tgp-net.h"
-#include "tgp-timers.h"
-#include "tgp-utils.h"
-#include "tgp-chat.h"
-#include "tgp-ft.h"
-#include "tgp-msg.h"
-#include "tgp-request.h"
-#include "tgp-blist.h"
-#include "tgp-structs.h"
-
 static void update_message_handler (struct tgl_state *TLS, struct tgl_message *M);
 static void update_user_handler (struct tgl_state *TLS, struct tgl_user *U, unsigned flags);
 static void update_user_status_handler (struct tgl_state *TLS, struct tgl_user *U);
@@ -871,7 +827,6 @@ static PurplePluginProtocolInfo prpl_info = {
 };
 
 static void tgprpl_init (PurplePlugin *plugin) {
-  
   PurpleAccountOption *opt;
   
   // set domain name that is used for translation
diff --git a/telegram-purple.h b/telegram-purple.h
index c11b04c..f9c8e18 100644
--- a/telegram-purple.h
+++ b/telegram-purple.h
@@ -33,16 +33,25 @@
 #endif
 
 #include <tgl.h>
-#include <purple.h>
-#include <notify.h>
-#include <server.h>
-#include <plugin.h>
-#include <version.h>
-#include <account.h>
-#include <connection.h>
+#include <tgl-binlog.h>
+#include <tgl-queries.h>
+#include <tgl-structures.h>
 
+#include <glib.h>
+#include <purple.h>
+
+#include "telegram-base.h"
 #include "tgp-blist.h"
 #include "tgp-structs.h"
+#include "tgp-2prpl.h"
+#include "tgp-net.h"
+#include "tgp-timers.h"
+#include "tgp-utils.h"
+#include "tgp-chat.h"
+#include "tgp-ft.h"
+#include "tgp-msg.h"
+#include "tgp-request.h"
+#include "msglog.h"
 
 #define PLUGIN_ID "prpl-telegram"
 // FIXME: Name must be translated (for languages without latin script, it would look like gibberish. Just like Japanese script looks to me.)
diff --git a/tgp-2prpl.c b/tgp-2prpl.c
index 275f90a..105f921 100644
--- a/tgp-2prpl.c
+++ b/tgp-2prpl.c
@@ -25,20 +25,6 @@
 #include "lodepng/lodepng.h"
 #endif
 
-#include "tgp-2prpl.h"
-#include "tgp-structs.h"
-#include "telegram-purple.h"
-#include "tgp-utils.h"
-#include "telegram-base.h"
-#include "tgp-msg.h"
-#include "tgp-net.h"
-
-#include <server.h>
-#include <tgl.h>
-#include "msglog.h"
-#include <assert.h>
-
-
 PurpleAccount *tls_get_pa (struct tgl_state *TLS) {
   return tls_get_data (TLS)->pa;
 }
diff --git a/tgp-2prpl.h b/tgp-2prpl.h
index 98da73e..32a165c 100644
--- a/tgp-2prpl.h
+++ b/tgp-2prpl.h
@@ -23,9 +23,6 @@
 #include <stdio.h>
 
 #include "telegram-purple.h"
-#include "account.h"
-#include "conversation.h"
-#include "prpl.h"
 
 PurpleAccount *tls_get_pa (struct tgl_state *TLS);
 PurpleConnection *tls_get_conn (struct tgl_state *TLS);
diff --git a/tgp-blist.c b/tgp-blist.c
index 7a78daf..eec8a17 100644
--- a/tgp-blist.c
+++ b/tgp-blist.c
@@ -16,13 +16,7 @@
  Copyright Matthias Jentsch 2015
  */
 
-#include "tgp-blist.h"
-#include "tgp-structs.h"
-#include "tgp-2prpl.h"
-
-#include <glib.h>
-#include <blist.h>
-#include <assert.h>
+#include "telegram-purple.h"
 
 const char *tgp_blist_peer_get_purple_name (struct tgl_state *TLS, tgl_peer_id_t id) {
   const char *name = g_hash_table_lookup (tls_get_data (TLS)->id_to_purple_name, GINT_TO_POINTER(tgl_get_peer_id (id)));
diff --git a/tgp-chat.c b/tgp-chat.c
index aa6e5db..46e26ff 100644
--- a/tgp-chat.c
+++ b/tgp-chat.c
@@ -18,16 +18,7 @@
  Copyright Matthias Jentsch 2014-2015
  */
 
-#include "msglog.h"
 #include "tgp-chat.h"
-#include "tgp-utils.h"
-#include "tgp-request.h"
-#include "telegram-base.h"
-#include "telegram-purple.h"
-
-#include <tgl.h>
-#include <tgl-queries.h>
-#include <assert.h>
 
 GHashTable *tgp_chat_info_new (struct tgl_state *TLS, struct tgl_chat *chat) {
   gchar *title = g_strdup (chat->print_title);
diff --git a/tgp-chat.h b/tgp-chat.h
index 0071325..917c990 100644
--- a/tgp-chat.h
+++ b/tgp-chat.h
@@ -22,9 +22,6 @@
 #define __telegram_adium__tgp_chat__
 
 #include "telegram-purple.h"
-#include "tgp-structs.h"
-#include "tgp-2prpl.h"
-#include <purple.h>
 
 PurpleChat *p2tgl_chat_new (struct tgl_state *TLS, struct tgl_chat *chat);
 
diff --git a/tgp-ft.c b/tgp-ft.c
index b989783..c5f37f7 100644
--- a/tgp-ft.c
+++ b/tgp-ft.c
@@ -18,17 +18,7 @@
  Copyright Matthias Jentsch 2014-2015
  */
 
-#include <tgl-queries.h>
-#include "tgp-utils.h"
-#include "tgp-ft.h"
-#include "tgp-structs.h"
-#include "msglog.h"
-
-#include <purple.h>
-#include <glib.h>
-#include <glib/gstdio.h>
 #include "telegram-purple.h"
-#include "telegram-base.h"
 
 static void tgprpl_xfer_free_data (struct tgp_xfer_send_data *data);
 
diff --git a/tgp-msg.c b/tgp-msg.c
index f078b0b..08ba817 100644
--- a/tgp-msg.c
+++ b/tgp-msg.c
@@ -20,12 +20,8 @@
 
 #include "telegram-purple.h"
 
-#include <assert.h>
-#include <tgl.h>
-#include <glib.h>
 #include <errno.h>
 #include <locale.h>
-#include <tgl-queries.h>
 
 #if !GLIB_CHECK_VERSION(2,30,0)
 gchar *
@@ -46,16 +42,6 @@ g_utf8_substring (const gchar *str,
 }
 #endif
 
-#include "telegram-base.h"
-#include "tgp-structs.h"
-#include "tgp-msg.h"
-#include "tgp-ft.h"
-#include "tgp-2prpl.h"
-#include "tgp-chat.h"
-#include "tgp-utils.h"
-#include "tgp-chat.h"
-#include "msglog.h"
-
 static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
   assert (M && M->flags & TGLMF_SERVICE);
   connection_data *conn = TLS->ev_base;
diff --git a/tgp-net.c b/tgp-net.c
index b2cb231..bb5c9d5 100644
--- a/tgp-net.c
+++ b/tgp-net.c
@@ -40,19 +40,8 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "tgp-net.h"
-#include "tgp-structs.h"
-#include "tgp-2prpl.h"
-#include "telegram-base.h"
-#include <tgl.h>
-#include <tgl-inner.h>
-#include <tools.h>
-#include <mtproto-client.h>
-
-#include <glib.h>
-#include <eventloop.h>
 #include "telegram-purple.h"
-#include "msglog.h"
+#include <mtproto-client.h>
 
 #ifndef POLLRDHUP
 #define POLLRDHUP 0
diff --git a/tgp-request.c b/tgp-request.c
index ec0b82e..03d4e6f 100644
--- a/tgp-request.c
+++ b/tgp-request.c
@@ -20,19 +20,6 @@
 
 #include "telegram-purple.h"
 
-#include <glib.h>
-#include <tgl.h>
-#include <tgl-binlog.h>
-#include <tgl-methods-in.h>
-#include <tgl-queries.h>
-
-#include "msglog.h"
-#include "tgp-request.h"
-#include "telegram-base.h"
-#include "tgp-2prpl.h"
-#include "tgp-utils.h"
-#include "tgp-structs.h"
-
 static struct request_values_data *request_values_data_init (struct tgl_state *TLS, void *callback, void *arg, int num_values) {
   struct request_values_data *data = talloc0 (sizeof (struct request_values_data));
   data->TLS = TLS;
diff --git a/tgp-structs.c b/tgp-structs.c
index 8897973..5069e05 100644
--- a/tgp-structs.c
+++ b/tgp-structs.c
@@ -19,16 +19,6 @@
  */
 
 #include "telegram-base.h"
-#include "tgp-structs.h"
-#include "purple.h"
-#include "msglog.h"
-#include "tgp-utils.h"
-#include "tgp-ft.h"
-#include "tgp-2prpl.h"
-
-#include <glib.h>
-#include <tgl.h>
-#include <tgl-queries.h>
 
 static void pending_reads_free_cb (gpointer data) {
   free (data);
diff --git a/tgp-utils.c b/tgp-utils.c
index 0ad2706..47ccad1 100644
--- a/tgp-utils.c
+++ b/tgp-utils.c
@@ -20,11 +20,6 @@
 
 #include "telegram-purple.h"
 
-#include "tgp-utils.h"
-#include "msglog.h"
-
-#include <purple.h>
-
 const char *format_time (time_t date) {
   struct tm *datetime = localtime(&date);
   /* This should be the language's timestamp format.