diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 60913a1d3..7a143f865 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -4,21 +4,11 @@ set(LIB_UTIL_SRC
   config/config.cpp
   config/ini.cpp
   config/key_manager.cpp
-  constants/defaults.cpp
   constants/limits.cpp
-  constants/link_layer.cpp
-  constants/path.cpp
-  constants/proto.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp
-  util/aligned.cpp
   util/bencode.cpp
-  util/bits.cpp
   util/buffer.cpp
-  util/codel.cpp
-  util/common.cpp
   util/encode.cpp
-  util/endian.cpp
-  util/decaying_hashset.cpp
   util/fs.cpp
   util/json.cpp
   util/logging/android_logger.cpp
@@ -31,19 +21,14 @@ set(LIB_UTIL_SRC
   util/logging/win32_logger.cpp
   util/lokinet_init.c
   util/mem.cpp
-  util/meta/traits.cpp
   util/printer.cpp
-  util/status.cpp
   util/str.cpp
-  util/string_view.cpp
   util/thread/logic.cpp
   util/thread/queue_manager.cpp
-  util/thread/queue.cpp
   util/thread/thread_pool.cpp
   util/thread/threading.cpp
   util/thread/threadpool.cpp
   util/time.cpp
-  util/types.cpp
 )
 
 add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
@@ -113,15 +98,12 @@ if(WIN32)
   target_link_libraries(${PLATFORM_LIB} PUBLIC iphlpapi)
 endif()
 set(DNSLIB_SRC
-  dns/dns.cpp
   dns/message.cpp
   dns/name.cpp
-  dns/query.cpp
   dns/question.cpp
   dns/rr.cpp
   dns/serialize.cpp
   dns/server.cpp
-  dns/string.cpp
 )
 
 set(CONSENSUS_SRC
@@ -133,19 +115,13 @@ set(LIB_SRC
   ${DNSLIB_SRC}
   bootstrap.cpp
   context.cpp
-  crypto/constants.cpp
   crypto/crypto_libsodium.cpp
-  crypto/crypto_noop.cpp
   crypto/crypto.cpp
   crypto/encrypted_frame.cpp
-  crypto/encrypted.cpp
   crypto/types.cpp
-  dht/bucket.cpp
   dht/context.cpp
   dht/dht.cpp
   dht/explorenetworkjob.cpp
-  dht/kademlia.cpp
-  dht/key.cpp
   dht/localtaglookup.cpp
   dht/localrouterlookup.cpp
   dht/localserviceaddresslookup.cpp
@@ -155,21 +131,16 @@ set(LIB_SRC
   dht/messages/gotintro.cpp
   dht/messages/gotrouter.cpp
   dht/messages/pubintro.cpp
-  dht/node.cpp
   dht/publishservicejob.cpp
   dht/recursiverouterlookup.cpp
   dht/serviceaddresslookup.cpp
   dht/taglookup.cpp
-  dht/tx.cpp
-  dht/txholder.cpp
-  dht/txowner.cpp
   exit/context.cpp
   exit/endpoint.cpp
   exit/exit_messages.cpp
   exit/policy.cpp
   exit/session.cpp
   handlers/exit.cpp
-  handlers/null.cpp
   handlers/tun.cpp
   hook/shell.cpp
   iwp/iwp.cpp
@@ -177,15 +148,11 @@ set(LIB_SRC
   iwp/message_buffer.cpp
   iwp/session.cpp
   link/factory.cpp
-  link/i_link_manager.cpp
   link/link_manager.cpp
   link/server.cpp
-  link/session.cpp
   messages/dht_immediate.cpp
-  messages/discard.cpp
   messages/link_intro.cpp
   messages/link_message_parser.cpp
-  messages/link_message.cpp
   messages/relay.cpp
   messages/relay_commit.cpp
   messages/relay_status.cpp
@@ -194,30 +161,22 @@ set(LIB_SRC
   nodedb.cpp
   path/ihophandler.cpp
   path/path_context.cpp
-  path/path_types.cpp
   path/path.cpp
   path/pathbuilder.cpp
   path/pathset.cpp
   path/transit_hop.cpp
   pow.cpp
   profiling.cpp
-  router/abstractrouter.cpp
-  router/i_outbound_message_handler.cpp
   router/outbound_message_handler.cpp
-  router/i_outbound_session_maker.cpp
   router/outbound_session_maker.cpp
-  router/i_rc_lookup_handler.cpp
   router/rc_lookup_handler.cpp
-  router/i_gossiper.cpp
   router/rc_gossiper.cpp
   router/router.cpp
   router_contact.cpp
   router_id.cpp
   router_version.cpp
   routing/dht_message.cpp
-  routing/handler.cpp
   routing/message_parser.cpp
-  routing/message.cpp
   routing/path_confirm_message.cpp
   routing/path_latency_message.cpp
   routing/path_transfer_message.cpp
@@ -230,7 +189,6 @@ set(LIB_SRC
   service/endpoint_state.cpp
   service/endpoint_util.cpp
   service/endpoint.cpp
-  service/handler.cpp
   service/hidden_service_address_lookup.cpp
   service/identity.cpp
   service/info.cpp
@@ -238,14 +196,12 @@ set(LIB_SRC
   service/intro.cpp
   service/lookup.cpp
   service/outbound_context.cpp
-  service/pendingbuffer.cpp
   service/protocol.cpp
   service/router_lookup_job.cpp
   service/sendcontext.cpp
   service/session.cpp
   service/tag_lookup_job.cpp
   service/tag.cpp
-  service/vanity.cpp
 )
 if(TESTNET)
   set(LIB_SRC ${LIB_SRC} testnet.c)
diff --git a/llarp/constants/defaults.cpp b/llarp/constants/defaults.cpp
deleted file mode 100644
index 247bdc78f..000000000
--- a/llarp/constants/defaults.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <constants/defaults.hpp>
diff --git a/llarp/constants/link_layer.cpp b/llarp/constants/link_layer.cpp
deleted file mode 100644
index 640bf821c..000000000
--- a/llarp/constants/link_layer.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <constants/link_layer.hpp>
diff --git a/llarp/constants/path.cpp b/llarp/constants/path.cpp
deleted file mode 100644
index 79ff4567e..000000000
--- a/llarp/constants/path.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <constants/path.hpp>
diff --git a/llarp/constants/proto.cpp b/llarp/constants/proto.cpp
deleted file mode 100644
index d3b302af7..000000000
--- a/llarp/constants/proto.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <constants/proto.hpp>
diff --git a/llarp/crypto/constants.cpp b/llarp/crypto/constants.cpp
deleted file mode 100644
index 37e0a0685..000000000
--- a/llarp/crypto/constants.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto/constants.hpp>
diff --git a/llarp/crypto/crypto_noop.cpp b/llarp/crypto/crypto_noop.cpp
deleted file mode 100644
index a71706fee..000000000
--- a/llarp/crypto/crypto_noop.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto/crypto_noop.hpp>
diff --git a/llarp/crypto/encrypted.cpp b/llarp/crypto/encrypted.cpp
deleted file mode 100644
index 073dab9ef..000000000
--- a/llarp/crypto/encrypted.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto/encrypted.hpp>
diff --git a/llarp/dht/bucket.cpp b/llarp/dht/bucket.cpp
deleted file mode 100644
index 1c00752c4..000000000
--- a/llarp/dht/bucket.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dht/bucket.hpp>
diff --git a/llarp/dht/kademlia.cpp b/llarp/dht/kademlia.cpp
deleted file mode 100644
index 2ae8bd507..000000000
--- a/llarp/dht/kademlia.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dht/kademlia.hpp>
diff --git a/llarp/dht/key.cpp b/llarp/dht/key.cpp
deleted file mode 100644
index a83099e13..000000000
--- a/llarp/dht/key.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dht/key.hpp>
diff --git a/llarp/dht/node.cpp b/llarp/dht/node.cpp
deleted file mode 100644
index d2347cb33..000000000
--- a/llarp/dht/node.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dht/node.hpp>
diff --git a/llarp/dht/tx.cpp b/llarp/dht/tx.cpp
deleted file mode 100644
index 4e60e79f0..000000000
--- a/llarp/dht/tx.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dht/tx.hpp>
diff --git a/llarp/dht/txholder.cpp b/llarp/dht/txholder.cpp
deleted file mode 100644
index 2f7bf76a7..000000000
--- a/llarp/dht/txholder.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dht/txholder.hpp>
diff --git a/llarp/dht/txowner.cpp b/llarp/dht/txowner.cpp
deleted file mode 100644
index 3707b15f4..000000000
--- a/llarp/dht/txowner.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dht/txowner.hpp>
diff --git a/llarp/dns/dns.cpp b/llarp/dns/dns.cpp
deleted file mode 100644
index 54e01b141..000000000
--- a/llarp/dns/dns.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dns/dns.hpp>
diff --git a/llarp/dns/query.cpp b/llarp/dns/query.cpp
deleted file mode 100644
index 882cc78b6..000000000
--- a/llarp/dns/query.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dns/query.hpp>
diff --git a/llarp/dns/string.cpp b/llarp/dns/string.cpp
deleted file mode 100644
index fc1dab46d..000000000
--- a/llarp/dns/string.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <dns/string.hpp>
diff --git a/llarp/handlers/null.cpp b/llarp/handlers/null.cpp
deleted file mode 100644
index 9d25b00f7..000000000
--- a/llarp/handlers/null.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <handlers/null.hpp>
diff --git a/llarp/link/i_link_manager.cpp b/llarp/link/i_link_manager.cpp
deleted file mode 100644
index ffdfcdc38..000000000
--- a/llarp/link/i_link_manager.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <link/i_link_manager.hpp>
diff --git a/llarp/link/session.cpp b/llarp/link/session.cpp
deleted file mode 100644
index a9537838d..000000000
--- a/llarp/link/session.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <link/session.hpp>
diff --git a/llarp/messages/discard.cpp b/llarp/messages/discard.cpp
deleted file mode 100644
index 831d51891..000000000
--- a/llarp/messages/discard.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <messages/discard.hpp>
diff --git a/llarp/messages/link_message.cpp b/llarp/messages/link_message.cpp
deleted file mode 100644
index 8a049643f..000000000
--- a/llarp/messages/link_message.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <messages/link_message.hpp>
diff --git a/llarp/path/path_types.cpp b/llarp/path/path_types.cpp
deleted file mode 100644
index eb23914ab..000000000
--- a/llarp/path/path_types.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <path/path_types.hpp>
diff --git a/llarp/router/abstractrouter.cpp b/llarp/router/abstractrouter.cpp
deleted file mode 100644
index e48b4218f..000000000
--- a/llarp/router/abstractrouter.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <router/abstractrouter.hpp>
diff --git a/llarp/router/i_gossiper.cpp b/llarp/router/i_gossiper.cpp
deleted file mode 100644
index 700d7fbd0..000000000
--- a/llarp/router/i_gossiper.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <router/i_gossiper.hpp>
diff --git a/llarp/router/i_outbound_message_handler.cpp b/llarp/router/i_outbound_message_handler.cpp
deleted file mode 100644
index 6a4b6a25f..000000000
--- a/llarp/router/i_outbound_message_handler.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <router/i_outbound_message_handler.hpp>
diff --git a/llarp/router/i_outbound_session_maker.cpp b/llarp/router/i_outbound_session_maker.cpp
deleted file mode 100644
index 35243e594..000000000
--- a/llarp/router/i_outbound_session_maker.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <router/i_outbound_session_maker.hpp>
diff --git a/llarp/router/i_rc_lookup_handler.cpp b/llarp/router/i_rc_lookup_handler.cpp
deleted file mode 100644
index 5582e4c83..000000000
--- a/llarp/router/i_rc_lookup_handler.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <router/i_rc_lookup_handler.hpp>
diff --git a/llarp/routing/handler.cpp b/llarp/routing/handler.cpp
deleted file mode 100644
index fc2b23dea..000000000
--- a/llarp/routing/handler.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <routing/handler.hpp>
diff --git a/llarp/routing/message.cpp b/llarp/routing/message.cpp
deleted file mode 100644
index d7062a1ba..000000000
--- a/llarp/routing/message.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <routing/message.hpp>
diff --git a/llarp/service/handler.cpp b/llarp/service/handler.cpp
deleted file mode 100644
index eb3a9c5c1..000000000
--- a/llarp/service/handler.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <service/handler.hpp>
diff --git a/llarp/service/pendingbuffer.cpp b/llarp/service/pendingbuffer.cpp
deleted file mode 100644
index 493049a0c..000000000
--- a/llarp/service/pendingbuffer.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <service/pendingbuffer.hpp>
diff --git a/llarp/service/vanity.cpp b/llarp/service/vanity.cpp
deleted file mode 100644
index e77e54ad9..000000000
--- a/llarp/service/vanity.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <service/vanity.hpp>
diff --git a/llarp/util/aligned.cpp b/llarp/util/aligned.cpp
deleted file mode 100644
index bff4235e4..000000000
--- a/llarp/util/aligned.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/aligned.hpp>
diff --git a/llarp/util/bits.cpp b/llarp/util/bits.cpp
deleted file mode 100644
index 1ce3419e0..000000000
--- a/llarp/util/bits.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/bits.hpp>
diff --git a/llarp/util/codel.cpp b/llarp/util/codel.cpp
deleted file mode 100644
index a79d5835b..000000000
--- a/llarp/util/codel.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/codel.hpp>
diff --git a/llarp/util/common.cpp b/llarp/util/common.cpp
deleted file mode 100644
index 695680901..000000000
--- a/llarp/util/common.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/common.hpp>
diff --git a/llarp/util/decaying_hashset.cpp b/llarp/util/decaying_hashset.cpp
deleted file mode 100644
index c9b69ab38..000000000
--- a/llarp/util/decaying_hashset.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/decaying_hashset.hpp>
diff --git a/llarp/util/endian.cpp b/llarp/util/endian.cpp
deleted file mode 100644
index fdc0e2848..000000000
--- a/llarp/util/endian.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/endian.hpp>
diff --git a/llarp/util/meta/memfn.cpp b/llarp/util/meta/memfn.cpp
deleted file mode 100644
index 7e29bdd32..000000000
--- a/llarp/util/meta/memfn.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/meta/memfn.hpp>
diff --git a/llarp/util/meta/traits.cpp b/llarp/util/meta/traits.cpp
deleted file mode 100644
index 5fa9cac9d..000000000
--- a/llarp/util/meta/traits.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/meta/traits.hpp>
diff --git a/llarp/util/status.cpp b/llarp/util/status.cpp
deleted file mode 100644
index 15c76b583..000000000
--- a/llarp/util/status.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/status.hpp>
diff --git a/llarp/util/string_view.cpp b/llarp/util/string_view.cpp
deleted file mode 100644
index 784d4b646..000000000
--- a/llarp/util/string_view.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/string_view.hpp>
diff --git a/llarp/util/thread/queue.cpp b/llarp/util/thread/queue.cpp
deleted file mode 100644
index 2947aea43..000000000
--- a/llarp/util/thread/queue.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/thread/queue.hpp>
diff --git a/llarp/util/types.cpp b/llarp/util/types.cpp
deleted file mode 100644
index 0ea777c95..000000000
--- a/llarp/util/types.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/types.hpp>