diff --git a/.gitignore b/.gitignore
index 3b52e1feb..8c45f674e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,9 +21,6 @@ gen_*.c
 gen_*.h
 wire/gen_*_csv
 cli/lightning-cli
-tools/check-bolt
-tools/hsmtool
-tools/lightning-hsmtool
 coverage
 ccan/config.h
 __pycache__
@@ -35,18 +32,6 @@ monkeytype.sqlite3
 !*/test/run-*.c
 */test/exp-run-*
 !*/test/exp-run-*.c
-external/libbacktrace-build/
-external/libbacktrace.a
-external/libbacktrace.la
-external/libbase58/
-external/libbase58.a
-external/libwally-core-build/
-external/libjsmn.a
-external/libsecp256k1.a
-external/libsecp256k1.la
-external/libwallycore.a
-external/libwallycore.la
-external/x86_64-pc-linux-gnu/
 test/test_protocol
 test/test_sphinx
 tests/.pytest.restart
@@ -55,7 +40,6 @@ tests/fuzz/fuzz-*
 !tests/fuzz/fuzz-*.c
 gossip_store
 .pytest_cache
-tools/headerversions
 .tmp.lightningrfc/
 contrib/pylightning/build/
 contrib/pylightning/dist/
@@ -63,12 +47,5 @@ contrib/pylightning/pylightning.egg-info/
 contrib/pyln-*/build/
 contrib/pyln-*/dist/
 contrib/pyln-*/pyln_*.egg-info/
-plugins/fetchinvoice
-plugins/offers
-plugins/keysend
 release/
 tests/plugins/test_selfdisable_after_getmanifest
-devtools/route
-devtools/topology
-devtools/bolt12-cli
-wallet/statements.po
diff --git a/devtools/.gitignore b/devtools/.gitignore
index 848261d9f..ce1866e9f 100644
--- a/devtools/.gitignore
+++ b/devtools/.gitignore
@@ -8,8 +8,11 @@ mkfunding
 mkclose
 mkgossip
 mkencoded
-create-gossipstore 
-checkchannels 
-mkquery 
-lightning-checkmessage 
+create-gossipstore
+checkchannels
+mkquery
+lightning-checkmessage
 blindedpath
+route
+topology
+bolt12-cli
diff --git a/external/.gitignore b/external/.gitignore
index d9f02c800..2d7ecacf4 100644
--- a/external/.gitignore
+++ b/external/.gitignore
@@ -1,3 +1,16 @@
 x86_64-linux-gnu
 aarch64-linux-gnu
 arm-linux-gnueabihf
+x86_64-pc-linux-gnu
+
+libbacktrace-build/
+libbacktrace.a
+libbacktrace.la
+libbase58/
+libbase58.a
+libwally-core-build/
+libjsmn.a
+libsecp256k1.a
+libsecp256k1.la
+libwallycore.a
+libwallycore.la
diff --git a/plugins/.gitignore b/plugins/.gitignore
index 20a577cf5..0d4eda99b 100644
--- a/plugins/.gitignore
+++ b/plugins/.gitignore
@@ -6,3 +6,6 @@ spenderp
 multifundchannel
 txprepare
 fundchannel
+fetchinvoice
+offers
+keysend
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 000000000..a17763bb9
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,4 @@
+headerversions
+check-bolt
+hsmtool
+lightning-hsmtool
diff --git a/wallet/.gitignore b/wallet/.gitignore
index 714639472..9a2bf90c0 100644
--- a/wallet/.gitignore
+++ b/wallet/.gitignore
@@ -1 +1,2 @@
 *_tests
+statements.po
diff --git a/wire/.gitignore b/wire/.gitignore
index 4be4fca3b..8072f91b4 100644
--- a/wire/.gitignore
+++ b/wire/.gitignore
@@ -1,4 +1,3 @@
 
 # Ignore experimental wiregen
 *_exp_*
-