diff --git a/include/llarp.h b/include/llarp.h
index 6607a25f1..acfc7c749 100644
--- a/include/llarp.h
+++ b/include/llarp.h
@@ -2,9 +2,9 @@
 #define LLARP_H_
 #include <llarp/dht.h>
 #include <llarp/ev.h>
-#include <llarp/logic.h>
+#include <llarp/logic.hpp>
 #include <llarp/mem.h>
-#include <llarp/version.h>
+#include <llarp/version.hpp>
 
 #ifdef __cplusplus
 #include <llarp/service/address.hpp>  // for service::address
diff --git a/include/llarp/bencode.h b/include/llarp/bencode.h
index b93ba468d..1e2ab7b5d 100644
--- a/include/llarp/bencode.h
+++ b/include/llarp/bencode.h
@@ -1,8 +1,8 @@
 #ifndef LLARP_BENCODE_H
 #define LLARP_BENCODE_H
 #include <llarp/buffer.h>
-#include <llarp/common.h>
-#include <llarp/proto.h>
+#include <llarp/common.hpp>
+#include <llarp/proto.hpp>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/include/llarp/buffer.h b/include/llarp/buffer.h
index 0bd6211b4..ee7d50bd7 100644
--- a/include/llarp/buffer.h
+++ b/include/llarp/buffer.h
@@ -1,6 +1,6 @@
 #ifndef LLARP_BUFFER_H_
 #define LLARP_BUFFER_H_
-#include <llarp/common.h>
+#include <llarp/common.hpp>
 #include <llarp/mem.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/include/llarp/common.h b/include/llarp/common.hpp
similarity index 75%
rename from include/llarp/common.h
rename to include/llarp/common.hpp
index f7d741ad5..3ef490f75 100644
--- a/include/llarp/common.h
+++ b/include/llarp/common.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_COMMON_H
-#define LLARP_COMMON_H
+#ifndef LLARP_COMMON_HPP
+#define LLARP_COMMON_HPP
 #ifdef __STRICT_ANSI__
 #define INLINE __inline__
 #else
diff --git a/include/llarp/crypto.h b/include/llarp/crypto.h
index f1e0874fe..6b7211e9b 100644
--- a/include/llarp/crypto.h
+++ b/include/llarp/crypto.h
@@ -1,7 +1,7 @@
 #ifndef LLARP_CRYPTO_H_
 #define LLARP_CRYPTO_H_
 #include <llarp/buffer.h>
-#include <llarp/common.h>
+#include <llarp/common.hpp>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/include/llarp/defaults.h b/include/llarp/defaults.hpp
similarity index 90%
rename from include/llarp/defaults.h
rename to include/llarp/defaults.hpp
index 8e5fd4f83..863fd2190 100644
--- a/include/llarp/defaults.h
+++ b/include/llarp/defaults.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_DEFAULTS_H
-#define LLARP_DEFAULTS_H
+#ifndef LLARP_DEFAULTS_HPP
+#define LLARP_DEFAULTS_HPP
 
 #ifndef DEFAULT_RESOLVER_US
 #define DEFAULT_RESOLVER_US "1.1.1.1"
@@ -27,4 +27,4 @@
 #endif
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/llarp/endian.h b/include/llarp/endian.hpp
similarity index 98%
rename from include/llarp/endian.h
rename to include/llarp/endian.hpp
index 6405dd97b..fd859828a 100644
--- a/include/llarp/endian.h
+++ b/include/llarp/endian.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_ENDIAN_H
-#define LLARP_ENDIAN_H
+#ifndef LLARP_ENDIAN_HPP
+#define LLARP_ENDIAN_HPP
 
 // adapted from libi2pd
 
diff --git a/include/llarp/link/server.hpp b/include/llarp/link/server.hpp
index 09a755d35..ac15ea70f 100644
--- a/include/llarp/link/server.hpp
+++ b/include/llarp/link/server.hpp
@@ -7,7 +7,7 @@
 #include <llarp/net.hpp>
 #include <llarp/ev.h>
 #include <llarp/link/session.hpp>
