diff --git a/Makefile b/Makefile
index b6645e2..e89ac50 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ $(OBJ_DIR)/server.o: server.c threadpool.h conn.h util.h serverWorker.h ini.h se
 	@echo $@
 
 $(BUILD_DIR)/server: $(OBJ_SERVER)
-	@$(CC) $(CFLAGS) $(OPTFLAGS) $(OPTFLAGS) $(LIBS) $(OBJ_SERVER) $(LDFLAGS) -o $(BUILD_DIR)/server
+	@$(CC) $(CFLAGS) $(OPTFLAGS) $(OPTFLAGS) $(OBJ_SERVER) $(LDFLAGS) -o $(BUILD_DIR)/server $(LIBS)
 	@echo $@
 
 
@@ -82,7 +82,7 @@ $(OBJ_DIR)/client.o: client.c api.h
 	@echo $@
 
 $(BUILD_DIR)/client: $(OBJ_CLIENT)
-	@$(CC) $(CFLAGS) $(OPTFLAGS) $(LIBS) $(OBJ_CLIENT) $(LDFLAGS) -o $(BUILD_DIR)/client
+	@$(CC) $(CFLAGS) $(OPTFLAGS) $(OBJ_CLIENT) $(LDFLAGS) -o $(BUILD_DIR)/client  $(LIBS)
 	@echo $@
 
 
diff --git a/src/client.c b/src/client.c
index cd48ba5..90f3408 100644
--- a/src/client.c
+++ b/src/client.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <bits/types.h>
+typedef unsigned short u_short;
 #include <sys/stat.h>
 #include <fts.h>
 #include <time.h>