diff --git a/project/Build.xml b/project/Build.xml
index 0d05bbcc3..758d42147 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -8,7 +8,7 @@
 	<set name="ios" value="1" if="iphone" />
 	<set name="tvos" value="1" if="appletv" />
 
-	<set name="LIME_CAIRO" value="1"/>
+	<set name="LIME_CAIRO" value="1" />
 	<set name="LIME_CURL" value="1" unless="emscripten || winrt" />
 	<set name="LIME_EFSW" value="1" if="windows || mac || linux" unless="winrt" />
 	<set name="LIME_JPEG" value="1" />
@@ -220,12 +220,12 @@
 			<section unless="emscripten">
 
 				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
-				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi"/>
-				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi"/>
-				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows" unless="winrt"/>
-				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac"/>
-				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi"/>
-				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/winrt/" if="winrt"/>
+				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi" />
+				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi" />
+				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows" unless="winrt" />
+				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac" />
+				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi" />
+				<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/winrt/" if="winrt" />
 
 				<compilerflag value="-DHAVE_LIBC" />
 
@@ -233,9 +233,9 @@
 
 			<section if="rpi">
 
-				<compilerflag value="-I/opt/vc/include"/>
-				<compilerflag value="-I/opt/vc/include/interface/vcos/pthreads"/>
-				<compilerflag value="-I/opt/vc/include/interface/vmcs_host/linux"/>
+				<compilerflag value="-I/opt/vc/include" />
+				<compilerflag value="-I/opt/vc/include/interface/vcos/pthreads" />
+				<compilerflag value="-I/opt/vc/include/interface/vmcs_host/linux" />
 				<compilerflag value="-lbrcmGLESv2" />
 				<compilerflag value="-lbrcmEGL" />
 				<compilerflag value="-Wl,--no-undefined -lm -L/opt/vc/lib -lbcm_host -ldl -lpthread -lrt" />
@@ -289,16 +289,17 @@
 		</section>
 
 		<file name="src/app/ApplicationEvent.cpp" />
-		<file name="src/graphics/utils/ImageDataUtil.cpp" />
 		<file name="src/graphics/Image.cpp" />
 		<file name="src/graphics/ImageBuffer.cpp" />
 		<file name="src/graphics/RenderEvent.cpp" />
+		<file name="src/graphics/utils/ImageDataUtil.cpp" />
+		<file name="src/hx/CFFIExt.cpp" />
 		<file name="src/math/ColorMatrix.cpp" />
 		<file name="src/math/Matrix3.cpp" />
 		<file name="src/math/Rectangle.cpp" />
 		<file name="src/math/Vector2.cpp" />
-		<file name="src/media/containers/WAV.cpp" />
 		<file name="src/media/AudioBuffer.cpp" />
+		<file name="src/media/containers/WAV.cpp" />
 		<file name="src/system/CFFI.cpp" />
 		<file name="src/system/CFFIPointer.cpp" />
 		<file name="src/system/ClipboardEvent.cpp" />
@@ -322,13 +323,11 @@
 		<file name="src/utils/ArrayBufferView.cpp" />
 		<file name="src/utils/Bytes.cpp" />
 
-		<file name="src/hx/CFFIExt.cpp" />
-
 	</files>
 
 	<files id="android-cpufeatures">
 
-		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android"/>
+		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android" />
 		<file name="${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.c" />
 
 	</files>
@@ -450,7 +449,7 @@
 
 			<section if="mac">
 
-				<vflag name="-l" value="iconv"/>
+				<vflag name="-l" value="iconv" />
 				<vflag name="-framework" value="IOKit" />
 				<vflag name="-framework" value="Foundation" />
 				<vflag name="-framework" value="CoreAudio" />
@@ -462,7 +461,7 @@
 				<vflag name="-framework" value="ForceFeedback" />
 				<vflag name="-framework" value="Carbon" />
 				<vflag name="-framework" value="AppKit" />
-				<vflag name="-framework" value="OpenAL"/>
+				<vflag name="-framework" value="OpenAL" />
 
 				<lib name="/opt/local/lib/libgc.a" if="LIME_NEKO" />
 				<lib name="-lm" if="LIME_NEKO" />
@@ -507,8 +506,8 @@
 				<vflag name="-framework" value="OpenGLES" />
 				<vflag name="-framework" value="AudioToolbox" />
 				<vflag name="-framework" value="AudioUnit" />
-				<vflag name="-framework" value="OpenAL"/>
-				<vflag name="-framework" value="GameController"/>
+				<vflag name="-framework" value="OpenAL" />
+				<vflag name="-framework" value="GameController" />
 				<!-- <vflag name="-framework" value="CoreBluetooth" /> -->
 
 				<lib name="-ldl" />
@@ -526,9 +525,9 @@
 				<vflag name="-framework" value="OpenGLES" />
 				<vflag name="-framework" value="AudioToolbox" />
 				<vflag name="-framework" value="AudioUnit" />
-				<vflag name="-framework" value="OpenAL"/>
-				<vflag name="-framework" value="CoreMotion"/>
-				<vflag name="-framework" value="CoreText"/>
+				<vflag name="-framework" value="OpenAL" />
+				<vflag name="-framework" value="CoreMotion" />
+				<vflag name="-framework" value="CoreText" />
 				<!-- <vflag name="-framework" value="CoreBluetooth" /> -->
 
 				<lib name="-ldl" />
@@ -550,4 +549,4 @@
 
 	</target>
 
-</xml>
\ No newline at end of file
+</xml>
diff --git a/project/lib/cairo-files.xml b/project/lib/cairo-files.xml
index 7f3130b2c..d0df3c510 100644
--- a/project/lib/cairo-files.xml
+++ b/project/lib/cairo-files.xml
@@ -1,6 +1,6 @@
 <xml>
 
-	<files id="native-toolkit-cairo" >
+	<files id="native-toolkit-cairo">
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/src/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/default/" unless="windows || mac || linux" />
@@ -28,19 +28,19 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-atomic.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-base64-stream.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-base85-stream.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-bentley-ottmann.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-bentley-ottmann-rectangular.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-bentley-ottmann-rectilinear.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-bentley-ottmann.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-botor-scan-converter.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-boxes.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-boxes-intersect.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-boxes.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-cache.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip-boxes.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip-polygon.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip-region.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip-surface.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip-tor-scan-converter.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-color.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-composite-rectangles.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-compositor.c" />
@@ -52,13 +52,13 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-error.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-fallback-compositor.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-fixed.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-ft-font.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-font-face.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-font-face-twin.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-font-face-twin-data.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-font-face-twin.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-font-face.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-font-options.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-freelist.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-freed-pool.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-freelist.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-ft-font.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-gstate.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-hash.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-hull.c" />
@@ -68,10 +68,10 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-image-surface.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-line.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-lzw.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-matrix.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-mask-compositor.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-mesh-pattern-rasterizer.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-matrix.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-mempool.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-mesh-pattern-rasterizer.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-misc.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-mono-scan-converter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-mutex.c" />
@@ -80,20 +80,20 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-output-stream.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-paginated-surface.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-bounds.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-fill.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-fixed.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-in-fill.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-stroke.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-stroke-boxes.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-stroke-polygon.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-stroke-traps.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-stroke-tristrip.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path-stroke.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-path.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-pattern.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-pen.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-polygon.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-polygon-intersect.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-polygon-reduce.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-polygon.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-raster-source-pattern.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-recording-surface.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-rectangle.c" />
@@ -103,12 +103,11 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-scaled-font.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-shape-mask-compositor.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-slope.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-spans.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-spans-compositor.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-spans.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-spline.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-stroke-dash.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-stroke-style.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface-clipper.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface-fallback.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface-observer.c" />
@@ -116,18 +115,19 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface-snapshot.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface-subsurface.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface-wrapper.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-surface.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-time.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-tor-scan-converter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-tor22-scan-converter.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-clip-tor-scan-converter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-toy-font-face.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-traps-compositor.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-traps.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-tristrip.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-traps-compositor.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-unicode.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-user-font.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-version.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo-wideint.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/cairo/src/cairo.c" />
 
 	</files>
 
