diff --git a/src/twc-bootstrap.c b/src/twc-bootstrap.c
index d3e1f66..ec2a96a 100644
--- a/src/twc-bootstrap.c
+++ b/src/twc-bootstrap.c
@@ -17,8 +17,6 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-
 #include <tox/tox.h>
 
 #include "twc-utils.h"
diff --git a/src/twc-chat.c b/src/twc-chat.c
index 36256e1..203242e 100644
--- a/src/twc-chat.c
+++ b/src/twc-chat.c
@@ -17,16 +17,13 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <weechat/weechat-plugin.h>
 #include <tox/tox.h>
 
 #include "twc.h"
+#include "twc-list.h"
 #include "twc-profile.h"
 #include "twc-message-queue.h"
-#include "twc-list.h"
 #include "twc-utils.h"
 
 #include "twc-chat.h"
diff --git a/src/twc-commands.c b/src/twc-commands.c
index 7c8f7fa..ce90122 100644
--- a/src/twc-commands.c
+++ b/src/twc-commands.c
@@ -23,12 +23,12 @@
 #include <tox/tox.h>
 
 #include "twc.h"
-#include "twc-utils.h"
+#include "twc-list.h"
 #include "twc-profile.h"
 #include "twc-chat.h"
 #include "twc-friend-request.h"
 #include "twc-bootstrap.h"
-#include "twc-list.h"
+#include "twc-utils.h"
 
 #include "twc-commands.h"
 
diff --git a/src/twc-completion.c b/src/twc-completion.c
index b69544a..ae7ffc5 100644
--- a/src/twc-completion.c
+++ b/src/twc-completion.c
@@ -17,14 +17,11 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <inttypes.h>
-
 #include <weechat/weechat-plugin.h>
 
 #include "twc.h"
-#include "twc-profile.h"
 #include "twc-list.h"
+#include "twc-profile.h"
 
 #include "twc-completion.h"
 
diff --git a/src/twc-friend-request.c b/src/twc-friend-request.c
index 6bdb57d..11521ee 100644
--- a/src/twc-friend-request.c
+++ b/src/twc-friend-request.c
@@ -17,16 +17,14 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 
 #include <weechat/weechat-plugin.h>
 #include <tox/tox.h>
 
 #include "twc.h"
-#include "twc-profile.h"
 #include "twc-list.h"
+#include "twc-profile.h"
 #include "twc-utils.h"
 
 #include "twc-friend-request.h"
diff --git a/src/twc-friend-request.h b/src/twc-friend-request.h
index cc41c05..d381cf6 100644
--- a/src/twc-friend-request.h
+++ b/src/twc-friend-request.h
@@ -20,8 +20,6 @@
 #ifndef TOX_WEECHAT_FRIEND_REQUEST_H
 #define TOX_WEECHAT_FRIEND_REQUEST_H
 
-#include <stdint.h>
-
 #include <tox/tox.h>
 
 /**
diff --git a/src/twc-gui.c b/src/twc-gui.c
index 2c3ad25..59c520a 100644
--- a/src/twc-gui.c
+++ b/src/twc-gui.c
@@ -16,7 +16,6 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/twc-message-queue.c b/src/twc-message-queue.c
index a751121..447fa59 100644
--- a/src/twc-message-queue.c
+++ b/src/twc-message-queue.c
@@ -18,15 +18,14 @@
  */
 
 #include <string.h>
-#include <time.h>
 
 #include <weechat/weechat-plugin.h>
 #include <tox/tox.h>
 
 #include "twc.h"
+#include "twc-list.h"
 #include "twc-profile.h"
 #include "twc-utils.h"
-#include "twc-list.h"
 
 #include "twc-message-queue.h"
 
diff --git a/src/twc-profile.c b/src/twc-profile.c
index 0b5f20e..b6c0d46 100644
--- a/src/twc-profile.c
+++ b/src/twc-profile.c
@@ -17,27 +17,23 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <pwd.h>
 #include <unistd.h>
-#include <stdbool.h>
 
 #include <weechat/weechat-plugin.h>
 #include <tox/tox.h>
 
 #include "twc.h"
-#include "twc-bootstrap.h"
 #include "twc-list.h"
+#include "twc-bootstrap.h"
 #include "twc-config.h"
 #include "twc-friend-request.h"
 #include "twc-message-queue.h"
 #include "twc-chat.h"
 #include "twc-tox-callbacks.h"
 #include "twc-utils.h"
-#include "twc-data.h"
 
 #include "twc-profile.h"
 
diff --git a/src/twc-profile.h b/src/twc-profile.h
index 97a62a7..4cd5c97 100644
--- a/src/twc-profile.h
+++ b/src/twc-profile.h
@@ -20,7 +20,6 @@
 #ifndef TOX_WEECHAT_PROFILE_H
 #define TOX_WEECHAT_PROFILE_H
 
-#include <stdint.h>
 #include <stdbool.h>
 
 #include <tox/tox.h>
diff --git a/src/twc-tox-callbacks.h b/src/twc-tox-callbacks.h
index e5b56db..8727772 100644
--- a/src/twc-tox-callbacks.h
+++ b/src/twc-tox-callbacks.h
@@ -20,8 +20,6 @@
 #ifndef TOX_WEECHAT_TOX_CALLBACKS_H
 #define TOX_WEECHAT_TOX_CALLBACKS_H
 
-#include <stdint.h>
-
 #include <tox/tox.h>
 
 int
diff --git a/src/twc-utils.c b/src/twc-utils.c
index ca8eef3..269f431 100644
--- a/src/twc-utils.c
+++ b/src/twc-utils.c
@@ -17,16 +17,12 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <stdio.h>
 
 #include <weechat/weechat-plugin.h>
 #include <tox/tox.h>
 
-#include "twc.h"
-
 #include "twc-utils.h"
 
 /**
diff --git a/src/twc-utils.h b/src/twc-utils.h
index a8dbab0..9195895 100644
--- a/src/twc-utils.h
+++ b/src/twc-utils.h
@@ -21,7 +21,6 @@
 #define TOX_WEECHAT_UTILS_H
 
 #include <stdlib.h>
-#include <stdint.h>
 
 #include <tox/tox.h>
 
diff --git a/src/twc.c b/src/twc.c
index 90035b1..35856d1 100644
--- a/src/twc.c
+++ b/src/twc.c
@@ -24,9 +24,7 @@
 #include "twc-profile.h"
 #include "twc-commands.h"
 #include "twc-gui.h"
-#include "twc-friend-request.h"
 #include "twc-config.h"
-#include "twc-data.h"
 #include "twc-completion.h"
 
 #include "twc.h"