diff --git a/AI/EmptyAI/EmptyAI.cbp b/AI/EmptyAI/EmptyAI.cbp
index 5c42e04ab..a77526dc7 100644
--- a/AI/EmptyAI/EmptyAI.cbp
+++ b/AI/EmptyAI/EmptyAI.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="EmptyAI" />
+		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
diff --git a/AI/FuzzyLite/FuzzyLite.cbp b/AI/FuzzyLite/FuzzyLite.cbp
index 8e37856ab..cc10f25a1 100644
--- a/AI/FuzzyLite/FuzzyLite.cbp
+++ b/AI/FuzzyLite/FuzzyLite.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="FuzzyLite" />
+		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
diff --git a/AI/StupidAI/StupidAI.cbp b/AI/StupidAI/StupidAI.cbp
index fe0b8bba2..f3b0125f0 100644
--- a/AI/StupidAI/StupidAI.cbp
+++ b/AI/StupidAI/StupidAI.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="StupidAI" />
+		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
diff --git a/AI/VCAI/VCAI.cbp b/AI/VCAI/VCAI.cbp
index e74ee4388..0074c5f00 100644
--- a/AI/VCAI/VCAI.cbp
+++ b/AI/VCAI/VCAI.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="VCAI" />
+		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
diff --git a/VCMI_client.cbp b/VCMI_client.cbp
index c0aa9b38a..4343ec32e 100644
--- a/VCMI_client.cbp
+++ b/VCMI_client.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="VCMI_client" />
+		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
diff --git a/VCMI_lib.cbp b/VCMI_lib.cbp
index 4a2da5ea6..c5ebcb9cb 100644
--- a/VCMI_lib.cbp
+++ b/VCMI_lib.cbp
@@ -4,6 +4,7 @@
 	<Project>
 		<Option title="VCMI_lib" />
 		<Option execution_dir="D:\projects\vcmi\engine\VCMI_lib\" />
+		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
@@ -47,7 +48,6 @@
 			</Target>
 		</Build>
 		<Compiler>
-			<Add option="-pedantic" />
 			<Add option="-Wextra" />
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
@@ -67,7 +67,7 @@
 		</Compiler>
 		<Linker>
 			<Add option="-lws2_32" />
-			<Add library="$(#mingw.lib)\libz.dll.a" />
+			<Add option="-lzlib" />
 			<Add directory="$(#boost.lib)" />
 			<Add directory="$(#sdl.lib)" />
 		</Linker>
diff --git a/VCMI_server.cbp b/VCMI_server.cbp
index deb5d9d12..8d6428e61 100644
--- a/VCMI_server.cbp
+++ b/VCMI_server.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="VCMI_server" />
+		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">