diff --git a/project/lib/curl-files.xml b/project/lib/curl-files.xml
index 179079626..2647184b6 100644
--- a/project/lib/curl-files.xml
+++ b/project/lib/curl-files.xml
@@ -1,26 +1,26 @@
 <xml>
 
 	<files id="native-toolkit-curl-depends"  >
-		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/curl.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/curl/lib/curl_config.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/curlver.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/easy.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/mprintf.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/multi.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/stdcheaders.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/typecheck-gcc.h"/>
+		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/curl.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/curl/lib/curl_config.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/curlver.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/easy.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/mprintf.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/multi.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/stdcheaders.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/typecheck-gcc.h" />
  	</files>
 
-	<files id="native-toolkit-curl" tags="" >
+	<files id="native-toolkit-curl" tags="">
 
 		<cache value="1" />
 		<tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
 		<depend files="native-toolkit-curl-depends" />
 
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/curl/lib/"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/curl/include/"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/curl/lib/"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/"/>
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/curl/lib/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/curl/include/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/curl/lib/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/axtls" if="NATIVE_TOOLKIT_HAVE_AXTLS" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" if="NATIVE_TOOLKIT_HAVE_MBEDTLS" />
@@ -30,124 +30,118 @@
 		<compilerflag value="-DUSE_AXTLS=1" if="NATIVE_TOOLKIT_HAVE_AXTLS" />
 		<compilerflag value="-DUSE_MBEDTLS=1" if="NATIVE_TOOLKIT_HAVE_MBEDTLS" />
 		<compilerflag value="-DNATIVE_TOOLKIT_CURL_DISABLE_AXTLS_NONBLOCKING" if="NATIVE_TOOLKIT_CURL_DISABLE_AXTLS_NONBLOCKING" />
-		<compilerflag value="-DHAVE_CONFIG_H" unless="windows"/>
+		<compilerflag value="-DHAVE_CONFIG_H" unless="windows" />
 		<compilerflag value="-DWIN32" if="windows" unless="winrt" />
-		<compilerflag value="-DALLOW_MSVC6_WITHOUT_PSDK" if="windows"/>
+		<compilerflag value="-DALLOW_MSVC6_WITHOUT_PSDK" if="windows" />
 		<compilerflag value="-DENABLE_IPV6=1" />
 		<compilerflag value="-DNEED_THREAD_SAFE=1" />
 		<compilerflag value="-DCURL_DISABLE_LDAP" if="winrt" />
 
 		<section if="windows">
 
-			<!--<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostthre.c"/>-->
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strtok.c"/>
-			<!-- todo - check? -->
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/idn_win32.c"/>
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_ntop.c"/>
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_pton.c"/>
-			<!--<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/krb4.c"/>-->
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/krb5.c"/>
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ldap.c"/>
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/openldap.c"/>
+			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/idn_win32.c" />
+			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_ntop.c" />
+			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_pton.c" />
+			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/krb5.c" />
+			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ldap.c" />
+			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/openldap.c" />
+			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strtok.c" />
 
 		</section>
 
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/base64.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/connect.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/content_encoding.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/cookie.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_addrinfo.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_des.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_endian.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_fnmatch.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_gethostname.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_memrchr.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_threads.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dict.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/easy.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/escape.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/file.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/fileinfo.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/formdata.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftp.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftplistparser.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/getenv.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/getinfo.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/gopher.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hash.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hmac.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostasyn.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip4.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip6.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostsyn.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_proxy.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_chunks.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_digest.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_ntlm.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/if2ip.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/imap.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/llist.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/md5.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/mime.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/mprintf.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/multi.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/netrc.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/nonblock.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/parsedate.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pingpong.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pop3.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/progress.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/rand.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/rtsp.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/select.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/sendf.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/share.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/slist.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/smb.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/smtp.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/socks.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/speedcheck.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/splay.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strcase.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strdup.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strerror.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strtoofft.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/system_win32.c" if="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/telnet.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/tftp.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/timeval.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/transfer.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/url.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/version.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/warnless.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/wildcard.c"/>
-
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_sasl.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/asyn-ares.c" if="windows" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/asyn-thread.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/base64.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/conncache.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pipeline.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dotdot.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostcheck.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/connect.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/content_encoding.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/cookie.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_addrinfo.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_des.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_endian.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_fnmatch.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_gethostname.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_memrchr.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_ntlm_core.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_sasl.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_threads.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dict.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dotdot.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/easy.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/escape.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/file.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/fileinfo.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/formdata.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftp.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftplistparser.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/getenv.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/getinfo.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/gopher.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hash.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hmac.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostasyn.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostcheck.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip4.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip6.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostsyn.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_chunks.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_digest.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_ntlm.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_proxy.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/if2ip.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/imap.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/llist.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/md4.c" />
-
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/md5.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/mime.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/mprintf.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/multi.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/netrc.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/nonblock.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/parsedate.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pingpong.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pipeline.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pop3.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/progress.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/rand.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/rtsp.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/select.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/sendf.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/share.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/slist.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/smb.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/smtp.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/socks.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/speedcheck.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/splay.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strcase.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strdup.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strerror.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/strtoofft.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/system_win32.c" if="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/telnet.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/tftp.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/timeval.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/transfer.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/url.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/cleartext.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/cram.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/digest.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/digest_sspi.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/digest.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/krb5_gssapi.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/krb5_sspi.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/ntlm.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/ntlm_sspi.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/ntlm.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/oauth2.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/spnego_gssapi.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/spnego_sspi.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vauth/vauth.c" />
-
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/version.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vtls/vtls.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/warnless.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/wildcard.c" />
 
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/vtls/axtls.c" if="NATIVE_TOOLKIT_HAVE_AXTLS" />
 
diff --git a/project/lib/efsw-files.xml b/project/lib/efsw-files.xml
index 1ff79c5f7..edaee7ed6 100644
--- a/project/lib/efsw-files.xml
+++ b/project/lib/efsw-files.xml
@@ -1,19 +1,19 @@
 <xml>
-	
+
 	<files id="native-toolkit-efsw">
