diff --git a/include/llarp/bencode.hpp b/include/llarp/bencode.hpp
index 739dc7843..70a240c58 100644
--- a/include/llarp/bencode.hpp
+++ b/include/llarp/bencode.hpp
@@ -1,10 +1,11 @@
 #ifndef LLARP_BENCODE_HPP
 #define LLARP_BENCODE_HPP
 
+#include <buffer.hpp>
 #include <llarp/bencode.h>
-#include <llarp/buffer.hpp>
 #include <llarp/logger.hpp>
 #include <llarp/mem.hpp>
+
 #include <set>
 #include <fstream>
 
diff --git a/include/llarp/buffer.hpp b/include/llarp/buffer.hpp
deleted file mode 100644
index cb6b37096..000000000
--- a/include/llarp/buffer.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef LLARP_BUFFER_HPP
-#define LLARP_BUFFER_HPP
-
-#include <llarp/buffer.h>
-
-namespace llarp
-{
-  template < typename T >
-  llarp_buffer_t
-  StackBuffer(T& stack)
-  {
-    llarp_buffer_t buff;
-    buff.base = &stack[0];
-    buff.cur  = buff.base;
-    buff.sz   = sizeof(stack);
-    return buff;
-  }
-
-  /** initialize llarp_buffer_t from raw memory */
-  template < typename T >
-  llarp_buffer_t
-  InitBuffer(T buf, size_t sz)
-  {
-    byte_t* ptr = (byte_t*)buf;
-    llarp_buffer_t ret;
-    ret.cur  = ptr;
-    ret.base = ptr;
-    ret.sz   = sz;
-    return ret;
-  }
-
-  /** initialize llarp_buffer_t from container */
-  template < typename T >
-  llarp_buffer_t
-  Buffer(T& t)
-  {
-    llarp_buffer_t buff;
-    buff.base = &t[0];
-    buff.cur  = buff.base;
-    buff.sz   = t.size();
-    return buff;
-  }
-
-  template < typename T >
-  llarp_buffer_t
-  ConstBuffer(const T& t)
-  {
-    llarp_buffer_t buff;
-    buff.base = (byte_t*)&t[0];
-    buff.cur  = buff.base;
-    buff.sz   = t.size();
-    return buff;
-  }
-
-}  // namespace llarp
-
-#endif
diff --git a/libabyss/src/client.cpp b/libabyss/src/client.cpp
index e0723a099..b7e9a3046 100644
--- a/libabyss/src/client.cpp
+++ b/libabyss/src/client.cpp
@@ -2,7 +2,7 @@
 #include <abyss/http.hpp>
 #include <llarp/logger.hpp>
 #include <llarp/crypto.hpp>
-#include <llarp/buffer.hpp>
+#include <buffer.hpp>
 
 namespace abyss
 {
diff --git a/libabyss/src/server.cpp b/libabyss/src/server.cpp
index dd5907db4..0ce53a4a5 100644
--- a/libabyss/src/server.cpp
+++ b/libabyss/src/server.cpp
@@ -1,12 +1,13 @@
-#include <abyss/server.hpp>
 #include <abyss/http.hpp>
+#include <abyss/server.hpp>
+#include <buffer.hpp>
+#include <llarp/logger.hpp>
 #include <llarp/time.hpp>
-#include <llarp/buffer.hpp>
+
+#include <algorithm>
 #include <sstream>
-#include <unordered_map>
 #include <string>
-#include <llarp/logger.hpp>
-#include <algorithm>
+#include <unordered_map>
 
 namespace abyss
 {
diff --git a/llarp/buffer.hpp b/llarp/buffer.hpp
index b2c9991bc..cb6b37096 100644
--- a/llarp/buffer.hpp
+++ b/llarp/buffer.hpp
@@ -1 +1,57 @@
-#include <llarp/buffer.hpp>
\ No newline at end of file
+#ifndef LLARP_BUFFER_HPP
+#define LLARP_BUFFER_HPP
+
+#include <llarp/buffer.h>
+
+namespace llarp
+{
+  template < typename T >
+  llarp_buffer_t
+  StackBuffer(T& stack)
+  {
+    llarp_buffer_t buff;
+    buff.base = &stack[0];
+    buff.cur  = buff.base;
+    buff.sz   = sizeof(stack);
+    return buff;
+  }
+
+  /** initialize llarp_buffer_t from raw memory */
+  template < typename T >
+  llarp_buffer_t
+  InitBuffer(T buf, size_t sz)
+  {
+    byte_t* ptr = (byte_t*)buf;
+    llarp_buffer_t ret;
+    ret.cur  = ptr;
+    ret.base = ptr;
+    ret.sz   = sz;
+    return ret;
+  }
+
+  /** initialize llarp_buffer_t from container */
+  template < typename T >
+  llarp_buffer_t
+  Buffer(T& t)
+  {
+    llarp_buffer_t buff;
+    buff.base = &t[0];
+    buff.cur  = buff.base;
+    buff.sz   = t.size();
+    return buff;
+  }
+
+  template < typename T >
+  llarp_buffer_t
+  ConstBuffer(const T& t)
+  {
+    llarp_buffer_t buff;
+    buff.base = (byte_t*)&t[0];
+    buff.cur  = buff.base;
+    buff.sz   = t.size();
+    return buff;
+  }
+
+}  // namespace llarp
+
+#endif
diff --git a/llarp/dns/message.cpp b/llarp/dns/message.cpp
index 0d5ca0230..fed1aba59 100644
--- a/llarp/dns/message.cpp
+++ b/llarp/dns/message.cpp
@@ -1,7 +1,7 @@
+#include <buffer.hpp>
 #include <llarp/dns/message.hpp>
 #include <llarp/endian.hpp>
 #include <llarp/logger.hpp>
-#include <llarp/buffer.hpp>
 
 namespace llarp
 {
diff --git a/llarp/ip.cpp b/llarp/ip.cpp
index c78df043e..7bb7a7d82 100644
--- a/llarp/ip.cpp
+++ b/llarp/ip.cpp
@@ -1,13 +1,13 @@
-#include <llarp/endian.hpp>
-#include <algorithm>
 #include <llarp/ip.hpp>
-#include "llarp/buffer.hpp"
+#include <buffer.hpp>
+#include <llarp/endian.hpp>
 #include "mem.hpp"
 #ifndef _WIN32
 #include <netinet/in.h>
 #endif
-#include <map>
+
 #include <algorithm>
+#include <map>
 
 namespace llarp
 {
diff --git a/llarp/link/utp.cpp b/llarp/link/utp.cpp
index 34ab1bcd8..b1e32d71e 100644
--- a/llarp/link/utp.cpp
+++ b/llarp/link/utp.cpp
@@ -1,14 +1,15 @@
+#include <buffer.hpp>
+#include <llarp/endian.hpp>
 #include <llarp/link/utp.hpp>
-#include <llarp/messages/link_intro.hpp>
 #include <llarp/messages/discard.hpp>
-#include <llarp/buffer.hpp>
-#include <llarp/endian.hpp>
+#include <llarp/messages/link_intro.hpp>
+#include <router.hpp>
 #include <utp.h>
+
 #include <cassert>
 #include <tuple>
 #include <deque>
 
-#include <router.hpp>
 
 #ifdef __linux__
 #include <linux/errqueue.h>