diff --git a/bitcoin/test/Makefile b/bitcoin/test/Makefile
index 411019d35..47d8edc35 100644
--- a/bitcoin/test/Makefile
+++ b/bitcoin/test/Makefile
@@ -2,7 +2,7 @@ BITCOIN_TEST_SRC := $(wildcard bitcoin/test/run-*.c)
 BITCOIN_TEST_OBJS := $(BITCOIN_TEST_SRC:.c=.o)
 BITCOIN_TEST_PROGRAMS := $(BITCOIN_TEST_OBJS:.o=)
 
-BITCOIN_TEST_COMMON_OBJS := common/utils.o common/setup.o
+BITCOIN_TEST_COMMON_OBJS := common/utils.o common/setup.o common/autodata.o
 
 $(BITCOIN_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_TEST_COMMON_OBJS) bitcoin/chainparams.o
 $(BITCOIN_TEST_OBJS): $(CCAN_HEADERS) $(BITCOIN_HEADERS) $(BITCOIN_SRC)
diff --git a/channeld/Makefile b/channeld/Makefile
index 49261924a..5e7626c37 100644
--- a/channeld/Makefile
+++ b/channeld/Makefile
@@ -30,6 +30,7 @@ LIGHTNINGD_CONTROL_OBJS += channeld/channeld_wiregen.o
 # Common source we use.
 CHANNELD_COMMON_OBJS :=				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/bigsize.o			\
 	common/billboard.o			\
diff --git a/channeld/test/Makefile b/channeld/test/Makefile
index 73faebf12..77ea655ab 100644
--- a/channeld/test/Makefile
+++ b/channeld/test/Makefile
@@ -9,6 +9,7 @@ ALL_TEST_PROGRAMS += $(CHANNELD_TEST_PROGRAMS)
 
 CHANNELD_TEST_COMMON_OBJS :=			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/channel_type.o			\
 	common/daemon_conn.o			\
 	common/features.o			\
diff --git a/cli/test/Makefile b/cli/test/Makefile
index 3093fbdbb..14daeb11e 100644
--- a/cli/test/Makefile
+++ b/cli/test/Makefile
@@ -8,6 +8,7 @@ ALL_C_SOURCES += $(CLI_TEST_SRC)
 ALL_TEST_PROGRAMS += $(CLI_TEST_PROGRAMS)
 
 CLI_TEST_COMMON_OBJS :=				\
+	common/autodata.o			\
 	common/configdir.o			\
 	common/daemon_conn.o			\
 	common/htlc_state.o			\
diff --git a/closingd/Makefile b/closingd/Makefile
index de6859107..7e31e6114 100644
--- a/closingd/Makefile
+++ b/closingd/Makefile
@@ -20,6 +20,7 @@ LIGHTNINGD_CONTROL_OBJS += closingd/closingd_wiregen.o
 # Common source we use.
 CLOSINGD_COMMON_OBJS :=				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/bigsize.o			\
 	common/bip32.o				\
diff --git a/common/test/Makefile b/common/test/Makefile
index f166d4c0e..18f78dc8a 100644
--- a/common/test/Makefile
+++ b/common/test/Makefile
@@ -8,6 +8,7 @@ COMMON_TEST_OBJS := $(COMMON_TEST_SRC:.c=.o)
 COMMON_TEST_PROGRAMS := $(COMMON_TEST_OBJS:.o=)
 
 COMMON_TEST_COMMON_OBJS :=				\
+	common/autodata.o				\
 	common/setup.o					\
 	common/utils.o
 
diff --git a/common/type_to_string.h b/common/type_to_string.h
index 3597271ad..40834c49e 100644
--- a/common/type_to_string.h
+++ b/common/type_to_string.h
@@ -2,7 +2,7 @@
 #define LIGHTNING_COMMON_TYPE_TO_STRING_H
 #include "config.h"
 #include "utils.h"