-		
+
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/efsw/include" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/efsw/src" />
-		
+
 		<!-- Define for macOS <= 10.6 support -->
 		<!-- <compilerflag value="-DEFSW_FSEVENTS_NOT_SUPPORTED" if="mac" /> -->
-		
+
 		<!-- Define if sys/inotify.h doesn't exist -->
 		<!-- <compilerflag value="-DEFSW_INOTIFY_NOSYS" if="linux" /> -->
-		
+
 		<compilerflag value="-D_SCL_SECURE_NO_WARNINGS" if="windows" />
 		<compilerflag value="-DNDEBUG" unless="debug" />
-		
+
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/Debug.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/DirectorySnapshot.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/DirectorySnapshotDiff.cpp" />
@@ -30,6 +30,14 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/FileWatcherWin32.cpp" if="windows" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/Log.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/Mutex.cpp" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/FileSystemImpl.cpp" unless="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/MutexImpl.cpp" unless="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/SystemImpl.cpp" unless="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/ThreadImpl.cpp" unless="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/FileSystemImpl.cpp" if="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/MutexImpl.cpp" if="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/SystemImpl.cpp" if="windows" />
+		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/ThreadImpl.cpp" if="windows" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/String.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/System.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/Thread.cpp" />
@@ -39,17 +47,7 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/WatcherInotify.cpp" if="linux" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/WatcherKqueue.cpp" if="mac" />
 		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/WatcherWin32.cpp" if="windows" />
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/FileSystemImpl.cpp" if="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/MutexImpl.cpp" if="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/SystemImpl.cpp" if="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/win/ThreadImpl.cpp" if="windows" />
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/FileSystemImpl.cpp" unless="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/MutexImpl.cpp" unless="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/SystemImpl.cpp" unless="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/efsw/src/efsw/platform/posix/ThreadImpl.cpp" unless="windows" />
-		
+
 	</files>
-	
+
 </xml>
\ No newline at end of file
diff --git a/project/lib/freetype-files.xml b/project/lib/freetype-files.xml
index ffa4fe5a0..079ff70c6 100644
--- a/project/lib/freetype-files.xml
+++ b/project/lib/freetype-files.xml
@@ -1,60 +1,60 @@
 <xml>
 
-	<files id="native-toolkit-freetype-depends" >
+	<files id="native-toolkit-freetype-depends">
 
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftconfig.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftheader.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftmodule.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/freetype/include/freetype/config/ftoption.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftstdlib.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/freetype.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/freetype/include/ft2build.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftadvanc.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbbox.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbdf.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbitmap.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbzip2.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftcache.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftchapters.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftcid.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftdriver.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fterrdef.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fterrors.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftfntfmt.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftgasp.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftglyph.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftgxval.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftgzip.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftimage.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftincrem.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftlcdfil.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftlist.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftlzw.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmac.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmm.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmodapi.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmoderr.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftotval.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftoutln.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftparams.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftpfr.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftrender.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsizes.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsnames.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftstroke.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsynth.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsystem.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fttrigon.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fttypes.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftwinfnt.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/t1tables.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ttnameid.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/tttables.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/tttags.h"/>
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftconfig.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftheader.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftmodule.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/freetype/include/freetype/config/ftoption.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftstdlib.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/freetype.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftadvanc.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbbox.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbdf.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbitmap.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftbzip2.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftcache.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftchapters.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftcid.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftdriver.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fterrdef.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fterrors.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftfntfmt.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftgasp.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftglyph.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftgxval.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftgzip.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftimage.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftincrem.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftlcdfil.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftlist.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftlzw.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmac.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmm.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmodapi.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftmoderr.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftotval.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftoutln.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftparams.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftpfr.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftrender.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsizes.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsnames.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftstroke.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsynth.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftsystem.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fttrigon.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fttypes.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftwinfnt.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/t1tables.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ttnameid.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/tttables.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/tttags.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/freetype/include/ft2build.h" />
 
 	</files>
 
-	<files id="native-toolkit-freetype" tags="" >
+	<files id="native-toolkit-freetype" tags="">
 
 		<cache value="1" />
 		<tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
diff --git a/project/lib/harfbuzz-files.xml b/project/lib/harfbuzz-files.xml
index bccb3d998..1027f14b3 100644
--- a/project/lib/harfbuzz-files.xml
+++ b/project/lib/harfbuzz-files.xml
@@ -1,6 +1,6 @@
 <xml>
 
-	<files id="native-toolkit-harfbuzz" >
+	<files id="native-toolkit-harfbuzz">
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/include" if="NATIVE_TOOLKIT_HAVE_FREETYPE" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/harfbuzz/src/" />
@@ -23,17 +23,6 @@
 		<compilerflag value="-DHAVE_CORETEXT" if="mac || ios" />
 		<compilerflag value="-Wno-undefined-bool-conversion" if="mac" />
 
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ft.cc" />
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ucd.cc" />
-
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-coretext.cc" if="mac || ios" />
-		<!-- <file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-glib.cc" if="HAVE_GLIB" />
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-gobject-structs.cc" if="HAVE_GOBJECT" />
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-graphite2.cc" if="HAVE_GRAPHITE2" />
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-icu.cc" if="HAVE_ICU" /> -->
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-uniscribe.cc" if="windows" />
-		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-directwrite.cc" if="windows HXCPP_M64" />
-
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-aat-layout.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-aat-map.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-blob.cc" />
@@ -41,9 +30,12 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-buffer-verify.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-buffer.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-common.cc" />
+		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-coretext.cc" if="mac || ios" />
+		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-directwrite.cc" if="windows HXCPP_M64" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-face.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-fallback-shape.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-font.cc" />
+		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ft.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-number.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-cff1-table.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-cff2-table.cc" />
@@ -75,7 +67,9 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-shape.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-shaper.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-static.cc" />
+		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ucd.cc" />
 		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-unicode.cc" />
+		<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-uniscribe.cc" if="windows" />
 
 	</files>
 
diff --git a/project/lib/jpeg-files.xml b/project/lib/jpeg-files.xml
index 879cf78af..9e314f478 100644
--- a/project/lib/jpeg-files.xml
+++ b/project/lib/jpeg-files.xml
@@ -20,9 +20,9 @@
 		<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jmorecfg.h" />
 		<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jpegint.h" />
 		<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jpeglib.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/jpeg/jversion.h" />
 		<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/simd/jsimd.h" />
 		<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/transupp.h" />
-		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/jpeg/jversion.h" />
 
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jaricom.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcapimin.c" />
@@ -70,9 +70,9 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctred.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemmgr.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemnobs.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jsimd_none.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jquant1.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jquant2.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jsimd_none.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jutils.c" />
 
 	</files>
diff --git a/project/lib/lzma-files.xml b/project/lib/lzma-files.xml
index 8b5c5d772..5003a5d8e 100644
--- a/project/lib/lzma-files.xml
+++ b/project/lib/lzma-files.xml
@@ -3,14 +3,14 @@
     <files id="native-toolkit-lzma">
 
         <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/lzma/include/" if="NATIVE_TOOLKIT_LZMA_BINDING" />
