diff --git a/public/engine/audio/snd_device.h b/public/engine/audio/snd_device.h
index 9c844b6310..3c7bcbec39 100644
--- a/public/engine/audio/snd_device.h
+++ b/public/engine/audio/snd_device.h
@@ -10,8 +10,8 @@
 #define SND_DEVICE_H
 #pragma once
 
-#include "snd_fixedint.h"
-#include "snd_mix_buf.h"
+#include "engine/audio/snd_fixedint.h"
+#include "engine/audio/snd_mix_buf.h"
 
 // sound engine rate defines
 #define SOUND_DMA_SPEED		44100		// hardware playback rate
diff --git a/engine/audio/snd_fixedint.h b/public/engine/audio/snd_fixedint.h
similarity index 100%
rename from engine/audio/snd_fixedint.h
rename to public/engine/audio/snd_fixedint.h
diff --git a/engine/audio/snd_mix_buf.h b/public/engine/audio/snd_mix_buf.h
similarity index 99%
rename from engine/audio/snd_mix_buf.h
rename to public/engine/audio/snd_mix_buf.h
index b51da6dbf7..b6603f212e 100644
--- a/engine/audio/snd_mix_buf.h
+++ b/public/engine/audio/snd_mix_buf.h
@@ -8,6 +8,8 @@
 #ifndef SND_MIX_BUF_H
 #define SND_MIX_BUF_H
 
+#include "utlvector.h"
+
 #if defined( _WIN32 )
 #pragma once
 #endif
diff --git a/video/quicktime_common.h b/video/video_quicktime/quicktime_common.h
similarity index 100%
rename from video/quicktime_common.h
rename to video/video_quicktime/quicktime_common.h
diff --git a/video/quicktime_material.cpp b/video/video_quicktime/quicktime_material.cpp
similarity index 100%
rename from video/quicktime_material.cpp
rename to video/video_quicktime/quicktime_material.cpp
diff --git a/video/quicktime_material.h b/video/video_quicktime/quicktime_material.h
similarity index 100%
rename from video/quicktime_material.h
rename to video/video_quicktime/quicktime_material.h
diff --git a/video/quicktime_recorder.cpp b/video/video_quicktime/quicktime_recorder.cpp
similarity index 100%
rename from video/quicktime_recorder.cpp
rename to video/video_quicktime/quicktime_recorder.cpp
diff --git a/video/quicktime_recorder.h b/video/video_quicktime/quicktime_recorder.h
similarity index 100%
rename from video/quicktime_recorder.h
rename to video/video_quicktime/quicktime_recorder.h
diff --git a/video/quicktime_video.cpp b/video/video_quicktime/quicktime_video.cpp
similarity index 100%
rename from video/quicktime_video.cpp
rename to video/video_quicktime/quicktime_video.cpp
diff --git a/video/quicktime_video.h b/video/video_quicktime/quicktime_video.h
similarity index 100%
rename from video/quicktime_video.h
rename to video/video_quicktime/quicktime_video.h
diff --git a/video/video_quicktime.vpc b/video/video_quicktime/video_quicktime.vpc
similarity index 100%
rename from video/video_quicktime.vpc
rename to video/video_quicktime/video_quicktime.vpc
diff --git a/video/video_webm.vpc b/video/video_webm/video_webm.vpc
similarity index 100%
rename from video/video_webm.vpc
rename to video/video_webm/video_webm.vpc
diff --git a/video/webm_common.h b/video/video_webm/webm_common.h
similarity index 100%
rename from video/webm_common.h
rename to video/video_webm/webm_common.h
diff --git a/video/webm_material.cpp b/video/video_webm/webm_material.cpp
similarity index 100%
rename from video/webm_material.cpp
rename to video/video_webm/webm_material.cpp
diff --git a/video/webm_material.h b/video/video_webm/webm_material.h
similarity index 100%
rename from video/webm_material.h
rename to video/video_webm/webm_material.h
diff --git a/video/webm_recorder.cpp b/video/video_webm/webm_recorder.cpp
similarity index 100%
rename from video/webm_recorder.cpp
rename to video/video_webm/webm_recorder.cpp
diff --git a/video/webm_recorder.h b/video/video_webm/webm_recorder.h
similarity index 100%
rename from video/webm_recorder.h
rename to video/video_webm/webm_recorder.h
diff --git a/video/webm_video.cpp b/video/video_webm/webm_video.cpp
similarity index 100%
rename from video/webm_video.cpp
rename to video/video_webm/webm_video.cpp
diff --git a/video/webm_video.h b/video/video_webm/webm_video.h
similarity index 100%
rename from video/webm_video.h
rename to video/video_webm/webm_video.h
diff --git a/wscript b/wscript
index 989c8e0d33..53e1ef1dcb 100644
--- a/wscript
+++ b/wscript
@@ -76,7 +76,8 @@ projects={
 		'vstdlib',
 		'vtf',
 		'utils/vtex',
-		'unicode'
+		'unicode',
+		'video',
 	],
 	'tests': [
 		'appframework',
@@ -336,13 +337,12 @@ def configure(conf):
 		flags += ['-fsanitize=%s'%conf.options.SANITIZE, '-fno-sanitize=vptr']
 
 	if conf.env.DEST_OS != 'win32':
-		flags += ['-pipe', '-fPIC']
+		flags += ['-pipe', '-fPIC', '-L'+os.path.abspath('.')+'/lib/'+conf.env.DEST_OS+'/'+conf.env.DEST_CPU+'/']
 	if conf.env.COMPILER_CC != 'msvc':
 		flags += ['-pthread']
 
 	if conf.env.DEST_OS == 'android':
 		flags += [
-			'-L'+os.path.abspath('.')+'/lib/android/'+conf.env.DEST_CPU+'/',
 			'-I'+os.path.abspath('.')+'/thirdparty/curl/include',
 			'-I'+os.path.abspath('.')+'/thirdparty/SDL',
 			'-I'+os.path.abspath('.')+'/thirdparty/openal-soft/include/',