diff --git a/lightningd/notification.h b/lightningd/notification.h
index 7db53d46f..9741c939c 100644
--- a/lightningd/notification.h
+++ b/lightningd/notification.h
@@ -4,13 +4,16 @@
 #include <bitcoin/short_channel_id.h>
 #include <bitcoin/tx.h>
 #include <ccan/json_escape/json_escape.h>
+#include <ccan/time/time.h>
 #include <common/amount.h>
 #include <common/node_id.h>
+#include <lightningd/htlc_end.h>
 #include <lightningd/jsonrpc.h>
 #include <lightningd/lightningd.h>
 #include <lightningd/log.h>
 #include <lightningd/plugin.h>
 #include <wallet/wallet.h>
+#include <wire/gen_onion_wire.h>
 
 bool notifications_have_topic(const char *topic);
 
diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
index d6356d665..e277f95b9 100644
--- a/wallet/test/run-wallet.c
+++ b/wallet/test/run-wallet.c
@@ -376,8 +376,13 @@ void notify_connect(struct lightningd *ld UNNEEDED, struct node_id *nodeid UNNEE
 void notify_disconnect(struct lightningd *ld UNNEEDED, struct node_id *nodeid UNNEEDED)
 { fprintf(stderr, "notify_disconnect called!\n"); abort(); }
 /* Generated stub for notify_forward_event */
-void notify_forward_event(struct lightningd *ld UNNEEDED, const struct htlc_in *in UNNEEDED, const struct htlc_out *out UNNEEDED, enum forward_status state UNNEEDED, enum onion_type failcode UNNEEDED, struct timeabs *resolved_time UNNEEDED)
-{ fprintf(stderr, "notify_disconnect called!\n"); abort(); }
+void notify_forward_event(struct lightningd *ld UNNEEDED,
+			  const struct htlc_in *in UNNEEDED,
+			  const struct htlc_out *out UNNEEDED,
+			  enum forward_status state UNNEEDED,
+			  enum onion_type failcode UNNEEDED,
+			  struct timeabs *resolved_time UNNEEDED)
+{ fprintf(stderr, "notify_forward_event called!\n"); abort(); }
 /* Generated stub for onchaind_funding_spent */
 enum watch_result onchaind_funding_spent(struct channel *channel UNNEEDED,
 					 const struct bitcoin_tx *tx UNNEEDED,