-        <compilerflag value="-D_7ZIP_ST" unless="windows"/>
+        <compilerflag value="-D_7ZIP_ST" unless="windows" />
 
-        <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/LzmaBinding.cpp" if="NATIVE_TOOLKIT_LZMA_BINDING" />
         <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/LzFind.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/LzFindMt.c" if="windows" />
+        <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/LzmaBinding.cpp" if="NATIVE_TOOLKIT_LZMA_BINDING" />
         <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/LzmaDec.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/LzmaEnc.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/LzFindMt.c"            if="windows" />
-        <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/Threads.c"             if="windows" />
+        <file name="${NATIVE_TOOLKIT_PATH}/lzma/src/Threads.c" if="windows" />
 
     </files>
 
diff --git a/project/lib/mbedtls-files.xml b/project/lib/mbedtls-files.xml
index 580552bc5..7643ad174 100644
--- a/project/lib/mbedtls-files.xml
+++ b/project/lib/mbedtls-files.xml
@@ -1,10 +1,10 @@
 <xml>
-	
+
 	<files id="native-toolkit-mbedtls">
-		
+
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
-		
+
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/aes.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/aesni.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/arc4.c" />
@@ -15,34 +15,38 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/blowfish.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/camellia.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ccm.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cipher.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/certs.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cipher_wrap.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cipher.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cmac.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ctr_drbg.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/debug.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/des.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/dhm.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecdh.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecdsa.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecjpake.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecp.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecp_curves.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/entropy.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecp.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/entropy_poll.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/entropy.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/error.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/gcm.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/havege.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/hmac_drbg.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md_wrap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md2.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md4.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md5.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md_wrap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/memory_buffer_alloc.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/net_sockets.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/oid.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/padlock.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pem.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pk.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pk_wrap.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pk.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkcs11.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkcs12.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkcs5.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkparse.c" />
@@ -53,24 +57,6 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/sha1.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/sha256.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/sha512.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/threading.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/timing.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/version.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/version_features.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/xtea.c" />
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/certs.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkcs11.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_create.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_crl.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_crt.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_csr.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509write_crt.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509write_csr.c" />
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/debug.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/net_sockets.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_cache.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_ciphersuites.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_cli.c" />
@@ -78,7 +64,19 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_srv.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_ticket.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls.c" />
-		
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/threading.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/timing.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/version_features.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/version.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_create.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_crl.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_crt.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_csr.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509write_crt.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509write_csr.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/xtea.c" />
+
 	</files>
-	
+
 </xml>
diff --git a/project/lib/mojoal-files.xml b/project/lib/mojoal-files.xml
index 6e0e1a7d3..08d1e2496 100644
--- a/project/lib/mojoal-files.xml
+++ b/project/lib/mojoal-files.xml
@@ -1,13 +1,13 @@
 <xml>
 
-	<files id="native-toolkit-mojoal" >
+	<files id="native-toolkit-mojoal">
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi"/>
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi" />
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mojoal/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mojoal/AL/" />
diff --git a/project/lib/neko-files.xml b/project/lib/neko-files.xml
index 7e78e3b5a..9bbd997bc 100644
--- a/project/lib/neko-files.xml
+++ b/project/lib/neko-files.xml
@@ -1,37 +1,36 @@
 <xml>
-	
+
 	<files id="native-toolkit-neko">
-		
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/neko/vm/"/>
-		<compilerflag value="-DNEKO_STANDALONE=1"/>
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/buffer.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/date.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/file.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/init.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/int32.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/math.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/string.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/random.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/serialize.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/socket.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/sys.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/misc.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/thread.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/process.c"/>
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/alloc.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/builtins.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/callback.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/interp.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/load.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/objtable.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/others.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/hash.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/module.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/jit_x86.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/threads.c"/>
-		
+
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/neko/vm/" />
+		<compilerflag value="-DNEKO_STANDALONE=1" />
+
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/buffer.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/date.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/file.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/init.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/int32.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/math.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/misc.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/process.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/random.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/serialize.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/socket.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/string.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/sys.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/libs/std/thread.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/alloc.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/builtins.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/callback.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/hash.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/interp.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/jit_x86.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/load.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/module.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/objtable.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/others.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/neko/vm/threads.c" />
+
 	</files>
-	
+
 </xml>
\ No newline at end of file
diff --git a/project/lib/ogg-files.xml b/project/lib/ogg-files.xml
index 8c8749e2e..efe4b2fe4 100644
--- a/project/lib/ogg-files.xml
+++ b/project/lib/ogg-files.xml
@@ -1,15 +1,15 @@
 <xml>
 
    <files id="native-toolkit-ogg-depends">
-      <depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h"/>
-      <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/>
-      <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/>
+      <depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h" />
+      <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h" />
+      <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h" />
    </files>
 
-    <files id="native-toolkit-ogg" tags="" >
+    <files id="native-toolkit-ogg" tags="">
 
-        <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/"/>
-        <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/ogg/include/"/>
+        <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/" />
+        <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/ogg/include/" />
         <cache value="1" />
 
         <tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
diff --git a/project/lib/openal-files.xml b/project/lib/openal-files.xml
index a9bb0be8f..b6c73668c 100644
--- a/project/lib/openal-files.xml
+++ b/project/lib/openal-files.xml
@@ -2,7 +2,7 @@
 
     <files id="native-toolkit-openal">
 
-        <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/"/>
+        <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/" />
         <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/openal/alc/" />
         <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/alc/" />
         <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/openal/build/" />
@@ -16,47 +16,56 @@
         <compilerflag value="-D_LARGE_FILES" />
         <compilerflag value="-DNOMINMAX" />
 
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/base.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/loopback.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/null.cpp"/>
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/auxeffectslot.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/buffer.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/effect.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/error.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/event.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/extension.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/filter.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/listener.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/source.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/state.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alc.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alconfig.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alu.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/ambdec.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/base.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/loopback.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/null.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/wave.cpp" />
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/autowah.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/chorus.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/compressor.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/dedicated.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/distortion.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/echo.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/equalizer.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/fshifter.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/modulator.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/null.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/pshifter.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/reverb.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/vmorpher.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/biquad.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/nfc.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/splitter.cpp"/>
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/bformatdec.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/bs2b.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/converter.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/autowah.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/chorus.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/compressor.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/dedicated.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/distortion.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/echo.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/equalizer.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/fshifter.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/modulator.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/null.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/pshifter.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/reverb.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/vmorpher.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/biquad.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/nfc.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/splitter.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/helpers.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/hrtf.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mastering.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_c.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_neon.cpp" if="rpi" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_sse.cpp" unless="rpi || android" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_sse2.cpp" unless="rpi || android" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_sse3.cpp" unless="rpi || android" />
-        <!-- <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_sse41.cpp" unless="rpi || android" /> -->
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_neon.cpp" if="rpi" />
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alc.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alconfig.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alu.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/ambdec.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/bformatdec.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/bs2b.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/converter.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/helpers.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/hrtf.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mastering.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/panning.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/ringbuffer.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/uhjfilter.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/voice.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/common/alcomplex.cpp"/>
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/panning.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/ringbuffer.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/uhjfilter.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/voice.cpp" />
+        <file name="${NATIVE_TOOLKIT_PATH}/openal/common/alcomplex.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/alexcpt.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/alfstream.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/almalloc.cpp" />
@@ -65,26 +74,16 @@
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/polyphase_resampler.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/strutils.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/threads.cpp" />
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/auxeffectslot.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/buffer.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/effect.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/error.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/event.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/extension.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/filter.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/listener.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/source.cpp"/>
-        <file name="${NATIVE_TOOLKIT_PATH}/openal/al/state.cpp"/>
 
         <section if="NATIVE_TOOLKIT_HAVE_SDL">
 
             <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/sdl/include/" />
             <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
