3 files changed, 21 insertions, 7 deletions
diff --git a/include/libsock/server/client.hpp b/include/libsock/server/client.hpp
index b86b440..ec5c6bc 100644
--- a/include/libsock/server/client.hpp
+++ b/include/libsock/server/client.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "misc/FileDescriptor.hpp"
-#include "misc/memory.hpp"
+#include "../types.hpp"
 #include <format>
 #include <functional>
 #include <netinet/in.h>
@@ -51,7 +50,7 @@ class Client {
 
   private:
 	WP<Client>			self;
-	SP<CFileDescriptor> m_sockfd;
+	SP<LibSock::CFileDescriptor> m_sockfd;
 	sockaddr_in			m_addr;
 	socklen_t			m_addrLen = sizeof(m_addr);
 	std::string			m_name;
diff --git a/include/libsock/server/server.hpp b/include/libsock/server/server.hpp
index c97c945..d831fd8 100644
--- a/include/libsock/server/server.hpp
+++ b/include/libsock/server/server.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include "misc/FileDescriptor.hpp"
-#include "misc/memory.hpp"
+#include "../types.hpp"
 #include <mutex>
 #include <netinet/in.h>
 
@@ -11,10 +10,10 @@ class Server {
   public:
 	Server(uint16_t port, bool reuseaddr = true, bool keepalive = false);
 	~Server();
-	SP<CFileDescriptor> getSocket() const;
+	SP<LibSock::CFileDescriptor> getSocket() const;
 
   private:
-	SP<CFileDescriptor> m_sockfd;
+	SP<LibSock::CFileDescriptor> m_sockfd;
 	sockaddr_in			m_addr;
 	uint16_t			m_port;
 
diff --git a/include/libsock/types.hpp b/include/libsock/types.hpp
new file mode 100644
index 0000000..f8116ab
--- /dev/null
+++ b/include/libsock/types.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <memory>
+
+template <typename T>
+using SP = std::shared_ptr<T>;
+
+template <typename T>
+using WP = std::weak_ptr<T>;
+
+template <typename T>
+using UP = std::unique_ptr<T>;
+
+namespace LibSock {
+class CFileDescriptor;
+}