diff --git a/daemon/dns.cpp b/daemon/dns.cpp
index 932fdaf34..ca98c453d 100644
--- a/daemon/dns.cpp
+++ b/daemon/dns.cpp
@@ -1,13 +1,12 @@
-#include <unistd.h>
+#include <config.h>
+#include <dns_dotlokilookup.hpp>
+#include <dns_iptracker.hpp>
+#include <dnsd.hpp>
 #include <llarp.h>
-#include <llarp/config.h>
-#include <llarp/dns_iptracker.hpp>
-#include <llarp/dnsd.hpp>
-#include <llarp/dns_dotlokilookup.hpp>
-
-#include <llarp/threading.hpp>  // for multithreaded version (multiplatorm)
+#include <threading.hpp>  // for multithreaded version (multiplatorm)
 
 #include <signal.h>  // Linux needs this for SIGINT
+#include <unistd.h>
 
 #ifdef _WIN32
 #define uint UINT
diff --git a/daemon/rcutil.cpp b/daemon/rcutil.cpp
index 0aa535c72..29221074d 100644
--- a/daemon/rcutil.cpp
+++ b/daemon/rcutil.cpp
@@ -1,16 +1,16 @@
 #include <buffer.hpp>
 #include <crypto.hpp>
 #include <fs.hpp>
-#include <fstream>
 #include <llarp.h>
-#include <llarp/messages/dht.hpp>
-#include <llarp/net.hpp>
-#include <llarp/nodedb.hpp>
-#include <llarp/time.hpp>
 #include <logger.hpp>
+#include <messages/dht.hpp>
+#include <net.hpp>
+#include <nodedb.hpp>
 #include <router.hpp>
 #include <router_contact.hpp>
+#include <time.hpp>
 
+#include <fstream>
 #include <getopt.h>
 #include <signal.h>
 
diff --git a/include/llarp.h b/include/llarp.h
index c8e6a44c4..1273e91ba 100644
--- a/include/llarp.h
+++ b/include/llarp.h
@@ -1,10 +1,11 @@
 #ifndef LLARP_H_
 #define LLARP_H_
+
 #include <dht.h>
-#include <llarp/ev.h>
-#include <llarp/logic.hpp>
-#include <llarp/mem.h>
-#include <llarp/version.hpp>
+#include <ev.h>
+#include <logic.hpp>
+#include <mem.h>
+#include <version.hpp>
 
 #ifdef __cplusplus
 #include <handlers/tun.hpp>     // for handlers
diff --git a/include/llarp.hpp b/include/llarp.hpp
index bfc0ca383..5419243c4 100644
--- a/include/llarp.hpp
+++ b/include/llarp.hpp
@@ -1,10 +1,11 @@
 #ifndef LLARP_HPP
 #define LLARP_HPP
 
-#include <iostream>
+#include <crypto.h>
 #include <llarp.h>
-#include <llarp/crypto.h>
-#include <llarp/threading.hpp>
+#include <threading.hpp>
+
+#include <iostream>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/include/llarp/messages.hpp b/include/llarp/messages.hpp
deleted file mode 100644
index eeb03d35b..000000000
--- a/include/llarp/messages.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LLARP_MESSAGES_HPP
-#define LLARP_MESSAGES_HPP
-
-/**
-   include shortcut for all link and routing messages
- */
-
-#include <llarp/messages/dht_immediate.hpp>
-#include <llarp/messages/link_intro.hpp>
-#include <llarp/messages/relay.hpp>
-#include <llarp/messages/relay_commit.hpp>
-#include <llarp/messages/discard.hpp>
-#include <llarp/messages/path_confirm.hpp>
-#include <llarp/messages/exit.hpp>
-#include <llarp/messages/transfer_traffic.hpp>
-
-#endif
diff --git a/include/llarp/string.h b/include/llarp/string.h
index 80aad1a70..afc042798 100644
--- a/include/llarp/string.h
+++ b/include/llarp/string.h
@@ -1,6 +1,7 @@
 #ifndef LLARP_STRING_H
 #define LLARP_STRING_H
-#include <llarp/common.hpp>
+
+#include <common.hpp>
 
 #ifndef __FreeBSD__
 #if !(__APPLE__ && __MACH__)
diff --git a/jni/lokinet_android.cpp b/jni/lokinet_android.cpp
index ce4e30f28..e610141cc 100755
--- a/jni/lokinet_android.cpp
+++ b/jni/lokinet_android.cpp
@@ -2,7 +2,7 @@
 //#include <string.h>
 #include <jni.h>
 #include <llarp.h>
-#include <llarp/config.h>
+#include <config.h>
 #include <signal.h>
 #include <memory>
 #include <thread>
@@ -15,7 +15,7 @@ struct AndroidMain
   std::string configFile;
 
   /// set configuration and ensure files
-  bool 
+  bool
   Configure(const char * conf, const char * basedir)
   {
     configFile = conf;
@@ -84,7 +84,7 @@ struct AndroidMain
      return "";
   }
 
-  int GetIfRange() const 
+  int GetIfRange() const
   {
     if(m_impl)
     {
@@ -95,7 +95,7 @@ struct AndroidMain
     return -1;
   }
 
-  void 
+  void
   SetVPN_FD(int fd)
   {
     if(m_impl)
@@ -148,7 +148,7 @@ extern "C"
     {
       if(daemon->Start())
         return env->NewStringUTF("ok");
-      else 
+      else
         return env->NewStringUTF("failed to start daemon");
     }
     else
@@ -163,7 +163,7 @@ extern "C"
       daemon->Stop();
     }
   }
