diff --git a/fuzz/src/msg_targets/mod.rs b/fuzz/src/msg_targets/mod.rs
index dd1540ce51..67d66e23f5 100644
--- a/fuzz/src/msg_targets/mod.rs
+++ b/fuzz/src/msg_targets/mod.rs
@@ -30,3 +30,4 @@ pub mod msg_reply_channel_range;
 pub mod msg_error_message;
 pub mod msg_warning_message;
 pub mod msg_channel_update;
+pub mod msg_channel_details;
diff --git a/fuzz/src/msg_targets/msg_accept_channel.rs b/fuzz/src/msg_targets/msg_accept_channel.rs
index a8ec438784..1732bf2f79 100644
--- a/fuzz/src/msg_targets/msg_accept_channel.rs
+++ b/fuzz/src/msg_targets/msg_accept_channel.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_accept_channel_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::AcceptChannel, data);
+	test_msg_simple!(lightning::ln::msgs::AcceptChannel, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_accept_channel_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::AcceptChannel, data);
+	test_msg_simple!(lightning::ln::msgs::AcceptChannel, data);
 }
diff --git a/fuzz/src/msg_targets/msg_announcement_signatures.rs b/fuzz/src/msg_targets/msg_announcement_signatures.rs
index 0fc40fcb69..15e4e6d804 100644
--- a/fuzz/src/msg_targets/msg_announcement_signatures.rs
+++ b/fuzz/src/msg_targets/msg_announcement_signatures.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_announcement_signatures_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::AnnouncementSignatures, data);
+	test_msg_simple!(lightning::ln::msgs::AnnouncementSignatures, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_announcement_signatures_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::AnnouncementSignatures, data);
+	test_msg_simple!(lightning::ln::msgs::AnnouncementSignatures, data);
 }
diff --git a/fuzz/src/msg_targets/msg_channel_announcement.rs b/fuzz/src/msg_targets/msg_channel_announcement.rs
index 53ffe0eff7..7a36520fb2 100644
--- a/fuzz/src/msg_targets/msg_channel_announcement.rs
+++ b/fuzz/src/msg_targets/msg_channel_announcement.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_channel_announcement_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_exact!(msgs::ChannelAnnouncement, data);
+	test_msg_exact!(lightning::ln::msgs::ChannelAnnouncement, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_channel_announcement_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_exact!(msgs::ChannelAnnouncement, data);
+	test_msg_exact!(lightning::ln::msgs::ChannelAnnouncement, data);
 }
diff --git a/fuzz/src/msg_targets/msg_channel_details.rs b/fuzz/src/msg_targets/msg_channel_details.rs
new file mode 100644
index 0000000000..f448a71988
--- /dev/null
+++ b/fuzz/src/msg_targets/msg_channel_details.rs
@@ -0,0 +1,25 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+// This file is auto-generated by gen_target.sh based on msg_target_template.txt
+// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
+
+use msg_targets::utils::VecWriter;
+use utils::test_logger;
+
+#[inline]
+pub fn msg_channel_details_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
+	test_msg_simple!(lightning::ln::channelmanager::ChannelDetails, data);
+}
+
+#[no_mangle]
+pub extern "C" fn msg_channel_details_run(data: *const u8, datalen: usize) {
+	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
+	test_msg_simple!(lightning::ln::channelmanager::ChannelDetails, data);
+}
diff --git a/fuzz/src/msg_targets/msg_channel_ready.rs b/fuzz/src/msg_targets/msg_channel_ready.rs
index e5f3b25c69..d95a86004f 100644
--- a/fuzz/src/msg_targets/msg_channel_ready.rs
+++ b/fuzz/src/msg_targets/msg_channel_ready.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_channel_ready_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::ChannelReady, data);
+	test_msg_simple!(lightning::ln::msgs::ChannelReady, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_channel_ready_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::ChannelReady, data);
+	test_msg_simple!(lightning::ln::msgs::ChannelReady, data);
 }