-#include <llarp/logic.h>
+#include <llarp/logic.hpp>
 #include <list>
 
 struct llarp_router;
diff --git a/include/llarp/logic.h b/include/llarp/logic.hpp
similarity index 95%
rename from include/llarp/logic.h
rename to include/llarp/logic.hpp
index e293f3f42..6b2fbf832 100644
--- a/include/llarp/logic.h
+++ b/include/llarp/logic.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_LOGIC_H
-#define LLARP_LOGIC_H
+#ifndef LLARP_LOGIC_HPP
+#define LLARP_LOGIC_HPP
 #include <llarp/mem.h>
 #include <llarp/threadpool.h>
 #include <llarp/timer.hpp>
diff --git a/include/llarp/nodedb.hpp b/include/llarp/nodedb.hpp
index 61784b1f0..1c3ba4012 100644
--- a/include/llarp/nodedb.hpp
+++ b/include/llarp/nodedb.hpp
@@ -1,6 +1,6 @@
 #ifndef LLARP_NODEDB_HPP
 #define LLARP_NODEDB_HPP
-#include <llarp/common.h>
+#include <llarp/common.hpp>
 #include <llarp/crypto.h>
 #include <llarp/router_contact.hpp>
 #include <llarp/router_id.hpp>
diff --git a/include/llarp/proto.h b/include/llarp/proto.hpp
similarity index 74%
rename from include/llarp/proto.h
rename to include/llarp/proto.hpp
index c720622e1..d2067331c 100644
--- a/include/llarp/proto.h
+++ b/include/llarp/proto.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_PROTO_H
-#define LLARP_PROTO_H
+#ifndef LLARP_PROTO_HPP
+#define LLARP_PROTO_HPP
 
 #ifndef LLARP_PROTO_VERSION
 #define LLARP_PROTO_VERSION (0)
diff --git a/include/llarp/router.h b/include/llarp/router.h
index 7cf3497b6..f58a00472 100644
--- a/include/llarp/router.h
+++ b/include/llarp/router.h
@@ -2,7 +2,7 @@
 #define LLARP_ROUTER_H_
 #include <llarp/config.h>
 #include <llarp/ev.h>
-#include <llarp/logic.h>
+#include <llarp/logic.hpp>
 #include <llarp/threadpool.h>
 #include <llarp/buffer.h>
 
diff --git a/include/llarp/string.h b/include/llarp/string.h
index 4b74b59f0..80aad1a70 100644
--- a/include/llarp/string.h
+++ b/include/llarp/string.h
@@ -1,6 +1,6 @@
 #ifndef LLARP_STRING_H
 #define LLARP_STRING_H
-#include <llarp/common.h>
+#include <llarp/common.hpp>
 
 #ifndef __FreeBSD__
 #if !(__APPLE__ && __MACH__)
diff --git a/include/llarp/timer.hpp b/include/llarp/timer.hpp
index 291b1f07f..c78e1e23d 100644
--- a/include/llarp/timer.hpp
+++ b/include/llarp/timer.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_TIMER_HPP
 #define LLARP_TIMER_HPP
 
-#include <llarp/common.h>
+#include <llarp/common.hpp>
 #include <llarp/threadpool.h>
 #include <llarp/time.hpp>
 
diff --git a/include/llarp/version.h b/include/llarp/version.hpp
similarity index 92%
rename from include/llarp/version.h
rename to include/llarp/version.hpp
index b831571e3..56e807670 100644
--- a/include/llarp/version.h
+++ b/include/llarp/version.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_VERSION_H
-#define LLARP_VERSION_H
+#ifndef LLARP_VERSION_HPP
+#define LLARP_VERSION_HPP
 
 #ifndef LLARP_VERSION_MAJ
 #define LLARP_VERSION_MAJ "0"
