diff --git a/src/core/context.c b/src/core/context.c
index 323fe57..c60510e 100644
--- a/src/core/context.c
+++ b/src/core/context.c
@@ -1,6 +1,14 @@
 /* bot/context.c
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <glib.h>
+#include <strophe.h>
+#include <openssl/sha.h> /* For SHA1 */
+#include <unistd.h>
+#include <signal.h>
 #include "context.h"
 
 extern struct BotXmppCtx *g_bctx = NULL;
diff --git a/src/core/context.h b/src/core/context.h
index 90d6d72..f53f584 100644
--- a/src/core/context.h
+++ b/src/core/context.h
@@ -6,15 +6,6 @@
  */
 
 #pragma once
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <glib.h>
-#include <strophe.h>
-#include <openssl/sha.h> /* For SHA1 */
-#include <unistd.h>
-#include <signal.h>
 #include "handlers.h"
 
 struct BotUserInfo {
diff --git a/src/core/handlers.c b/src/core/handlers.c
index 3c184a7..24e3198 100644
--- a/src/core/handlers.c
+++ b/src/core/handlers.c
@@ -1,6 +1,9 @@
 /* bot/handlers.c
  */
-
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <glib.h>
 #include "handlers.h"
 
 int version_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
diff --git a/src/core/handlers.h b/src/core/handlers.h
index 268d937..ecc7458 100644
--- a/src/core/handlers.h
+++ b/src/core/handlers.h
@@ -2,11 +2,7 @@
  */
 
 #pragma once
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <strophe.h>
-#include <glib.h>
 #include "../../build/expenses/grammar.tab.h"
 #include "../expenses/types.h"
 
diff --git a/src/expenses/types.h b/src/expenses/types.h
index fb95e4e..9899731 100644
--- a/src/expenses/types.h
+++ b/src/expenses/types.h
@@ -1,8 +1,11 @@
 /* additional types for expenses grammar
  */
 #pragma once
+#include <stdio.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include <time.h>
+#include <glib.h>
 
 typedef enum BotCommand {
     BOT_CMD_NONE,