diff --git a/fuzz/src/msg_targets/msg_channel_reestablish.rs b/fuzz/src/msg_targets/msg_channel_reestablish.rs
index 7316bfbdf8..2b934c00c2 100644
--- a/fuzz/src/msg_targets/msg_channel_reestablish.rs
+++ b/fuzz/src/msg_targets/msg_channel_reestablish.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_channel_reestablish_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg!(msgs::ChannelReestablish, data);
+	test_msg!(lightning::ln::msgs::ChannelReestablish, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_channel_reestablish_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg!(msgs::ChannelReestablish, data);
+	test_msg!(lightning::ln::msgs::ChannelReestablish, data);
 }
diff --git a/fuzz/src/msg_targets/msg_channel_update.rs b/fuzz/src/msg_targets/msg_channel_update.rs
index 1cd9ddbbfe..7c7822e659 100644
--- a/fuzz/src/msg_targets/msg_channel_update.rs
+++ b/fuzz/src/msg_targets/msg_channel_update.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_channel_update_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_hole!(msgs::ChannelUpdate, data, 108, 1);
+	test_msg_hole!(lightning::ln::msgs::ChannelUpdate, data, 108, 1);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_channel_update_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_hole!(msgs::ChannelUpdate, data, 108, 1);
+	test_msg_hole!(lightning::ln::msgs::ChannelUpdate, data, 108, 1);
 }
diff --git a/fuzz/src/msg_targets/msg_closing_signed.rs b/fuzz/src/msg_targets/msg_closing_signed.rs
index 52f39af29a..f494acf62a 100644
--- a/fuzz/src/msg_targets/msg_closing_signed.rs
+++ b/fuzz/src/msg_targets/msg_closing_signed.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_closing_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::ClosingSigned, data);
+	test_msg_simple!(lightning::ln::msgs::ClosingSigned, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_closing_signed_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::ClosingSigned, data);
+	test_msg_simple!(lightning::ln::msgs::ClosingSigned, data);
 }
diff --git a/fuzz/src/msg_targets/msg_commitment_signed.rs b/fuzz/src/msg_targets/msg_commitment_signed.rs
index 163ce74460..63c38ce8e5 100644
--- a/fuzz/src/msg_targets/msg_commitment_signed.rs
+++ b/fuzz/src/msg_targets/msg_commitment_signed.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_commitment_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::CommitmentSigned, data);
+	test_msg_simple!(lightning::ln::msgs::CommitmentSigned, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_commitment_signed_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::CommitmentSigned, data);
+	test_msg_simple!(lightning::ln::msgs::CommitmentSigned, data);
 }
diff --git a/fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs b/fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs
index 92fb532e64..af4963245b 100644
--- a/fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs
+++ b/fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_decoded_onion_error_packet_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg!(msgs::DecodedOnionErrorPacket, data);
+	test_msg!(lightning::ln::msgs::DecodedOnionErrorPacket, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_decoded_onion_error_packet_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg!(msgs::DecodedOnionErrorPacket, data);
+	test_msg!(lightning::ln::msgs::DecodedOnionErrorPacket, data);
 }
diff --git a/fuzz/src/msg_targets/msg_error_message.rs b/fuzz/src/msg_targets/msg_error_message.rs
index 7fba2c4dc8..4a70074043 100644
--- a/fuzz/src/msg_targets/msg_error_message.rs
+++ b/fuzz/src/msg_targets/msg_error_message.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_error_message_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_hole!(msgs::ErrorMessage, data, 32, 2);
+	test_msg_hole!(lightning::ln::msgs::ErrorMessage, data, 32, 2);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_error_message_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_hole!(msgs::ErrorMessage, data, 32, 2);
+	test_msg_hole!(lightning::ln::msgs::ErrorMessage, data, 32, 2);
 }
