diff --git a/include/proto/checks.h b/include/proto/checks.h
index 079e2dc..f0ff52a 100644
--- a/include/proto/checks.h
+++ b/include/proto/checks.h
@@ -22,11 +22,9 @@
 #ifndef _PROTO_CHECKS_H
 #define _PROTO_CHECKS_H
 
-#include <types/task.h>
-#include <common/config.h>
-#include <types/mailers.h>
-
 #include <types/action.h>
+#include <types/mailers.h>
+#include <types/checks.h>
 
 const char *get_check_status_description(short check_status);
 const char *get_check_status_info(short check_status);
diff --git a/include/types/checks.h b/include/types/checks.h
index 8cf1c62..4809285 100644
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -13,15 +13,21 @@
 #ifndef _TYPES_CHECKS_H
 #define _TYPES_CHECKS_H
 
-#include <sys/time.h>
+#include <ebpttree.h>
 
+#include <common/standard.h>
 #include <common/config.h>
+#include <common/ist.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>
 #include <common/buf.h>
 
 #include <types/connection.h>
 #include <types/obj_type.h>
+#include <types/proxy.h>
+#include <types/sample.h>
+#include <types/server.h>
+#include <types/session.h>
 #include <types/task.h>
 
 /* enum used by check->result. Must remain in this order, as some code uses