5 files changed, 8 insertions, 8 deletions
diff --git a/lib/include/net/auth.h b/lib/include/net/auth.h
index 0f22d22..f3f47d1 100644
--- a/lib/include/net/auth.h
+++ b/lib/include/net/auth.h
@@ -30,9 +30,9 @@
 #ifndef NET_AUTH_H_
 #define NET_AUTH_H_
 
-#include <net/stpsession.h>
-#include <libostp/session.h>
-#include <libostp/server.h>
+#include <ostp/net/stpsession.h>
+#include <ostp/session.h>
+#include <ostp/server.h>
 
 int handle_srq(struct ostp_client *c, struct ostp_listener *lp,
     struct session_request *srq);
diff --git a/lib/include/net/param.h b/lib/include/net/param.h
index ba2a0a2..03282c1 100644
--- a/lib/include/net/param.h
+++ b/lib/include/net/param.h
@@ -30,8 +30,8 @@
 #ifndef NET_PARAM_H_
 #define NET_PARAM_H_
 
+#include <ostp/defs.h>
 #include <stdint.h>
-#include <defs.h>
 
 /*
  * The Parameter Arbitration Packet which is crucial
diff --git a/lib/include/net/stpsession.h b/lib/include/net/stpsession.h
index 8b61da2..7f9d151 100644
--- a/lib/include/net/stpsession.h
+++ b/lib/include/net/stpsession.h
@@ -30,9 +30,9 @@
 #ifndef STP_SESSION_H_
 #define STP_SESSION_H_
 
-#include <crypto/aes.h>
+#include <ostp/crypto/aes.h>
+#include <ostp/defs.h>
 #include <stdint.h>
-#include <defs.h>
 
 /*
  * 2^12 (4096) bytes is a common page size on
diff --git a/lib/include/libostp/server.h b/lib/include/server.h
index 0e232f6..9e09f78 100644
--- a/lib/include/libostp/server.h
+++ b/lib/include/server.h
@@ -31,7 +31,7 @@
 #define LIBOSTP_SERVER_H_
 
 #include <sys/select.h>
-#include <libostp/session.h>
+#include <ostp/session.h>
 #include <pthread.h>
 #include <stddef.h>
 
@@ -44,7 +44,7 @@ struct ostp_client {
 };
 
 struct ostp_listener {
-    int(*on_recv)(struct ostp_client *c, const char *buf, size_t len);
+    int(*on_recv)(struct ostp_client *c, const void *buf, size_t len);
     int port;
 
     /* -- Private -- */
diff --git a/lib/include/libostp/session.h b/lib/include/session.h
index 397fa68..397fa68 100644
--- a/lib/include/libostp/session.h
+++ b/lib/include/session.h