diff --git a/fuzz/src/msg_targets/msg_funding_created.rs b/fuzz/src/msg_targets/msg_funding_created.rs
index e0005cb082..7fad86e743 100644
--- a/fuzz/src/msg_targets/msg_funding_created.rs
+++ b/fuzz/src/msg_targets/msg_funding_created.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_funding_created_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::FundingCreated, data);
+	test_msg_simple!(lightning::ln::msgs::FundingCreated, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_funding_created_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::FundingCreated, data);
+	test_msg_simple!(lightning::ln::msgs::FundingCreated, data);
 }
diff --git a/fuzz/src/msg_targets/msg_funding_signed.rs b/fuzz/src/msg_targets/msg_funding_signed.rs
index f0586e7b29..82886d6393 100644
--- a/fuzz/src/msg_targets/msg_funding_signed.rs
+++ b/fuzz/src/msg_targets/msg_funding_signed.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_funding_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::FundingSigned, data);
+	test_msg_simple!(lightning::ln::msgs::FundingSigned, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_funding_signed_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::FundingSigned, data);
+	test_msg_simple!(lightning::ln::msgs::FundingSigned, data);
 }
diff --git a/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs b/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs
index 448aaffc90..5c14a24162 100644
--- a/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs
+++ b/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_gossip_timestamp_filter_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::GossipTimestampFilter, data);
+	test_msg_simple!(lightning::ln::msgs::GossipTimestampFilter, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_gossip_timestamp_filter_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::GossipTimestampFilter, data);
+	test_msg_simple!(lightning::ln::msgs::GossipTimestampFilter, data);
 }
diff --git a/fuzz/src/msg_targets/msg_init.rs b/fuzz/src/msg_targets/msg_init.rs
index 4aa5c4a314..efa53a473e 100644
--- a/fuzz/src/msg_targets/msg_init.rs
+++ b/fuzz/src/msg_targets/msg_init.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_init_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::Init, data);
+	test_msg_simple!(lightning::ln::msgs::Init, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_init_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::Init, data);
+	test_msg_simple!(lightning::ln::msgs::Init, data);
 }
diff --git a/fuzz/src/msg_targets/msg_node_announcement.rs b/fuzz/src/msg_targets/msg_node_announcement.rs
index 8f5751b9a0..57c05145fc 100644
--- a/fuzz/src/msg_targets/msg_node_announcement.rs
+++ b/fuzz/src/msg_targets/msg_node_announcement.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_node_announcement_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_exact!(msgs::NodeAnnouncement, data);
+	test_msg_exact!(lightning::ln::msgs::NodeAnnouncement, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_node_announcement_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_exact!(msgs::NodeAnnouncement, data);
+	test_msg_exact!(lightning::ln::msgs::NodeAnnouncement, data);
 }
diff --git a/fuzz/src/msg_targets/msg_onion_hop_data.rs b/fuzz/src/msg_targets/msg_onion_hop_data.rs
index 757f316190..d73523dc15 100644
--- a/fuzz/src/msg_targets/msg_onion_hop_data.rs
+++ b/fuzz/src/msg_targets/msg_onion_hop_data.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_onion_hop_data_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::OnionHopData, data);
+	test_msg_simple!(lightning::ln::msgs::OnionHopData, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_onion_hop_data_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::OnionHopData, data);
+	test_msg_simple!(lightning::ln::msgs::OnionHopData, data);
 }
diff --git a/fuzz/src/msg_targets/msg_open_channel.rs b/fuzz/src/msg_targets/msg_open_channel.rs
index ce637c167e..2508fa353b 100644
--- a/fuzz/src/msg_targets/msg_open_channel.rs
+++ b/fuzz/src/msg_targets/msg_open_channel.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_open_channel_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::OpenChannel, data);
+	test_msg_simple!(lightning::ln::msgs::OpenChannel, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_open_channel_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::OpenChannel, data);
+	test_msg_simple!(lightning::ln::msgs::OpenChannel, data);
 }
