diff --git a/Makefile b/Makefile
index 989d66f1f..faf828a2d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CXX = g++
 
 CFLAGS = -W -Wall -Wextra -O2 -Wno-implicit-function-declaration
 CXXFLAGS = -W -Wall -Wextra -std=c++11 -O2 -Izopfli/src -I7zip \
-	-Wno-unused-parameter
+	-Wno-unused-parameter -pthread
 
 SRC_CXX_SRC = $(wildcard src/*.cpp)
 SRC_CXX_OBJ = $(SRC_CXX_SRC:.cpp=.o)
@@ -24,7 +24,7 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a
-	$(CXX) -lz -luv -llz4 -o $@ $(CXXFLAGS) $^
+	$(CXX) -o $@ $(CXXFLAGS) $^ -luv -llz4 -lz
 
 7zip/7zip.a:
 	$(MAKE) -C 7zip 7zip.a
diff --git a/cli/cli.cpp b/cli/cli.cpp
index c2405103f..936ee1bd9 100644
--- a/cli/cli.cpp
+++ b/cli/cli.cpp
@@ -1,8 +1,9 @@
-#include <stdio.h>
-#include <stdlib.h>
 #include <algorithm>
-#include <vector>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <string>
+#include <vector>
 #include "winargs.h"
 #include "winglob.h"
 #include "../src/compress.h"
diff --git a/src/input.cpp b/src/input.cpp
index f31078f50..f68252254 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "input.h"
 #include "buffer_pool.h"
 #include "cso.h"
diff --git a/src/output.cpp b/src/output.cpp
index a9e7a8c6f..07b86ab29 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "output.h"
 #include "buffer_pool.h"
 #include "compress.h"
diff --git a/src/sector.cpp b/src/sector.cpp
index e27015005..0e9c72d87 100644
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "sector.h"
 #include "compress.h"
 #include "cso.h"