- 
+
   JNIEXPORT void JNICALL
   Java_network_loki_lokinet_Lokinet_1JNI_setVPNFileDescriptor(JNIEnv*, jclass, jint fd)
   {
@@ -207,4 +207,4 @@ extern "C"
       daemon->Stop();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libabyss/include/abyss/client.hpp b/libabyss/include/abyss/client.hpp
index 3702f4b63..18222a2fc 100644
--- a/libabyss/include/abyss/client.hpp
+++ b/libabyss/include/abyss/client.hpp
@@ -1,14 +1,16 @@
 #ifndef __ABYSS_CLIENT_HPP__
 #define __ABYSS_CLIENT_HPP__
-#include <string>
-#include <memory>
-#include <list>
+
+#include <abyss/json.hpp>
+#include <ev.h>
+#include <string_view.hpp>
+
 #include <deque>
-#include <unordered_map>
 #include <functional>
-#include <llarp/string_view.hpp>
-#include <abyss/json.hpp>
-#include <llarp/ev.h>
+#include <list>
+#include <memory>
+#include <string>
+#include <unordered_map>
 
 namespace abyss
 {
diff --git a/libabyss/include/abyss/http.hpp b/libabyss/include/abyss/http.hpp
index cf0de9666..9728fd6ba 100644
--- a/libabyss/include/abyss/http.hpp
+++ b/libabyss/include/abyss/http.hpp
@@ -1,9 +1,10 @@
 #ifndef __ABYSS_HTTP_HPP__
 #define __ABYSS_HTTP_HPP__
+#include <abyss/json.hpp>
+#include <string_view.hpp>
+
 #include <string>
 #include <unordered_map>
-#include <llarp/string_view.hpp>
-#include <abyss/json.hpp>
 
 namespace abyss
 {
diff --git a/libabyss/include/abyss/server.hpp b/libabyss/include/abyss/server.hpp
index ed4092883..88451c59a 100644
--- a/libabyss/include/abyss/server.hpp
+++ b/libabyss/include/abyss/server.hpp
@@ -1,14 +1,15 @@
 #ifndef __ABYSS_SERVER_HPP__
 #define __ABYSS_SERVER_HPP__
 
-#include <llarp/ev.h>
-#include <llarp/logic.hpp>
-#include <llarp/string_view.hpp>
-#include <llarp/time.hpp>
+#include <abyss/json.hpp>
+#include <ev.h>
+#include <logic.hpp>
+#include <string_view.hpp>
+#include <time.hpp>
+
 #include <list>
 #include <memory>
 #include <string>
-#include <abyss/json.hpp>
 #include <unordered_map>
 
 namespace abyss
diff --git a/libabyss/main.cpp b/libabyss/main.cpp
index 4f734f682..0ebfbe62f 100644
--- a/libabyss/main.cpp
+++ b/libabyss/main.cpp
@@ -1,5 +1,6 @@
 #include <libabyss.hpp>
-#include <llarp/net.hpp>
+#include <net.hpp>
+
 #ifndef _WIN32
 #include <sys/signal.h>
 #endif
diff --git a/libabyss/src/json.cpp b/libabyss/src/json.cpp
index 6d88c3eea..0f301fb07 100644
--- a/libabyss/src/json.cpp
+++ b/libabyss/src/json.cpp
@@ -1,10 +1,11 @@
-#include <llarp/string_view.hpp>
 #include <abyss/json.hpp>
-#include <vector>
-#include <cstring>
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>
+#include <string_view.hpp>
+
+#include <cstring>
 #include <string>
+#include <vector>
 
 namespace abyss
 {
diff --git a/libabyss/src/server.cpp b/libabyss/src/server.cpp
index ba5b5297a..692a6de32 100644
--- a/libabyss/src/server.cpp
+++ b/libabyss/src/server.cpp
@@ -2,7 +2,7 @@
 #include <abyss/server.hpp>
 #include <buffer.hpp>
 #include <logger.hpp>
-#include <llarp/time.hpp>
+#include <time.hpp>
 
 #include <algorithm>
 #include <sstream>
diff --git a/llarp/address_info.cpp b/llarp/address_info.cpp
index b09780f56..414975560 100644
--- a/llarp/address_info.cpp
+++ b/llarp/address_info.cpp
@@ -2,10 +2,10 @@
 #ifndef _WIN32
 #include <arpa/inet.h>
 #endif
-#include <llarp/bencode.h>
-#include <llarp/mem.h>
-#include <llarp/string.h>
-#include <llarp/net.hpp>
+#include <bencode.h>
+#include <mem.h>
+#include <string.h>
+#include <net.hpp>
 
 namespace llarp
 {
diff --git a/llarp/address_info.hpp b/llarp/address_info.hpp
index b8f7b9bf3..ff2f88084 100644
--- a/llarp/address_info.hpp
+++ b/llarp/address_info.hpp
@@ -1,11 +1,11 @@
 #ifndef LLARP_AI_HPP
 #define LLARP_AI_HPP
 
+#include <bencode.hpp>
+#include <crypto.h>
 #include <crypto.hpp>
-#include <llarp/bencode.hpp>
-#include <llarp/crypto.h>
-#include <llarp/mem.h>
-#include <llarp/net.h>
+#include <mem.h>
+#include <net.h>
 
 #include <string>
 #include <vector>
diff --git a/include/llarp/aligned.hpp b/llarp/aligned.hpp
similarity index 98%
rename from include/llarp/aligned.hpp
rename to llarp/aligned.hpp
index a0cf0820d..e7768f854 100644
--- a/include/llarp/aligned.hpp
+++ b/llarp/aligned.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_ALIGNED_HPP
 #define LLARP_ALIGNED_HPP
 
+#include <bencode.h>
+#include <crypto.h>
 #include <encode.hpp>
-#include <llarp/bencode.h>
-#include <llarp/crypto.h>
 #include <logger.hpp>
 
 #include <iomanip>
diff --git a/llarp/bencode.cpp b/llarp/bencode.cpp
index 853405257..5e9500896 100644
--- a/llarp/bencode.cpp
+++ b/llarp/bencode.cpp
@@ -1,4 +1,4 @@
-#include <llarp/bencode.h>
+#include <bencode.h>
 #include <logger.hpp>
 
 bool
diff --git a/include/llarp/bencode.h b/llarp/bencode.h
similarity index 95%
rename from include/llarp/bencode.h
rename to llarp/bencode.h
index 1e2ab7b5d..f037a2f82 100644
--- a/include/llarp/bencode.h
+++ b/llarp/bencode.h
@@ -1,8 +1,10 @@
 #ifndef LLARP_BENCODE_H
 #define LLARP_BENCODE_H
-#include <llarp/buffer.h>
-#include <llarp/common.hpp>
-#include <llarp/proto.hpp>
+
+#include <buffer.h>
+#include <common.hpp>
+#include <proto.hpp>
+
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/include/llarp/bencode.hpp b/llarp/bencode.hpp
similarity index 99%
rename from include/llarp/bencode.hpp
rename to llarp/bencode.hpp
index aee839da9..7fc5fd002 100644
--- a/include/llarp/bencode.hpp
+++ b/llarp/bencode.hpp
@@ -2,7 +2,7 @@
 #define LLARP_BENCODE_HPP
 
 #include <buffer.hpp>
-#include <llarp/bencode.h>
+#include <bencode.h>
 #include <logger.hpp>
 #include <mem.hpp>
 
diff --git a/include/llarp/bits.hpp b/llarp/bits.hpp
similarity index 100%
rename from include/llarp/bits.hpp
rename to llarp/bits.hpp
diff --git a/llarp/buffer.cpp b/llarp/buffer.cpp
index 684c51e56..d8351e7d3 100644
--- a/llarp/buffer.cpp
+++ b/llarp/buffer.cpp
@@ -1,5 +1,6 @@
-#include <llarp/buffer.h>
-#include <llarp/endian.hpp>
+#include <buffer.h>
+#include <endian.hpp>
+
 #include <stdarg.h>
 #include <stdio.h>
 
diff --git a/include/llarp/buffer.h b/llarp/buffer.h
similarity index 98%
rename from include/llarp/buffer.h
rename to llarp/buffer.h
index ee7d50bd7..bd819dc4e 100644
--- a/include/llarp/buffer.h
+++ b/llarp/buffer.h
@@ -1,7 +1,9 @@
 #ifndef LLARP_BUFFER_H_
 #define LLARP_BUFFER_H_
-#include <llarp/common.hpp>
-#include <llarp/mem.h>
+
+#include <common.hpp>
+#include <mem.h>
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/llarp/buffer.hpp b/llarp/buffer.hpp
index cb6b37096..6638a6bf5 100644
--- a/llarp/buffer.hpp
+++ b/llarp/buffer.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_BUFFER_HPP
 #define LLARP_BUFFER_HPP
 
-#include <llarp/buffer.h>
+#include <buffer.h>
 
 namespace llarp
 {
diff --git a/include/llarp/codel.hpp b/llarp/codel.hpp
similarity index 98%
rename from include/llarp/codel.hpp
rename to llarp/codel.hpp
index 012b4d8b6..fd8c9ff2c 100644
--- a/include/llarp/codel.hpp
+++ b/llarp/codel.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_CODEL_QUEUE_HPP
 #define LLARP_CODEL_QUEUE_HPP
-#include <llarp/threading.hpp>
-#include <llarp/time.hpp>
+
 #include <logger.hpp>
 #include <mem.hpp>
+#include <threading.hpp>
+#include <time.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/include/llarp/common.hpp b/llarp/common.hpp
similarity index 100%
rename from include/llarp/common.hpp
rename to llarp/common.hpp
diff --git a/llarp/config.cpp b/llarp/config.cpp
index 3640b62cc..1488bd5cf 100644
--- a/llarp/config.cpp
+++ b/llarp/config.cpp
@@ -1,11 +1,11 @@
-#include "config.hpp"
-#include <llarp/config.h>
-#include <llarp/defaults.hpp>
-#include <llarp/net.hpp>
-#include "fs.hpp"
-#include "ini.hpp"
-#include "logger.hpp"
-#include "mem.hpp"
+#include <config.h>
+#include <config.hpp>
+#include <defaults.hpp>
+#include <fs.hpp>
+#include <ini.hpp>
+#include <logger.hpp>
+#include <mem.hpp>
+#include <net.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/config.h b/llarp/config.h
similarity index 100%
rename from include/llarp/config.h
rename to llarp/config.h
diff --git a/llarp/config.hpp b/llarp/config.hpp
index a48abddc7..c556a5a17 100644
--- a/llarp/config.hpp
+++ b/llarp/config.hpp
@@ -1,10 +1,10 @@
 #ifndef LIBLLARP_CONFIG_HPP
 #define LIBLLARP_CONFIG_HPP
+#include <config.h>
+
 #include <list>
 #include <string>
 
-#include <llarp/config.h>
-
 namespace llarp
 {
   struct Config
diff --git a/llarp/context.cpp b/llarp/context.cpp
index 08aac2a51..c36bcd392 100644
--- a/llarp/context.cpp
+++ b/llarp/context.cpp
@@ -1,19 +1,19 @@
+#include <dns_dotlokilookup.hpp>
+#include <dnsd.hpp>
+#include <ev.hpp>
 #include <getopt.h>
 #include <llarp.h>
-#include <llarp/logger.h>
-#include <signal.h>
-#include <sys/param.h>  // for MIN
 #include <llarp.hpp>
+#include <logger.h>
 #include <router.hpp>
+#include <signal.h>
 
-#include <llarp/dnsd.hpp>
-#include <llarp/dns_dotlokilookup.hpp>
+#include <sys/param.h>  // for MIN
 
 #if(__FreeBSD__) || (__OpenBSD__) || (__NetBSD__)
 #include <pthread_np.h>
 #endif
 
-#include "ev.hpp"
 
 namespace llarp
 {
diff --git a/include/llarp/crypto.h b/llarp/crypto.h
similarity index 98%
rename from include/llarp/crypto.h
rename to llarp/crypto.h
index a15974d5b..b50b34b20 100644
--- a/include/llarp/crypto.h
+++ b/llarp/crypto.h
@@ -1,7 +1,8 @@
 #ifndef LLARP_CRYPTO_H_
 #define LLARP_CRYPTO_H_
-#include <llarp/buffer.h>
-#include <llarp/common.hpp>
+#include <buffer.h>
+#include <common.hpp>
+
 #include <functional>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/llarp/crypto.hpp b/llarp/crypto.hpp
index 7c33ca8ec..eb813f95c 100644
--- a/llarp/crypto.hpp
+++ b/llarp/crypto.hpp
@@ -1,11 +1,11 @@
 #ifndef LLARP_CRYPTO_HPP
 #define LLARP_CRYPTO_HPP
 
-#include <llarp/crypto.h>
-#include <llarp/mem.h>
-#include <llarp/threadpool.h>
-#include <llarp/aligned.hpp>
-#include <llarp/router_id.hpp>
+#include <aligned.hpp>
+#include <crypto.h>
+#include <mem.h>
+#include <router_id.hpp>
+#include <threadpool.h>
 
 namespace llarp
 {
diff --git a/llarp/crypto_libsodium.cpp b/llarp/crypto_libsodium.cpp
index 2876c0ac0..48b8648db 100644
--- a/llarp/crypto_libsodium.cpp
+++ b/llarp/crypto_libsodium.cpp
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include <llarp/crypto.h>
+#include <crypto.h>
 #include <sodium/crypto_generichash.h>
 #include <sodium/crypto_sign.h>
 #include <sodium/crypto_scalarmult.h>
diff --git a/include/llarp/defaults.hpp b/llarp/defaults.hpp
similarity index 100%
rename from include/llarp/defaults.hpp
rename to llarp/defaults.hpp
diff --git a/llarp/dht.h b/llarp/dht.h
index 0406f7cbd..b3b5c90b3 100644
--- a/llarp/dht.h
+++ b/llarp/dht.h
@@ -2,7 +2,7 @@
 #define LLARP_DHT_H_
 
 #include <crypto.hpp>
-#include <llarp/buffer.h>
+#include <buffer.h>
 #include <router_contact.hpp>
 
 /**
diff --git a/llarp/dht/context.cpp b/llarp/dht/context.cpp
index 79bf785f0..c8735ccd5 100644
--- a/llarp/dht/context.cpp
+++ b/llarp/dht/context.cpp
@@ -1,8 +1,9 @@
 #include <dht/context.hpp>
 #include <dht/messages/gotrouter.hpp>
-#include <llarp/messages/dht.hpp>
-#include <llarp/messages/dht_immediate.hpp>
-#include "router.hpp"
+#include <messages/dht.hpp>
+#include <messages/dht_immediate.hpp>
+#include <router.hpp>
+
 #include <vector>
 
 namespace llarp
diff --git a/llarp/dht/context.hpp b/llarp/dht/context.hpp
index 8a06d7c8d..1f8163925 100644
--- a/llarp/dht/context.hpp
+++ b/llarp/dht/context.hpp
@@ -7,8 +7,8 @@
 #include <dht/message.hpp>
 #include <dht/messages/findintro.hpp>
 #include <dht/node.hpp>
-#include <llarp/time.hpp>
 #include <service/IntroSet.hpp>
+#include <time.hpp>
 
 #include <set>
 
diff --git a/llarp/dht/dht_immediate.cpp b/llarp/dht/dht_immediate.cpp
index 48242c4dc..ae2f737d8 100644
--- a/llarp/dht/dht_immediate.cpp
+++ b/llarp/dht/dht_immediate.cpp
@@ -1,4 +1,4 @@
-#include <llarp/messages/dht_immediate.hpp>
+#include <messages/dht_immediate.hpp>
 
 #include <router.hpp>
 
diff --git a/llarp/dht/find_router.cpp b/llarp/dht/find_router.cpp
index 77409475c..92607f84d 100644
--- a/llarp/dht/find_router.cpp
+++ b/llarp/dht/find_router.cpp
@@ -1,8 +1,7 @@
 #include <dht/context.hpp>
 #include <dht/messages/findrouter.hpp>
 #include <dht/messages/gotrouter.hpp>
-#include <llarp/messages/dht.hpp>
-
+#include <messages/dht.hpp>
 #include <router.hpp>
 
 namespace llarp
diff --git a/llarp/dht/got_intro.cpp b/llarp/dht/got_intro.cpp
index c5bf8c3a3..dccd96e7b 100644
--- a/llarp/dht/got_intro.cpp
+++ b/llarp/dht/got_intro.cpp
@@ -1,7 +1,6 @@
 #include <dht/context.hpp>
 #include <dht/messages/gotintro.hpp>
-#include <llarp/messages/dht.hpp>
-
+#include <messages/dht.hpp>
 #include <router.hpp>
 
 namespace llarp
diff --git a/llarp/dht/key.hpp b/llarp/dht/key.hpp
index 6fdf49541..17d9e1563 100644
--- a/llarp/dht/key.hpp
+++ b/llarp/dht/key.hpp
@@ -1,6 +1,7 @@
 #ifndef LLARP_DHT_KEY_HPP
 #define LLARP_DHT_KEY_HPP
-#include <llarp/aligned.hpp>
+
+#include <aligned.hpp>
 
 namespace llarp
 {
@@ -52,4 +53,4 @@ namespace llarp
   }  // namespace dht
 }  // namespace llarp
 
-#endif
\ No newline at end of file
+#endif
diff --git a/llarp/dht/message.hpp b/llarp/dht/message.hpp
index a39f780d6..a78a7ab80 100644
--- a/llarp/dht/message.hpp
+++ b/llarp/dht/message.hpp
@@ -1,10 +1,11 @@
 #ifndef LLARP_DHT_MESSAGE_HPP
 #define LLARP_DHT_MESSAGE_HPP
 
+#include <bencode.hpp>
 #include <dht.h>
 #include <dht/key.hpp>
-#include <llarp/bencode.hpp>
-#include <llarp/path_types.hpp>
+#include <path_types.hpp>
+
 #include <vector>
 
 namespace llarp
diff --git a/llarp/dht/publish_intro.cpp b/llarp/dht/publish_intro.cpp
index c3cd970e9..249cd06cb 100644
--- a/llarp/dht/publish_intro.cpp
+++ b/llarp/dht/publish_intro.cpp
@@ -1,8 +1,7 @@
 #include <dht/context.hpp>
 #include <dht/messages/pubintro.hpp>
-#include <llarp/messages/dht.hpp>
-#include <llarp/messages/dht_immediate.hpp>
-
+#include <messages/dht.hpp>
+#include <messages/dht_immediate.hpp>
 #include <router.hpp>
 
 namespace llarp
diff --git a/llarp/dns.cpp b/llarp/dns.cpp
index b371efa77..462736ef6 100644
--- a/llarp/dns.cpp
+++ b/llarp/dns.cpp
@@ -1,5 +1,5 @@
-#include <llarp/endian.hpp>
-#include <llarp/dnsd.hpp>  // for llarp_handle_dnsd_recvfrom, dnsc
+#include <dnsd.hpp>  // for llarp_handle_dnsd_recvfrom, dnsc
+#include <endian.hpp>
 #include <logger.hpp>
 
 void
diff --git a/llarp/dns.hpp b/llarp/dns.hpp
index 06acdc17f..6b19882a1 100644
--- a/llarp/dns.hpp
+++ b/llarp/dns.hpp
@@ -3,17 +3,18 @@
 
 #include <dns.h>
 #include <sys/types.h>  // for uint & ssize_t
-#include <map>
-#include <string>
-#include <vector>
 
 #ifndef _WIN32
 #include <sys/socket.h>
 #endif
 
-#include <llarp/net.hpp>  // for llarp::Addr , llarp::huint32_t
+#include <net.hpp>  // for llarp::Addr , llarp::huint32_t
 #include <dns_rectypes.hpp>
 
+#include <map>
+#include <string>
+#include <vector>
+
 #define LLARP_DNS_RECTYPE_A 1
 #define LLARP_DNS_RECTYPE_NS 2
 #define LLARP_DNS_RECTYPE_CNAME 5
diff --git a/llarp/dns/message.cpp b/llarp/dns/message.cpp
index 33fe0b4ec..0c9af092e 100644
--- a/llarp/dns/message.cpp
+++ b/llarp/dns/message.cpp
@@ -1,6 +1,6 @@
 #include <buffer.hpp>
 #include <dns/message.hpp>
-#include <llarp/endian.hpp>
+#include <endian.hpp>
 #include <logger.hpp>
 
 namespace llarp
diff --git a/llarp/dns/name.cpp b/llarp/dns/name.cpp
index 6b29f0502..cb75ecb04 100644
--- a/llarp/dns/name.cpp
+++ b/llarp/dns/name.cpp
@@ -1,5 +1,5 @@
 #include <dns/name.hpp>
-#include <llarp/net.hpp>
+#include <net.hpp>
 
 #include <algorithm>
 #include <sstream>
diff --git a/llarp/dns/name.hpp b/llarp/dns/name.hpp
index e974fb923..b5f728818 100644
--- a/llarp/dns/name.hpp
+++ b/llarp/dns/name.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_DNS_NAME_HPP
 #define LLARP_DNS_NAME_HPP
 
+#include <buffer.h>
+#include <net_int.hpp>
+
 #include <string>
-#include <llarp/buffer.h>
-#include <llarp/net_int.hpp>
 
 namespace llarp
 {
diff --git a/llarp/dns/question.hpp b/llarp/dns/question.hpp
index 21c57ef40..68401c35c 100644
--- a/llarp/dns/question.hpp
+++ b/llarp/dns/question.hpp
@@ -1,8 +1,9 @@
 #ifndef LLARP_DNS_QUESTION_HPP
 #define LLARP_DNS_QUESTION_HPP
+
 #include <dns/serialize.hpp>
 #include <dns/name.hpp>
-#include <llarp/net_int.hpp>
+#include <net_int.hpp>
 
 namespace llarp
 {
diff --git a/llarp/dns/rr.hpp b/llarp/dns/rr.hpp
index 3eedcb1d1..995f0566f 100644
--- a/llarp/dns/rr.hpp
+++ b/llarp/dns/rr.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_DNS_RR_HPP
 #define LLARP_DNS_RR_HPP
+
 #include <dns/name.hpp>
 #include <dns/serialize.hpp>
-
-#include <llarp/net_int.hpp>
+#include <net_int.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/llarp/dns/serialize.cpp b/llarp/dns/serialize.cpp
index 8e8b33a18..7872ec1fa 100644
--- a/llarp/dns/serialize.cpp
+++ b/llarp/dns/serialize.cpp
@@ -1,5 +1,5 @@
 #include <dns/serialize.hpp>
-#include <llarp/net_int.hpp>
+#include <net_int.hpp>
 
 namespace llarp
 {
diff --git a/llarp/dns/serialize.hpp b/llarp/dns/serialize.hpp
index 10902b007..95d5a7de3 100644
--- a/llarp/dns/serialize.hpp
+++ b/llarp/dns/serialize.hpp
@@ -1,6 +1,6 @@
 #ifndef LLARP_DNS_SERIALIZE_HPP
 #define LLARP_DNS_SERIALIZE_HPP
-#include <llarp/buffer.h>
+#include <buffer.h>
 #include <vector>
 
 namespace llarp
diff --git a/llarp/dns/server.hpp b/llarp/dns/server.hpp
index e9301e273..25ca58aaa 100644
--- a/llarp/dns/server.hpp
+++ b/llarp/dns/server.hpp
@@ -1,10 +1,10 @@
 #ifndef LLARP_DNS_SERVER_HPP
 #define LLARP_DNS_SERVER_HPP
-#include <dns/message.hpp>
 
-#include <llarp/ev.h>
-#include <llarp/net.hpp>
-#include <llarp/string_view.hpp>
+#include <dns/message.hpp>
+#include <ev.h>
+#include <net.hpp>
+#include <string_view.hpp>
 
 #include <unordered_map>
 
diff --git a/llarp/dns_dotlokilookup.cpp b/llarp/dns_dotlokilookup.cpp
index 855e928e2..e8e279727 100644
--- a/llarp/dns_dotlokilookup.cpp
+++ b/llarp/dns_dotlokilookup.cpp
@@ -1,6 +1,6 @@
+#include <dns_dotlokilookup.hpp>
 #include <handlers/tun.hpp>
-#include <llarp/dns_dotlokilookup.hpp>
-#include <llarp/logic.hpp>
+#include <logic.hpp>
 #include <service/context.hpp>
 
 std::string const default_chars =
diff --git a/include/llarp/dns_dotlokilookup.hpp b/llarp/dns_dotlokilookup.hpp
similarity index 97%
rename from include/llarp/dns_dotlokilookup.hpp
rename to llarp/dns_dotlokilookup.hpp
index 6854bf71c..8b93a8027 100644
--- a/include/llarp/dns_dotlokilookup.hpp
+++ b/llarp/dns_dotlokilookup.hpp
@@ -1,7 +1,7 @@
 #ifndef LIBLLARP_DNS_DOTLOKILOOKUP_HPP
 #define LIBLLARP_DNS_DOTLOKILOOKUP_HPP
 
-#include <llarp/dnsd.hpp>
+#include <dnsd.hpp>
 #include <service/address.hpp>
 
 
diff --git a/llarp/dns_iptracker.cpp b/llarp/dns_iptracker.cpp
index ea553b385..ac95e1ceb 100644
--- a/llarp/dns_iptracker.cpp
+++ b/llarp/dns_iptracker.cpp
@@ -1,4 +1,4 @@
-#include <llarp/dns_iptracker.hpp>
+#include <dns_iptracker.hpp>
 
 dns_iptracker g_dns_iptracker;
 
diff --git a/include/llarp/dns_iptracker.hpp b/llarp/dns_iptracker.hpp
similarity index 95%
rename from include/llarp/dns_iptracker.hpp
rename to llarp/dns_iptracker.hpp
index b2c9f882d..8a26a2fa4 100644
--- a/include/llarp/dns_iptracker.hpp
+++ b/llarp/dns_iptracker.hpp
@@ -1,8 +1,8 @@
 #ifndef LIBLLARP_DNSIPTRACKER_HPP
 #define LIBLLARP_DNSIPTRACKER_HPP
 
-#include <llarp/dns_dotlokilookup.hpp>
-#include <llarp/net.hpp>
+#include <dns_dotlokilookup.hpp>
+#include <net.hpp>
 #include <service/address.hpp>
 
 #include <map>
diff --git a/llarp/dns_rectypes.hpp b/llarp/dns_rectypes.hpp
index efdeb3308..d66f415f5 100644
--- a/llarp/dns_rectypes.hpp
+++ b/llarp/dns_rectypes.hpp
@@ -1,9 +1,9 @@
 #ifndef LIBLLARP_DNS_REC_TYPES_HPP
 #define LIBLLARP_DNS_REC_TYPES_HPP
 
+#include <buffer.h>  // for byte_t
+#include <net.hpp>   // for llarp::Addr , llarp::huint32_t
 #include <vector>
-#include <llarp/buffer.h>  // for byte_t
-#include <llarp/net.hpp>   // for llarp::Addr , llarp::huint32_t
 
 namespace llarp
 {
diff --git a/llarp/dnsc.cpp b/llarp/dnsc.cpp
index d5451e35d..9d58de371 100644
--- a/llarp/dnsc.cpp
+++ b/llarp/dnsc.cpp
@@ -1,4 +1,6 @@
 #include <dnsc.hpp>
+#include <logger.hpp>
+#include <net.hpp>  // for llarp::Addr
 
 #ifndef _WIN32
 #include <arpa/inet.h>
@@ -13,8 +15,6 @@
 #include <unistd.h> /* close */
 
 #include <algorithm>      // for std::find_if
-#include <llarp/net.hpp>  // for llarp::Addr
-#include <logger.hpp>
 #include <stdio.h>  // sprintf
 
 #define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
diff --git a/llarp/dnsc.hpp b/llarp/dnsc.hpp
index abe1db034..fd21b32fc 100644
--- a/llarp/dnsc.hpp
+++ b/llarp/dnsc.hpp
@@ -1,7 +1,7 @@
 #ifndef LIBLLARP_DNSC_HPP
 #define LIBLLARP_DNSC_HPP
 
-#include <llarp/ev.h>     // for sockaadr
+#include <ev.h>     // for sockaadr
 #include <dns.hpp>  // get protocol structs
 
 // internal, non-public functions
diff --git a/llarp/dnsd.cpp b/llarp/dnsd.cpp
index 42db0c03c..23f3b8ab6 100644
--- a/llarp/dnsd.cpp
+++ b/llarp/dnsd.cpp
@@ -1,5 +1,5 @@
-#include <llarp/dnsd.hpp>
-#include <llarp/net.hpp>
+#include <dnsd.hpp>
+#include <net.hpp>
 
 extern dns_tracker dns_udp_tracker;
 
diff --git a/include/llarp/dnsd.hpp b/llarp/dnsd.hpp
similarity index 98%
rename from include/llarp/dnsd.hpp
rename to llarp/dnsd.hpp
index ab19b13f4..1667c65a0 100644
--- a/include/llarp/dnsd.hpp
+++ b/llarp/dnsd.hpp
@@ -1,11 +1,12 @@
 #ifndef LIBLLARP_DNSD_HPP
 #define LIBLLARP_DNSD_HPP
 
-#include <llarp/ev.h>  // for sockaadr
-#include <string>
+#include <ev.h>  // for sockaadr
 #include <dns.hpp>  // question and dnsc
 #include <dnsc.hpp>
 
+#include <string>
+
 //
 // Input structures/functions:
 //
diff --git a/include/llarp/dtls.h b/llarp/dtls.h
similarity index 100%
rename from include/llarp/dtls.h
rename to llarp/dtls.h
diff --git a/include/llarp/dtls.hpp b/llarp/dtls.hpp
similarity index 100%
rename from include/llarp/dtls.hpp
rename to llarp/dtls.hpp
diff --git a/llarp/dtls/server.cpp b/llarp/dtls/server.cpp
index c4cb9d232..9d43c241d 100644
--- a/llarp/dtls/server.cpp
+++ b/llarp/dtls/server.cpp
@@ -1 +1 @@
-#include <llarp/dtls.hpp>
+#include <dtls.hpp>
diff --git a/include/llarp/encrypted.hpp b/llarp/encrypted.hpp
similarity index 96%
rename from include/llarp/encrypted.hpp
rename to llarp/encrypted.hpp
index 4aef3914a..1b0aade09 100644
--- a/include/llarp/encrypted.hpp
+++ b/llarp/encrypted.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_ENCCRYPTED_HPP
 #define LLARP_ENCCRYPTED_HPP
 
-#include <llarp/bencode.h>
-#include <llarp/buffer.h>
-#include <llarp/aligned.hpp>
+#include <aligned.hpp>
+#include <bencode.h>
+#include <buffer.h>
+
 #include <vector>
 #include <stdexcept>
 
diff --git a/include/llarp/encrypted_ack.hpp b/llarp/encrypted_ack.hpp
similarity index 89%
rename from include/llarp/encrypted_ack.hpp
rename to llarp/encrypted_ack.hpp
index 30f7dc573..8f965f923 100644
--- a/include/llarp/encrypted_ack.hpp
+++ b/llarp/encrypted_ack.hpp
@@ -1,6 +1,8 @@
 #ifndef LLARP_ENCRYPTED_ACK_HPP
 #define LLARP_ENCRYPTED_ACK_HPP
-#include <llarp/encrypted.hpp>
+
+#include <encrypted.hpp>
+
 namespace llarp
 {
   struct EncryptedAck : public Encrypted
diff --git a/llarp/encrypted_frame.cpp b/llarp/encrypted_frame.cpp
index 922e98af7..8a7ae171b 100644
--- a/llarp/encrypted_frame.cpp
+++ b/llarp/encrypted_frame.cpp
@@ -1,7 +1,7 @@
 #include <crypto.hpp>
-#include <llarp/encrypted_frame.hpp>
-#include "logger.hpp"
-#include "mem.hpp"
+#include <encrypted_frame.hpp>
+#include <logger.hpp>
+#include <mem.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/encrypted_frame.hpp b/llarp/encrypted_frame.hpp
similarity index 96%
rename from include/llarp/encrypted_frame.hpp
rename to llarp/encrypted_frame.hpp
index d639231f2..e0f0b3d16 100644
--- a/include/llarp/encrypted_frame.hpp
+++ b/llarp/encrypted_frame.hpp
@@ -1,10 +1,10 @@
 #ifndef LLARP_ENCRYPTED_FRAME_HPP
 #define LLARP_ENCRYPTED_FRAME_HPP
 
-#include <llarp/crypto.h>
-#include <llarp/mem.h>
-#include <llarp/threadpool.h>
-#include <llarp/encrypted.hpp>
+#include <crypto.h>
+#include <encrypted.hpp>
+#include <mem.h>
+#include <threadpool.h>
 
 namespace llarp
 {
diff --git a/include/llarp/endian.hpp b/llarp/endian.hpp
similarity index 100%
rename from include/llarp/endian.hpp
rename to llarp/endian.hpp
diff --git a/include/llarp/establish_job.hpp b/llarp/establish_job.hpp
similarity index 100%
rename from include/llarp/establish_job.hpp
rename to llarp/establish_job.hpp
diff --git a/llarp/ev.cpp b/llarp/ev.cpp
index ddcd7bc7f..8b23a03b1 100644
--- a/llarp/ev.cpp
+++ b/llarp/ev.cpp
@@ -1,10 +1,10 @@
-#include <llarp/ev.h>
-#include <llarp/logic.hpp>
-#include <llarp/string_view.hpp>
+#include <ev.h>
+#include <logic.hpp>
+#include <mem.hpp>
+#include <string_view.hpp>
 
 #include <stddef.h>
 
-#include "mem.hpp"
 
 #define EV_TICK_INTERVAL 100
 
diff --git a/include/llarp/ev.h b/llarp/ev.h
similarity index 99%
rename from include/llarp/ev.h
rename to llarp/ev.h
index 7e4ed449f..84fd03eed 100644
--- a/include/llarp/ev.h
+++ b/llarp/ev.h
@@ -1,5 +1,10 @@
 #ifndef LLARP_EV_H
 #define LLARP_EV_H
+
+#include <buffer.h>
+#include <time.hpp>
+#include <tuntap.h>
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -11,12 +16,10 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #endif
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <tuntap.h>
-#include <llarp/time.hpp>
-#include <llarp/buffer.h>
 
 /**
  * ev.h
diff --git a/llarp/ev.hpp b/llarp/ev.hpp
index 62a4bfcca..bc8f6a23e 100644
--- a/llarp/ev.hpp
+++ b/llarp/ev.hpp
@@ -1,17 +1,20 @@
 #ifndef LLARP_EV_HPP
 #define LLARP_EV_HPP
-#include <llarp/ev.h>
-#include <llarp/threading.hpp>
+
+#include <ev.h>
+#include <codel.hpp>
+#include <threading.hpp>
+
 // writev
 #ifndef _WIN32
 #include <sys/uio.h>
 #endif
-#include <unistd.h>
-#include <llarp/buffer.h>
-#include <llarp/codel.hpp>
-#include <list>
-#include <deque>
+
 #include <algorithm>
+#include <buffer.h>
+#include <deque>
+#include <list>
+#include <unistd.h>
 
 #ifdef _WIN32
 #include <win32_up.h>
diff --git a/llarp/ev_epoll.hpp b/llarp/ev_epoll.hpp
index 10d483299..fe262efe3 100644
--- a/llarp/ev_epoll.hpp
+++ b/llarp/ev_epoll.hpp
@@ -1,19 +1,19 @@
 #ifndef EV_EPOLL_HPP
 #define EV_EPOLL_HPP
 #include <fcntl.h>
-#include <llarp/buffer.h>
-#include <llarp/net.h>
+#include <buffer.h>
+#include <net.h>
 #include <signal.h>
 #include <sys/epoll.h>
 #include <sys/un.h>
 #include <tuntap.h>
 #include <unistd.h>
 #include <cstdio>
-#include "buffer.hpp"
-#include "ev.hpp"
-#include "llarp/net.hpp"
-#include "logger.hpp"
-#include "mem.hpp"
+#include <buffer.hpp>
+#include <ev.hpp>
+#include <net.hpp>
+#include <logger.hpp>
+#include <mem.hpp>
 #include <cassert>
 
 #ifdef ANDROID
diff --git a/llarp/ev_kqueue.hpp b/llarp/ev_kqueue.hpp
index 4739a30d7..393e3ac5d 100644
--- a/llarp/ev_kqueue.hpp
+++ b/llarp/ev_kqueue.hpp
@@ -1,7 +1,11 @@
 #ifndef EV_KQUEUE_HPP
 #define EV_KQUEUE_HPP
-#include <llarp/buffer.h>
-#include <llarp/net.h>
+
+#include <buffer.h>
+#include <ev.hpp>
+#include <logger.hpp>
+#include <net.h>
+#include <net.hpp>
 
 #include <sys/un.h>
 
@@ -14,9 +18,6 @@
 // original upstream
 #include <unistd.h>
 #include <cstdio>
-#include <llarp/net.hpp>
-#include "ev.hpp"
-#include "logger.hpp"
 
 namespace llarp
 {
diff --git a/llarp/ev_win32.hpp b/llarp/ev_win32.hpp
index 331c5be4c..8cdfc82a9 100644
--- a/llarp/ev_win32.hpp
+++ b/llarp/ev_win32.hpp
@@ -1,12 +1,14 @@
 #ifndef EV_WIN32_HPP
 #define EV_WIN32_HPP
-#include <llarp/buffer.h>
-#include <llarp/net.h>
+
+#include <buffer.h>
+#include <ev.hpp>
+#include <logger.hpp>
+#include <net.h>
+#include <net.hpp>
 #include <windows.h>
+
 #include <cstdio>
-#include <llarp/net.hpp>
-#include "ev.hpp"
-#include "logger.hpp"
 
 #ifdef sizeof
 #undef sizeof
diff --git a/llarp/exit/close_exit.cpp b/llarp/exit/close_exit.cpp
index 5fe702c48..3fe7d3993 100644
--- a/llarp/exit/close_exit.cpp
+++ b/llarp/exit/close_exit.cpp
@@ -1,4 +1,4 @@
-#include <llarp/messages/exit.hpp>
+#include <messages/exit.hpp>
 #include <routing/handler.hpp>
 
 namespace llarp
diff --git a/llarp/exit/endpoint.hpp b/llarp/exit/endpoint.hpp
index 958ab7e42..10822bfec 100644
--- a/llarp/exit/endpoint.hpp
+++ b/llarp/exit/endpoint.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_EXIT_ENDPOINT_HPP
 #define LLARP_EXIT_ENDPOINT_HPP
-#include <llarp/time.hpp>
+
 #include <crypto.hpp>
-#include <llarp/path.hpp>
-#include <llarp/ip.hpp>
+#include <ip.hpp>
+#include <path.hpp>
+#include <time.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/grant_exit.cpp b/llarp/exit/grant_exit.cpp
index 67e1d2844..2b8395e59 100644
--- a/llarp/exit/grant_exit.cpp
+++ b/llarp/exit/grant_exit.cpp
@@ -1,4 +1,4 @@
-#include <llarp/messages/exit.hpp>
+#include <messages/exit.hpp>
 #include <routing/handler.hpp>
 
 namespace llarp
diff --git a/llarp/exit/obtain_exit.cpp b/llarp/exit/obtain_exit.cpp
index 8b9ecb610..672cd34c2 100644
--- a/llarp/exit/obtain_exit.cpp
+++ b/llarp/exit/obtain_exit.cpp
@@ -1,5 +1,5 @@
 #include <link_layer.hpp>
-#include <llarp/messages/exit.hpp>
+#include <messages/exit.hpp>
 #include <routing/handler.hpp>
 
 namespace llarp
diff --git a/llarp/exit/policy.hpp b/llarp/exit/policy.hpp
index 914745a07..1aa70031d 100644
--- a/llarp/exit/policy.hpp
+++ b/llarp/exit/policy.hpp
@@ -1,6 +1,7 @@
 #ifndef LLARP_EXIT_POLICY_HPP
 #define LLARP_EXIT_POLICY_HPP
-#include <llarp/bencode.hpp>
+
+#include <bencode.hpp>
 
 namespace llarp
 {
@@ -23,4 +24,4 @@ namespace llarp
   }  // namespace exit
 }  // namespace llarp
 
-#endif
\ No newline at end of file
+#endif
diff --git a/llarp/exit/reject_exit.cpp b/llarp/exit/reject_exit.cpp
index e245ecce5..2edd8280e 100644
--- a/llarp/exit/reject_exit.cpp
+++ b/llarp/exit/reject_exit.cpp
@@ -1,4 +1,4 @@
-#include <llarp/messages/exit.hpp>
+#include <messages/exit.hpp>
 #include <routing/handler.hpp>
 
 namespace llarp
diff --git a/llarp/exit/session.cpp b/llarp/exit/session.cpp
index 408c77e57..009a3bbe2 100644
--- a/llarp/exit/session.cpp
+++ b/llarp/exit/session.cpp
@@ -1,5 +1,5 @@
 #include <exit/session.hpp>
-#include <llarp/path.hpp>
+#include <path.hpp>
 #include <router.hpp>
 
 namespace llarp
diff --git a/llarp/exit/session.hpp b/llarp/exit/session.hpp
index bfdea12c7..0313ef851 100644
--- a/llarp/exit/session.hpp
+++ b/llarp/exit/session.hpp
@@ -1,9 +1,11 @@
 #ifndef LLARP_EXIT_SESSION_HPP
 #define LLARP_EXIT_SESSION_HPP
-#include <llarp/pathbuilder.hpp>
-#include <llarp/ip.hpp>
-#include <llarp/messages/transfer_traffic.hpp>
-#include <llarp/messages/exit.hpp>
+
+#include <ip.hpp>
+#include <messages/exit.hpp>
+#include <messages/transfer_traffic.hpp>
+#include <pathbuilder.hpp>
+
 #include <deque>
 
 namespace llarp
diff --git a/llarp/exit/transfer_traffic.cpp b/llarp/exit/transfer_traffic.cpp
index 8160212eb..cabdc9024 100644
--- a/llarp/exit/transfer_traffic.cpp
+++ b/llarp/exit/transfer_traffic.cpp
@@ -1,5 +1,5 @@
-#include <llarp/endian.hpp>
-#include <llarp/messages/transfer_traffic.hpp>
+#include <endian.hpp>
+#include <messages/transfer_traffic.hpp>
 #include <routing/handler.hpp>
 
 namespace llarp
diff --git a/llarp/exit/update_exit.cpp b/llarp/exit/update_exit.cpp
index 5de2714b2..06723066d 100644
--- a/llarp/exit/update_exit.cpp
+++ b/llarp/exit/update_exit.cpp
@@ -1,4 +1,4 @@
-#include <llarp/messages/exit.hpp>
+#include <messages/exit.hpp>
 #include <routing/handler.hpp>
 
 namespace llarp
diff --git a/llarp/exit_info.cpp b/llarp/exit_info.cpp
index f7f3535da..29b093ab1 100644
--- a/llarp/exit_info.cpp
+++ b/llarp/exit_info.cpp
@@ -2,10 +2,11 @@
 #include <arpa/inet.h>
 #endif
 
-#include <llarp/bencode.h>
-#include <llarp/exit_info.hpp>
-#include <llarp/mem.h>
-#include <llarp/string.h>
+#include <bencode.h>
+#include <exit_info.hpp>
+#include <mem.h>
+#include <string.h>
+
 #include <list>
 
 namespace llarp
diff --git a/include/llarp/exit_info.h b/llarp/exit_info.h
similarity index 94%
rename from include/llarp/exit_info.h
rename to llarp/exit_info.h
index 96535a8c9..c2a9a62ce 100644
--- a/include/llarp/exit_info.h
+++ b/llarp/exit_info.h
@@ -1,12 +1,14 @@
 #ifndef LLARP_XI_H
 #define LLARP_XI_H
-#include <llarp/buffer.h>
-#include <llarp/crypto.h>
-#include <llarp/net.h>
+
+#include <buffer.h>
+#include <crypto.h>
+#include <net.h>
+
 #ifdef __cplusplus
+#include <bits.hpp>
 #include <iostream>
 #include <string>
-#include <llarp/bits.hpp>
 #endif
 
 /**
diff --git a/include/llarp/exit_info.hpp b/llarp/exit_info.hpp
similarity index 95%
rename from include/llarp/exit_info.hpp
rename to llarp/exit_info.hpp
index a23b4e625..9f046e595 100644
--- a/include/llarp/exit_info.hpp
+++ b/llarp/exit_info.hpp
@@ -1,10 +1,12 @@
 #ifndef LLARP_XI_HPP
 #define LLARP_XI_HPP
+
+#include <bencode.hpp>
+#include <bits.hpp>
 #include <crypto.hpp>
-#include <llarp/bencode.hpp>
-#include <llarp/net.hpp>
+#include <net.hpp>
+
 #include <iostream>
-#include <llarp/bits.hpp>
 
 /**
  * exit_info.h
diff --git a/llarp/exit_route.cpp b/llarp/exit_route.cpp
index 94e89bf79..2d8e3c746 100644
--- a/llarp/exit_route.cpp
+++ b/llarp/exit_route.cpp
@@ -2,8 +2,9 @@
 #include <arpa/inet.h>
 #endif
 
-#include <llarp/bencode.h>
-#include <llarp/exit_route.h>
+#include <bencode.h>
+#include <exit_route.h>
+
 #include <llarp/string.h>
 
 bool
diff --git a/include/llarp/exit_route.h b/llarp/exit_route.h
similarity index 86%
rename from include/llarp/exit_route.h
rename to llarp/exit_route.h
index 6d49b5e29..0afff19a1 100644
--- a/include/llarp/exit_route.h
+++ b/llarp/exit_route.h
@@ -1,7 +1,9 @@
 #ifndef LLARP_XR_H
 #define LLARP_XR_H
-#include <llarp/buffer.h>
-#include <llarp/net.h>
+
+#include <buffer.h>
+#include <net.h>
+
 #include <stdint.h>
 
 struct llarp_xr
diff --git a/llarp/handlers/exit.cpp b/llarp/handlers/exit.cpp
index d255e9db6..6df3705bd 100644
--- a/llarp/handlers/exit.cpp
+++ b/llarp/handlers/exit.cpp
@@ -1,5 +1,5 @@
 #include <handlers/exit.hpp>
-#include <llarp/net.hpp>
+#include <net.hpp>
 #include <router.hpp>
 #include <str.hpp>
 
diff --git a/llarp/handlers/tun.hpp b/llarp/handlers/tun.hpp
index 7eb64109f..c762af950 100644
--- a/llarp/handlers/tun.hpp
+++ b/llarp/handlers/tun.hpp
@@ -1,13 +1,13 @@
 #ifndef LLARP_HANDLERS_TUN_HPP
 #define LLARP_HANDLERS_TUN_HPP
 
+#include <codel.hpp>
 #include <dns/server.hpp>
-#include <llarp/codel.hpp>
-#include <llarp/ev.h>
-#include <llarp/ip.hpp>
-#include <llarp/net.hpp>
-#include <llarp/threading.hpp>
+#include <ev.h>
+#include <ip.hpp>
+#include <net.hpp>
 #include <service/endpoint.hpp>
+#include <threading.hpp>
 
 namespace llarp
 {
diff --git a/llarp/ip.cpp b/llarp/ip.cpp
index 7bb7a7d82..87bf62819 100644
--- a/llarp/ip.cpp
+++ b/llarp/ip.cpp
@@ -1,7 +1,8 @@
-#include <llarp/ip.hpp>
 #include <buffer.hpp>
-#include <llarp/endian.hpp>
-#include "mem.hpp"
+#include <endian.hpp>
+#include <ip.hpp>
+#include <mem.hpp>
+
 #ifndef _WIN32
 #include <netinet/in.h>
 #endif
diff --git a/include/llarp/ip.hpp b/llarp/ip.hpp
similarity index 97%
rename from include/llarp/ip.hpp
rename to llarp/ip.hpp
index 7b6a1a62a..30ef49a45 100644
--- a/include/llarp/ip.hpp
+++ b/llarp/ip.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_IP_HPP
 #define LLARP_IP_HPP
-#include <llarp/buffer.h>
-#include <llarp/time.hpp>
-#include <llarp/net.hpp>
-#include <llarp/ev.h>
+
+#include <buffer.h>
+#include <ev.h>
+#include <net.hpp>
+#include <time.hpp>
 
 #ifndef _WIN32
 // unix, linux
diff --git a/include/llarp/iwp.hpp b/llarp/iwp.hpp
similarity index 92%
rename from include/llarp/iwp.hpp
rename to llarp/iwp.hpp
index 1d7ea5b6e..a95189fd2 100644
--- a/include/llarp/iwp.hpp
+++ b/llarp/iwp.hpp
@@ -1,6 +1,8 @@
 #ifndef LLARP_IWP_HPP
 #define LLARP_IWP_HPP
-#include <llarp/crypto.h>
+
+#include <crypto.h>
+
 #include <string>
 
 namespace llarp {
diff --git a/llarp/link/curvecp.cpp b/llarp/link/curvecp.cpp
index 35d197812..0dd0d8202 100644
--- a/llarp/link/curvecp.cpp
+++ b/llarp/link/curvecp.cpp
@@ -1,6 +1,6 @@
 #include <link/curvecp.hpp>
 #include <link/server.hpp>
-#include <llarp/messages/link_intro.hpp>
+#include <messages/link_intro.hpp>
 
 namespace llarp
 {
diff --git a/llarp/link/encoder.hpp b/llarp/link/encoder.hpp
index 8e93175f2..8a56227b5 100644
--- a/llarp/link/encoder.hpp
+++ b/llarp/link/encoder.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_LINK_ENCODER_HPP
 #define LLARP_LINK_ENCODER_HPP
 
-#include <llarp/bencode.h>
-#include <llarp/buffer.h>
+#include <bencode.h>
+#include <buffer.h>
 #include <router_contact.hpp>
 
 namespace llarp
diff --git a/llarp/link/server.hpp b/llarp/link/server.hpp
index 7797543b7..c03886763 100644
--- a/llarp/link/server.hpp
+++ b/llarp/link/server.hpp
@@ -1,12 +1,13 @@
 #ifndef LLARP_LINK_SERVER_HPP
 #define LLARP_LINK_SERVER_HPP
+
 #include <crypto.hpp>
+#include <ev.h>
 #include <link/session.hpp>
-#include <llarp/ev.h>
-#include <llarp/logic.hpp>
-#include <llarp/net.hpp>
-#include <llarp/threading.hpp>
+#include <logic.hpp>
+#include <net.hpp>
 #include <router_contact.hpp>
+#include <threading.hpp>
 
 #include <list>
 #include <unordered_map>
diff --git a/llarp/link/session.hpp b/llarp/link/session.hpp
index 3921a5135..f0d91cfb4 100644
--- a/llarp/link/session.hpp
+++ b/llarp/link/session.hpp
@@ -2,9 +2,9 @@
 #define LLARP_LINK_SESSION_HPP
 
 #include <crypto.hpp>
-#include <llarp/net.hpp>
-#include <llarp/types.hpp>
+#include <net.hpp>
 #include <router_contact.hpp>
+#include <types.hpp>
 
 #include <functional>
 
diff --git a/llarp/link/utp.cpp b/llarp/link/utp.cpp
index 22394b10d..57cf67a60 100644
--- a/llarp/link/utp.cpp
+++ b/llarp/link/utp.cpp
@@ -1,9 +1,9 @@
 #include <buffer.hpp>
+#include <endian.hpp>
 #include <link/server.hpp>
 #include <link/utp.hpp>
-#include <llarp/endian.hpp>
-#include <llarp/messages/discard.hpp>
-#include <llarp/messages/link_intro.hpp>
+#include <messages/discard.hpp>
+#include <messages/link_intro.hpp>
 #include <router.hpp>
 #include <utp.h>
 
diff --git a/llarp/link_intro.cpp b/llarp/link_intro.cpp
index 04b339fcf..9eafcc797 100644
--- a/llarp/link_intro.cpp
+++ b/llarp/link_intro.cpp
@@ -1,6 +1,6 @@
-#include <llarp/bencode.h>
-#include <llarp/messages/link_intro.hpp>
+#include <bencode.h>
 #include <logger.hpp>
+#include <messages/link_intro.hpp>
 #include <router.hpp>
 #include <router_contact.hpp>
 
diff --git a/llarp/link_layer.hpp b/llarp/link_layer.hpp
index d6da5343f..6e97edd7e 100644
--- a/llarp/link_layer.hpp
+++ b/llarp/link_layer.hpp
@@ -1,6 +1,6 @@
 #ifndef LLARP_LINK_LAYER_HPP
 #define LLARP_LINK_LAYER_HPP
-#include <llarp/types.hpp>
+#include <types.hpp>
 
 #include <stdlib.h>
 
diff --git a/llarp/link_message.cpp b/llarp/link_message.cpp
index 6cad15d0a..0f7ff3de9 100644
--- a/llarp/link_message.cpp
+++ b/llarp/link_message.cpp
@@ -1,6 +1,6 @@
 #include <buffer.hpp>
-#include <llarp/messages.hpp>
 #include <logger.hpp>
+#include <messages.hpp>
 #include <router_contact.hpp>
 
 namespace llarp
diff --git a/llarp/link_message.hpp b/llarp/link_message.hpp
index d9e9e0323..b57baea46 100644
--- a/llarp/link_message.hpp
+++ b/llarp/link_message.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_LINK_MESSAGE_HPP
 #define LLARP_LINK_MESSAGE_HPP
 
+#include <bencode.hpp>
 #include <link/session.hpp>
-#include <llarp/bencode.hpp>
-#include <llarp/router_id.hpp>
+#include <router_id.hpp>
 
 #include <queue>
 #include <vector>
diff --git a/llarp/logger.cpp b/llarp/logger.cpp
index 78c7c27d8..01033a7b2 100644
--- a/llarp/logger.cpp
+++ b/llarp/logger.cpp
@@ -1,5 +1,5 @@
-#include "logger.hpp"
-#include <llarp/logger.h>
+#include <logger.hpp>
+#include <logger.h>
 
 namespace llarp
 {
@@ -25,4 +25,4 @@ extern "C"
   {
     llarp::_glog.nodeName = name;
   }
-}
\ No newline at end of file
+}
diff --git a/include/llarp/logger.h b/llarp/logger.h
similarity index 100%
rename from include/llarp/logger.h
rename to llarp/logger.h
diff --git a/llarp/logger.hpp b/llarp/logger.hpp
index 96c2415ea..d3d9efd65 100644
--- a/llarp/logger.hpp
+++ b/llarp/logger.hpp
@@ -1,12 +1,9 @@
 #ifndef LLARP_LOGGER_HPP
 #define LLARP_LOGGER_HPP
-#include <llarp/time.hpp>
-#include <ctime>
-#include <iomanip>
-#include <iostream>
-#include <llarp/threading.hpp>
-#include <sstream>
-#include <string>
+
+#include <threading.hpp>
+#include <time.hpp>
+
 #ifdef _WIN32
 #define VC_EXTRALEAN
 #include <windows.h>
@@ -18,6 +15,12 @@
 #include <cstdio>
 #endif
 
+#include <ctime>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+#include <string>
+
 namespace llarp
 {
   // probably will need to move out of llarp namespace for c api
diff --git a/llarp/logic.cpp b/llarp/logic.cpp
index 98c91a476..6dcf1d38e 100644
--- a/llarp/logic.cpp
+++ b/llarp/logic.cpp
@@ -1,6 +1,6 @@
-#include <llarp/logic.hpp>
-#include <llarp/mem.h>
-#include "logger.hpp"
+#include <logger.hpp>
+#include <logic.hpp>
+#include <mem.h>
 
 namespace llarp
 {
diff --git a/include/llarp/logic.hpp b/llarp/logic.hpp
similarity index 91%
rename from include/llarp/logic.hpp
rename to llarp/logic.hpp
index 2f87286c5..420dc85ea 100644
--- a/include/llarp/logic.hpp
+++ b/llarp/logic.hpp
@@ -1,8 +1,9 @@
 #ifndef LLARP_LOGIC_HPP
 #define LLARP_LOGIC_HPP
-#include <llarp/mem.h>
-#include <llarp/threadpool.h>
-#include <llarp/timer.hpp>
+
+#include <mem.h>
+#include <threadpool.h>
+#include <timer.hpp>
 
 namespace llarp
 {
diff --git a/llarp/mem.cpp b/llarp/mem.cpp
index d38b08f5b..7a36b320d 100644
--- a/llarp/mem.cpp
+++ b/llarp/mem.cpp
@@ -1,5 +1,5 @@
 #define NO_JEMALLOC
-#include <llarp/mem.h>
+#include <mem.h>
 #include <cstdlib>
 
 namespace llarp
diff --git a/include/llarp/mem.h b/llarp/mem.h
similarity index 100%
rename from include/llarp/mem.h
rename to llarp/mem.h
diff --git a/llarp/mem.hpp b/llarp/mem.hpp
index 1bad4a766..fe9a86fee 100644
--- a/llarp/mem.hpp
+++ b/llarp/mem.hpp
@@ -1,7 +1,8 @@
 #ifndef LLARP_MEM_HPP
 #define LLARP_MEM_HPP
-#include <llarp/buffer.h>
-#include <llarp/mem.h>
+#include <buffer.h>
+#include <mem.h>
+
 #include <cctype>
 #include <cstdio>
 #include <memory>
diff --git a/llarp/mem_std.cpp b/llarp/mem_std.cpp
index 5eef71a1a..5f443db1a 100644
--- a/llarp/mem_std.cpp
+++ b/llarp/mem_std.cpp
@@ -1,5 +1,5 @@
 #define NO_JEMALLOC
-#include <llarp/mem.h>
+#include <mem.h>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/llarp/messages.hpp b/llarp/messages.hpp
new file mode 100644
index 000000000..57f15381e
--- /dev/null
+++ b/llarp/messages.hpp
@@ -0,0 +1,17 @@
+#ifndef LLARP_MESSAGES_HPP
+#define LLARP_MESSAGES_HPP
+
+/**
+   include shortcut for all link and routing messages
+ */
+
+#include <messages/dht_immediate.hpp>
+#include <messages/discard.hpp>
+#include <messages/exit.hpp>
+#include <messages/link_intro.hpp>
+#include <messages/path_confirm.hpp>
+#include <messages/relay.hpp>
+#include <messages/relay_commit.hpp>
+#include <messages/transfer_traffic.hpp>
+
+#endif
diff --git a/include/llarp/messages/dht.hpp b/llarp/messages/dht.hpp
similarity index 100%
rename from include/llarp/messages/dht.hpp
rename to llarp/messages/dht.hpp
diff --git a/include/llarp/messages/dht_immediate.hpp b/llarp/messages/dht_immediate.hpp
similarity index 100%
rename from include/llarp/messages/dht_immediate.hpp
rename to llarp/messages/dht_immediate.hpp
diff --git a/include/llarp/messages/discard.hpp b/llarp/messages/discard.hpp
similarity index 98%
rename from include/llarp/messages/discard.hpp
rename to llarp/messages/discard.hpp
index a187f0b24..c5dabb7c9 100644
--- a/include/llarp/messages/discard.hpp
+++ b/llarp/messages/discard.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_MESSAGES_DISCARD_HPP
 #define LLARP_MESSAGES_DISCARD_HPP
 
+#include <bencode.hpp>
 #include <link_message.hpp>
-#include <llarp/bencode.hpp>
 #include <routing/handler.hpp>
 #include <routing/message.hpp>
 
diff --git a/include/llarp/messages/exit.hpp b/llarp/messages/exit.hpp
similarity index 100%
rename from include/llarp/messages/exit.hpp
rename to llarp/messages/exit.hpp
diff --git a/include/llarp/messages/link_intro.hpp b/llarp/messages/link_intro.hpp
similarity index 100%
rename from include/llarp/messages/link_intro.hpp
rename to llarp/messages/link_intro.hpp
diff --git a/include/llarp/messages/path_confirm.hpp b/llarp/messages/path_confirm.hpp
similarity index 100%
rename from include/llarp/messages/path_confirm.hpp
rename to llarp/messages/path_confirm.hpp
diff --git a/include/llarp/messages/path_latency.hpp b/llarp/messages/path_latency.hpp
similarity index 100%
rename from include/llarp/messages/path_latency.hpp
rename to llarp/messages/path_latency.hpp
diff --git a/include/llarp/messages/path_transfer.hpp b/llarp/messages/path_transfer.hpp
similarity index 96%
rename from include/llarp/messages/path_transfer.hpp
rename to llarp/messages/path_transfer.hpp
index f4a150ee2..a52583445 100644
--- a/include/llarp/messages/path_transfer.hpp
+++ b/llarp/messages/path_transfer.hpp
@@ -2,7 +2,7 @@
 #define LLARP_MESSAGES_PATH_TRANSFER_HPP
 
 #include <crypto.hpp>
-#include <llarp/encrypted.hpp>
+#include <encrypted.hpp>
 #include <routing/message.hpp>
 #include <service/protocol.hpp>
 
diff --git a/include/llarp/messages/relay.hpp b/llarp/messages/relay.hpp
similarity index 93%
rename from include/llarp/messages/relay.hpp
rename to llarp/messages/relay.hpp
index 722986c0a..0e0a7a0e9 100644
--- a/include/llarp/messages/relay.hpp
+++ b/llarp/messages/relay.hpp
@@ -2,9 +2,9 @@
 #define LLARP_MESSAGES_RELAY_HPP
 
 #include <crypto.hpp>
+#include <encrypted.hpp>
 #include <link_message.hpp>
-#include <llarp/encrypted.hpp>
-#include <llarp/path_types.hpp>
+#include <path_types.hpp>
 
 #include <vector>
 
diff --git a/include/llarp/messages/relay_commit.hpp b/llarp/messages/relay_commit.hpp
similarity index 90%
rename from include/llarp/messages/relay_commit.hpp
rename to llarp/messages/relay_commit.hpp
index 988d15939..1f4e1796e 100644
--- a/include/llarp/messages/relay_commit.hpp
+++ b/llarp/messages/relay_commit.hpp
@@ -1,11 +1,12 @@
 #ifndef LLARP_RELAY_COMMIT_HPP
 #define LLARP_RELAY_COMMIT_HPP
+
 #include <crypto.hpp>
+#include <encrypted_ack.hpp>
+#include <encrypted_frame.hpp>
 #include <link_message.hpp>
-#include <llarp/encrypted_ack.hpp>
-#include <llarp/encrypted_frame.hpp>
-#include <llarp/path_types.hpp>
-#include <llarp/pow.hpp>
+#include <path_types.hpp>
+#include <pow.hpp>
 
 #include <array>
 
diff --git a/include/llarp/messages/transfer_traffic.hpp b/llarp/messages/transfer_traffic.hpp
similarity index 96%
rename from include/llarp/messages/transfer_traffic.hpp
rename to llarp/messages/transfer_traffic.hpp
index c704f2c6b..408e58b65 100644
--- a/include/llarp/messages/transfer_traffic.hpp
+++ b/llarp/messages/transfer_traffic.hpp
@@ -1,7 +1,8 @@
 #ifndef LLARP_MESSAGES_TRANSFER_TRAFFIC_HPP
 #define LLARP_MESSAGES_TRANSFER_TRAFFIC_HPP
+
 #include <crypto.hpp>
-#include <llarp/encrypted.hpp>
+#include <encrypted.hpp>
 #include <routing/message.hpp>
 
 #include <vector>
diff --git a/llarp/net.cpp b/llarp/net.cpp
index f21035bb4..366553d17 100644
--- a/llarp/net.cpp
+++ b/llarp/net.cpp
@@ -1,4 +1,4 @@
-#include "llarp/net.hpp"
+#include <net.hpp>
 #include <str.hpp>
 #ifdef ANDROID
 #include "android/ifaddrs.h"
@@ -10,11 +10,10 @@
 #endif
 #include <net/if.h>
 #endif
-#include <cstdio>
 #include <logger.hpp>
+#include <net_addr.hpp>
 
-//#include <llarp/net_inaddr.hpp>
-#include <llarp/net_addr.hpp>
+#include <cstdio>
 
 bool
 operator==(const sockaddr& a, const sockaddr& b)
diff --git a/include/llarp/net.h b/llarp/net.h
similarity index 100%
rename from include/llarp/net.h
rename to llarp/net.h
diff --git a/include/llarp/net.hpp b/llarp/net.hpp
similarity index 94%
rename from include/llarp/net.hpp
rename to llarp/net.hpp
index c7df1a5dc..27466153e 100644
--- a/include/llarp/net.hpp
+++ b/llarp/net.hpp
@@ -1,16 +1,16 @@
 #ifndef LLARP_NET_HPP
 #define LLARP_NET_HPP
+
 #include <address_info.hpp>
-#include "logger.hpp"
-#include "mem.hpp"
-#include <llarp/net.h>
-#include <llarp/net_int.hpp>
-#include <llarp/string_view.hpp>
+#include <logger.hpp>
+#include <mem.hpp>
+#include <net.h>
+#include <net_int.hpp>
+#include <string_view.hpp>
 
 #include <functional>
-#include <vector>
-
 #include <stdlib.h>  // for itoa
+#include <vector>
 
 // for addrinfo
 #ifndef _WIN32
@@ -147,7 +147,7 @@ namespace llarp
 
 }  // namespace llarp
 
-#include <llarp/net_inaddr.hpp>
-#include <llarp/net_addr.hpp>
+#include <net_addr.hpp>
+#include <net_inaddr.hpp>
 
 #endif
diff --git a/llarp/net_addr.cpp b/llarp/net_addr.cpp
index d832d9644..4e8ec55ba 100644
--- a/llarp/net_addr.cpp
+++ b/llarp/net_addr.cpp
@@ -1,7 +1,6 @@
-#include <llarp/net_addr.hpp>
-
-#include <llarp/net.hpp>
-#include <llarp/string_view.hpp>
+#include <net.hpp>
+#include <net_addr.hpp>
+#include <string_view.hpp>
 
 // for addrinfo
 #ifndef _WIN32
diff --git a/include/llarp/net_addr.hpp b/llarp/net_addr.hpp
similarity index 97%
rename from include/llarp/net_addr.hpp
rename to llarp/net_addr.hpp
index 244914a14..4c3fa4b53 100644
--- a/include/llarp/net_addr.hpp
+++ b/llarp/net_addr.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_NET_ADDR_HPP
 #define LLARP_NET_ADDR_HPP
+
 #include <address_info.hpp>
-#include <llarp/net.h>
-#include <llarp/net.hpp>
-#include <llarp/string_view.hpp>
+#include <net.h>
+#include <net.hpp>
+#include <string_view.hpp>
 
 #include <string>
 
diff --git a/llarp/net_inaddr.cpp b/llarp/net_inaddr.cpp
index a52e18430..bfee7684a 100644
--- a/llarp/net_inaddr.cpp
+++ b/llarp/net_inaddr.cpp
@@ -1,4 +1,4 @@
-#include <llarp/net_inaddr.hpp>
+#include <net_inaddr.hpp>
 
 std::ostream&
 operator<<(std::ostream& out, const llarp::inAddr& a)
diff --git a/include/llarp/net_inaddr.hpp b/llarp/net_inaddr.hpp
similarity index 98%
rename from include/llarp/net_inaddr.hpp
rename to llarp/net_inaddr.hpp
index ddc0a013b..d46721036 100644
--- a/include/llarp/net_inaddr.hpp
+++ b/llarp/net_inaddr.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_NET_INADDR_HPP
 #define LLARP_NET_INADDR_HPP
 
-#include <llarp/net.hpp>
+#include <net.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/net_int.hpp b/llarp/net_int.hpp
similarity index 99%
rename from include/llarp/net_int.hpp
rename to llarp/net_int.hpp
index 822182f43..662f8919d 100644
--- a/include/llarp/net_int.hpp
+++ b/llarp/net_int.hpp
@@ -12,9 +12,10 @@
 #define inet_aton(x, y) inet_pton(AF_INET, x, y)
 #endif
 
+#include <net.h>
+
 #include <stdlib.h>  // for itoa
 #include <iostream>
-#include <llarp/net.h>
 
 namespace llarp
 {
diff --git a/llarp/nodedb.cpp b/llarp/nodedb.cpp
index 4c53f042e..ceb8e2458 100644
--- a/llarp/nodedb.cpp
+++ b/llarp/nodedb.cpp
@@ -2,10 +2,10 @@
 #include <crypto.hpp>
 #include <encode.hpp>
 #include <fs.hpp>
-#include <llarp/logic.hpp>
-#include <llarp/nodedb.hpp>
 #include <logger.hpp>
+#include <logic.hpp>
 #include <mem.hpp>
+#include <nodedb.hpp>
 #include <router_contact.hpp>
 
 #include <fstream>
diff --git a/include/llarp/nodedb.hpp b/llarp/nodedb.hpp
similarity index 97%
rename from include/llarp/nodedb.hpp
rename to llarp/nodedb.hpp
index 4b365d015..deee3b8fb 100644
--- a/include/llarp/nodedb.hpp
+++ b/llarp/nodedb.hpp
@@ -1,11 +1,11 @@
 #ifndef LLARP_NODEDB_HPP
 #define LLARP_NODEDB_HPP
 
+#include <common.hpp>
+#include <crypto.h>
 #include <fs.hpp>
-#include <llarp/common.hpp>
-#include <llarp/crypto.h>
-#include <llarp/router_id.hpp>
 #include <router_contact.hpp>
+#include <router_id.hpp>
 
 /**
  * nodedb.hpp
diff --git a/llarp/path.cpp b/llarp/path.cpp
index d306d94ac..07546d08e 100644
--- a/llarp/path.cpp
+++ b/llarp/path.cpp
@@ -1,12 +1,13 @@
+#include <buffer.hpp>
+#include <encrypted_frame.hpp>
+#include <endian.hpp>
+#include <messages/dht.hpp>
+#include <messages/discard.hpp>
+#include <path.hpp>
+#include <pathbuilder.hpp>
+#include <router.hpp>
+
 #include <deque>
-#include <llarp/encrypted_frame.hpp>
-#include <llarp/path.hpp>
-#include <llarp/pathbuilder.hpp>
-#include <llarp/messages/dht.hpp>
-#include <llarp/messages/discard.hpp>
-#include <llarp/endian.hpp>
-#include "buffer.hpp"
-#include "router.hpp"
 
 namespace llarp
 {
diff --git a/include/llarp/path.hpp b/llarp/path.hpp
similarity index 98%
rename from include/llarp/path.hpp
rename to llarp/path.hpp
index 552764239..a26bc425d 100644
--- a/include/llarp/path.hpp
+++ b/llarp/path.hpp
@@ -1,20 +1,20 @@
 #ifndef LLARP_PATH_HPP
 #define LLARP_PATH_HPP
 
+#include <aligned.hpp>
 #include <crypto.hpp>
 #include <dht.hpp>
-#include <llarp/aligned.hpp>
-#include <llarp/messages/relay.hpp>
-#include <llarp/messages/relay_commit.hpp>
-#include <llarp/path_types.hpp>
-#include <llarp/pathbuilder.hpp>
-#include <llarp/pathset.hpp>
-#include <llarp/router_id.hpp>
-#include <llarp/threading.hpp>
-#include <llarp/time.hpp>
+#include <messages/relay.hpp>
+#include <messages/relay_commit.hpp>
+#include <path_types.hpp>
+#include <pathbuilder.hpp>
+#include <pathset.hpp>
+#include <router_id.hpp>
 #include <routing/handler.hpp>
 #include <routing/message.hpp>
 #include <service/Intro.hpp>
+#include <threading.hpp>
+#include <time.hpp>
 
 #include <functional>
 #include <list>
diff --git a/include/llarp/path_types.hpp b/llarp/path_types.hpp
similarity index 71%
rename from include/llarp/path_types.hpp
rename to llarp/path_types.hpp
index 20830e79f..f01dd885b 100644
--- a/include/llarp/path_types.hpp
+++ b/llarp/path_types.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_PATH_TYPES_HPP
 #define LLARP_PATH_TYPES_HPP
 
-#include <llarp/crypto.h>
-#include <llarp/aligned.hpp>
+#include <aligned.hpp>
+#include <crypto.h>
 
 namespace llarp
 {
diff --git a/llarp/pathbuilder.cpp b/llarp/pathbuilder.cpp
index c9969ec00..2b083b22a 100644
--- a/llarp/pathbuilder.cpp
+++ b/llarp/pathbuilder.cpp
@@ -1,10 +1,10 @@
-#include <llarp/nodedb.hpp>
-#include <llarp/path.hpp>
+#include <buffer.hpp>
+#include <nodedb.hpp>
+#include <path.hpp>
+#include <pathbuilder.hpp>
+#include <router.hpp>
 
-#include <llarp/pathbuilder.hpp>
 #include <functional>
-#include "buffer.hpp"
-#include "router.hpp"
 
 namespace llarp
 {
diff --git a/include/llarp/pathbuilder.hpp b/llarp/pathbuilder.hpp
similarity index 98%
rename from include/llarp/pathbuilder.hpp
rename to llarp/pathbuilder.hpp
index e7b7772f3..a26317e18 100644
--- a/include/llarp/pathbuilder.hpp
+++ b/llarp/pathbuilder.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_PATHBUILDER_HPP_
 #define LLARP_PATHBUILDER_HPP_
 
-#include <llarp/pathset.hpp>
+#include <pathset.hpp>
 
 namespace llarp
 {
diff --git a/llarp/pathset.cpp b/llarp/pathset.cpp
index eba8ddda9..7b88af693 100644
--- a/llarp/pathset.cpp
+++ b/llarp/pathset.cpp
@@ -1,7 +1,7 @@
 #include <dht/messages/pubintro.hpp>
-#include <llarp/messages/dht.hpp>
-#include <llarp/path.hpp>
-#include <llarp/pathset.hpp>
+#include <messages/dht.hpp>
+#include <path.hpp>
+#include <pathset.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/pathset.hpp b/llarp/pathset.hpp
similarity index 98%
rename from include/llarp/pathset.hpp
rename to llarp/pathset.hpp
index 94c0f182b..8f66e4d1e 100644
--- a/include/llarp/pathset.hpp
+++ b/llarp/pathset.hpp
@@ -2,12 +2,12 @@
 #define LLARP_PATHSET_HPP
 
 #include <dht/messages/all.hpp>
-#include <llarp/path_types.hpp>
-#include <llarp/router_id.hpp>
-#include <llarp/time.hpp>
+#include <path_types.hpp>
+#include <router_id.hpp>
 #include <routing/message.hpp>
 #include <service/IntroSet.hpp>
 #include <service/lookup.hpp>
+#include <time.hpp>
 
 #include <functional>
 #include <list>
diff --git a/include/llarp/pow.hpp b/llarp/pow.hpp
similarity index 92%
rename from include/llarp/pow.hpp
rename to llarp/pow.hpp
index d2fcd1e6c..b804a018a 100644
--- a/include/llarp/pow.hpp
+++ b/llarp/pow.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_POW_HPP
 #define LLARP_POW_HPP
-#include <llarp/crypto.h>
-#include <llarp/bencode.hpp>
-#include <llarp/router_id.hpp>
+#include <crypto.h>
+#include <bencode.hpp>
+#include <router_id.hpp>
 
 namespace llarp
 {
diff --git a/llarp/profiling.cpp b/llarp/profiling.cpp
index 3ea1cd50f..bd323fc66 100644
--- a/llarp/profiling.cpp
+++ b/llarp/profiling.cpp
@@ -1,4 +1,5 @@
-#include <llarp/profiling.hpp>
+#include <profiling.hpp>
+
 #include <fstream>
 
 namespace llarp
diff --git a/include/llarp/profiling.hpp b/llarp/profiling.hpp
similarity index 92%
rename from include/llarp/profiling.hpp
rename to llarp/profiling.hpp
index 8c348b114..b1d966c6a 100644
--- a/include/llarp/profiling.hpp
+++ b/llarp/profiling.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_PROFILING_HPP
 #define LLARP_PROFILING_HPP
-#include <llarp/bencode.hpp>
-#include <llarp/threading.hpp>
-#include <llarp/router_id.hpp>
-#include <llarp/path.hpp>
+
+#include <bencode.hpp>
+#include <threading.hpp>
+#include <router_id.hpp>
+#include <path.hpp>
 
 #include <map>
 
diff --git a/llarp/proofofwork.cpp b/llarp/proofofwork.cpp
index 7ea535f7d..d7a2dd696 100644
--- a/llarp/proofofwork.cpp
+++ b/llarp/proofofwork.cpp
@@ -1,6 +1,7 @@
+#include <buffer.hpp>
+#include <pow.hpp>
+
 #include <cmath>
-#include <llarp/pow.hpp>
-#include "buffer.hpp"
 
 namespace llarp
 {
diff --git a/include/llarp/proto.hpp b/llarp/proto.hpp
similarity index 100%
rename from include/llarp/proto.hpp
rename to llarp/proto.hpp
diff --git a/llarp/queue.hpp b/llarp/queue.hpp
index 95e3aa4e1..0edc3fa00 100644
--- a/llarp/queue.hpp
+++ b/llarp/queue.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_QUEUE_HPP
 #define LLARP_QUEUE_HPP
 
-#include <llarp/threading.hpp>
 #include <queue_manager.hpp>
+#include <threading.hpp>
 
 #include <atomic>
 #if __cplusplus >= 201703L
diff --git a/llarp/queue_manager.cpp b/llarp/queue_manager.cpp
index f5173cc87..26058f7f4 100644
--- a/llarp/queue_manager.cpp
+++ b/llarp/queue_manager.cpp
@@ -1,6 +1,5 @@
-#include "queue_manager.hpp"
-
-#include <llarp/threading.hpp>
+#include <queue_manager.hpp>
+#include <threading.hpp>
 
 namespace llarp
 {
diff --git a/llarp/relay_commit.cpp b/llarp/relay_commit.cpp
index 68c7f990e..e64455cf2 100644
--- a/llarp/relay_commit.cpp
+++ b/llarp/relay_commit.cpp
@@ -1,10 +1,10 @@
-#include <llarp/bencode.hpp>
-#include <llarp/path.hpp>
-#include <llarp/messages/path_confirm.hpp>
-#include <llarp/messages/relay_commit.hpp>
-#include "buffer.hpp"
-#include "logger.hpp"
-#include "router.hpp"
+#include <bencode.hpp>
+#include <buffer.hpp>
+#include <logger.hpp>
+#include <messages/path_confirm.hpp>
+#include <messages/relay_commit.hpp>
+#include <path.hpp>
+#include <router.hpp>
 
 namespace llarp
 {
diff --git a/llarp/relay_up_down.cpp b/llarp/relay_up_down.cpp
index 75cc2a4c0..0700efc68 100644
--- a/llarp/relay_up_down.cpp
+++ b/llarp/relay_up_down.cpp
@@ -1,7 +1,6 @@
-#include <llarp/bencode.hpp>
-#include <llarp/messages/relay.hpp>
-
-#include "router.hpp"
+#include <bencode.hpp>
+#include <messages/relay.hpp>
+#include <router.hpp>
 
 namespace llarp
 {
diff --git a/llarp/router.cpp b/llarp/router.cpp
index 2197bcd84..f7d27c847 100644
--- a/llarp/router.cpp
+++ b/llarp/router.cpp
@@ -1,14 +1,14 @@
 #include <buffer.hpp>
 #include <encode.hpp>
+#include <iwp.hpp>
 #include <link/server.hpp>
 #include <link/utp.hpp>
 #include <link_message.hpp>
-#include <llarp/iwp.hpp>
-#include <llarp/net.hpp>
-#include <llarp/proto.hpp>
-#include <llarp/rpc.hpp>
 #include <logger.hpp>
+#include <net.hpp>
+#include <proto.hpp>
 #include <router.hpp>
+#include <rpc.hpp>
 #include <str.hpp>
 
 #include <fstream>
diff --git a/llarp/router.hpp b/llarp/router.hpp
index 782db5906..699935414 100644
--- a/llarp/router.hpp
+++ b/llarp/router.hpp
@@ -1,26 +1,26 @@
 #ifndef LLARP_ROUTER_HPP
 #define LLARP_ROUTER_HPP
 
+#include <buffer.h>
+#include <config.h>
 #include <crypto.hpp>
 #include <dht.h>
 #include <dht.hpp>
+#include <establish_job.hpp>
+#include <ev.h>
 #include <exit.hpp>
 #include <fs.hpp>
 #include <handlers/tun.hpp>
 #include <link_layer.hpp>
 #include <link_message.hpp>
-#include <llarp/buffer.h>
-#include <llarp/config.h>
-#include <llarp/establish_job.hpp>
-#include <llarp/ev.h>
-#include <llarp/logic.hpp>
-#include <llarp/nodedb.hpp>
-#include <llarp/path.hpp>
-#include <llarp/profiling.hpp>
-#include <llarp/rpc.hpp>
+#include <logic.hpp>
 #include <mem.hpp>
+#include <nodedb.hpp>
+#include <path.hpp>
+#include <profiling.hpp>
 #include <router_contact.hpp>
 #include <routing/handler.hpp>
+#include <rpc.hpp>
 #include <service.hpp>
 #include <str.hpp>
 #include <threadpool.hpp>
diff --git a/llarp/router_contact.cpp b/llarp/router_contact.cpp
index 232de7605..4a2bb873f 100644
--- a/llarp/router_contact.cpp
+++ b/llarp/router_contact.cpp
@@ -1,12 +1,12 @@
+#include <bencode.hpp>
 #include <buffer.hpp>
 #include <crypto.hpp>
-#include <llarp/bencode.hpp>
-#include <llarp/net.hpp>
-#include <llarp/time.hpp>
-#include <llarp/version.hpp>
 #include <logger.hpp>
 #include <mem.hpp>
+#include <net.hpp>
 #include <router_contact.hpp>
+#include <time.hpp>
+#include <version.hpp>
 
 #include <fstream>
 
diff --git a/llarp/router_contact.hpp b/llarp/router_contact.hpp
index 0574daf35..0a2384011 100644
--- a/llarp/router_contact.hpp
+++ b/llarp/router_contact.hpp
@@ -1,10 +1,10 @@
 #ifndef LLARP_RC_HPP
 #define LLARP_RC_HPP
-#include <address_info.hpp>
 
-#include <llarp/bencode.hpp>
-#include <llarp/crypto.h>
-#include <llarp/exit_info.hpp>
+#include <address_info.hpp>
+#include <bencode.hpp>
+#include <crypto.h>
+#include <exit_info.hpp>
 
 #include <vector>
 
diff --git a/llarp/router_id.cpp b/llarp/router_id.cpp
index 73a6f5244..723b9bef8 100644
--- a/llarp/router_id.cpp
+++ b/llarp/router_id.cpp
@@ -1,4 +1,4 @@
-#include <llarp/router_id.hpp>
+#include <router_id.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/router_id.hpp b/llarp/router_id.hpp
similarity index 95%
rename from include/llarp/router_id.hpp
rename to llarp/router_id.hpp
index 4a26ad028..ff052417f 100644
--- a/include/llarp/router_id.hpp
+++ b/llarp/router_id.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_ROUTER_ID_HPP
 #define LLARP_ROUTER_ID_HPP
 
-#include <llarp/aligned.hpp>
+#include <aligned.hpp>
 
 namespace llarp
 {
diff --git a/llarp/routing/dht_message.cpp b/llarp/routing/dht_message.cpp
index 5ceacf14d..b75893dbf 100644
--- a/llarp/routing/dht_message.cpp
+++ b/llarp/routing/dht_message.cpp
@@ -1,5 +1,5 @@
-#include <llarp/messages/dht.hpp>
-#include "../router.hpp"
+#include <messages/dht.hpp>
+#include <router.hpp>
 
 namespace llarp
 {
diff --git a/llarp/routing/handler.hpp b/llarp/routing/handler.hpp
index 7f8e63810..16e27f433 100644
--- a/llarp/routing/handler.hpp
+++ b/llarp/routing/handler.hpp
@@ -1,14 +1,13 @@
 #ifndef LLARP_ROUTING_HANDLER_HPP
 #define LLARP_ROUTING_HANDLER_HPP
 
+#include <buffer.h>
 #include <dht.hpp>
-#include <llarp/buffer.h>
-
-#include <llarp/messages/path_confirm.hpp>
-#include <llarp/messages/path_latency.hpp>
-#include <llarp/messages/path_transfer.hpp>
-#include <llarp/messages/exit.hpp>
-#include <llarp/messages/transfer_traffic.hpp>
+#include <messages/exit.hpp>
+#include <messages/path_confirm.hpp>
+#include <messages/path_latency.hpp>
+#include <messages/path_transfer.hpp>
+#include <messages/transfer_traffic.hpp>
 
 namespace llarp
 {
diff --git a/llarp/routing/message.hpp b/llarp/routing/message.hpp
index 765b65a5f..e06bd52c9 100644
--- a/llarp/routing/message.hpp
+++ b/llarp/routing/message.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_ROUTING_MESSAGE_HPP
 #define LLARP_ROUTING_MESSAGE_HPP
 
-#include <llarp/buffer.h>
-#include <llarp/bencode.hpp>
-#include <llarp/path_types.hpp>
+#include <bencode.hpp>
+#include <buffer.h>
+#include <path_types.hpp>
 
 namespace llarp
 {
diff --git a/llarp/routing/message_parser.cpp b/llarp/routing/message_parser.cpp
index 731c2df5a..1c386689d 100644
--- a/llarp/routing/message_parser.cpp
+++ b/llarp/routing/message_parser.cpp
@@ -1,9 +1,9 @@
-#include <llarp/messages/dht.hpp>
-#include <llarp/messages/discard.hpp>
-#include <llarp/messages/path_confirm.hpp>
-#include <llarp/messages/path_latency.hpp>
-#include <llarp/messages/path_transfer.hpp>
 #include <mem.hpp>
+#include <messages/dht.hpp>
+#include <messages/discard.hpp>
+#include <messages/path_confirm.hpp>
+#include <messages/path_latency.hpp>
+#include <messages/path_transfer.hpp>
 #include <routing/message.hpp>
 
 namespace llarp
diff --git a/llarp/routing/path_confirm.cpp b/llarp/routing/path_confirm.cpp
index ff6160dbc..4a790955b 100644
--- a/llarp/routing/path_confirm.cpp
+++ b/llarp/routing/path_confirm.cpp
@@ -1,8 +1,7 @@
-#include <llarp/messages/path_confirm.hpp>
-
-#include <llarp/bencode.hpp>
-#include <llarp/time.hpp>
+#include <bencode.hpp>
+#include <messages/path_confirm.hpp>
 #include <routing/handler.hpp>
+#include <time.hpp>
 
 namespace llarp
 {
diff --git a/llarp/routing/path_latency.cpp b/llarp/routing/path_latency.cpp
index 494afdd29..f6329c3eb 100644
--- a/llarp/routing/path_latency.cpp
+++ b/llarp/routing/path_latency.cpp
@@ -1,5 +1,4 @@
-#include <llarp/messages/path_latency.hpp>
-
+#include <messages/path_latency.hpp>
 #include <routing/handler.hpp>
 
 namespace llarp
diff --git a/llarp/routing/path_transfer.cpp b/llarp/routing/path_transfer.cpp
index 8156089e2..12a9cd11a 100644
--- a/llarp/routing/path_transfer.cpp
+++ b/llarp/routing/path_transfer.cpp
@@ -1,6 +1,6 @@
-#include <llarp/messages/path_transfer.hpp>
-#include "../buffer.hpp"
-#include "../router.hpp"
+#include <buffer.hpp>
+#include <messages/path_transfer.hpp>
+#include <router.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/routing_endpoint.hpp b/llarp/routing_endpoint.hpp
similarity index 84%
rename from include/llarp/routing_endpoint.hpp
rename to llarp/routing_endpoint.hpp
index 532af81e0..cfc7f3a3f 100644
--- a/include/llarp/routing_endpoint.hpp
+++ b/llarp/routing_endpoint.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_ROUTING_ENDPOINT_HPP
 #define LLARP_ROUTING_ENDPOINT_HPP
 
-#include <llarp/buffer.h>
-#include <llarp/aligned.hpp>
+#include <aligned.hpp>
+#include <buffer.h>
 
 namespace llarp
 {
diff --git a/llarp/rpc.cpp b/llarp/rpc.cpp
index b627304fa..64cea102d 100644
--- a/llarp/rpc.cpp
+++ b/llarp/rpc.cpp
@@ -1,5 +1,5 @@
-#include <llarp/rpc.hpp>
 #include <router.hpp>
+#include <rpc.hpp>
 
 #ifdef USE_ABYSS
 #include <libabyss.hpp>
diff --git a/include/llarp/rpc.hpp b/llarp/rpc.hpp
similarity index 94%
rename from include/llarp/rpc.hpp
rename to llarp/rpc.hpp
index f3aa624aa..c79f2ea3d 100644
--- a/include/llarp/rpc.hpp
+++ b/llarp/rpc.hpp
@@ -1,10 +1,12 @@
 #ifndef LLARP_RPC_HPP
 #define LLARP_RPC_HPP
-#include <llarp/time.hpp>
-#include <llarp/ev.h>
+
+#include <crypto.hpp>
+#include <ev.h>
+#include <time.hpp>
+
 #include <string>
 #include <functional>
-#include <crypto.hpp>
 
 namespace llarp
 {
diff --git a/llarp/service/Identity.hpp b/llarp/service/Identity.hpp
index f55de902e..75dc6b8a2 100644
--- a/llarp/service/Identity.hpp
+++ b/llarp/service/Identity.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_SERVICE_IDENTITY_HPP
 #define LLARP_SERVICE_IDENTITY_HPP
 
+#include <bencode.hpp>
 #include <crypto.hpp>
-#include <llarp/bencode.hpp>
 #include <service/Info.hpp>
 #include <service/IntroSet.hpp>
 #include <service/types.hpp>
diff --git a/llarp/service/Info.hpp b/llarp/service/Info.hpp
index 292f3f134..76ee02454 100644
--- a/llarp/service/Info.hpp
+++ b/llarp/service/Info.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_SERVICE_INFO_HPP
 #define LLARP_SERVICE_INFO_HPP
 
+#include <bencode.hpp>
 #include <crypto.hpp>
-#include <llarp/bencode.hpp>
 #include <service/types.hpp>
 
 namespace llarp
diff --git a/llarp/service/Intro.hpp b/llarp/service/Intro.hpp
index 0c49d65b8..ee63b9918 100644
--- a/llarp/service/Intro.hpp
+++ b/llarp/service/Intro.hpp
@@ -1,8 +1,9 @@
 #ifndef LLARP_SERVICE_INTRO_HPP
 #define LLARP_SERVICE_INTRO_HPP
-#include <llarp/bencode.hpp>
+
+#include <bencode.hpp>
 #include <crypto.hpp>
-#include <llarp/path_types.hpp>
+#include <path_types.hpp>
 
 #include <iostream>
 
diff --git a/llarp/service/IntroSet.hpp b/llarp/service/IntroSet.hpp
index 5415b5b25..4208b805c 100644
--- a/llarp/service/IntroSet.hpp
+++ b/llarp/service/IntroSet.hpp
@@ -1,12 +1,13 @@
 #ifndef LLARP_SERVICE_INTROSET_HPP
 #define LLARP_SERVICE_INTROSET_HPP
+
+#include <bencode.hpp>
 #include <crypto.hpp>
-#include <llarp/bencode.hpp>
-#include <llarp/pow.hpp>
-#include <llarp/time.hpp>
+#include <pow.hpp>
 #include <service/Info.hpp>
 #include <service/Intro.hpp>
 #include <service/tag.hpp>
+#include <time.hpp>
 
 #include <algorithm>
 #include <iostream>
diff --git a/llarp/service/address.hpp b/llarp/service/address.hpp
index 013bb6622..4495406e8 100644
--- a/llarp/service/address.hpp
+++ b/llarp/service/address.hpp
@@ -1,8 +1,10 @@
 #ifndef LLARP_SERVICE_ADDRESS_HPP
 #define LLARP_SERVICE_ADDRESS_HPP
-#include <llarp/aligned.hpp>
+
+#include <aligned.hpp>
 #include <dht/key.hpp>
-#include <llarp/router_id.hpp>
+#include <router_id.hpp>
+
 #include <string>
 
 namespace llarp
diff --git a/llarp/service/context.hpp b/llarp/service/context.hpp
index fce6651f0..8a3757736 100644
--- a/llarp/service/context.hpp
+++ b/llarp/service/context.hpp
@@ -2,7 +2,7 @@
 #define LLARP_SERVICE_CONTEXT_HPP
 
 #include <handlers/tun.hpp>
-#include <llarp/net.hpp>
+#include <net.hpp>
 #include <service/config.hpp>
 #include <service/endpoint.hpp>
 
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index b4359ec49..c2c50f572 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1,7 +1,7 @@
 #include <buffer.hpp>
 #include <dht/messages/findintro.hpp>
-#include <llarp/logic.hpp>
-#include <llarp/messages/dht.hpp>
+#include <logic.hpp>
+#include <messages/dht.hpp>
 #include <router.hpp>
 #include <service/endpoint.hpp>
 #include <service/protocol.hpp>
diff --git a/llarp/service/endpoint.hpp b/llarp/service/endpoint.hpp
index d38c9b5dc..ff319c394 100644
--- a/llarp/service/endpoint.hpp
+++ b/llarp/service/endpoint.hpp
@@ -1,12 +1,12 @@
 #ifndef LLARP_SERVICE_ENDPOINT_HPP
 #define LLARP_SERVICE_ENDPOINT_HPP
 
+#include <codel.hpp>
+#include <ev.h>
 #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 <net.hpp>
+#include <path.hpp>
+#include <pathbuilder.hpp>
 #include <service/Identity.hpp>
 #include <service/handler.hpp>
 #include <service/protocol.hpp>
diff --git a/llarp/service/handler.hpp b/llarp/service/handler.hpp
index fa4ac91fa..28035d8bf 100644
--- a/llarp/service/handler.hpp
+++ b/llarp/service/handler.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_SERVICE_HANDLER_HPP
 #define LLARP_SERVICE_HANDLER_HPP
 
+#include <aligned.hpp>
 #include <crypto.hpp>
-#include <llarp/aligned.hpp>
-#include <llarp/path_types.hpp>
+#include <path_types.hpp>
 #include <service/IntroSet.hpp>
 
 namespace llarp
diff --git a/llarp/service/lookup.cpp b/llarp/service/lookup.cpp
index e8ca7983e..32a64a0c3 100644
--- a/llarp/service/lookup.cpp
+++ b/llarp/service/lookup.cpp
@@ -1,7 +1,7 @@
-#include <llarp/path.hpp>
-#include <llarp/time.hpp>
+#include <path.hpp>
 #include <service/endpoint.hpp>
 #include <service/lookup.hpp>
+#include <time.hpp>
 
 namespace llarp
 {
diff --git a/llarp/service/protocol.cpp b/llarp/service/protocol.cpp
index b88f74e56..1f5991b5c 100644
--- a/llarp/service/protocol.cpp
+++ b/llarp/service/protocol.cpp
@@ -1,5 +1,5 @@
 #include <buffer.hpp>
-#include <llarp/logic.hpp>
+#include <logic.hpp>
 #include <mem.hpp>
 #include <routing/handler.hpp>
 #include <service/protocol.hpp>
diff --git a/llarp/service/protocol.hpp b/llarp/service/protocol.hpp
index 8437fd418..68a98be6d 100644
--- a/llarp/service/protocol.hpp
+++ b/llarp/service/protocol.hpp
@@ -1,16 +1,16 @@
 #ifndef LLARP_SERVICE_PROTOCOL_HPP
 #define LLARP_SERVICE_PROTOCOL_HPP
 
+#include <bencode.hpp>
 #include <crypto.hpp>
 #include <dht/message.hpp>
-#include <llarp/bencode.hpp>
-#include <llarp/encrypted.hpp>
-#include <llarp/time.hpp>
+#include <encrypted.hpp>
 #include <routing/message.hpp>
 #include <service/Identity.hpp>
 #include <service/Info.hpp>
 #include <service/Intro.hpp>
 #include <service/handler.hpp>
+#include <time.hpp>
 
 #include <vector>
 
diff --git a/llarp/service/tag.hpp b/llarp/service/tag.hpp
index dc00d569b..e6d1fbb59 100644
--- a/llarp/service/tag.hpp
+++ b/llarp/service/tag.hpp
@@ -1,10 +1,11 @@
 #ifndef LLARP_SERVICE_TAG_HPP
 #define LLARP_SERVICE_TAG_HPP
 
-#include <sodium/crypto_generichash.h>
-#include <llarp/aligned.hpp>
+#include <aligned.hpp>
 #include <dht/key.hpp>
 
+#include <sodium/crypto_generichash.h>
+
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
diff --git a/llarp/service/vanity.hpp b/llarp/service/vanity.hpp
index 4f3a92d71..cf79ad512 100644
--- a/llarp/service/vanity.hpp
+++ b/llarp/service/vanity.hpp
@@ -1,7 +1,9 @@
 
 #ifndef LLARP_SERVICE_VANITY_HPP
 #define LLARP_SERVICE_VANITY_HPP
-#include <llarp/aligned.hpp>
+
+#include <aligned.hpp>
+
 namespace llarp
 {
   namespace service
diff --git a/include/llarp/string_view.hpp b/llarp/string_view.hpp
similarity index 100%
rename from include/llarp/string_view.hpp
rename to llarp/string_view.hpp
diff --git a/llarp/thread_pool.hpp b/llarp/thread_pool.hpp
index d61294e08..7fe3842db 100644
--- a/llarp/thread_pool.hpp
+++ b/llarp/thread_pool.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_THREAD_POOL_HPP
 #define LLARP_THREAD_POOL_HPP
 
-#include <llarp/threading.hpp>
 #include <queue.hpp>
+#include <threading.hpp>
 
 #include <functional>
 #include <thread>
diff --git a/include/llarp/threading.hpp b/llarp/threading.hpp
similarity index 96%
rename from include/llarp/threading.hpp
rename to llarp/threading.hpp
index 5bf0ac944..0a4f24cd2 100644
--- a/include/llarp/threading.hpp
+++ b/llarp/threading.hpp
@@ -6,9 +6,9 @@
 #error this should not be set
 #endif
 #define _MINGW32_NO_THREADS
-#include <llarp/win32/threads/mingw.condition_variable.h>
-#include <llarp/win32/threads/mingw.mutex.h>
-#include <llarp/win32/threads/mingw.thread.h>
+#include <win32/threads/mingw.condition_variable.h>
+#include <win32/threads/mingw.mutex.h>
+#include <win32/threads/mingw.thread.h>
 #else
 #include <condition_variable>
 #include <thread>
diff --git a/llarp/threadpool.cpp b/llarp/threadpool.cpp
index ad8ecdd51..bf7cd2722 100644
--- a/llarp/threadpool.cpp
+++ b/llarp/threadpool.cpp
@@ -1,12 +1,11 @@
-#include "threadpool.hpp"
-#include <cstring>
+#include <logger.hpp>
+#include <threadpool.hpp>
+#include <time.hpp>
 
-#include <llarp/time.hpp>
+#include <cstring>
 #include <functional>
 #include <queue>
 
-#include "logger.hpp"
-
 struct llarp_threadpool
 {
   std::unique_ptr< llarp::thread::Pool > impl;
diff --git a/include/llarp/threadpool.h b/llarp/threadpool.h
similarity index 100%
rename from include/llarp/threadpool.h
rename to llarp/threadpool.h
diff --git a/llarp/threadpool.hpp b/llarp/threadpool.hpp
index ba5bd804c..5c2e4587c 100644
--- a/llarp/threadpool.hpp
+++ b/llarp/threadpool.hpp
@@ -1,10 +1,9 @@
 #ifndef LLARP_THREADPOOL_HPP
 #define LLARP_THREADPOOL_HPP
 
-#include <llarp/threadpool.h>
-#include <llarp/threading.hpp>
-
-#include "thread_pool.hpp"
+#include <thread_pool.hpp>
+#include <threading.hpp>
+#include <threadpool.h>
 
 namespace llarp
 {
diff --git a/llarp/time.cpp b/llarp/time.cpp
index 167c288ac..372488a31 100644
--- a/llarp/time.cpp
+++ b/llarp/time.cpp
@@ -1,4 +1,4 @@
-#include <llarp/time.hpp>
+#include <time.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/time.hpp b/llarp/time.hpp
similarity index 87%
rename from include/llarp/time.hpp
rename to llarp/time.hpp
index 2b57c9ca8..3f0d37293 100644
--- a/include/llarp/time.hpp
+++ b/llarp/time.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_TIME_HPP
 #define LLARP_TIME_HPP
 
-#include <llarp/types.hpp>
+#include <types.hpp>
 
 #include <chrono>
 
diff --git a/llarp/timer.cpp b/llarp/timer.cpp
index 98596afcf..d8657b503 100644
--- a/llarp/timer.cpp
+++ b/llarp/timer.cpp
@@ -1,13 +1,13 @@
-#include <llarp/time.hpp>
-#include <llarp/timer.hpp>
+#include <logger.hpp>
+#include <time.hpp>
+#include <timer.hpp>
+
 #include <atomic>
 #include <condition_variable>
 #include <list>
 #include <queue>
 #include <unordered_map>
 
-#include "logger.hpp"
-
 namespace llarp
 {
   struct timer
diff --git a/include/llarp/timer.hpp b/llarp/timer.hpp
similarity index 94%
rename from include/llarp/timer.hpp
rename to llarp/timer.hpp
index 5d887cf60..a86e1e747 100644
--- a/include/llarp/timer.hpp
+++ b/llarp/timer.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_TIMER_HPP
 #define LLARP_TIMER_HPP
 
-#include <llarp/common.hpp>
-#include <llarp/threadpool.h>
-#include <llarp/time.hpp>
+#include <common.hpp>
+#include <threadpool.h>
+#include <time.hpp>
 
 #include <functional>
 
diff --git a/llarp/transit_hop.cpp b/llarp/transit_hop.cpp
index 2044bb923..3309f650e 100644
--- a/llarp/transit_hop.cpp
+++ b/llarp/transit_hop.cpp
@@ -1,7 +1,7 @@
 #include <buffer.hpp>
-#include <llarp/endian.hpp>
-#include <llarp/messages/discard.hpp>
-#include <llarp/path.hpp>
+#include <endian.hpp>
+#include <messages/discard.hpp>
+#include <path.hpp>
 #include <router.hpp>
 #include <routing/handler.hpp>
 
diff --git a/include/llarp/types.hpp b/llarp/types.hpp
similarity index 100%
rename from include/llarp/types.hpp
rename to llarp/types.hpp
diff --git a/include/llarp/version.hpp b/llarp/version.hpp
similarity index 100%
rename from include/llarp/version.hpp
rename to llarp/version.hpp
diff --git a/include/llarp/win32/threads/mingw.condition_variable.h b/llarp/win32/threads/mingw.condition_variable.h
similarity index 100%
rename from include/llarp/win32/threads/mingw.condition_variable.h
rename to llarp/win32/threads/mingw.condition_variable.h
diff --git a/include/llarp/win32/threads/mingw.mutex.h b/llarp/win32/threads/mingw.mutex.h
similarity index 100%
rename from include/llarp/win32/threads/mingw.mutex.h
rename to llarp/win32/threads/mingw.mutex.h
diff --git a/include/llarp/win32/threads/mingw.shared_mutex.h b/llarp/win32/threads/mingw.shared_mutex.h
similarity index 100%
rename from include/llarp/win32/threads/mingw.shared_mutex.h
rename to llarp/win32/threads/mingw.shared_mutex.h
diff --git a/include/llarp/win32/threads/mingw.thread.h b/llarp/win32/threads/mingw.thread.h
similarity index 100%
rename from include/llarp/win32/threads/mingw.thread.h
rename to llarp/win32/threads/mingw.thread.h
diff --git a/llarp/win32_inet.c b/llarp/win32_inet.c
index a4f51bfb0..59b3c84ec 100644
--- a/llarp/win32_inet.c
+++ b/llarp/win32_inet.c
@@ -10,7 +10,7 @@
 
 // these need to be in a specific order
 #include <assert.h>
-#include <llarp/net.h>
+#include <net.h>
 #include <windows.h>
 #include <iphlpapi.h>
 #if WINNT_CROSS_COMPILE && !NTSTATUS
diff --git a/test/alignedbuffer_unittest.cpp b/test/alignedbuffer_unittest.cpp
index 5dc20bde6..632f1e9e8 100644
--- a/test/alignedbuffer_unittest.cpp
+++ b/test/alignedbuffer_unittest.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <llarp/aligned.hpp>
+
+#include <aligned.hpp>
 
 using Buffer_t = llarp::AlignedBuffer< 32 >;
 using Map_t    = std::unordered_map< Buffer_t, int, Buffer_t::Hash >;
diff --git a/test/base32_unittest.cpp b/test/base32_unittest.cpp
index e1bf30675..f674340fc 100644
--- a/test/base32_unittest.cpp
+++ b/test/base32_unittest.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
+#include <aligned.hpp>
 #include <encode.hpp>
-#include <llarp/aligned.hpp>
 #include <logger.hpp>
 
 struct Base32Test : public ::testing::Test
diff --git a/test/encrypted_frame_unittest.cpp b/test/encrypted_frame_unittest.cpp
index e11e165cc..48f58b2dc 100644
--- a/test/encrypted_frame_unittest.cpp
+++ b/test/encrypted_frame_unittest.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <crypto.hpp>
-#include <llarp/encrypted_frame.hpp>
-#include <llarp/messages/relay_commit.hpp>
+#include <encrypted_frame.hpp>
+#include <messages/relay_commit.hpp>
 
 using EncryptedFrame = llarp::EncryptedFrame;
 using SecretKey      = llarp::SecretKey;
diff --git a/test/hiddenservice_unittest.cpp b/test/hiddenservice_unittest.cpp
index 6c7849eb7..5528dd69d 100644
--- a/test/hiddenservice_unittest.cpp
+++ b/test/hiddenservice_unittest.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include <llarp/time.hpp>
 #include <service.hpp>
+#include <time.hpp>
 
 struct HiddenServiceTest : public ::testing::Test
 {
diff --git a/test/jsonrpc_unittest.cpp b/test/jsonrpc_unittest.cpp
index e923648c9..260c106cf 100644
--- a/test/jsonrpc_unittest.cpp
+++ b/test/jsonrpc_unittest.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 #include <libabyss.hpp>
-#include <llarp/ev.h>
-#include <llarp/threading.hpp>
-#include <llarp/net.hpp>
+#include <ev.h>
+#include <threading.hpp>
+#include <net.hpp>
 
 struct AbyssTestBase : public ::testing::Test
 {
diff --git a/test/net_unittest.cpp b/test/net_unittest.cpp
index d2e3ffb80..ba5c99f31 100644
--- a/test/net_unittest.cpp
+++ b/test/net_unittest.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
-#include <llarp/net.hpp>
-#include <llarp/net_inaddr.hpp>
+
+#include <net.hpp>
+#include <net_inaddr.hpp>
 
 struct NetTest : public ::testing::Test
 {
diff --git a/test/obtain_exit_unittest.cpp b/test/obtain_exit_unittest.cpp
index 73e853cf8..afbb4cf0d 100644
--- a/test/obtain_exit_unittest.cpp
+++ b/test/obtain_exit_unittest.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include <llarp/messages/exit.hpp>
+
+#include <messages/exit.hpp>
 
 using ObtainExitMessage = llarp::routing::ObtainExitMessage;
 
diff --git a/test/test_dns_unit.cpp b/test/test_dns_unit.cpp
index 45076bf2f..4e7bfe66c 100644
--- a/test/test_dns_unit.cpp
+++ b/test/test_dns_unit.cpp
@@ -3,8 +3,8 @@
 #include <dns.hpp>
 #include <dnsc.hpp>
 #include <llarp.h>          // for llarp_main_init
-#include <llarp/logic.hpp>  // for threadpool/llarp::Logic
-#include "llarp/net.hpp"    // for llarp::Addr
+#include <logic.hpp>  // for threadpool/llarp::Logic
+#include <net.hpp>    // for llarp::Addr
 
 struct DNSTest : public ::testing::Test
 {
diff --git a/test/test_dnsc_unit.cpp b/test/test_dnsc_unit.cpp
index 931d8b737..9799e6792 100644
--- a/test/test_dnsc_unit.cpp
+++ b/test/test_dnsc_unit.cpp
@@ -2,5 +2,5 @@
 
 #include <dnsc.hpp>
 #include <llarp.h>          // for llarp_main_init
-#include <llarp/logic.hpp>  // for threadpool/llarp::Logic
-#include <llarp/net.hpp>    // for llarp::Addr
+#include <logic.hpp>  // for threadpool/llarp::Logic
+#include <net.hpp>    // for llarp::Addr
diff --git a/test/test_dnsd_unit.cpp b/test/test_dnsd_unit.cpp
index 6f4382bd2..c8d2692b2 100644
--- a/test/test_dnsd_unit.cpp
+++ b/test/test_dnsd_unit.cpp
@@ -1,8 +1,9 @@
 #include <gtest/gtest.h>
+
 #include <llarp.h>          // for llarp_main_init
-#include <llarp/logic.hpp>  // for threadpool/llarp::Logic
-#include "llarp/net.hpp"    // for llarp::Addr
-#include "llarp/dnsd.hpp"
+#include <logic.hpp>  // for threadpool/llarp::Logic
+#include <net.hpp>    // for llarp::Addr
+#include <dnsd.hpp>
 
 unsigned int g_length = 0;
 std::string g_result  = "";
diff --git a/test/test_dnslib.cpp b/test/test_dnslib.cpp
index 9223b1dea..0a0eccb65 100644
--- a/test/test_dnslib.cpp
+++ b/test/test_dnslib.cpp
@@ -1,7 +1,9 @@
-#include <dns/dns.hpp>
 #include <gtest/gtest.h>
+
+#include <dns/dns.hpp>
+#include <net.hpp>
+
 #include <algorithm>
-#include <llarp/net.hpp>
 
 struct DNSLibTest : public ::testing::Test
 {
diff --git a/test/test_llarp_queue.cpp b/test/test_llarp_queue.cpp
index 05d6cce4c..7d4f9bbb6 100644
--- a/test/test_llarp_queue.cpp
+++ b/test/test_llarp_queue.cpp
@@ -1,5 +1,5 @@
 #include <queue.hpp>
-#include <llarp/threading.hpp>
+#include <threading.hpp>
 
 #include <array>
 #include <thread>
diff --git a/test/test_llarp_thread_pool.cpp b/test/test_llarp_thread_pool.cpp
index e8b5be3da..e2045c8ad 100644
--- a/test/test_llarp_thread_pool.cpp
+++ b/test/test_llarp_thread_pool.cpp
@@ -1,5 +1,5 @@
 #include <thread_pool.hpp>
-#include <llarp/threading.hpp>
+#include <threading.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/traffic_transfer_unittest.cpp b/test/traffic_transfer_unittest.cpp
index dc6204eae..6fbc5259c 100644
--- a/test/traffic_transfer_unittest.cpp
+++ b/test/traffic_transfer_unittest.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <llarp/messages/transfer_traffic.hpp>
+#include <messages/transfer_traffic.hpp>
 
 using TransferTrafficMessage = llarp::routing::TransferTrafficMessage;