diff --git a/src/client/http.c b/src/client/http.c
index 24edee6..5fb7526 100644
--- a/src/client/http.c
+++ b/src/client/http.c
@@ -1,14 +1,5 @@
 #include "http.h"
 #include "sock.h"
-#include <assert.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/file.h>
-#include <sys/socket.h>
-#include <time.h>
 
 const char *CONTENT_LENGTH_HEADER = "Content-Length: ";
 const char *GET_REQ_TEMPLATE =
diff --git a/src/client/http.h b/src/client/http.h
index d2060b3..63ce14c 100644
--- a/src/client/http.h
+++ b/src/client/http.h
@@ -1,7 +1,9 @@
 #ifndef HTTP_H
 #define HTTP_H
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
 
diff --git a/src/client/sock.c b/src/client/sock.c
index 0bdbc47..0bf27e0 100644
--- a/src/client/sock.c
+++ b/src/client/sock.c
@@ -1,7 +1,4 @@
 #include "sock.h"
-#include <netdb.h>
-#include <stdlib.h>
-
 /* Wrapper for getaddrinfo, handles error */
 int h_getaddrinfo(const char *ip, const char *port, struct addrinfo *hints,
                   struct addrinfo **ainfo) {
diff --git a/src/client/sock.h b/src/client/sock.h
index a95876d..162c0a7 100644
--- a/src/client/sock.h
+++ b/src/client/sock.h
@@ -3,11 +3,11 @@
 
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <sys/socket.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
-
+#include <sys/socket.h>
+#include <unistd.h>
 
 int create_sock_and_conn(struct addrinfo *res);
 void setup_hints(struct addrinfo *hints);