diff --git a/fuzz/src/msg_targets/msg_ping.rs b/fuzz/src/msg_targets/msg_ping.rs
index 7b44ae1804..36d4d0d8ae 100644
--- a/fuzz/src/msg_targets/msg_ping.rs
+++ b/fuzz/src/msg_targets/msg_ping.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_ping_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::Ping, data);
+	test_msg_simple!(lightning::ln::msgs::Ping, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_ping_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::Ping, data);
+	test_msg_simple!(lightning::ln::msgs::Ping, data);
 }
diff --git a/fuzz/src/msg_targets/msg_pong.rs b/fuzz/src/msg_targets/msg_pong.rs
index cff4a54fac..ea8a1bdd8a 100644
--- a/fuzz/src/msg_targets/msg_pong.rs
+++ b/fuzz/src/msg_targets/msg_pong.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_pong_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::Pong, data);
+	test_msg_simple!(lightning::ln::msgs::Pong, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_pong_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::Pong, data);
+	test_msg_simple!(lightning::ln::msgs::Pong, data);
 }
diff --git a/fuzz/src/msg_targets/msg_query_channel_range.rs b/fuzz/src/msg_targets/msg_query_channel_range.rs
index 4b3de6aa89..75a2f042a3 100644
--- a/fuzz/src/msg_targets/msg_query_channel_range.rs
+++ b/fuzz/src/msg_targets/msg_query_channel_range.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_query_channel_range_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::QueryChannelRange, data);
+	test_msg_simple!(lightning::ln::msgs::QueryChannelRange, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_query_channel_range_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::QueryChannelRange, data);
+	test_msg_simple!(lightning::ln::msgs::QueryChannelRange, data);
 }
diff --git a/fuzz/src/msg_targets/msg_query_short_channel_ids.rs b/fuzz/src/msg_targets/msg_query_short_channel_ids.rs
index 99cde11175..f536c7f4f3 100644
--- a/fuzz/src/msg_targets/msg_query_short_channel_ids.rs
+++ b/fuzz/src/msg_targets/msg_query_short_channel_ids.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_query_short_channel_ids_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg!(msgs::QueryShortChannelIds, data);
+	test_msg!(lightning::ln::msgs::QueryShortChannelIds, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_query_short_channel_ids_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg!(msgs::QueryShortChannelIds, data);
+	test_msg!(lightning::ln::msgs::QueryShortChannelIds, data);
 }
diff --git a/fuzz/src/msg_targets/msg_reply_channel_range.rs b/fuzz/src/msg_targets/msg_reply_channel_range.rs
index d23b58a2db..0fd0ed6340 100644
--- a/fuzz/src/msg_targets/msg_reply_channel_range.rs
+++ b/fuzz/src/msg_targets/msg_reply_channel_range.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_reply_channel_range_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg!(msgs::ReplyChannelRange, data);
+	test_msg!(lightning::ln::msgs::ReplyChannelRange, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_reply_channel_range_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg!(msgs::ReplyChannelRange, data);
+	test_msg!(lightning::ln::msgs::ReplyChannelRange, data);
 }
diff --git a/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs b/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs
index 7634329a43..712bb3ac47 100644
--- a/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs
+++ b/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_reply_short_channel_ids_end_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::ReplyShortChannelIdsEnd, data);
+	test_msg_simple!(lightning::ln::msgs::ReplyShortChannelIdsEnd, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_reply_short_channel_ids_end_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::ReplyShortChannelIdsEnd, data);
+	test_msg_simple!(lightning::ln::msgs::ReplyShortChannelIdsEnd, data);
 }
diff --git a/fuzz/src/msg_targets/msg_revoke_and_ack.rs b/fuzz/src/msg_targets/msg_revoke_and_ack.rs
index 873939ca7c..cd3e64c36d 100644
--- a/fuzz/src/msg_targets/msg_revoke_and_ack.rs
+++ b/fuzz/src/msg_targets/msg_revoke_and_ack.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_revoke_and_ack_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::RevokeAndACK, data);
+	test_msg_simple!(lightning::ln::msgs::RevokeAndACK, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_revoke_and_ack_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::RevokeAndACK, data);
+	test_msg_simple!(lightning::ln::msgs::RevokeAndACK, data);
 }
