diff --git a/chttp.c b/chttp.c
index 64c9fd2..dec3879 100644
--- a/chttp.c
+++ b/chttp.c
@@ -143,7 +143,7 @@ int server_secure_context_free(ServerSecureContext *ctx)
 }
 
 int server_secure_context_add_certificate(ServerSecureContext *ctx,
-    String domain, String cert_file)
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
 {
     // TODO
 }
@@ -359,7 +359,7 @@ int socket_manager_listen_tls(SocketManager *sm,
 }
 
 int socket_manager_add_certificate(SocketManager *sm,
-    String domain, String cert_file, String key_file)
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
 {
     if (sm->secure_sock == NATIVE_SOCKET_INVALID)
         return -1;
@@ -3023,7 +3023,7 @@ int http_server_listen_tls(HTTP_Server *server,
 }
 
 int http_server_add_certificate(HTTP_Server *server,
-    String domain, String cert_file, String key_file)
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
 {
     if (socket_manager_add_certificate(&server->sockets,
         domain, cert_file, key_file) < 0)
diff --git a/chttp.h b/chttp.h
index 80611fc..0b558c3 100644
--- a/chttp.h
+++ b/chttp.h
@@ -9,6 +9,9 @@
 
 #include <stdint.h>
 #include <assert.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdlib.h>
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -17,6 +20,11 @@
 #else
 #include <unistd.h>
 #include <pthread.h>
+#include <poll.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #endif
 
@@ -105,7 +113,7 @@ typedef struct {
 int server_secure_context_init(ServerSecureContext *ctx);
 int server_secure_context_free(ServerSecureContext *ctx);
 int server_secure_context_add_certificate(ServerSecureContext *ctx,
-    String domain, String cert_file, String key_file);
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // src/socket.h
@@ -348,7 +356,7 @@ int socket_manager_listen_tls(SocketManager *sm,
 // authenticity.
 // Returns 0 on success, -1 on error.
 int socket_manager_add_certificate(SocketManager *sm,
-    String domain, String cert_file, String key_file);
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
 
 // When a thread is blocked on a poll() call for
 // descriptors associated to this socket manager,
@@ -418,7 +426,7 @@ void socket_set_user(SocketManager *sm, SocketHandle handle);
 ////////////////////////////////////////////////////////////////////////////////////////
 
 typedef struct {
-    // TODO
+    char unused; // TODO
 } Mutex;
 
 int mutex_init(Mutex *mutex);
@@ -924,13 +932,13 @@ int http_server_listen_tcp(HTTP_Server *server,
 // interfact, using the specified certificate and key
 // to verify the connection.
 int http_server_listen_tls(HTTP_Server *server,
-    String addr, Port port, String cert_file_name,
-    String key_file_name);
+    HTTP_String addr, Port port, HTTP_String cert_file_name,
+    HTTP_String key_file_name);
 
 // Add the certificate for an additional domain when
 // the server is listening for HTTPS requests.
 int http_server_add_certificate(HTTP_Server *server,
-    String domain, String cert_file, String key_file);
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
 
 // When a thread is blocked waiting for server events,
 // other threads can call this function to wake it up.
diff --git a/src/includes.h b/src/includes.h
index 04a13f6..336caac 100644
--- a/src/includes.h
+++ b/src/includes.h
@@ -1,6 +1,9 @@
 
 #include <stdint.h>
 #include <assert.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdlib.h>
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -9,5 +12,11 @@
 #else
 #include <unistd.h>
 #include <pthread.h>
+#include <poll.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #endif
diff --git a/src/secure_context.c b/src/secure_context.c
index a559ec8..52cb003 100644
--- a/src/secure_context.c
+++ b/src/secure_context.c
@@ -30,7 +30,7 @@ int server_secure_context_free(ServerSecureContext *ctx)
 }
 
 int server_secure_context_add_certificate(ServerSecureContext *ctx,
-    String domain, String cert_file)
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
 {
     // TODO
 }
diff --git a/src/secure_context.h b/src/secure_context.h
index 6c2fad3..96a1647 100644
--- a/src/secure_context.h
+++ b/src/secure_context.h
@@ -26,4 +26,4 @@ typedef struct {
 int server_secure_context_init(ServerSecureContext *ctx);
 int server_secure_context_free(ServerSecureContext *ctx);
 int server_secure_context_add_certificate(ServerSecureContext *ctx,
-    String domain, String cert_file, String key_file);
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
diff --git a/src/server.c b/src/server.c
index a732bb5..a5b5ce7 100644
--- a/src/server.c
+++ b/src/server.c
@@ -47,7 +47,7 @@ int http_server_listen_tls(HTTP_Server *server,
 }
 
 int http_server_add_certificate(HTTP_Server *server,
-    String domain, String cert_file, String key_file)
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
 {
     if (socket_manager_add_certificate(&server->sockets,
         domain, cert_file, key_file) < 0)
diff --git a/src/server.h b/src/server.h
index 3554731..4a6fb9b 100644
--- a/src/server.h
+++ b/src/server.h
@@ -114,13 +114,13 @@ int http_server_listen_tcp(HTTP_Server *server,
 // interfact, using the specified certificate and key
 // to verify the connection.
 int http_server_listen_tls(HTTP_Server *server,
-    String addr, Port port, String cert_file_name,
-    String key_file_name);
+    HTTP_String addr, Port port, HTTP_String cert_file_name,
+    HTTP_String key_file_name);
 
 // Add the certificate for an additional domain when
 // the server is listening for HTTPS requests.
 int http_server_add_certificate(HTTP_Server *server,
-    String domain, String cert_file, String key_file);
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
 
 // When a thread is blocked waiting for server events,
 // other threads can call this function to wake it up.
diff --git a/src/socket.c b/src/socket.c
index fc29021..6453f89 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -206,7 +206,7 @@ int socket_manager_listen_tls(SocketManager *sm,
 }
 
 int socket_manager_add_certificate(SocketManager *sm,
-    String domain, String cert_file, String key_file)
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
 {
     if (sm->secure_sock == NATIVE_SOCKET_INVALID)
         return -1;
diff --git a/src/socket.h b/src/socket.h
index f068ce3..251c648 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -236,7 +236,7 @@ int socket_manager_listen_tls(SocketManager *sm,
 // authenticity.
 // Returns 0 on success, -1 on error.
 int socket_manager_add_certificate(SocketManager *sm,
-    String domain, String cert_file, String key_file);
+    HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
 
 // When a thread is blocked on a poll() call for
 // descriptors associated to this socket manager,
diff --git a/src/thread.h b/src/thread.h
index 7141287..dc6da6a 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,6 +1,6 @@
 
 typedef struct {
-    // TODO
+    char unused; // TODO
 } Mutex;
 
 int mutex_init(Mutex *mutex);