-            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi"/>
-            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi"/>
-            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows"/>
-            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac"/>
-            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi"/>
+            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi" />
+            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi" />
+            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac" />
+            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi" />
+            <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows" />
 
             <compilerflag value="-DHAVE_SDL2" />
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/sdl2.cpp" />
@@ -103,9 +102,9 @@
             <compilerflag value="-mfpu=neon" if="rpi" />
             <compilerflag value="-fcommon" />
 
-            <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/pulseaudio.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/alsa.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/oss.cpp" />
+            <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/pulseaudio.cpp" />
 
         </section>
 
@@ -123,12 +122,12 @@
 
         <section if="windows">
 
-            <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/winmm.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/dsound.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/wasapi.cpp" />
+            <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/winmm.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/uiddefs.cpp" />
 
-            <compilerflag value="-DWIN32"/>
+            <compilerflag value="-DWIN32" />
             <compilerflag value="-D_WINDOWS" />
             <compilerflag value="-D_WIN32" />
             <compilerflag value="-D_WIN32_WINNT=0x0502" />
diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml
index 6f9ee9f22..6bf43ba7e 100644
--- a/project/lib/pixman-files.xml
+++ b/project/lib/pixman-files.xml
@@ -5,7 +5,7 @@
 	<!-- <set name="PIXMAN_ARM_SIMD" value="1" if="android || rpi" unless="HXCPP_ARMV7 || HXCPP_ARMV7S || HXCPP_ARM64 || HXCPP_X86" /> -->
 	<set name="PIXMAN_ARM_NEON" value="1" if="HXCPP_ARMV7 || HXCPP_ARMV7S || rpi" unless="ios" />
 
-	<files id="native-toolkit-pixman" >
+	<files id="native-toolkit-pixman">
 
 		<compilerflag value="-fno-integrated-as" if="HXCPP_CLANG || NDKV20+" unless="mac || ios" />
 
@@ -21,56 +21,56 @@
 		<compilerflag value="-DUSE_ARM_NEON=1" if="PIXMAN_ARM_NEON" />
 		<compilerflag value="-DUSE_ARM_SIMD=1" if="PIXMAN_ARM_SIMD" />
 
-		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android"/>
+		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android" />
 
-		<compilerflag value="-mmmx" if="linux || mac" unless="rpi"/>
-		<compilerflag value="-msse" if="linux || mac" unless="rpi"/>
-		<compilerflag value="-msse2" if="linux || mac" unless="rpi"/>
-		<compilerflag value="-msse3" if="linux || mac" unless="rpi"/>
-		<compilerflag value="-mssse3" if="linux || mac" unless="rpi"/>
+		<compilerflag value="-mmmx" if="linux || mac" unless="rpi" />
+		<compilerflag value="-msse" if="linux || mac" unless="rpi" />
+		<compilerflag value="-msse2" if="linux || mac" unless="rpi" />
+		<compilerflag value="-msse3" if="linux || mac" unless="rpi" />
+		<compilerflag value="-mssse3" if="linux || mac" unless="rpi" />
 
 		<compilerflag value="-Wno-attributes" if="android" />
 		<compilerflag value="-Wno-tautological-constant-out-of-range-compare" if="mac || ios || tvos" />
 
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-access.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-access-accessors.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon.c" if="PIXMAN_ARM_NEON" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-access.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon-asm-bilinear.S" if="PIXMAN_ARM_NEON" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon-asm.S" if="PIXMAN_ARM_NEON" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd.c" if="PIXMAN_ARM_SIMD" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd-asm.S" if="PIXMAN_ARM_SIMD" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon.c" if="PIXMAN_ARM_NEON" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd-asm-scaled.S" if="PIXMAN_ARM_SIMD" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd-asm.S" if="PIXMAN_ARM_SIMD" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd.c" if="PIXMAN_ARM_SIMD" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-bits-image.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-combine32.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-combine-float.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-combine32.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-conical-gradient.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-edge.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-edge-accessors.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-edge.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-fast-path.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-filter.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-glyph.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-general.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-glyph.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-gradient-walker.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-image.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-implementation.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-linear-gradient.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-matrix.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-mips.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-mmx.c" if="windows || mac || linux" unless="rpi"/>
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-mmx.c" if="windows || mac || linux" unless="rpi" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-noop.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-ppc.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-radial-gradient.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-region16.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-region32.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-solid-fill.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-sse2.c" if="windows || mac || linux" unless="rpi"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-ssse3.c" if="windows || mac || linux" unless="rpi"/>
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-sse2.c" if="windows || mac || linux" unless="rpi" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-ssse3.c" if="windows || mac || linux" unless="rpi" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-timer.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-trap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-utils.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-x86.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman.c" />
 
 	</files>
 
diff --git a/project/lib/png-files.xml b/project/lib/png-files.xml
index 3cc42b0c7..3e1ebcab6 100644
--- a/project/lib/png-files.xml
+++ b/project/lib/png-files.xml
@@ -1,10 +1,10 @@
 <xml>
 
 	<files id="native-toolkit-png-depends">
-		<depend name="${NATIVE_TOOLKIT_PATH}/png/png.h"/>
+		<depend name="${NATIVE_TOOLKIT_PATH}/png/png.h" />
 	</files>
 
-	<files id="native-toolkit-png" tags="" >
+	<files id="native-toolkit-png" tags="">
 
 		<cache value="1" />
 		<tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
@@ -15,13 +15,12 @@
 
 		<depend files="native-toolkit-png-depends" />
 
-		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngstruct.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/png/pnginfo.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/png/pnglibconf.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngpriv.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngconf.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngdebug.h"/>
-
+		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngconf.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngdebug.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/png/pnginfo.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/png/pnglibconf.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngpriv.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/png/pngstruct.h" />
 
 		<file name="${NATIVE_TOOLKIT_PATH}/png/png.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/png/pngerror.c" />