@@ -28,4 +28,5 @@
 #ifndef LLARP_RELEASE_MOTTO
 #define LLARP_RELEASE_MOTTO "(dev build)"
 #endif
+
 #endif
diff --git a/libabyss/include/abyss/server.hpp b/libabyss/include/abyss/server.hpp
index 8c069d251..2de7add48 100644
--- a/libabyss/include/abyss/server.hpp
+++ b/libabyss/include/abyss/server.hpp
@@ -2,7 +2,7 @@
 #define __ABYSS_SERVER_HPP__
 
 #include <llarp/ev.h>
-#include <llarp/logic.h>
+#include <llarp/logic.hpp>
 #include <llarp/string_view.hpp>
 #include <llarp/time.hpp>
 #include <list>
diff --git a/llarp/buffer.cpp b/llarp/buffer.cpp
index db5a6cf8c..2345e0e79 100644
--- a/llarp/buffer.cpp
+++ b/llarp/buffer.cpp
@@ -1,5 +1,5 @@
 #include <llarp/buffer.h>
-#include <llarp/endian.h>
+#include <llarp/endian.hpp>
 #include <stdarg.h>
 #include <stdio.h>
 
diff --git a/llarp/config.cpp b/llarp/config.cpp
index 2d1b0e885..0c4d003fd 100644
--- a/llarp/config.cpp
+++ b/llarp/config.cpp
@@ -1,6 +1,6 @@
 #include "config.hpp"
 #include <llarp/config.h>
-#include <llarp/defaults.h>
+#include <llarp/defaults.hpp>
 #include <llarp/net.hpp>
 #include "fs.hpp"
 #include "ini.hpp"
diff --git a/llarp/dns.cpp b/llarp/dns.cpp
index ae74d5229..5236ba1d2 100644
--- a/llarp/dns.cpp
+++ b/llarp/dns.cpp
@@ -1,4 +1,4 @@
-#include <llarp/endian.h>
+#include <llarp/endian.hpp>
 #include <llarp/dnsd.hpp>  // for llarp_handle_dnsd_recvfrom, dnsc
 #include <llarp/logger.hpp>
 
@@ -212,7 +212,7 @@ extern "C"
     }
     */
     question->name = m_qName;
-  
+
     question->type = get16bits(moveable);
     (*pos) += 2;
     // printf("Now1 at [%d]\n", buffer - start);
@@ -244,7 +244,7 @@ extern "C"
 
     //hexDump(moveable, 12);
     //hexDumpAt(buffer, *pos, 12);
