diff --git a/dlib/assets.d b/dlib/assets.d
index 5bf7164..af43a5b 100644
--- a/dlib/assets.d
+++ b/dlib/assets.d
@@ -2,8 +2,7 @@ module dlib.assets;
 
 import dlib.aliases;
 
-static if(NativeTarget)
-{
+static if(NativeTarget) version(DLIB_ASSETS):
 
 import dlibincludes : cgltf_result, 
 			 cgltf_memory_options, 
@@ -817,4 +816,3 @@ GenerateDefaultMaterial()
 	return mat;
 }
 
-}
diff --git a/dlib/dlibincludes.c b/dlib/dlibincludes.c
index 6b9a119..12c8916 100644
--- a/dlib/dlibincludes.c
+++ b/dlib/dlibincludes.c
@@ -23,16 +23,9 @@
 # define VK_USE_PLATFORM_WIN32_KHR
 #endif
 
-#if !defined(NO_STBI) && !defined(BUILD_WASM)
+#ifdef BUILD_ASSETS
 # include "../external/stb/stb_image.h"
 # include "../external/stb/stb_image_write.h"
-#endif
-
-#ifdef DLIB_INCLUDE_VULKAN
-# include "../../VulkanRenderer/vulkan_includes.c"
-#endif
-
-#ifndef BUILD_WASM
 # include "../external/cgltf/cgltf.h"
 #endif
 
diff --git a/test.sh b/test.sh
index 25cf1df..878e450 100755
--- a/test.sh
+++ b/test.sh
@@ -12,7 +12,7 @@ declare -a shared_src=(
 	dlib/alloc.d
 	dlib/assets.d
 	dlib/externdecl.d
-	stb_truetype.d
+	dlib/stb_truetype.d
 )
 
 if [ "$1" == "wasm" ]; then
@@ -73,7 +73,9 @@ else
 		-L-lstdc++
 		-Jbuild
 		-d-version=VULKAN_RENDERER_TEST
+		-d-version=DLIB_ASSETS
 		-Xcc=-DBUILD_VULKAN
+		-Xcc=-DBUILD_ASSETS
 	)
 
 	# Test for compilation
diff --git a/vulkan/vulkan.d b/vulkan/vulkan.d
index a5e466b..e3be259 100644
--- a/vulkan/vulkan.d
+++ b/vulkan/vulkan.d
@@ -9,8 +9,8 @@ import vulkan_funcs;
 import std.stdio;
 import std.algorithm.comparison;
 import std.algorithm.searching : canFind;
-import std.traits : isPointer, isArray;
-import core.stdc.string  : strcmp, memcpy;
+import std.traits        : isPointer, isArray;
+import core.stdc.string  : strcmp, memcpy, strlen;
 import core.stdc.stdio   : Printf = printf;
 import std.format        : sformat;
 import std.math.rounding : Ceil = ceil;