diff --git a/project/lib/sdl-files.xml b/project/lib/sdl-files.xml
index ec6015e13..e324a4bc7 100644
--- a/project/lib/sdl-files.xml
+++ b/project/lib/sdl-files.xml
@@ -2,90 +2,83 @@
 
     <files id="native-toolkit-sdl-depends">
 
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_android.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/begin_code.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/close_code.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test_random.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_thread.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_timer.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_touch.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_types.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_version.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_video.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_surface.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_system.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_syswm.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test_assert.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test_common.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_render.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_revision.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_rwops.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_scancode.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_shape.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_stdinc.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_gl2platform.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_khrplatform.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_pixels.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_platform.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_power.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_quit.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_rect.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengl_glext.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_gl2.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_gl2ext.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_mouse.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_mutex.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_name.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengl.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_hints.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_joystick.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_keyboard.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_keycode.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_loadso.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_log.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_main.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_messagebox.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_error.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_events.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_filesystem.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_gamecontroller.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_gesture.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_haptic.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_winrt.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_copying.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_cpuinfo.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_egl.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_endian.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_iphoneos.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/include/SDL_config_macosx.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_minimal.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_pandora.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/include/SDL_config_windows.h" unless="winrt"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_assert.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_atomic.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_audio.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_bits.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_blendmode.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_clipboard.h"/>
-        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL.h"/>
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/begin_code.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/close_code.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_assert.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_atomic.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_audio.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_bits.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_blendmode.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_clipboard.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_android.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_iphoneos.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/include/SDL_config_macosx.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_minimal.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_pandora.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/include/SDL_config_windows.h" unless="winrt" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_config_winrt.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_copying.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_cpuinfo.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_egl.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_endian.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_error.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_events.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_filesystem.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_gamecontroller.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_gesture.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_haptic.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_hints.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_joystick.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_keyboard.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_keycode.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_loadso.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_log.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_main.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_messagebox.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_mouse.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_mutex.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_name.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengl_glext.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengl.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_gl2.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_gl2ext.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_gl2platform.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2_khrplatform.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_opengles2.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_pixels.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_platform.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_power.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_quit.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_rect.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_render.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_revision.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_rwops.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_scancode.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_shape.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_stdinc.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_surface.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_system.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_syswm.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test_assert.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test_common.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test_random.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_test.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_thread.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_timer.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_touch.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_types.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_version.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_video.h" />
+        <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL.h" />
 
         <section if="winrt">
             <depend name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/winrt/SDL_winrtapp_common.h" />
             <depend name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/winrt/SDL_winrtapp_direct3d.h" />
             <depend name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/winrt/SDL_winrtapp_xaml.h" />
-
-            <!--
-            <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_gamecontrollerdb.h" />
-            <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_windows.h" />
-            <depend name="${NATIVE_TOOLKIT_PATH}/sdl/include/SDL_xinput.h" />
-            -->
-
-            <depend name="${NATIVE_TOOLKIT_PATH}/sdl/src/dynapi/SDL_dynapi.h" />
             <depend name="${NATIVE_TOOLKIT_PATH}/sdl/src/dynapi/SDL_dynapi_overrides.h" />
             <depend name="${NATIVE_TOOLKIT_PATH}/sdl/src/dynapi/SDL_dynapi_procs.h" />
+            <depend name="${NATIVE_TOOLKIT_PATH}/sdl/src/dynapi/SDL_dynapi.h" />
         </section>
 
     </files>
@@ -93,13 +86,13 @@
 
 
 
-    <files id="native-toolkit-sdl" tags="" >
+    <files id="native-toolkit-sdl" tags="">
 
         <cache value="1" />
         <tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
 
         <compilerflag value="-DUSING_GENERATED_CONFIG_H" />
-        <depend files="native-toolkit-sdl-depends"/>
+        <depend files="native-toolkit-sdl-depends" />
 
         <compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android" />
 
@@ -126,9 +119,9 @@
 
         <section if="winrt">
 
-            <compilerflag value="-D__WINRT__"/>
-            <compilerflag value="-DUNICODE"/>
-            <compilerflag value="-DSDL_BUILDING_WINRT=1"/>
+            <compilerflag value="-D__WINRT__" />
+            <compilerflag value="-DUNICODE" />
+            <compilerflag value="-DSDL_BUILDING_WINRT=1" />
 
         </section>
 
@@ -151,11 +144,11 @@
             <compilerflag value="-I/usr/include/interface/vcos/pthreads" if="rpi" />
             <compilerflag value="-I/usr/include/interface/vmcs_host/linux" if="rpi" />
 
-            <set name="XINPUT2" value="${NATIVE_TOOLKIT_SDL_X11_XINPUT2}"/>
+            <set name="XINPUT2" value="${NATIVE_TOOLKIT_SDL_X11_XINPUT2}" />
             <compilerflag value="-DNATIVE_TOOLKIT_SDL_X11_XINPUT2=${XINPUT2}" if="XINPUT2" />
-            <compilerflag value="-DNATIVE_TOOLKIT_SDL_X11_XINPUT2_SUPPORTS_MULTITOUCH=${XINPUT2}" if="XINPUT2"/>
+            <compilerflag value="-DNATIVE_TOOLKIT_SDL_X11_XINPUT2_SUPPORTS_MULTITOUCH=${XINPUT2}" if="XINPUT2" />
             <compilerflag value="-DNATIVE_TOOLKIT_SDL_X11_XINPUT2=0" unless="XINPUT2" />
-            <compilerflag value="-DNATIVE_TOOLKIT_SDL_X11_XINPUT2_SUPPORTS_MULTITOUCH=0" unless="XINPUT2"/>
+            <compilerflag value="-DNATIVE_TOOLKIT_SDL_X11_XINPUT2_SUPPORTS_MULTITOUCH=0" unless="XINPUT2" />
 
         </section>
 
@@ -172,15 +165,10 @@
 
         </section>
 
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_assert.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_dataqueue.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_error.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_hints.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_list.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_log.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/atomic/SDL_atomic.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/atomic/SDL_spinlock.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/disk/SDL_diskaudio.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/dummy/SDL_dummyaudio.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/SDL_audio.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/SDL_audiocvt.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/SDL_audiotypecvt.c" />
@@ -201,9 +189,9 @@
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/file/SDL_rwops.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/SDL_haptic.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/SDL_hidapi.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_gamecontroller.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_joystick.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/virtual/SDL_virtualjoystick.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_atan2.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_exp.c" />
@@ -225,11 +213,29 @@
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/s_scalbn.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/s_sin.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/s_tan.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/loadso/dlopen/SDL_sysloadso.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/locale/SDL_locale.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/SDL_url.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/SDL_power.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengl/SDL_render_gl.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengl/SDL_shaders_gl.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/SDL_render.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/SDL_yuv_sw.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_blendfillrect.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_blendline.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_blendpoint.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_drawline.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_drawpoint.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_render_sw.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_rotate.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_triangle.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_assert.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_dataqueue.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_error.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_hints.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_list.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_log.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/dummy/SDL_dummysensor.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/SDL_sensor.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_crc32.c" />
@@ -242,45 +248,30 @@
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_strtokr.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/SDL_thread.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/timer/SDL_timer.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_RLEaccel.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/dummy/SDL_nullevents.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/dummy/SDL_nullframebuffer.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/dummy/SDL_nullvideo.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_0.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_1.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_A.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_N.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_auto.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_copy.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_N.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit_slow.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_blit.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_bmp.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_clipboard.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_fillrect.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_pixels.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_rect.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_RLEaccel.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_shape.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_stretch.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_surface.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_video.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_vulkan_utils.c" />
         <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_yuv.c" />
