diff --git a/iterator/iterator.h b/iterator/iterator.h
index 204c972c0..b77870c48 100644
--- a/iterator/iterator.h
+++ b/iterator/iterator.h
@@ -44,9 +44,7 @@
 #define ITERATOR_ITERATOR_H
 #include "services/outbound_list.h"
 #include "util/data/msgreply.h"
-struct module_func_block;
-enum module_ev;
-struct module_env;
+#include "util/module.h"
 struct delegpt;
 struct iter_hints;
 struct iter_forwards;
diff --git a/validator/validator.h b/validator/validator.h
index 79254e70e..cb18e9b41 100644
--- a/validator/validator.h
+++ b/validator/validator.h
@@ -42,11 +42,7 @@
 
 #ifndef VALIDATOR_VALIDATOR_H
 #define VALIDATOR_VALIDATOR_H
-struct module_func_block;
-struct module_env;
-enum module_ev;
-struct outbound_entry;
-struct module_qstate;
+#include "util/module.h"
 #include "util/data/msgreply.h"
 #include "validator/val_utils.h"
 struct val_anchors;