-      
+
     if(*moveable == '\xc0')
     {
       // hexDump(moveable, 2);
diff --git a/llarp/ev.cpp b/llarp/ev.cpp
index 59aef067c..13a612aa3 100644
--- a/llarp/ev.cpp
+++ b/llarp/ev.cpp
@@ -1,5 +1,5 @@
 #include <llarp/ev.h>
-#include <llarp/logic.h>
+#include <llarp/logic.hpp>
 #include <llarp/string_view.hpp>
 
 #include <stddef.h>
diff --git a/llarp/ip.cpp b/llarp/ip.cpp
index a3042a352..321e3bf16 100644
--- a/llarp/ip.cpp
+++ b/llarp/ip.cpp
@@ -1,4 +1,4 @@
-#include <llarp/endian.h>
+#include <llarp/endian.hpp>
 #include <algorithm>
 #include <llarp/ip.hpp>
 #include "llarp/buffer.hpp"
@@ -6,7 +6,6 @@
 #ifndef _WIN32
 #include <netinet/in.h>
 #endif
-#include <llarp/endian.h>
 #include <map>
 #include <algorithm>
 
diff --git a/llarp/link/utp.cpp b/llarp/link/utp.cpp
index 50fbf7972..993e762f2 100644
--- a/llarp/link/utp.cpp
+++ b/llarp/link/utp.cpp
@@ -3,7 +3,7 @@
 #include <llarp/messages/link_intro.hpp>
 #include <llarp/messages/discard.hpp>
 #include <llarp/buffer.hpp>
-#include <llarp/endian.h>
+#include <llarp/endian.hpp>
 #include <utp.h>
 #include <cassert>
 #include <tuple>
diff --git a/llarp/logic.cpp b/llarp/logic.cpp
index 4d3cd42b1..e775bd7ca 100644
--- a/llarp/logic.cpp
+++ b/llarp/logic.cpp
@@ -1,4 +1,4 @@
-#include <llarp/logic.h>
+#include <llarp/logic.hpp>
 #include <llarp/mem.h>
 #include "logger.hpp"
 
diff --git a/llarp/nodedb.cpp b/llarp/nodedb.cpp
index 7d1a3e3ce..46b72b4ad 100644
--- a/llarp/nodedb.cpp
+++ b/llarp/nodedb.cpp
@@ -1,4 +1,4 @@
-#include <llarp/logic.h>
+#include <llarp/logic.hpp>
 #include <llarp/nodedb.hpp>
 #include <llarp/router_contact.hpp>
 
diff --git a/llarp/router.cpp b/llarp/router.cpp
index 18ea451c4..fe216b72d 100644
--- a/llarp/router.cpp
+++ b/llarp/router.cpp
@@ -1,5 +1,5 @@
 #include "router.hpp"
-#include <llarp/proto.h>
+#include <llarp/proto.hpp>
 #include <llarp/iwp.hpp>
 #include <llarp/link_message.hpp>
 #include <llarp/link/utp.hpp>
diff --git a/llarp/router_contact.cpp b/llarp/router_contact.cpp
index c3abbc656..dc60f93da 100644
--- a/llarp/router_contact.cpp
+++ b/llarp/router_contact.cpp
@@ -3,7 +3,7 @@
 #include <llarp/net.hpp>
 #include <llarp/router_contact.hpp>
 #include <llarp/time.hpp>
-#include <llarp/version.h>
+#include <llarp/version.hpp>
 #include "buffer.hpp"
 #include "logger.hpp"
 #include "mem.hpp"
diff --git a/test/test_dns_unit.cpp b/test/test_dns_unit.cpp
index adae07886..4536007ad 100644
--- a/test/test_dns_unit.cpp
+++ b/test/test_dns_unit.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 #include <llarp.h>        // for llarp_main_init
-#include <llarp/logic.h>  // for threadpool/llarp_logic
+#include <llarp/logic.hpp>  // for threadpool/llarp_logic
 #include "llarp/net.hpp"  // for llarp::Addr
 #include "llarp/dns.hpp"
 #include "llarp/dnsc.hpp"
diff --git a/test/test_dnsc_unit.cpp b/test/test_dnsc_unit.cpp
index 9c6de37ea..e585fbea5 100644
--- a/test/test_dnsc_unit.cpp
+++ b/test/test_dnsc_unit.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
 #include <llarp.h> // for llarp_main_init
-#include <llarp/logic.h> // for threadpool/llarp_logic
+#include <llarp/logic.hpp> // for threadpool/llarp_logic
 #include "llarp/net.hpp"  // for llarp::Addr
 #include "llarp/dnsc.hpp"
diff --git a/test/test_dnsd_unit.cpp b/test/test_dnsd_unit.cpp
index 7975de9d9..a038ccf79 100644
--- a/test/test_dnsd_unit.cpp
+++ b/test/test_dnsd_unit.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 #include <llarp.h>        // for llarp_main_init
-#include <llarp/logic.h>  // for threadpool/llarp_logic
+#include <llarp/logic.hpp>  // for threadpool/llarp_logic
 #include "llarp/net.hpp"  // for llarp::Addr
 #include "llarp/dnsd.hpp"