diff --git a/include/llarp.h b/include/llarp.h
index 363ea9c6b..ed6bfcae3 100644
--- a/include/llarp.h
+++ b/include/llarp.h
@@ -7,8 +7,8 @@
 #include <llarp/version.hpp>
 
 #ifdef __cplusplus
+#include <handlers/tun.hpp>     // for handlers
 #include <llarp/service/address.hpp>  // for service::address
-#include <llarp/handlers/tun.hpp>     // for handlers
 #include <llarp/service/endpoint.hpp>
 
 extern "C"
diff --git a/include/llarp/service/context.hpp b/include/llarp/service/context.hpp
index 5435cd3c8..6b44d6e22 100644
--- a/include/llarp/service/context.hpp
+++ b/include/llarp/service/context.hpp
@@ -1,10 +1,11 @@
 #ifndef LLARP_SERVICE_CONTEXT_HPP
 #define LLARP_SERVICE_CONTEXT_HPP
+#include <handlers/tun.hpp>
 #include <llarp/net.hpp>
 #include <llarp/service/config.hpp>
 #include <llarp/service/endpoint.hpp>
+
 #include <unordered_map>
-#include <llarp/handlers/tun.hpp>
 
 namespace llarp
 {
diff --git a/llarp/dns_dotlokilookup.cpp b/llarp/dns_dotlokilookup.cpp
index db244dcc0..94f6a0a74 100644
--- a/llarp/dns_dotlokilookup.cpp
+++ b/llarp/dns_dotlokilookup.cpp
@@ -1,5 +1,5 @@
+#include <handlers/tun.hpp>
 #include <llarp/dns_dotlokilookup.hpp>
-#include <llarp/handlers/tun.hpp>
 #include <llarp/service/context.hpp>
 #include <llarp/logic.hpp>
 
diff --git a/llarp/exit/context.hpp b/llarp/exit/context.hpp
index 9da74c2b9..7c6bd67b7 100644
--- a/llarp/exit/context.hpp
+++ b/llarp/exit/context.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_EXIT_CONTEXT_HPP
 #define LLARP_EXIT_CONTEXT_HPP
 #include <exit/policy.hpp>
+#include <handlers/exit.hpp>
+
 #include <string>
 #include <unordered_map>
-#include <llarp/handlers/exit.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/endpoint.cpp b/llarp/exit/endpoint.cpp
index 32ae4c600..f9922cafd 100644
--- a/llarp/exit/endpoint.cpp
+++ b/llarp/exit/endpoint.cpp
@@ -1,6 +1,5 @@
 #include <exit/endpoint.hpp>
-#include <llarp/handlers/exit.hpp>
-
+#include <handlers/exit.hpp>
 #include <router.hpp>
 
 namespace llarp
diff --git a/llarp/handlers/exit.cpp b/llarp/handlers/exit.cpp
index e102c8a53..d255e9db6 100644
--- a/llarp/handlers/exit.cpp
+++ b/llarp/handlers/exit.cpp
@@ -1,7 +1,8 @@
-#include <llarp/handlers/exit.hpp>
-#include "../str.hpp"
-#include "../router.hpp"
+#include <handlers/exit.hpp>
 #include <llarp/net.hpp>
+#include <router.hpp>
+#include <str.hpp>
+
 #include <cassert>
 
 namespace llarp
diff --git a/include/llarp/handlers/exit.hpp b/llarp/handlers/exit.hpp
similarity index 99%
rename from include/llarp/handlers/exit.hpp
rename to llarp/handlers/exit.hpp
index f585a57d8..6101c79be 100644
--- a/include/llarp/handlers/exit.hpp
+++ b/llarp/handlers/exit.hpp
@@ -2,7 +2,7 @@
 #define LLARP_HANDLERS_EXIT_HPP
 
 #include <exit/endpoint.hpp>
-#include <llarp/handlers/tun.hpp>
+#include <handlers/tun.hpp>
 
 #include <unordered_map>
 
diff --git a/include/llarp/handlers/null.hpp b/llarp/handlers/null.hpp
similarity index 100%
rename from include/llarp/handlers/null.hpp
rename to llarp/handlers/null.hpp
diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp
index b06d0659e..c80f31fda 100644
--- a/llarp/handlers/tun.cpp
+++ b/llarp/handlers/tun.cpp
@@ -1,14 +1,14 @@
 #include <algorithm>
 // harmless on other platforms
 #define __USE_MINGW_ANSI_STDIO 1
-#include <llarp/handlers/tun.hpp>
+#include <handlers/tun.hpp>
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <netdb.h>
 #endif
-#include "ev.hpp"
 
+#include <ev.hpp>
 #include <router.hpp>
 
 namespace llarp
diff --git a/include/llarp/handlers/tun.hpp b/llarp/handlers/tun.hpp
similarity index 100%
rename from include/llarp/handlers/tun.hpp
rename to llarp/handlers/tun.hpp
diff --git a/llarp/router.hpp b/llarp/router.hpp
index e2cba4afd..901b28aa0 100644
--- a/llarp/router.hpp
+++ b/llarp/router.hpp
@@ -1,14 +1,16 @@
 #ifndef LLARP_ROUTER_HPP
 #define LLARP_ROUTER_HPP
 
-#include <llarp/buffer.h>
-#include <llarp/config.h>
+#include <crypto.hpp>
 #include <dht.h>
 #include <dht.hpp>
 #include <exit.hpp>
+#include <fs.hpp>
+#include <handlers/tun.hpp>
+#include <llarp/buffer.h>
+#include <llarp/config.h>
 #include <llarp/establish_job.hpp>
 #include <llarp/ev.h>
-#include <llarp/handlers/tun.hpp>
 #include <llarp/link_layer.hpp>
 #include <llarp/link_message.hpp>
 #include <llarp/logic.hpp>
@@ -19,6 +21,8 @@
 #include <llarp/routing/handler.hpp>
 #include <llarp/rpc.hpp>
 #include <llarp/service.hpp>
+#include <mem.hpp>
+#include <str.hpp>
 #include <threadpool.hpp>
 
 #include <functional>
@@ -27,11 +31,6 @@
 #include <vector>
 #include <unordered_map>
 
-#include <crypto.hpp>
-#include <fs.hpp>
-#include <mem.hpp>
-#include <str.hpp>
-
 bool
 llarp_findOrCreateEncryption(llarp::Crypto *crypto, const char *fpath,
                              llarp::SecretKey &encryption);
diff --git a/llarp/service/context.cpp b/llarp/service/context.cpp
index 4ef303b4b..ea881eb44 100644
--- a/llarp/service/context.cpp
+++ b/llarp/service/context.cpp
@@ -1,5 +1,5 @@
-#include <llarp/handlers/tun.hpp>
-#include <llarp/handlers/null.hpp>
+#include <handlers/tun.hpp>
+#include <handlers/null.hpp>
 #include <llarp/service/context.hpp>
 #include <llarp/service/endpoint.hpp>