diff --git a/src/expenses/csv.c b/src/expenses/csv.c
index 1069990..fd23a1d 100644
--- a/src/expenses/csv.c
+++ b/src/expenses/csv.c
@@ -1,3 +1,6 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <glib.h>
 #include "csv.h"
 
 int bot_get_current_entry_id_csv
diff --git a/src/expenses/csv.h b/src/expenses/csv.h
index b01dbe7..bde5681 100644
--- a/src/expenses/csv.h
+++ b/src/expenses/csv.h
@@ -1,9 +1,6 @@
 /* Routines to write a CSV expenses file
  */
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <glib.h>
+#pragma once
 #include "types.h"
 
 /* count the lines of the file to get the last ID */
diff --git a/src/expenses/types.c b/src/expenses/types.c
index b4a29cc..e467a63 100644
--- a/src/expenses/types.c
+++ b/src/expenses/types.c
@@ -1,5 +1,10 @@
 /* function definition to parse a string instead of a file
  */
+#include <stdio.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <time.h>
+#include <glib.h>
 #include "types.h"
 
 extern BotCommand g_LastCommand = BOT_CMD_NONE;
diff --git a/src/expenses/types.h b/src/expenses/types.h
index 0f66238..68b04ab 100644
--- a/src/expenses/types.h
+++ b/src/expenses/types.h
@@ -1,13 +1,7 @@
 /* additional types for expenses grammar
  */
 #pragma once
-#include <stdio.h>
-#include <stdbool.h>
 #include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#include <glib.h>
-#include <strophe.h>
 
 typedef enum BotCommand {
     BOT_CMD_NONE,