-
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/disk/SDL_diskaudio.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/loadso/dlopen/SDL_sysloadso.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengl/SDL_render_gl.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengl/SDL_shaders_gl.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_blendfillrect.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_blendline.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_blendpoint.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_drawline.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_drawpoint.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_render_sw.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_rotate.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/software/SDL_triangle.c" />
-
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/dummy/SDL_nullevents.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/dummy/SDL_nullframebuffer.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/dummy/SDL_nullvideo.c" />
-        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/dummy/SDL_dummyaudio.c" />
+        <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb.c" />
 
         <section unless="windows">
 
@@ -293,12 +284,12 @@
 
         </section>
 
-        <section if="android || ios || windows || rpi || tvos" >
+        <section if="android || ios || windows || rpi || tvos">
 
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_egl.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles/SDL_render_gles.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles2/SDL_render_gles2.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles2/SDL_shaders_gles2.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_egl.c" />
 
         </section>
 
@@ -321,7 +312,6 @@
 
         <section if="LIBSDL_DIRECTFB">
 
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_WM.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_dyn.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_events.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_modes.c" />
@@ -331,6 +321,7 @@
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_shape.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_video.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_window.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/directfb/SDL_DirectFB_WM.c" />
 
         </section>
 
@@ -351,8 +342,8 @@
 
         <section if="LIBSDL_PANDORA">
 
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/pandora/SDL_pandora.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/pandora/SDL_pandora_events.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/pandora/SDL_pandora.c" />
 
         </section>
 
@@ -386,34 +377,35 @@
 
         <section if="linux">
 
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/SDL_audiodev.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/alsa/SDL_alsa_audio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/arts/SDL_artsaudio.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/dsp/SDL_dspaudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/esd/SDL_esdaudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/fusionsound/SDL_fsaudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/nas/SDL_nasaudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/paudio/SDL_paudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/pulseaudio/SDL_pulseaudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/qsa/SDL_qsa_audio.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/SDL_audiodev.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/sndio/SDL_sndioaudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/sun/SDL_sunaudio.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/dsp/SDL_dspaudio.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/linux/SDL_syshaptic.c" />
-            <!-- <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/linux/hid.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/linux/hidraw.cpp" /> -->
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/linux/SDL_syspower.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_evdev.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_dbus.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_evdev_capabilities.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_evdev_kbd.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_udev.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_dbus.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_evdev.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_ibus.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_ime.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_threadprio.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_udev.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/unix/SDL_poll.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/imKStoUCS.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/unix/SDL_sysfilesystem.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/linux/SDL_syshaptic.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/linux/SDL_sysjoystick.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/locale/unix/SDL_syslocale.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/unix/SDL_sysurl.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/linux/SDL_syspower.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/edid-parse.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11clipboard.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11dyn.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11events.c" />
@@ -430,30 +422,27 @@
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11vulkan.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11window.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11xinput2.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/edid-parse.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/imKStoUCS.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/unix/SDL_sysfilesystem.c" />
 
         </section>
 
         <section if="windows">
 
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/generic/SDL_syscond.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/directsound/SDL_directsound.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/wasapi/SDL_wasapi.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/winmm/SDL_winmm.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_windows.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_xinput.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_dinputjoystick.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_windowsjoystick.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_xinputjoystick.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_dinputhaptic.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_windowshaptic.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_xinputhaptic.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/windows/hid.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_dinputjoystick.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_windowsjoystick.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_xinputjoystick.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/loadso/windows/SDL_sysloadso.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_d3d11.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/SDL_d3dmath.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/generic/SDL_syscond.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/windows/SDL_sysmutex.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/windows/SDL_syssem.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/windows/SDL_systhread.c" />
@@ -500,28 +489,28 @@
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_winrt.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_shaders_d3d11.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtevents.cpp" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtgamebar.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtkeyboard.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtmessagebox.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtmouse.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtopengles.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtpointerinput.cpp" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtvideo.cpp" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtgamebar.cpp" />
 
         </section>
 
         <section if="mac">
 
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/coreaudio/SDL_coreaudio.m" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/darwin/SDL_iokitjoystick.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/iphoneos/SDL_mfijoystick.m" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/darwin/SDL_syshaptic.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/mac/hid.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/darwin/SDL_iokitjoystick.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/iphoneos/SDL_mfijoystick.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/locale/macosx/SDL_syslocale.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/macosx/SDL_sysurl.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/macosx/SDL_syspower.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/cocoa/SDL_cocoaclipboard.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/cocoa/SDL_cocoaevents.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/cocoa/SDL_cocoakeyboard.m" />
@@ -543,12 +532,12 @@
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/coreaudio/SDL_coreaudio.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/iphoneos/SDL_mfijoystick.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/dummy/SDL_syshaptic.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/ios/hid.m" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/iphoneos/SDL_mfijoystick.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/locale/dummy/SDL_syslocale.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/ios/SDL_sysurl.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/main/uikit/SDL_uikit_main.c" if="NATIVE_TOOLKIT_SDL_STATIC" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/ios/SDL_sysurl.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/uikit/SDL_syspower.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/metal/SDL_render_metal.m" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/coremotion/SDL_coremotionsensor.m" if="ios" />
@@ -576,40 +565,40 @@
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/android/SDL_androidaudio.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/openslES/SDL_openslES.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/android/SDL_android.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/android/SDL_syshaptic.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/android/SDL_sysjoystick.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/android/SDL_sysfilesystem.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/android/SDL_syshaptic.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/android/hid.cpp" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/android/SDL_sysjoystick.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/locale/android/SDL_syslocale.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/android/SDL_sysurl.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/main/android/SDL_android_main.c" if="NATIVE_TOOLKIT_SDL_STATIC" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/android/SDL_sysurl.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/android/SDL_syspower.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/android/SDL_androidsensor.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidclipboard.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidevents.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidgl.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidkeyboard.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidmessagebox.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidmouse.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidtouch.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidvideo.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidvulkan.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidwindow.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidmessagebox.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/android/SDL_androidmouse.c" />
 
         </section>
 
         <section if="emscripten">
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/emscripten/SDL_emscriptenaudio.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/emscripten/SDL_sysjoystick.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/locale/emscripten/SDL_syslocale.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/emscripten/SDL_sysurl.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/emscripten/SDL_syspower.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/emscripten/SDL_emscriptenevents.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/emscripten/SDL_emscriptenmouse.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/emscripten/SDL_emscriptenopengles.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/emscripten/SDL_emscriptenvideo.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/emscripten/SDL_syspower.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/emscripten/SDL_sysurl.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/locale/emscripten/SDL_syslocale.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/emscripten/SDL_sysjoystick.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/emscripten/SDL_emscriptenaudio.c" />
         </section>
 
     </files>
diff --git a/project/lib/tinyfiledialogs-files.xml b/project/lib/tinyfiledialogs-files.xml
index 6a79cc872..11bf133e5 100644
--- a/project/lib/tinyfiledialogs-files.xml
+++ b/project/lib/tinyfiledialogs-files.xml
@@ -1,12 +1,12 @@
 <xml>
-	
+
 	<files id="native-toolkit-tinyfiledialogs">
-		
+
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/tinyfiledialogs" />
 		<compilerflag value="-D_CRT_SECURE_NO_WARNINGS" if="windows" />