diff --git a/fuzz/src/msg_targets/msg_shutdown.rs b/fuzz/src/msg_targets/msg_shutdown.rs
index e6e74cc661..465d1e39eb 100644
--- a/fuzz/src/msg_targets/msg_shutdown.rs
+++ b/fuzz/src/msg_targets/msg_shutdown.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_shutdown_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::Shutdown, data);
+	test_msg_simple!(lightning::ln::msgs::Shutdown, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_shutdown_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::Shutdown, data);
+	test_msg_simple!(lightning::ln::msgs::Shutdown, data);
 }
diff --git a/fuzz/src/msg_targets/msg_update_add_htlc.rs b/fuzz/src/msg_targets/msg_update_add_htlc.rs
index 409f0fac8d..f031a4d89e 100644
--- a/fuzz/src/msg_targets/msg_update_add_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_add_htlc.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_update_add_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::UpdateAddHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateAddHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_add_htlc_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::UpdateAddHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateAddHTLC, data);
 }
diff --git a/fuzz/src/msg_targets/msg_update_fail_htlc.rs b/fuzz/src/msg_targets/msg_update_fail_htlc.rs
index 12d3f1c3fc..8d9dfedfcf 100644
--- a/fuzz/src/msg_targets/msg_update_fail_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_fail_htlc.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fail_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::UpdateFailHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFailHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fail_htlc_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::UpdateFailHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFailHTLC, data);
 }
diff --git a/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs b/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs
index 0b36070d1e..2635a4cb6a 100644
--- a/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fail_malformed_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::UpdateFailMalformedHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFailMalformedHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fail_malformed_htlc_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::UpdateFailMalformedHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFailMalformedHTLC, data);
 }
diff --git a/fuzz/src/msg_targets/msg_update_fee.rs b/fuzz/src/msg_targets/msg_update_fee.rs
index 3c23a902f5..b891a36319 100644
--- a/fuzz/src/msg_targets/msg_update_fee.rs
+++ b/fuzz/src/msg_targets/msg_update_fee.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fee_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::UpdateFee, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFee, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fee_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::UpdateFee, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFee, data);
 }
diff --git a/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs b/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs
index 460ff0e167..a96aa3729a 100644
--- a/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fulfill_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_simple!(msgs::UpdateFulfillHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFulfillHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fulfill_htlc_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_simple!(msgs::UpdateFulfillHTLC, data);
+	test_msg_simple!(lightning::ln::msgs::UpdateFulfillHTLC, data);
 }
diff --git a/fuzz/src/msg_targets/msg_warning_message.rs b/fuzz/src/msg_targets/msg_warning_message.rs
index f033b6fd6e..abcef229bd 100644
--- a/fuzz/src/msg_targets/msg_warning_message.rs
+++ b/fuzz/src/msg_targets/msg_warning_message.rs
@@ -10,18 +10,16 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
-use lightning::ln::msgs;
-
 use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]
 pub fn msg_warning_message_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-	test_msg_hole!(msgs::WarningMessage, data, 32, 2);
+	test_msg_hole!(lightning::ln::msgs::WarningMessage, data, 32, 2);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_warning_message_run(data: *const u8, datalen: usize) {
 	let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-	test_msg_hole!(msgs::WarningMessage, data, 32, 2);
+	test_msg_hole!(lightning::ln::msgs::WarningMessage, data, 32, 2);
 }
diff --git a/fuzz/targets.h b/fuzz/targets.h
index d142aa6487..7958a6f614 100644
--- a/fuzz/targets.h
+++ b/fuzz/targets.h
@@ -36,3 +36,4 @@ void msg_channel_update_run(const unsigned char* data, size_t data_len);
 void msg_onion_hop_data_run(const unsigned char* data, size_t data_len);
 void msg_ping_run(const unsigned char* data, size_t data_len);
 void msg_pong_run(const unsigned char* data, size_t data_len);
+void msg_channel_details_run(const unsigned char* data, size_t data_len);