-#include <ccan/autodata/autodata.h>
+#include <common/autodata.h>
 
 /* This must match the type_to_string_ cases. */
 union printable_types {
diff --git a/connectd/Makefile b/connectd/Makefile
index 397558128..0a32022d7 100644
--- a/connectd/Makefile
+++ b/connectd/Makefile
@@ -26,6 +26,7 @@ LIGHTNINGD_CONTROL_OBJS += connectd/connectd_wiregen.o
 # Common source we use.
 CONNECTD_COMMON_OBJS :=				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/base64.o				\
 	common/bech32.o				\
diff --git a/connectd/test/Makefile b/connectd/test/Makefile
index fe92b2376..fa3ace591 100644
--- a/connectd/test/Makefile
+++ b/connectd/test/Makefile
@@ -5,6 +5,7 @@ CONNECTD_TEST_OBJS := $(CONNECTD_TEST_SRC:.c=.o)
 CONNECTD_TEST_PROGRAMS := $(CONNECTD_TEST_OBJS:.o=)
 
 CONNECTD_TEST_COMMON_OBJS :=			\
+	common/autodata.o			\
 	common/features.o			\
 	common/pseudorand.o			\
 	common/setup.o				\
diff --git a/contrib/sanitizer_suppressions/lsan b/contrib/sanitizer_suppressions/lsan
index f53dadfcf..0073bf216 100644
--- a/contrib/sanitizer_suppressions/lsan
+++ b/contrib/sanitizer_suppressions/lsan
@@ -1,3 +1,2 @@
 # Clang would detect false positive here, due to padding. See https://github.com/ElementsProject/lightning/pull/2285
-leak:ccan/ccan/autodata/autodata.c
 leak:ccan/ccan/htable/htable.c
diff --git a/devtools/Makefile b/devtools/Makefile
index 1cd72ceea..93ebbf2f1 100644
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -13,6 +13,7 @@ ALL_PROGRAMS += $(DEVTOOLS)
 
 DEVTOOLS_COMMON_OBJS :=				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/bech32.o				\
 	common/bech32_util.o			\
diff --git a/gossipd/Makefile b/gossipd/Makefile
index 510ebccf9..75b872447 100644
--- a/gossipd/Makefile
+++ b/gossipd/Makefile
@@ -28,6 +28,7 @@ LIGHTNINGD_CONTROL_OBJS += gossipd/gossipd_wiregen.o
 GOSSIPD_COMMON_OBJS :=				\
 	bitcoin/chainparams.o			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/bech32.o				\
 	common/bech32_util.o			\
diff --git a/gossipd/test/Makefile b/gossipd/test/Makefile
index 28aaed2ce..f4057a4cf 100644
--- a/gossipd/test/Makefile
+++ b/gossipd/test/Makefile
@@ -8,6 +8,7 @@ GOSSIPD_TEST_PROGRAMS := $(GOSSIPD_TEST_OBJS:.o=)
 
 GOSSIPD_TEST_COMMON_OBJS :=			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/bigsize.o			\
 	common/channel_id.o			\
 	common/features.o			\
diff --git a/hsmd/Makefile b/hsmd/Makefile
index afd120d64..448833a1c 100644
--- a/hsmd/Makefile
+++ b/hsmd/Makefile
@@ -20,6 +20,7 @@ ALL_PROGRAMS += lightningd/lightning_hsmd
 # Common source we use.
 HSMD_COMMON_OBJS :=				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/bigsize.o			\
 	common/bip32.o				\
 	common/bolt12_merkle.o			\
diff --git a/lightningd/Makefile b/lightningd/Makefile
index 2b5a59a11..63b6aa2be 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -63,6 +63,7 @@ ALL_PROGRAMS += lightningd/lightningd
 LIGHTNINGD_COMMON_OBJS :=			\
 	common/addr.o				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/base64.o				\
 	common/bech32.o				\
diff --git a/lightningd/jsonrpc.h b/lightningd/jsonrpc.h
index 4d0789eaa..16fc01049 100644
--- a/lightningd/jsonrpc.h
+++ b/lightningd/jsonrpc.h
@@ -1,8 +1,8 @@
 #ifndef LIGHTNING_LIGHTNINGD_JSONRPC_H
 #define LIGHTNING_LIGHTNINGD_JSONRPC_H
 #include "config.h"
-#include <ccan/autodata/autodata.h>
 #include <ccan/list/list.h>
+#include <common/autodata.h>
 #include <common/json.h>
 #include <common/json_stream.h>
 #include <common/status_levels.h>
diff --git a/lightningd/test/Makefile b/lightningd/test/Makefile
index d19d8d277..c52f8c042 100644
--- a/lightningd/test/Makefile
+++ b/lightningd/test/Makefile
@@ -9,6 +9,7 @@ ALL_TEST_PROGRAMS += $(LIGHTNINGD_TEST_PROGRAMS)
 
 LIGHTNINGD_TEST_COMMON_OBJS :=			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/bech32.o				\
 	common/daemon_conn.o			\
 	common/htlc_state.o			\
diff --git a/onchaind/Makefile b/onchaind/Makefile
index ff5a52b1a..a57e2bcf9 100644
--- a/onchaind/Makefile
+++ b/onchaind/Makefile
@@ -33,6 +33,7 @@ LIGHTNINGD_CONTROL_OBJS += \
 # Common source we use.
 ONCHAIND_COMMON_OBJS :=				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/bigsize.o			\
 	common/bip32.o				\
 	common/coin_mvt.o			\
diff --git a/onchaind/test/Makefile b/onchaind/test/Makefile
index d52a04777..96fd2b865 100644
--- a/onchaind/test/Makefile
+++ b/onchaind/test/Makefile
@@ -11,6 +11,7 @@ ALL_TEST_PROGRAMS += $(ONCHAIND_TEST_PROGRAMS)
 
 ONCHAIND_TEST_COMMON_OBJS :=			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/features.o			\
 	common/pseudorand.o			\
 	common/setup.o				\
diff --git a/openingd/Makefile b/openingd/Makefile
index e0d77e612..b0fc6ef27 100644
--- a/openingd/Makefile
+++ b/openingd/Makefile
@@ -32,6 +32,7 @@ LIGHTNINGD_CONTROL_OBJS += openingd/openingd_wiregen.o openingd/dualopend_wirege
 # Common source we use.
 OPENINGD_COMMON_OBJS :=				\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/bigsize.o			\
 	common/billboard.o			\
diff --git a/plugins/Makefile b/plugins/Makefile
index b54c0fcea..79bbadea3 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -107,6 +107,7 @@ PLUGIN_COMMON_OBJS :=				\
 	bitcoin/tx.o				\
 	bitcoin/varint.o			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/bech32.o				\
 	common/bech32_util.o			\
diff --git a/plugins/test/Makefile b/plugins/test/Makefile
index 67591ecc5..465fc0331 100644
--- a/plugins/test/Makefile
+++ b/plugins/test/Makefile
@@ -9,6 +9,7 @@ ALL_TEST_PROGRAMS += $(PLUGIN_TEST_PROGRAMS)
 
 PLUGIN_TEST_COMMON_OBJS :=			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/pseudorand.o			\
 	common/setup.o				\
 	common/type_to_string.o			\
diff --git a/tools/Makefile b/tools/Makefile
index 64653331a..5dd478fcf 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,7 +17,7 @@ tools/headerversions: $(FORCE) tools/headerversions.o $(CCAN_OBJS)
 
 tools/check-bolt: tools/check-bolt.o $(CCAN_OBJS) $(TOOLS_COMMON_OBJS)
 
-tools/hsmtool: tools/hsmtool.o $(CCAN_OBJS) $(TOOLS_COMMON_OBJS) $(BITCOIN_OBJS) common/amount.o common/bech32.o common/bigsize.o common/configdir.o common/derive_basepoints.o common/descriptor_checksum.o common/hsm_encryption.o common/node_id.o common/type_to_string.o common/version.o wire/fromwire.o wire/towire.o
+tools/hsmtool: tools/hsmtool.o $(CCAN_OBJS) $(TOOLS_COMMON_OBJS) $(BITCOIN_OBJS) common/amount.o common/autodata.o common/bech32.o common/bigsize.o common/configdir.o common/derive_basepoints.o common/descriptor_checksum.o common/hsm_encryption.o common/node_id.o common/type_to_string.o common/version.o wire/fromwire.o wire/towire.o
 
 tools/lightning-hsmtool: tools/hsmtool
 	cp $< $@
diff --git a/wallet/db_common.h b/wallet/db_common.h
index dca2381b1..2b697822c 100644
--- a/wallet/db_common.h
+++ b/wallet/db_common.h
@@ -1,9 +1,9 @@
 #ifndef LIGHTNING_WALLET_DB_COMMON_H
 #define LIGHTNING_WALLET_DB_COMMON_H
 #include "config.h"
-#include <ccan/autodata/autodata.h>
 #include <ccan/list/list.h>
 #include <ccan/short_types/short_types.h>
+#include <common/autodata.h>
 
 /* For testing, we want to catch fatal messages. */
 #ifndef db_fatal
diff --git a/wallet/test/Makefile b/wallet/test/Makefile
index 6ea28e140..46335b063 100644
--- a/wallet/test/Makefile
+++ b/wallet/test/Makefile
@@ -7,6 +7,7 @@ ALL_TEST_PROGRAMS += $(WALLET_TEST_PROGRAMS)
 
 WALLET_TEST_COMMON_OBJS :=			\
 	common/amount.o				\
+	common/autodata.o			\
 	common/base32.o				\
 	common/blockheight_states.o		\
 	common/channel_type.o			\
diff --git a/wire/test/Makefile b/wire/test/Makefile
index 0326d3080..d38fb9aad 100644
--- a/wire/test/Makefile
+++ b/wire/test/Makefile
@@ -10,6 +10,7 @@ ALL_C_SOURCES += $(WIRE_TEST_SRC)
 ALL_TEST_PROGRAMS += $(WIRE_TEST_PROGRAMS)
 
 WIRE_TEST_COMMON_OBJS :=		\
+	common/autodata.o		\
 	common/pseudorand.o		\
 	common/setup.o			\
 	common/utils.o