-		
+
 		<file name="${NATIVE_TOOLKIT_PATH}/tinyfiledialogs/tinyfiledialogs.c" />
-		
+
 	</files>
-	
+
 </xml>
\ No newline at end of file
diff --git a/project/lib/vorbis-files.xml b/project/lib/vorbis-files.xml
index ebf9622a2..50fe69fd8 100644
--- a/project/lib/vorbis-files.xml
+++ b/project/lib/vorbis-files.xml
@@ -1,70 +1,68 @@
 <xml>
 
 	<files id="native-toolkit-vorbis-depends">
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/codec.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/vorbisenc.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/vorbisfile.h"/>
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/codec.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/vorbisenc.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/vorbisfile.h" />
 	</files>
 
-	<files id="native-toolkit-vorbis" tags="" >
+	<files id="native-toolkit-vorbis" tags="">
 
 		<cache value="1" />
 		<tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
 
-		<depend files="native-toolkit-vorbis-depends"/>
+		<depend files="native-toolkit-vorbis-depends" />
 
-		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/>
+		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h" />
 
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/window.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/smallft.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/scales.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/registry.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/psy.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/os.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/misc.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/mdct.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/masking.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lsp.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lpc.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lookup_data.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lookup.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/highlevel.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/envelope.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/codec_internal.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/codebook.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/bitrate.h"/>
-		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/backends.h"/>
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/backends.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/bitrate.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/codebook.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/codec_internal.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/envelope.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/highlevel.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lookup_data.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lookup.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lpc.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lsp.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/masking.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/mdct.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/misc.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/os.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/psy.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/registry.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/scales.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/smallft.h" />
+		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/window.h" />
 
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/include/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/lib/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/ogg/include/" />
 
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/include/"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/lib/"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/"/>
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/ogg/include/"/>
-
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/mdct.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/smallft.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/block.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/envelope.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/window.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lsp.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lpc.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/analysis.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/synthesis.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/psy.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/info.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/floor1.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/floor0.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/res0.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/mapping0.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/registry.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/codebook.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/sharedbook.c"/>
-		<!--<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lookup.c"/>-->
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/bitrate.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/vorbisfile.c"/>
-		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/vorbisenc.c"/>
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/analysis.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/bitrate.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/block.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/codebook.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/envelope.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/floor0.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/floor1.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/info.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lpc.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/lsp.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/mapping0.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/mdct.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/psy.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/registry.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/res0.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/sharedbook.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/smallft.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/synthesis.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/vorbisenc.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/vorbisfile.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/window.c" />
 
 	</files>
 
diff --git a/project/lib/vpx-files.xml b/project/lib/vpx-files.xml
index fc49a236f..2c3cdd6a9 100644
--- a/project/lib/vpx-files.xml
+++ b/project/lib/vpx-files.xml
@@ -1,30 +1,17 @@
 <xml>
-	
+
 	<!-- <set name="HXCPP_CPP11" value="1" /> -->
-	
-	<files id="native-toolkit-vpx" >
-		
+
+	<files id="native-toolkit-vpx">
+
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/ogg/include" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/include" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/lib" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vpx" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vpx/vpx-ports" />
-		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/cpufeatures" if="android"/>
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_ports/arm_cpudetect.c" if="ios || android" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_decoder.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_encoder.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_codec.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_image.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_dsp/vpx_dsp_rtcd.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_mem/vpx_mem.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/vpx_scale_rtcd.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/vpx_scale.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/yv12config.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/yv12extend.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/gen_scalers.c" />
+		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/cpufeatures" if="android" />
+
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/alloccommon.c" />
-		<!-- <file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/asm_com_offsets.c" /> -->
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/blockd.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/debugmodes.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/dequantize.c" />
@@ -37,8 +24,6 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/generic/systemdependent.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/idct_blk.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/idctllm.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/rtcd.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/vp8_loopfilter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/loopfilter_filters.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/mbpitch.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/modecont.c" />
@@ -46,21 +31,31 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/reconinter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/reconintra.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/reconintra4x4.c" />
-		<!-- <file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/sad_c.c" /> -->
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/rtcd.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/setupintrarecon.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/swapyv12buffer.c" />
-		<!-- <file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/variance_c.c" /> -->
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/treecoder.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/vp8_dx_iface.c" />
-		<!-- <file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/asm_dec_offsets.c" /> -->
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/common/vp8_loopfilter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/dboolhuff.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/decodemv.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/decodeframe.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/decodemv.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/detokenize.c" />
-		<!-- <file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/error_concealment.c" /> -->
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/decoder/onyxd_if.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vp8/vp8_dx_iface.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_config.c" />
-		
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_dsp/vpx_dsp_rtcd.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_mem/vpx_mem.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_ports/arm_cpudetect.c" if="ios || android" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/gen_scalers.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/vpx_scale.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/yv12config.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/generic/yv12extend.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx_scale/vpx_scale_rtcd.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_codec.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_decoder.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_encoder.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/vpx/vpx/src/vpx_image.c" />
+
 	</files>
-	
+
 </xml>
\ No newline at end of file
diff --git a/project/lib/webm-files.xml b/project/lib/webm-files.xml
index d496702ab..261d7458a 100644
--- a/project/lib/webm-files.xml
+++ b/project/lib/webm-files.xml
@@ -1,17 +1,17 @@
 <xml>
-	
+
 	<!-- <set name="HXCPP_CPP11" value="1" /> -->
-	
-	<files id="native-toolkit-webm" >
-		
-		<file name="${NATIVE_TOOLKIT_PATH}/webm/vttreader.cc" />
-		<file name="${NATIVE_TOOLKIT_PATH}/webm/webvttparser.cc" />
+
+	<files id="native-toolkit-webm">
+
 		<file name="${NATIVE_TOOLKIT_PATH}/webm/mkvmuxer.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/webm/mkvmuxerutil.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/webm/mkvparser.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/webm/mkvreader.cpp" />
 		<file name="${NATIVE_TOOLKIT_PATH}/webm/mkvwriter.cpp" />
-		
+		<file name="${NATIVE_TOOLKIT_PATH}/webm/vttreader.cc" />
+		<file name="${NATIVE_TOOLKIT_PATH}/webm/webvttparser.cc" />
+
 	</files>
-	
+
 </xml>
\ No newline at end of file
diff --git a/project/lib/zlib-files.xml b/project/lib/zlib-files.xml
index a7b5b87a0..1987b5853 100644
--- a/project/lib/zlib-files.xml
+++ b/project/lib/zlib-files.xml
@@ -9,19 +9,19 @@
 		<compilerflag value="-DZ_HAVE_UNISTD_H" if="windows HXCPP_X86_64" />
 
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/adler32.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/zlib/crc32.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/zlib/infback.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/zlib/inflate.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/zlib/uncompr.c"/>
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/compress.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/zlib/crc32.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/deflate.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/zlib/gzread.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/zlib/gzwrite.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/gzclose.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/gzlib.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/zlib/gzread.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/zlib/gzwrite.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/zlib/infback.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/inffast.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/zlib/inflate.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/inftrees.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/trees.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/zlib/uncompr.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/zlib/zutil.c" />
 
 	</files>