Index: teeworlds-0.6.5-src/bam.lua
===================================================================
--- teeworlds-0.6.5-src/bam.lua
+++ teeworlds-0.6.5-src/bam.lua	2018-11-09 14:34:37.121411920 +0100
@@ -15,6 +15,8 @@
 config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
 config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
 config:Add(OptLibrary("zlib", "zlib.h", false))
+config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptLibrary("pnglite", "sys/types.h", false))
 config:Add(SDL.OptFind("sdl", true))
 config:Add(FreeType.OptFind("freetype", true))
 config:Finalize("config.lua")
@@ -150,6 +152,10 @@
 	settings.cc.flags_cxx:Add(os.getenv('CXXFLAGS'))
 	settings.link.flags:Add(os.getenv('LDFLAGS'))
 
+	settings.link.libs:Add("wavpack")
+	settings.link.libs:Add("z")
+	settings.link.libs:Add("pnglite")
+
 	if config.compiler.driver == "cl" then
 		settings.cc.flags:Add("/wd4244", "/wd4577")
 	else
@@ -172,7 +178,6 @@
 
 	-- set some platform specific settings
 	settings.cc.includes:Add("src")
-	settings.cc.includes:Add("src/engine/external/wavpack")
 
 	if family == "unix" then
 		if platform == "macosx" then
@@ -195,21 +200,7 @@
 		settings.link.libs:Add("advapi32")
 	end
 
-	-- compile zlib if needed
-	if config.zlib.value then
-		settings.link.libs:Add("z")
-		if config.zlib.include_path then
-			settings.cc.includes:Add(config.zlib.include_path)
-		end
-		zlib = {}
-	else
-		zlib = Compile(settings, Collect("src/engine/external/zlib/*.c"))
-		settings.cc.includes:Add("src/engine/external/zlib")
-	end
-
 	-- build the small libraries
-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
 	md5 = Compile(settings, Collect("src/engine/external/md5/*.c"))
 
 	-- build game components
Index: teeworlds-0.6.5-src/src/engine/client/graphics.cpp
===================================================================
--- teeworlds-0.6.5-src/src/engine/client/graphics.cpp
+++ teeworlds-0.6.5-src/src/engine/client/graphics.cpp	2018-11-09 14:34:19.550088368 +0100
@@ -9,7 +9,7 @@
 #include "SDL_opengl.h"
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/shared/config.h>
 #include <engine/graphics.h>
Index: teeworlds-0.6.5-src/src/engine/client/graphics_threaded.cpp
===================================================================
--- teeworlds-0.6.5-src/src/engine/client/graphics_threaded.cpp
+++ teeworlds-0.6.5-src/src/engine/client/graphics_threaded.cpp	2018-11-09 14:34:19.551088330 +0100
@@ -6,7 +6,7 @@
 #include <base/tl/threading.h>
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/shared/config.h>
 #include <engine/graphics.h>
Index: teeworlds-0.6.5-src/src/engine/client/sound.cpp
===================================================================
--- teeworlds-0.6.5-src/src/engine/client/sound.cpp
+++ teeworlds-0.6.5-src/src/engine/client/sound.cpp	2018-11-09 14:34:19.551088330 +0100
@@ -14,7 +14,7 @@
 
 extern "C"
 {
-	#include <wavpack.h>
+	#include <wavpack/wavpack.h>
 }
 #include <math.h>
 
Index: teeworlds-0.6.5-src/src/tools/dilate.cpp
===================================================================
--- teeworlds-0.6.5-src/src/tools/dilate.cpp
+++ teeworlds-0.6.5-src/src/tools/dilate.cpp	2018-11-09 14:34:19.551088330 +0100
@@ -2,7 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/system.h>
 #include <base/math.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 typedef struct
 {
Index: teeworlds-0.6.5-src/src/tools/tileset_borderadd.cpp
===================================================================
--- teeworlds-0.6.5-src/src/tools/tileset_borderadd.cpp
+++ teeworlds-0.6.5-src/src/tools/tileset_borderadd.cpp	2018-11-09 14:34:19.551088330 +0100
@@ -2,7 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/math.h>
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 typedef struct
 {
Index: teeworlds-0.6.5-src/src/tools/tileset_borderfix.cpp
===================================================================
--- teeworlds-0.6.5-src/src/tools/tileset_borderfix.cpp
+++ teeworlds-0.6.5-src/src/tools/tileset_borderfix.cpp	2018-11-09 14:34:19.551088330 +0100
@@ -1,7 +1,7 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 typedef struct
 {
Index: teeworlds-0.6.5-src/src/tools/tileset_borderrem.cpp
===================================================================
--- teeworlds-0.6.5-src/src/tools/tileset_borderrem.cpp
+++ teeworlds-0.6.5-src/src/tools/tileset_borderrem.cpp	2018-11-09 14:34:19.551088330 +0100
@@ -2,7 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/math.h>
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 typedef struct
 {
Index: teeworlds-0.6.5-src/src/tools/tileset_borderset.cpp
===================================================================
--- teeworlds-0.6.5-src/src/tools/tileset_borderset.cpp
+++ teeworlds-0.6.5-src/src/tools/tileset_borderset.cpp	2018-11-09 14:34:19.552088291 +0100
@@ -2,7 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/math.h>
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 typedef struct
 {