diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 923d5bee7..12727f1f6 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <time.h>
 
 #include "weechat.h"
 #include "wee-command.h"
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index ec3e9c833..3257d35a3 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -28,6 +28,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include "weechat.h"
 #include "wee-config-file.h"
diff --git a/src/core/wee-util.c b/src/core/wee-util.c
index c96718ff8..8706345b7 100644
--- a/src/core/wee-util.c
+++ b/src/core/wee-util.c
@@ -31,6 +31,7 @@
 #include <dirent.h>
 #include <signal.h>
 #include <ctype.h>
+#include <time.h>
 
 #include "weechat.h"
 #include "wee-util.h"
diff --git a/src/core/weechat.h b/src/core/weechat.h
index 01efa04a0..79950e1aa 100644
--- a/src/core/weechat.h
+++ b/src/core/weechat.h
@@ -27,10 +27,6 @@
 #include <stdio.h>
 #include <sys/time.h>
 
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
-
 #include <locale.h>
 
 #if defined(ENABLE_NLS) && !defined(_)
diff --git a/src/gui/curses/gui-curses-infobar.c b/src/gui/curses/gui-curses-infobar.c
index 818e7058b..94a222136 100644
--- a/src/gui/curses/gui-curses-infobar.c
+++ b/src/gui/curses/gui-curses-infobar.c
@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "../../core/weechat.h"
 #include "../../core/wee-config.h"
diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c
index 62be0e4c1..0c337da60 100644
--- a/src/gui/curses/gui-curses-keyboard.c
+++ b/src/gui/curses/gui-curses-keyboard.c
@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "../../core/weechat.h"
 #include "../../core/wee-config.h"
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index 30198a184..18c982bfa 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
+#include <time.h>
 #include <regex.h>
 
 #include "../core/weechat.h"
diff --git a/src/plugins/irc/irc.h b/src/plugins/irc/irc.h
index 6c0fd99bc..a46228a6b 100644
--- a/src/plugins/irc/irc.h
+++ b/src/plugins/irc/irc.h
@@ -68,6 +68,8 @@ extern struct t_hook *irc_hook_timer_check_away;
 
 extern int irc_debug;
 
+#ifdef HAVE_GNUTLS
 extern gnutls_certificate_credentials gnutls_xcred;
+#endif
 
 #endif /* irc.h */
diff --git a/src/plugins/plugin-api.c b/src/plugins/plugin-api.c
index ac99a3f59..8b5ebb195 100644
--- a/src/plugins/plugin-api.c
+++ b/src/plugins/plugin-api.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include "../core/weechat.h"
 #include "../core/wee-config.h"