diff --git a/common/Makefile b/common/Makefile
index dfc7ab9cc..c5cc87893 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -45,6 +45,7 @@ COMMON_SRC_NOGEN :=				\
 	common/initial_channel.c		\
 	common/initial_commit_tx.c		\
 	common/io_lock.c			\
+	common/iso4217.c			\
 	common/json.c				\
 	common/json_helpers.c			\
 	common/json_stream.c			\
@@ -100,7 +101,6 @@ COMMON_HEADERS_NOGEN := $(COMMON_SRC_NOGEN:.c=.h)	\
 	common/errcode.h				\
 	common/gossip_constants.h			\
 	common/htlc.h					\
-	common/iso4217.h				\
 	common/json_command.h				\
 	common/jsonrpc_errors.h				\
 	common/overflows.h				\
diff --git a/wire/bolt12_wiregen.c b/wire/bolt12_wiregen.c
index b52cf3326..c3258a599 100644
--- a/wire/bolt12_wiregen.c
+++ b/wire/bolt12_wiregen.c
@@ -1562,4 +1562,4 @@ bool invoice_error_is_valid(const struct tlv_invoice_error *record, size_t *err_
 	return tlv_fields_valid(record->fields, err_index);
 }
 
-// SHA256STAMP:b09ebf868d0b5b9792d0054bee17d763c1243d18c419847c554c63aefb7a8548
+// SHA256STAMP:e82f2f1c0f73838262e59ffeb3572d5e8ce6efcca7c8ae3c36f6448adacde16b
diff --git a/wire/bolt12_wiregen.h b/wire/bolt12_wiregen.h
index 91d79a349..909fe9af6 100644
--- a/wire/bolt12_wiregen.h
+++ b/wire/bolt12_wiregen.h
@@ -316,4 +316,4 @@ struct fallback_address *fromwire_fallback_address(const tal_t *ctx, const u8 **
 
 
 #endif /* LIGHTNING_WIRE_BOLT12_WIREGEN_H */
-// SHA256STAMP:b09ebf868d0b5b9792d0054bee17d763c1243d18c419847c554c63aefb7a8548
+// SHA256STAMP:e82f2f1c0f73838262e59ffeb3572d5e8ce6efcca7c8ae3c36f6448adacde16b
diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
index 921c529c7..203ba5fe1 100644
--- a/wire/onion_printgen.c
+++ b/wire/onion_printgen.c
@@ -859,4 +859,4 @@ void printonion_wire_tlv_message(const char *tlv_name, const u8 *msg) {
 		printwire_tlvs(tlv_name, &msg, &plen, print_tlvs_encmsg_tlvs, ARRAY_SIZE(print_tlvs_encmsg_tlvs));
 	}
 }
-// SHA256STAMP:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f
+// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h
index 21dbd534b..51618d4ee 100644
--- a/wire/onion_printgen.h
+++ b/wire/onion_printgen.h
@@ -58,4 +58,4 @@ void printwire_mpp_timeout(const char *fieldname, const u8 *cursor);
 
 void printwire_onionmsg_path(const char *fieldname, const u8 **cursor, size_t *plen);
 #endif /* LIGHTNING_WIRE_ONION_PRINTGEN_H */
-// SHA256STAMP:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f
+// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98
diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c
index adef035c9..513cf8143 100644
--- a/wire/onion_wiregen.c
+++ b/wire/onion_wiregen.c
@@ -1026,4 +1026,4 @@ bool fromwire_mpp_timeout(const void *p)
 		return false;
 	return cursor != NULL;
 }
-// SHA256STAMP:720f5585d10f973a398e821541c6a2f0841c338c0c73f53bd4215d7bcad378d1
+// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98
diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c
index 83f0869cc..166fd4793 100644
--- a/wire/peer_printgen.c
+++ b/wire/peer_printgen.c
@@ -2130,4 +2130,4 @@ void printpeer_wire_tlv_message(const char *tlv_name, const u8 *msg) {
 		printwire_tlvs(tlv_name, &msg, &plen, print_tlvs_onion_message_tlvs, ARRAY_SIZE(print_tlvs_onion_message_tlvs));
 	}
 }
-// SHA256STAMP:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439
diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h
index 7767289a6..cc597757a 100644
--- a/wire/peer_printgen.h
+++ b/wire/peer_printgen.h
@@ -74,4 +74,4 @@ void printwire_onion_message(const char *fieldname, const u8 *cursor);
 void printwire_channel_update_checksums(const char *fieldname, const u8 **cursor, size_t *plen);
 void printwire_channel_update_timestamps(const char *fieldname, const u8 **cursor, size_t *plen);
 #endif /* LIGHTNING_WIRE_PEER_PRINTGEN_H */
-// SHA256STAMP:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439
diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c
index 7256b2e26..8a6700b7c 100644
--- a/wire/peer_wiregen.c
+++ b/wire/peer_wiregen.c
@@ -1749,4 +1749,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec
  	*htlc_maximum_msat = fromwire_amount_msat(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:d664c34d8dddb0c11be08e907fb3f58deda009cee08661afa7030101c2a7c5f3
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439
diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h
index 77b724271..b3c9477b5 100644
--- a/wire/peer_wiregen.h
+++ b/wire/peer_wiregen.h
@@ -650,4 +650,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec
 
 
 #endif /* LIGHTNING_WIRE_PEER_WIREGEN_H */
-// SHA256STAMP:d664c34d8dddb0c11be08e907fb3f58deda009cee08661afa7030101c2a7c5f3
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439