diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -308,6 +308,7 @@
 	compat/glibcxx_sanity.cpp
 	compat/strnlen.cpp
 	fs.cpp
+	interfaces/handler.cpp
 	logging.cpp
 	random.cpp
 	rcu.cpp
@@ -389,6 +390,7 @@
 add_library(common
 	amount.cpp
 	base58.cpp
+	bloom.cpp
 	cashaddr.cpp
 	cashaddrenc.cpp
 	chainparams.cpp
@@ -403,9 +405,11 @@
 	key.cpp
 	key_io.cpp
 	keystore.cpp
+	merkleblock.cpp
 	net_permissions.cpp
 	netaddress.cpp
 	netbase.cpp
+	outputtype.cpp
 	policy/policy.cpp
 	primitives/block.cpp
 	protocol.cpp
@@ -466,7 +470,6 @@
 	addrman.cpp
 	avalanche.cpp
 	banman.cpp
-	bloom.cpp
 	blockencodings.cpp
 	blockfilter.cpp
 	chain.cpp
@@ -483,9 +486,7 @@
 	index/txindex.cpp
 	init.cpp
 	interfaces/chain.cpp
-	interfaces/handler.cpp
 	interfaces/node.cpp
-	merkleblock.cpp
 	miner.cpp
 	minerfund.cpp
 	net.cpp
@@ -493,7 +494,6 @@
 	node/coin.cpp
 	node/transaction.cpp
 	noui.cpp
-	outputtype.cpp
 	policy/fees.cpp
 	policy/mempool.cpp
 	policy/settings.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -278,7 +278,6 @@
   addrman.cpp \
   avalanche.cpp \
   banman.cpp \
-  bloom.cpp \
   blockencodings.cpp \
   blockfilter.cpp \
   chain.cpp \
@@ -293,10 +292,8 @@
   index/txindex.cpp \
   init.cpp \
   interfaces/chain.cpp \
-  interfaces/handler.cpp \
   interfaces/node.cpp \
   dbwrapper.cpp \
-  merkleblock.cpp \
   miner.cpp \
   minerfund.cpp \
   net.cpp \
@@ -304,7 +301,6 @@
   node/coin.cpp \
   node/transaction.cpp \
   noui.cpp \
-  outputtype.cpp \
   policy/fees.cpp \
   policy/mempool.cpp \
   policy/settings.cpp \
@@ -474,6 +470,7 @@
   base58.cpp \
   cashaddr.cpp \
   cashaddrenc.cpp \
+  bloom.cpp \
   chainparams.cpp \
   config.cpp \
   coins.cpp \
@@ -485,9 +482,11 @@
   key.cpp \
   key_io.cpp \
   keystore.cpp \
+  merkleblock.cpp \
   net_permissions.cpp \
   netaddress.cpp \
   netbase.cpp \
+  outputtype.cpp \
   policy/policy.cpp \
   protocol.cpp \
   psbt.cpp \
@@ -515,6 +514,7 @@
   compat/glibcxx_sanity.cpp \
   compat/strnlen.cpp \
   fs.cpp \
+  interfaces/handler.cpp \
   logging.cpp \
   random.cpp \
   rcu.cpp \