diff --git a/include/llarp/exit.hpp b/include/llarp/exit.hpp
deleted file mode 100644
index 87f43ac78..000000000
--- a/include/llarp/exit.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef LLARP_EXIT_HPP
-#define LLARP_EXIT_HPP
-#include <llarp/exit/context.hpp>
-#include <llarp/exit/policy.hpp>
-#include <llarp/exit/session.hpp>
-#endif
\ No newline at end of file
diff --git a/include/llarp/handlers/exit.hpp b/include/llarp/handlers/exit.hpp
index a0c3f0330..f585a57d8 100644
--- a/include/llarp/handlers/exit.hpp
+++ b/include/llarp/handlers/exit.hpp
@@ -1,8 +1,9 @@
 #ifndef LLARP_HANDLERS_EXIT_HPP
 #define LLARP_HANDLERS_EXIT_HPP
 
+#include <exit/endpoint.hpp>
 #include <llarp/handlers/tun.hpp>
-#include <llarp/exit/endpoint.hpp>
+
 #include <unordered_map>
 
 namespace llarp
diff --git a/include/llarp/messages/exit.hpp b/include/llarp/messages/exit.hpp
index aea0eca96..379415153 100644
--- a/include/llarp/messages/exit.hpp
+++ b/include/llarp/messages/exit.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_MESSAGES_EXIT_HPP
 #define LLARP_MESSAGES_EXIT_HPP
+#include <crypto.hpp>
+#include <exit/policy.hpp>
 #include <llarp/routing/message.hpp>
-#include <llarp/exit/policy.hpp>
+
 #include <vector>
-#include <crypto.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/service/endpoint.hpp b/include/llarp/service/endpoint.hpp
index e17debd4e..17db05b40 100644
--- a/include/llarp/service/endpoint.hpp
+++ b/include/llarp/service/endpoint.hpp
@@ -1,14 +1,14 @@
 #ifndef LLARP_SERVICE_ENDPOINT_HPP
 #define LLARP_SERVICE_ENDPOINT_HPP
+#include <exit/session.hpp>
 #include <llarp/codel.hpp>
+#include <llarp/ev.h>
+#include <llarp/net.hpp>
+#include <llarp/path.hpp>
 #include <llarp/pathbuilder.hpp>
 #include <llarp/service/Identity.hpp>
 #include <llarp/service/handler.hpp>
 #include <llarp/service/protocol.hpp>
-#include <llarp/path.hpp>
-#include <llarp/ev.h>
-#include <llarp/net.hpp>
-#include <llarp/exit/session.hpp>
 
 // minimum time between interoset shifts
 #ifndef MIN_SHIFT_INTERVAL
diff --git a/llarp/exit.hpp b/llarp/exit.hpp
new file mode 100644
index 000000000..f46211b4f
--- /dev/null
+++ b/llarp/exit.hpp
@@ -0,0 +1,6 @@
+#ifndef LLARP_EXIT_HPP
+#define LLARP_EXIT_HPP
+#include <exit/context.hpp>
+#include <exit/policy.hpp>
+#include <exit/session.hpp>
+#endif
diff --git a/llarp/exit/context.cpp b/llarp/exit/context.cpp
index cf7eff261..98bfb7ba2 100644
--- a/llarp/exit/context.cpp
+++ b/llarp/exit/context.cpp
@@ -1,4 +1,4 @@
-#include <llarp/exit/context.hpp>
+#include <exit/context.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/exit/context.hpp b/llarp/exit/context.hpp
similarity index 97%
rename from include/llarp/exit/context.hpp
rename to llarp/exit/context.hpp
index 04e3f3293..9da74c2b9 100644
--- a/include/llarp/exit/context.hpp
+++ b/llarp/exit/context.hpp
@@ -1,6 +1,6 @@
 #ifndef LLARP_EXIT_CONTEXT_HPP
 #define LLARP_EXIT_CONTEXT_HPP
-#include <llarp/exit/policy.hpp>
+#include <exit/policy.hpp>
 #include <string>
 #include <unordered_map>
 #include <llarp/handlers/exit.hpp>
diff --git a/llarp/exit/endpoint.cpp b/llarp/exit/endpoint.cpp
index eccd16d4e..32ae4c600 100644
--- a/llarp/exit/endpoint.cpp
+++ b/llarp/exit/endpoint.cpp
@@ -1,4 +1,4 @@
-#include <llarp/exit/endpoint.hpp>
+#include <exit/endpoint.hpp>
 #include <llarp/handlers/exit.hpp>
 
 #include <router.hpp>
diff --git a/include/llarp/exit/endpoint.hpp b/llarp/exit/endpoint.hpp
similarity index 100%
rename from include/llarp/exit/endpoint.hpp
rename to llarp/exit/endpoint.hpp
diff --git a/llarp/exit/policy.cpp b/llarp/exit/policy.cpp
index 3ecf79fe0..ffefb7fe7 100644
--- a/llarp/exit/policy.cpp
+++ b/llarp/exit/policy.cpp
@@ -1,4 +1,4 @@
-#include <llarp/exit/policy.hpp>
+#include <exit/policy.hpp>
 
 namespace llarp
 {
@@ -40,4 +40,4 @@ namespace llarp
     }
 
   }  // namespace exit
-}  // namespace llarp
\ No newline at end of file
+}  // namespace llarp
diff --git a/include/llarp/exit/policy.hpp b/llarp/exit/policy.hpp
similarity index 100%
rename from include/llarp/exit/policy.hpp
rename to llarp/exit/policy.hpp
diff --git a/llarp/exit/session.cpp b/llarp/exit/session.cpp
index 1eb29a403..408c77e57 100644
--- a/llarp/exit/session.cpp
+++ b/llarp/exit/session.cpp
@@ -1,4 +1,4 @@
-#include <llarp/exit/session.hpp>
+#include <exit/session.hpp>
 #include <llarp/path.hpp>
 #include <router.hpp>
 
diff --git a/include/llarp/exit/session.hpp b/llarp/exit/session.hpp
similarity index 100%
rename from include/llarp/exit/session.hpp
rename to llarp/exit/session.hpp
diff --git a/llarp/router.hpp b/llarp/router.hpp
index 90ac95cfd..e2cba4afd 100644
--- a/llarp/router.hpp
+++ b/llarp/router.hpp
@@ -5,9 +5,9 @@
 #include <llarp/config.h>
 #include <dht.h>
 #include <dht.hpp>
+#include <exit.hpp>
 #include <llarp/establish_job.hpp>
 #include <llarp/ev.h>
-#include <llarp/exit.hpp>
 #include <llarp/handlers/tun.hpp>
 #include <llarp/link_layer.hpp>
 #include <llarp/link_message.hpp>
diff --git a/test/exit_unittest.cpp b/test/exit_unittest.cpp
index 1179cbb53..3edc75cda 100644
--- a/test/exit_unittest.cpp
+++ b/test/exit_unittest.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <llarp/exit.hpp>
+
+#include <exit.hpp>
 #include <router.hpp>
 
 struct ExitTest : public ::testing::Test