2409 files changed, 11915 insertions, 8350 deletions

diff --git a/SConstruct b/SConstruct
index 730af41545..10bf3b3625 100644
--- a/SConstruct
+++ b/SConstruct
@@ -119,23 +119,20 @@ opts.Add('platform','Platform: '+str(platform_list)+'.',"")
 opts.Add('p','Platform (same as platform=).',"")
 opts.Add('tools','Build Tools (Including Editor): (yes/no)','yes')
 opts.Add('gdscript','Build GDSCript support: (yes/no)','yes')
-opts.Add('vorbis','Build Ogg Vorbis Support: (yes/no)','yes')
-opts.Add('opus','Build Opus Audio Format Support: (yes/no)','yes')
+opts.Add('libogg','Ogg library for ogg container support (system/builtin)','builtin')
+opts.Add('libvorbis','Ogg Vorbis library for vorbis support (system/builtin)','builtin')
+opts.Add('libtheora','Theora library for theora module (system/builtin)','builtin')
+opts.Add('opus','Opus and opusfile library for Opus format support: (system/builtin)','builtin')
 opts.Add('minizip','Build Minizip Archive Support: (yes/no)','yes')
-opts.Add('squish','Squish BC Texture Compression in editor (yes/no)','yes')
-opts.Add('theora','Theora Video (yes/no)','yes')
-opts.Add('theoralib','Theora Video (yes/no)','no')
-opts.Add('freetype','Freetype support in editor','builtin')
+opts.Add('squish','Squish library for BC Texture Compression in editor (system/builtin)','builtin')
+opts.Add('freetype','Freetype library for TTF support via freetype module (system/builtin)','builtin')
 opts.Add('xml','XML Save/Load support (yes/no)','yes')
-opts.Add('png','PNG Image loader support (yes/no)','yes')
-opts.Add('jpg','JPG Image loader support (yes/no)','yes')
-opts.Add('webp','WEBP Image loader support (yes/no)','yes')
-opts.Add('dds','DDS Texture loader support (yes/no)','yes')
-opts.Add('pvr','PVR (PowerVR) Texture loader support (yes/no)','yes')
-opts.Add('etc1','etc1 Texture compression support (yes/no)','yes')
-opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes')
-opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no')
-opts.Add('musepack','Musepack Audio (yes/no)','yes')
+opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin')
+opts.Add('libwebp','libwebp library for webp module (system/builtin)','builtin')
+opts.Add('openssl','OpenSSL library for openssl module (system/builtin)','builtin')
+opts.Add('libmpcdec','libmpcdec library for mpc module (system/builtin)','builtin')
+opts.Add('enet','ENet library (system/builtin)','builtin')
+opts.Add('glew','GLEW library for the gl_context (system/builtin)','builtin')
 opts.Add("CXX", "C++ Compiler")
 opts.Add("CC", "C Compiler")
 opts.Add("CCFLAGS", "Custom flags for the C++ compiler");
@@ -157,7 +154,7 @@ for k in platform_opts.keys():
 		opts.Add(o[0],o[1],o[2])
 
 for x in module_list:
-	opts.Add('module_'+x+'_enabled', "Enable module '"+x+"'.", "yes")
+	opts.Add('module_'+x+'_enabled', "Enable module '"+x+"' (yes/no)", "yes")
 
 opts.Update(env_base) # update environment
 Help(opts.GenerateHelpText(env_base)) # generate help
@@ -253,14 +250,6 @@ if selected_platform in platform_list:
 	#must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11)
 	detect.configure(env)
 
-
-	if (env["freetype"]!="no"):
-		env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
-		if (env["freetype"]=="builtin"):
-			env.Append(CPPPATH=['#drivers/freetype'])
-			env.Append(CPPPATH=['#drivers/freetype/freetype/include'])
-
-
 	#env['platform_libsuffix'] = env['LIBSUFFIX']
 
 	suffix="."+selected_platform
@@ -321,46 +310,9 @@ if selected_platform in platform_list:
 	if (env.use_ptrcall):
 		env.Append(CPPFLAGS=['-DPTRCALL_ENABLED']);
 
-	if (env['musepack']=='yes'):
-		env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']);
-
-	#if (env['openssl']!='no'):
-	#	env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
-	#	if (env['openssl']=="builtin"):
-	#		env.Append(CPPPATH=['#drivers/builtin_openssl2'])
-
-	if (env["builtin_zlib"]=='yes'):
-		env.Append(CPPPATH=['#drivers/builtin_zlib/zlib'])
-
 	# to test 64 bits compiltion
 	# env.Append(CPPFLAGS=['-m64'])
 
-	if (env_base['squish']=='yes'):
-		env.Append(CPPFLAGS=['-DSQUISH_ENABLED']);
-
-	if (env['vorbis']=='yes'):
-		env.Append(CPPFLAGS=['-DVORBIS_ENABLED']);
-	if (env['opus']=='yes'):
-		env.Append(CPPFLAGS=['-DOPUS_ENABLED']);
-
-
-	if (env['theora']=='yes'):
-		env['theoralib']='yes'
-		env.Append(CPPFLAGS=['-DTHEORA_ENABLED']);
-	if (env['theoralib']=='yes'):
-		env.Append(CPPFLAGS=['-DTHEORALIB_ENABLED']);
-
-	if (env['png']=='yes'):
-		env.Append(CPPFLAGS=['-DPNG_ENABLED']);
-	if (env['dds']=='yes'):
-		env.Append(CPPFLAGS=['-DDDS_ENABLED']);
-	if (env['pvr']=='yes'):
-		env.Append(CPPFLAGS=['-DPVR_ENABLED']);
-	if (env['jpg']=='yes'):
-		env.Append(CPPFLAGS=['-DJPG_ENABLED']);
-	if (env['webp']=='yes'):
-		env.Append(CPPFLAGS=['-DWEBP_ENABLED']);
-
 	if (env['tools']=='yes'):
 		env.Append(CPPFLAGS=['-DTOOLS_ENABLED'])
 	if (env['disable_3d']=='yes'):
@@ -379,9 +331,6 @@ if selected_platform in platform_list:
 	if (env['colored']=='yes'):
 		methods.colored(sys,env)
 
-	if (env['etc1']=='yes'):
-		env.Append(CPPFLAGS=['-DETC1_ENABLED'])
-
 	Export('env')
 
 	#build subdirs, the build order is dependent on link order.
diff --git a/drivers/SCsub b/drivers/SCsub
index 5d3c071296..c496f46a1f 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -1,78 +1,47 @@
 Import('env')
 
-env_drivers = env.Clone()
-
 env.drivers_sources=[]
-#env.add_source_files(env.drivers_sources,"*.cpp")
-env_drivers.Append(CPPPATH=["vorbis"])
 
-Export('env_drivers')
+if ("builtin_zlib" in env and env["builtin_zlib"] == "yes"):
+	SConscript("zlib/SCsub");
 
+# OS drivers
 SConscript('unix/SCsub');
+SConscript('windows/SCsub');
+
+# Sounds drivers
 SConscript('alsa/SCsub');
 SConscript('pulseaudio/SCsub');
-SConscript('windows/SCsub');
+if (env["platform"] == "windows"):
+	SConscript("rtaudio/SCsub");
+
+# Graphics drivers
 SConscript('gles2/SCsub');
 SConscript('gl_context/SCsub');
-SConscript('pnm/SCsub');
-
-if (env['openssl']!='no'):
-	env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
-	env_drivers.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
-	if (env['openssl']=="builtin"):
-		env_drivers.Append(CPPPATH=['#drivers/builtin_openssl2'])
-		SConscript("builtin_openssl2/SCsub");
-
-	SConscript('openssl/SCsub')
-
-
-if (env["png"]=="yes"):
-	SConscript("png/SCsub");
-if (env["jpg"]=="yes"):
-	#SConscript("jpg/SCsub");
-	SConscript("jpegd/SCsub");
-if (env["webp"]=="yes"):
-	SConscript("webp/SCsub");
-SConscript("dds/SCsub");
-SConscript("pvr/SCsub");
-SConscript("etc1/SCsub")
-if (env["builtin_zlib"]=="yes"):
-	SConscript("builtin_zlib/SCsub");
-
-SConscript("rtaudio/SCsub");
+
+# Core dependencies
+SConscript("png/SCsub");
 SConscript("nrex/SCsub");
-SConscript("chibi/SCsub");
-if (env["vorbis"]=="yes" or env["theoralib"]=="yes" or env["opus"]=="yes"):
-        SConscript("ogg/SCsub");
-if (env["vorbis"]=="yes"):
-        SConscript("vorbis/SCsub");
-if (env["opus"]=="yes"):
-	SConscript('opus/SCsub');
+
+# Tools override
+# FIXME: Should likely be integrated in the tools/ codebase
 if (env["tools"]=="yes"):
 	SConscript("convex_decomp/SCsub");
 
-if (env["theoralib"]=="yes"):
-	SConscript("theora/SCsub");
-if (env['musepack']=='yes'):
-	SConscript("mpc/SCsub");
-if (env["squish"]=="yes" and env["tools"]=="yes"):
-	SConscript("squish/SCsub");
-if (env["freetype"]!="no"):
-	SConscript("freetype/SCsub");
-
-num = 0
-cur_base = ""
-total = len(env.drivers_sources)
-max_src = 64
-list = []
-lib_list = []
-
-import string
-
 if env['vsproj']=="yes":
 	env.AddToVSProject(env.drivers_sources)
 
-if (env.split_drivers): #split drivers, this used to be needed for windows until separate builders for windows were created
+
+# Split drivers, this used to be needed for windows until separate builders for windows were created
+# FIXME: Check if still needed now that the drivers were made more lightweight
+if (env.split_drivers):
+	import string
+
+	num = 0
+	cur_base = ""
+	max_src = 64
+	list = []
+	lib_list = []
 
 	for f in env.drivers_sources:
 		fname = ""
@@ -84,14 +53,14 @@ if (env.split_drivers): #split drivers, this used to be needed for windows until
 		base = string.join(fname.split("/")[:2], "/")
 		if base != cur_base and len(list) > max_src:
 			if num > 0:
-				lib = env_drivers.Library("drivers"+str(num), list)
+				lib = env.Library("drivers"+str(num), list)
 				lib_list.append(lib)
 				list = []
 			num = num+1
 		cur_base = base
 		list.append(f)
 
-	lib = env_drivers.Library("drivers"+str(num), list)
+	lib = env.Library("drivers"+str(num), list)
 	lib_list.append(lib)
 
 	if len(lib_list) > 0:
@@ -99,15 +68,15 @@ if (env.split_drivers): #split drivers, this used to be needed for windows until
 		if os.name=='posix' and sys.platform=='msys':
 			env.Replace(ARFLAGS=['rcsT'])
 
-			lib = env_drivers.Library("drivers_collated", lib_list)
+			lib = env.Library("drivers_collated", lib_list)
 			lib_list = [lib]
 
 	drivers_base=[]
-	env_drivers.add_source_files(drivers_base,"*.cpp")
-	lib_list.insert(0, env_drivers.Library("drivers", drivers_base))
+	env.add_source_files(drivers_base,"*.cpp")
+	lib_list.insert(0, env.Library("drivers", drivers_base))
 
 	env.Prepend(LIBS=lib_list)
 else:
-	env_drivers.add_source_files(env.drivers_sources,"*.cpp")
-	lib = env_drivers.Library("drivers",env.drivers_sources)
+	env.add_source_files(env.drivers_sources,"*.cpp")
+	lib = env.Library("drivers",env.drivers_sources)
 	env.Prepend(LIBS=[lib])
diff --git a/drivers/alsa/SCsub b/drivers/alsa/SCsub
index 9fbb467baa..0582e01978 100644
--- a/drivers/alsa/SCsub
+++ b/drivers/alsa/SCsub
@@ -1,5 +1,5 @@
 Import('env')
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+env.add_source_files(env.drivers_sources, "*.cpp")
 
 Export('env')
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub
deleted file mode 100644
index 0c035cc4a5..0000000000
--- a/drivers/builtin_openssl2/SCsub
+++ /dev/null
@@ -1,663 +0,0 @@
-Import('env')
-Import('env_drivers')
-
-openssl_sources = [
-"ssl/t1_lib.c",
-"ssl/t1_ext.c",
-"ssl/s3_srvr.c",
-"ssl/t1_enc.c",
-"ssl/t1_meth.c",
-"ssl/s23_clnt.c",
-"ssl/ssl_asn1.c",
-"ssl/tls_srp.c",
-"ssl/kssl.c",
-"ssl/d1_both.c",
-"ssl/t1_clnt.c",
-"ssl/bio_ssl.c",
-"ssl/d1_srtp.c",
-"ssl/t1_reneg.c",
-"ssl/ssl_cert.c",
-"ssl/s3_lib.c",
-"ssl/d1_srvr.c",
-"ssl/s23_meth.c",
-"ssl/ssl_stat.c",
-"ssl/ssl_err.c",
-"ssl/ssl_algs.c",
-"ssl/s3_cbc.c",
-"ssl/d1_clnt.c",
-"ssl/s3_pkt.c",
-"ssl/d1_meth.c",
-"ssl/s3_both.c",
-"ssl/s2_enc.c",
-"ssl/s3_meth.c",
-"ssl/s3_enc.c",
-"ssl/s23_pkt.c",
-"ssl/s2_pkt.c",
-"ssl/d1_pkt.c",
-"ssl/ssl_rsa.c",
-"ssl/s23_srvr.c",
-"ssl/s2_meth.c",
-"ssl/s3_clnt.c",
-"ssl/s23_lib.c",
-"ssl/t1_srvr.c",
-"ssl/ssl_lib.c",
-"ssl/ssl_txt.c",
-"ssl/s2_srvr.c",
-"ssl/ssl_sess.c",
-"ssl/s2_clnt.c",
-"ssl/d1_lib.c",
-"ssl/s2_lib.c",
-"ssl/ssl_err2.c",
-"ssl/ssl_ciph.c",
-"crypto/dsa/dsa_lib.c",
-"crypto/dsa/dsa_pmeth.c",
-"crypto/dsa/dsa_ossl.c",
-"crypto/dsa/dsa_gen.c",
-"crypto/dsa/dsa_asn1.c",
-"crypto/dsa/dsa_prn.c",
-"crypto/dsa/dsa_sign.c",
-"crypto/dsa/dsa_key.c",
-"crypto/dsa/dsa_vrf.c",
-"crypto/dsa/dsa_err.c",
-"crypto/dsa/dsa_ameth.c",
-"crypto/dsa/dsa_depr.c",
-"crypto/x509/x509_lu.c",
-"crypto/x509/x509cset.c",
-"crypto/x509/x509_set.c",
-"crypto/x509/x509_d2.c",
-"crypto/x509/x509_txt.c",
-"crypto/x509/x509rset.c",
-"crypto/x509/by_dir.c",
-"crypto/x509/x509_vpm.c",
-"crypto/x509/x509_vfy.c",
-"crypto/x509/x509_trs.c",
-"crypto/x509/by_file.c",
-"crypto/x509/x509_obj.c",
-"crypto/x509/x509spki.c",
-"crypto/x509/x509_v3.c",
-"crypto/x509/x509_req.c",
-"crypto/x509/x509_att.c",
-"crypto/x509/x_all.c",
-"crypto/x509/x509_ext.c",
-"crypto/x509/x509type.c",
-"crypto/x509/x509_def.c",
-"crypto/x509/x509_err.c",
-"crypto/x509/x509name.c",
-"crypto/x509/x509_r2x.c",
-"crypto/x509/x509_cmp.c",
-"crypto/asn1/x_pkey.c",
-"crypto/asn1/a_gentm.c",
-"crypto/asn1/x_sig.c",
-"crypto/asn1/t_req.c",
-"crypto/asn1/t_pkey.c",
-"crypto/asn1/p8_pkey.c",
-"crypto/asn1/a_i2d_fp.c",
-"crypto/asn1/x_val.c",
-"crypto/asn1/f_string.c",
-"crypto/asn1/p5_pbe.c",
-"crypto/asn1/bio_ndef.c",
-"crypto/asn1/a_bool.c",
-"crypto/asn1/asn1_gen.c",
-"crypto/asn1/x_algor.c",
-"crypto/asn1/bio_asn1.c",
-"crypto/asn1/asn_mime.c",
-"crypto/asn1/t_x509.c",
-"crypto/asn1/a_strex.c",
-"crypto/asn1/x_nx509.c",
-"crypto/asn1/asn1_err.c",
-"crypto/asn1/x_crl.c",
-"crypto/asn1/a_print.c",
-"crypto/asn1/a_type.c",
-"crypto/asn1/tasn_new.c",
-"crypto/asn1/n_pkey.c",
-"crypto/asn1/x_bignum.c",
-"crypto/asn1/asn_pack.c",
-"crypto/asn1/evp_asn1.c",
-"crypto/asn1/t_bitst.c",
-"crypto/asn1/x_req.c",
-"crypto/asn1/a_time.c",
-"crypto/asn1/x_name.c",
-"crypto/asn1/x_pubkey.c",
-"crypto/asn1/tasn_typ.c",
-"crypto/asn1/asn_moid.c",
-"crypto/asn1/a_utctm.c",
-"crypto/asn1/asn1_lib.c",
-"crypto/asn1/x_x509a.c",
-"crypto/asn1/a_set.c",
-"crypto/asn1/t_crl.c",
-"crypto/asn1/p5_pbev2.c",
-"crypto/asn1/tasn_enc.c",
-"crypto/asn1/a_mbstr.c",
-"crypto/asn1/tasn_dec.c",
-"crypto/asn1/x_x509.c",
-"crypto/asn1/a_octet.c",
-"crypto/asn1/x_long.c",
-"crypto/asn1/a_bytes.c",
-"crypto/asn1/t_x509a.c",
-"crypto/asn1/a_enum.c",
-"crypto/asn1/a_int.c",
-"crypto/asn1/tasn_prn.c",
-"crypto/asn1/i2d_pr.c",
-"crypto/asn1/a_utf8.c",
-"crypto/asn1/t_spki.c",
-"crypto/asn1/a_digest.c",
-"crypto/asn1/a_dup.c",
-"crypto/asn1/i2d_pu.c",
-"crypto/asn1/a_verify.c",
-"crypto/asn1/f_enum.c",
-"crypto/asn1/a_sign.c",
-"crypto/asn1/d2i_pr.c",
-"crypto/asn1/asn1_par.c",
-"crypto/asn1/x_spki.c",
-"crypto/asn1/a_d2i_fp.c",
-"crypto/asn1/f_int.c",
-"crypto/asn1/x_exten.c",
-"crypto/asn1/tasn_utl.c",
-"crypto/asn1/nsseq.c",
-"crypto/asn1/a_bitstr.c",
-"crypto/asn1/x_info.c",
-"crypto/asn1/a_strnid.c",
-"crypto/asn1/a_object.c",
-"crypto/asn1/tasn_fre.c",
-"crypto/asn1/d2i_pu.c",
-"crypto/asn1/ameth_lib.c",
-"crypto/asn1/x_attrib.c",
-"crypto/evp/m_sha.c",
-"crypto/evp/e_camellia.c",
-"crypto/evp/e_aes.c",
-"crypto/evp/bio_b64.c",
-"crypto/evp/m_sigver.c",
-"crypto/evp/m_wp.c",
-"crypto/evp/m_sha1.c",
-"crypto/evp/p_seal.c",
-"crypto/evp/c_alld.c",
-"crypto/evp/p5_crpt.c",
-"crypto/evp/e_rc4.c",
-"crypto/evp/m_ecdsa.c",
-"crypto/evp/bio_enc.c",
-"crypto/evp/e_des3.c",
-"crypto/evp/m_null.c",
-"crypto/evp/bio_ok.c",
-"crypto/evp/pmeth_gn.c",
-"crypto/evp/e_rc5.c",
-"crypto/evp/e_rc2.c",
-"crypto/evp/p_dec.c",
-"crypto/evp/p_verify.c",
-"crypto/evp/e_rc4_hmac_md5.c",
-"crypto/evp/pmeth_lib.c",
-"crypto/evp/m_ripemd.c",
-"crypto/evp/m_md5.c",
-"crypto/evp/e_bf.c",
-"crypto/evp/p_enc.c",
-"crypto/evp/m_dss.c",
-"crypto/evp/bio_md.c",
-"crypto/evp/evp_pbe.c",
-"crypto/evp/e_seed.c",
-"crypto/evp/e_cast.c",
-"crypto/evp/p_open.c",
-"crypto/evp/p5_crpt2.c",
-"crypto/evp/m_dss1.c",
-"crypto/evp/names.c",
-"crypto/evp/evp_acnf.c",
-"crypto/evp/e_des.c",
-"crypto/evp/evp_cnf.c",
-"crypto/evp/evp_lib.c",
-"crypto/evp/digest.c",
-"crypto/evp/evp_err.c",
-"crypto/evp/evp_enc.c",
-"crypto/evp/e_old.c",
-"crypto/evp/c_all.c",
-"crypto/evp/m_md2.c",
-"crypto/evp/e_xcbc_d.c",
-"crypto/evp/pmeth_fn.c",
-"crypto/evp/p_lib.c",
-"crypto/evp/evp_key.c",
-"crypto/evp/encode.c",
-"crypto/evp/e_aes_cbc_hmac_sha1.c",
-"crypto/evp/e_aes_cbc_hmac_sha256.c",
-"crypto/evp/m_mdc2.c",
-"crypto/evp/e_null.c",
-"crypto/evp/p_sign.c",
-"crypto/evp/e_idea.c",
-"crypto/evp/c_allc.c",
-"crypto/evp/evp_pkey.c",
-"crypto/evp/m_md4.c",
-"crypto/ex_data.c",
-"crypto/pkcs12/p12_p8e.c",
-"crypto/pkcs12/p12_crt.c",
-"crypto/pkcs12/p12_utl.c",
-"crypto/pkcs12/p12_attr.c",
-"crypto/pkcs12/p12_npas.c",
-"crypto/pkcs12/p12_decr.c",
-"crypto/pkcs12/p12_init.c",
-"crypto/pkcs12/p12_kiss.c",
-"crypto/pkcs12/p12_add.c",
-"crypto/pkcs12/p12_p8d.c",
-"crypto/pkcs12/p12_mutl.c",
-"crypto/pkcs12/p12_crpt.c",
-"crypto/pkcs12/pk12err.c",
-"crypto/pkcs12/p12_asn.c",
-"crypto/pkcs12/p12_key.c",
-"crypto/ecdh/ech_key.c",
-"crypto/ecdh/ech_ossl.c",
-"crypto/ecdh/ech_lib.c",
-"crypto/ecdh/ech_err.c",
-"crypto/ecdh/ech_kdf.c",
-"crypto/o_str.c",
-"crypto/conf/conf_api.c",
-"crypto/conf/conf_err.c",
-"crypto/conf/conf_def.c",
-"crypto/conf/conf_lib.c",
-"crypto/conf/conf_mall.c",
-"crypto/conf/conf_sap.c",
-"crypto/conf/conf_mod.c",
-"crypto/ebcdic.c",
-"crypto/ecdsa/ecs_lib.c",
-"crypto/ecdsa/ecs_asn1.c",
-"crypto/ecdsa/ecs_ossl.c",
-"crypto/ecdsa/ecs_vrf.c",
-"crypto/ecdsa/ecs_sign.c",
-"crypto/ecdsa/ecs_err.c",
-"crypto/dso/dso_win32.c",
-"crypto/dso/dso_lib.c",
-"crypto/dso/dso_dlfcn.c",
-"crypto/dso/dso_dl.c",
-"crypto/dso/dso_beos.c",
-"crypto/dso/dso_null.c",
-"crypto/dso/dso_vms.c",
-"crypto/dso/dso_err.c",
-"crypto/dso/dso_openssl.c",
-"crypto/cryptlib.c",
-"crypto/md5/md5_one.c",
-"crypto/md5/md5_dgst.c",
-"crypto/pkcs7/pkcs7err.c",
-"crypto/pkcs7/pk7_smime.c",
-"crypto/pkcs7/bio_pk7.c",
-"crypto/pkcs7/pk7_mime.c",
-"crypto/pkcs7/pk7_lib.c",
-"crypto/pkcs7/pk7_asn1.c",
-"crypto/pkcs7/pk7_doit.c",
-"crypto/pkcs7/pk7_attr.c",
-"crypto/md4/md4_one.c",
-"crypto/md4/md4_dgst.c",
-"crypto/o_dir.c",
-"crypto/buffer/buf_err.c",
-"crypto/buffer/buf_str.c",
-"crypto/buffer/buffer.c",
-"crypto/cms/cms_lib.c",
-"crypto/cms/cms_io.c",
-"crypto/cms/cms_err.c",
-"crypto/cms/cms_dd.c",
-"crypto/cms/cms_smime.c",
-"crypto/cms/cms_att.c",
-"crypto/cms/cms_pwri.c",
-"crypto/cms/cms_cd.c",
-"crypto/cms/cms_sd.c",
-"crypto/cms/cms_asn1.c",
-"crypto/cms/cms_env.c",
-"crypto/cms/cms_enc.c",
-"crypto/cms/cms_ess.c",
-"crypto/cms/cms_kari.c",
-"crypto/mem_dbg.c",
-"crypto/uid.c",
-"crypto/stack/stack.c",
-"crypto/ec/ec_ameth.c",
-"crypto/ec/ec_err.c",
-"crypto/ec/ec_lib.c",
-"crypto/ec/ec_curve.c",
-"crypto/ec/ec_oct.c",
-"crypto/ec/ec_asn1.c",
-"crypto/ec/ecp_oct.c",
-"crypto/ec/ec_print.c",
-"crypto/ec/ec2_smpl.c",
-"crypto/ec/ecp_nistp224.c",
-"crypto/ec/ec2_oct.c",
-"crypto/ec/eck_prn.c",
-"crypto/ec/ec_key.c",
-"crypto/ec/ecp_nist.c",
-"crypto/ec/ec_check.c",
-"crypto/ec/ecp_smpl.c",
-"crypto/ec/ec2_mult.c",
-"crypto/ec/ecp_mont.c",
-"crypto/ec/ecp_nistp521.c",
-"crypto/ec/ec_mult.c",
-"crypto/ec/ecp_nistputil.c",
-"crypto/ec/ec_pmeth.c",
-"crypto/ec/ec_cvt.c",
-"crypto/ec/ecp_nistp256.c",
-"crypto/krb5/krb5_asn.c",
-"crypto/hmac/hmac.c",
-"crypto/hmac/hm_ameth.c",
-"crypto/hmac/hm_pmeth.c",
-"crypto/comp/c_rle.c",
-"crypto/comp/c_zlib.c",
-"crypto/comp/comp_lib.c",
-"crypto/comp/comp_err.c",
-"crypto/des/fcrypt.c",
-"crypto/des/str2key.c",
-"crypto/des/cbc_cksm.c",
-"crypto/des/des_enc.c",
-"crypto/des/ofb_enc.c",
-"crypto/des/read2pwd.c",
-"crypto/des/ecb3_enc.c",
-"crypto/des/rand_key.c",
-"crypto/des/cfb64ede.c",
-"crypto/des/rpc_enc.c",
-"crypto/des/ofb64ede.c",
-"crypto/des/qud_cksm.c",
-"crypto/des/enc_writ.c",
-"crypto/des/set_key.c",
-"crypto/des/xcbc_enc.c",
-"crypto/des/fcrypt_b.c",
-"crypto/des/ede_cbcm_enc.c",
-"crypto/des/des_old2.c",
-"crypto/des/cfb_enc.c",
-"crypto/des/ecb_enc.c",
-"crypto/des/enc_read.c",
-"crypto/des/des_old.c",
-"crypto/des/ofb64enc.c",
-"crypto/des/pcbc_enc.c",
-"crypto/des/cbc_enc.c",
-"crypto/des/cfb64enc.c",
-"crypto/lhash/lh_stats.c",
-"crypto/lhash/lhash.c",
-"crypto/x509v3/v3_genn.c",
-"crypto/x509v3/pcy_cache.c",
-"crypto/x509v3/v3_sxnet.c",
-"crypto/x509v3/v3_scts.c",
-"crypto/x509v3/v3err.c",
-"crypto/x509v3/v3_conf.c",
-"crypto/x509v3/v3_utl.c",
-"crypto/x509v3/v3_akeya.c",
-"crypto/x509v3/v3_lib.c",
-"crypto/x509v3/pcy_lib.c",
-"crypto/x509v3/v3_cpols.c",
-"crypto/x509v3/v3_ia5.c",
-"crypto/x509v3/v3_bitst.c",
-"crypto/x509v3/v3_skey.c",
-"crypto/x509v3/v3_info.c",
-"crypto/x509v3/v3_asid.c",
-"crypto/x509v3/pcy_tree.c",
-"crypto/x509v3/v3_pcons.c",
-"crypto/x509v3/v3_bcons.c",
-"crypto/x509v3/v3_pku.c",
-"crypto/x509v3/v3_ocsp.c",
-"crypto/x509v3/pcy_map.c",
-"crypto/x509v3/v3_ncons.c",
-"crypto/x509v3/v3_purp.c",
-"crypto/x509v3/v3_enum.c",
-"crypto/x509v3/v3_pmaps.c",
-"crypto/x509v3/pcy_node.c",
-"crypto/x509v3/v3_pcia.c",
-"crypto/x509v3/v3_crld.c",
-"crypto/x509v3/v3_pci.c",
-"crypto/x509v3/v3_akey.c",
-"crypto/x509v3/v3_addr.c",
-"crypto/x509v3/v3_int.c",
-"crypto/x509v3/v3_alt.c",
-"crypto/x509v3/v3_extku.c",
-"crypto/x509v3/v3_prn.c",
-"crypto/x509v3/pcy_data.c",
-"crypto/aes/aes_ofb.c",
-"crypto/aes/aes_ctr.c",
-"crypto/aes/aes_ecb.c",
-"crypto/aes/aes_cfb.c",
-"crypto/aes/aes_wrap.c",
-"crypto/aes/aes_ige.c",
-"crypto/aes/aes_misc.c",
-"crypto/pqueue/pqueue.c",
-"crypto/sha/sha_one.c",
-"crypto/sha/sha_dgst.c",
-"crypto/sha/sha512.c",
-"crypto/sha/sha1_one.c",
-"crypto/sha/sha1dgst.c",
-"crypto/sha/sha256.c",
-"crypto/whrlpool/wp_dgst.c",
-"crypto/objects/obj_xref.c",
-"crypto/objects/o_names.c",
-"crypto/objects/obj_err.c",
-"crypto/objects/obj_dat.c",
-"crypto/objects/obj_lib.c",
-"crypto/mem.c",
-"crypto/fips_ers.c",
-"crypto/o_fips.c",
-"crypto/engine/eng_rdrand.c",
-"crypto/engine/eng_err.c",
-"crypto/engine/tb_ecdsa.c",
-"crypto/engine/tb_rsa.c",
-"crypto/engine/tb_cipher.c",
-"crypto/engine/tb_dsa.c",
-"crypto/engine/eng_lib.c",
-"crypto/engine/tb_asnmth.c",
-"crypto/engine/tb_ecdh.c",
-"crypto/engine/tb_dh.c",
-"crypto/engine/tb_store.c",
-"crypto/engine/eng_init.c",
-"crypto/engine/eng_cnf.c",
-"crypto/engine/eng_all.c",
-"crypto/engine/tb_digest.c",
-"crypto/engine/tb_pkmeth.c",
-"crypto/engine/eng_table.c",
-"crypto/engine/eng_ctrl.c",
-"crypto/engine/eng_list.c",
-"crypto/engine/eng_cryptodev.c",
-"crypto/engine/eng_pkey.c",
-"crypto/engine/tb_rand.c",
-"crypto/engine/eng_openssl.c",
-"crypto/engine/eng_fat.c",
-"crypto/engine/eng_dyn.c",
-"crypto/ts/ts_rsp_verify.c",
-"crypto/ts/ts_req_print.c",
-"crypto/ts/ts_verify_ctx.c",
-"crypto/ts/ts_req_utils.c",
-"crypto/ts/ts_err.c",
-"crypto/ts/ts_rsp_print.c",
-"crypto/ts/ts_rsp_utils.c",
-"crypto/ts/ts_lib.c",
-"crypto/ts/ts_conf.c",
-"crypto/ts/ts_asn1.c",
-"crypto/ts/ts_rsp_sign.c",
-"crypto/ocsp/ocsp_ext.c",
-"crypto/ocsp/ocsp_cl.c",
-"crypto/ocsp/ocsp_ht.c",
-"crypto/ocsp/ocsp_lib.c",
-"crypto/ocsp/ocsp_srv.c",
-"crypto/ocsp/ocsp_vfy.c",
-"crypto/ocsp/ocsp_err.c",
-"crypto/ocsp/ocsp_prn.c",
-"crypto/ocsp/ocsp_asn.c",
-"crypto/bf/bf_cfb64.c",
-"crypto/bf/bf_ecb.c",
-"crypto/bf/bf_enc.c",
-"crypto/bf/bf_skey.c",
-"crypto/bf/bf_ofb64.c",
-"crypto/idea/i_skey.c",
-"crypto/idea/i_ofb64.c",
-"crypto/idea/i_cbc.c",
-"crypto/idea/i_ecb.c",
-"crypto/idea/i_cfb64.c",
-"crypto/cmac/cm_ameth.c",
-"crypto/cmac/cmac.c",
-"crypto/cmac/cm_pmeth.c",
-"crypto/dh/dh_lib.c",
-"crypto/dh/dh_key.c",
-"crypto/dh/dh_asn1.c",
-"crypto/dh/dh_depr.c",
-"crypto/dh/dh_pmeth.c",
-"crypto/dh/dh_prn.c",
-"crypto/dh/dh_gen.c",
-"crypto/dh/dh_ameth.c",
-"crypto/dh/dh_check.c",
-"crypto/dh/dh_err.c",
-"crypto/dh/dh_kdf.c",
-"crypto/dh/dh_rfc5114.c",
-"crypto/modes/ccm128.c",
-"crypto/modes/ofb128.c",
-"crypto/modes/cts128.c",
-"crypto/modes/ctr128.c",
-"crypto/modes/gcm128.c",
-"crypto/modes/cbc128.c",
-"crypto/modes/cfb128.c",
-"crypto/modes/xts128.c",
-"crypto/modes/wrap128.c",
-"crypto/camellia/cmll_cfb.c",
-"crypto/camellia/cmll_ecb.c",
-"crypto/camellia/cmll_utl.c",
-"crypto/camellia/cmll_misc.c",
-"crypto/camellia/cmll_ofb.c",
-"crypto/camellia/cmll_ctr.c",
-"crypto/seed/seed_ecb.c",
-"crypto/seed/seed_cbc.c",
-"crypto/seed/seed.c",
-"crypto/seed/seed_ofb.c",
-"crypto/seed/seed_cfb.c",
-"crypto/txt_db/txt_db.c",
-"crypto/cpt_err.c",
-"crypto/pem/pem_pk8.c",
-"crypto/pem/pem_lib.c",
-"crypto/pem/pem_sign.c",
-"crypto/pem/pem_all.c",
-"crypto/pem/pem_info.c",
-"crypto/pem/pem_pkey.c",
-"crypto/pem/pem_seal.c",
-"crypto/pem/pem_err.c",
-"crypto/pem/pem_xaux.c",
-"crypto/pem/pvkfmt.c",
-"crypto/pem/pem_x509.c",
-"crypto/pem/pem_oth.c",
-"crypto/rand/rand_lib.c",
-"crypto/rand/randfile.c",
-"crypto/rand/rand_os2.c",
-"crypto/rand/rand_unix.c",
-"crypto/rand/rand_nw.c",
-"crypto/rand/md_rand.c",
-"crypto/rand/rand_err.c",
-"crypto/rand/rand_win.c",
-"crypto/rand/rand_egd.c",
-"crypto/cversion.c",
-"crypto/cast/c_ecb.c",
-"crypto/cast/c_skey.c",
-"crypto/cast/c_ofb64.c",
-"crypto/cast/c_enc.c",
-"crypto/cast/c_cfb64.c",
-"crypto/o_time.c",
-"crypto/mdc2/mdc2dgst.c",
-"crypto/mdc2/mdc2_one.c",
-"crypto/rc4/rc4_utl.c",
-"crypto/ui/ui_compat.c",
-"crypto/ui/ui_util.c",
-"crypto/ui/ui_lib.c",
-"crypto/ui/ui_err.c",
-"crypto/ui/ui_openssl.c",
-"crypto/bio/bf_buff.c",
-"crypto/bio/bss_null.c",
-"crypto/bio/bss_acpt.c",
-"crypto/bio/bss_conn.c",
-"crypto/bio/bss_fd.c",
-"crypto/bio/bf_null.c",
-"crypto/bio/bio_err.c",
-"crypto/bio/bss_sock.c",
-"crypto/bio/bss_mem.c",
-"crypto/bio/b_dump.c",
-"crypto/bio/b_print.c",
-"crypto/bio/b_sock.c",
-"crypto/bio/bss_dgram.c",
-"crypto/bio/bf_nbio.c",
-"crypto/bio/bio_lib.c",
-"crypto/bio/bss_file.c",
-"crypto/bio/bss_bio.c",
-"crypto/bio/bss_log.c",
-"crypto/bio/bio_cb.c",
-"crypto/o_init.c",
-"crypto/rc2/rc2_skey.c",
-"crypto/rc2/rc2_cbc.c",
-"crypto/rc2/rc2cfb64.c",
-"crypto/rc2/rc2_ecb.c",
-"crypto/rc2/rc2ofb64.c",
-"crypto/bn/bn_x931p.c",
-"crypto/bn/bn_blind.c",
-"crypto/bn/bn_gf2m.c",
-"crypto/bn/bn_const.c",
-"crypto/bn/bn_sqr.c",
-"crypto/bn/bn_nist.c",
-"crypto/bn/bn_rand.c",
-"crypto/bn/bn_err.c",
-"crypto/bn/bn_div.c",
-"crypto/bn/bn_kron.c",
-"crypto/bn/bn_ctx.c",
-"crypto/bn/bn_shift.c",
-"crypto/bn/bn_mod.c",
-"crypto/bn/bn_exp2.c",
-"crypto/bn/bn_word.c",
-"crypto/bn/bn_add.c",
-"crypto/bn/bn_exp.c",
-"crypto/bn/bn_mont.c",
-"crypto/bn/bn_print.c",
-"crypto/bn/bn_mul.c",
-"crypto/bn/bn_prime.c",
-"crypto/bn/bn_depr.c",
-"crypto/bn/bn_gcd.c",
-"crypto/bn/bn_mpi.c",
-"crypto/bn/bn_sqrt.c",
-"crypto/bn/bn_recp.c",
-"crypto/bn/bn_lib.c",
-"crypto/ripemd/rmd_dgst.c",
-"crypto/ripemd/rmd_one.c",
-"crypto/rsa/rsa_x931.c",
-"crypto/rsa/rsa_depr.c",
-"crypto/rsa/rsa_saos.c",
-"crypto/rsa/rsa_crpt.c",
-"crypto/rsa/rsa_pss.c",
-"crypto/rsa/rsa_oaep.c",
-"crypto/rsa/rsa_null.c",
-"crypto/rsa/rsa_gen.c",
-"crypto/rsa/rsa_prn.c",
-"crypto/rsa/rsa_pmeth.c",
-"crypto/rsa/rsa_asn1.c",
-"crypto/rsa/rsa_ssl.c",
-"crypto/rsa/rsa_ameth.c",
-"crypto/rsa/rsa_pk1.c",
-"crypto/rsa/rsa_err.c",
-"crypto/rsa/rsa_lib.c",
-"crypto/rsa/rsa_none.c",
-"crypto/rsa/rsa_chk.c",
-"crypto/rsa/rsa_eay.c",
-"crypto/rsa/rsa_sign.c",
-"crypto/srp/srp_lib.c",
-"crypto/srp/srp_vfy.c",
-"crypto/err/err.c",
-"crypto/err/err_prn.c",
-"crypto/err/err_all.c",
-"crypto/mem_clr.c",
-"crypto/rc4/rc4_skey.c",
-"crypto/rc4/rc4_enc.c",
-"crypto/camellia/camellia.c",
-"crypto/camellia/cmll_cbc.c",
-#"crypto/aes/aes_x86core.c",
-"crypto/aes/aes_core.c",
-"crypto/aes/aes_cbc.c",
-"crypto/whrlpool/wp_block.c",
-"crypto/bn/bn_asm.c",
-]
-
-#env.drivers_sources+=openssl_sources
-
-env.Append(CPPPATH=["#drivers/builtin_openssl2"])
-env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"])
-env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"])
-env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"])
-env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"])
-env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"])
-#env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
-env_drivers.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
-
-if "platform" in env and env["platform"] == "winrt":
-	openssl_sources += ['winrt.cpp']
-
-# Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517)
-import os
-import methods
-if not (os.name=="nt" and methods.msvc_is_detected() ): # not Windows and not MSVC
-	env_drivers.Append(CFLAGS=["-Wno-error=implicit-function-declaration"])
-
-env_drivers.add_source_files(env.drivers_sources,openssl_sources)
diff --git a/drivers/builtin_zlib/SCsub b/drivers/builtin_zlib/SCsub
deleted file mode 100644
index e5c81c0b3b..0000000000
--- a/drivers/builtin_zlib/SCsub
+++ /dev/null
@@ -1,22 +0,0 @@
-Import('env')
-
-zlib_sources = [
-
-	"builtin_zlib/zlib/adler32.c",
-	"builtin_zlib/zlib/compress.c",
-	"builtin_zlib/zlib/crc32.c",
-	"builtin_zlib/zlib/deflate.c",
-	"builtin_zlib/zlib/infback.c",
-	"builtin_zlib/zlib/inffast.c",
-	"builtin_zlib/zlib/inflate.c",
-	"builtin_zlib/zlib/inftrees.c",
-	"builtin_zlib/zlib/trees.c",
-	"builtin_zlib/zlib/uncompr.c",
-	"builtin_zlib/zlib/zutil.c",
-	]
-
-
-env.drivers_sources+=zlib_sources
-
-#env.add_source_files("core", png_sources)
-Export('env')
diff --git a/drivers/chibi/SCsub b/drivers/chibi/SCsub
deleted file mode 100644
index 9fbb467baa..0000000000
--- a/drivers/chibi/SCsub
+++ /dev/null
@@ -1,5 +0,0 @@
-Import('env')
-
-env.add_source_files(env.drivers_sources,"*.cpp")
-
-Export('env')
diff --git a/drivers/convex_decomp/SCsub b/drivers/convex_decomp/SCsub
index 6699efef75..0582e01978 100644
--- a/drivers/convex_decomp/SCsub
+++ b/drivers/convex_decomp/SCsub
@@ -1,4 +1,5 @@
 Import('env')
-Export('env');
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+env.add_source_files(env.drivers_sources, "*.cpp")
+
+Export('env')
diff --git a/drivers/dds/SCsub b/drivers/dds/SCsub
deleted file mode 100644
index 159829384f..0000000000
--- a/drivers/dds/SCsub
+++ /dev/null
@@ -1,10 +0,0 @@
-Import('env')
-
-
-dds_sources = [
-	"dds/texture_loader_dds.cpp"
-	]
-
-env.drivers_sources+=dds_sources
-
-#env.add_source_files(env.drivers_sources, dds_sources)
diff --git a/drivers/etc1/SCsub b/drivers/etc1/SCsub
deleted file mode 100644
index 2b9dc1b31c..0000000000
--- a/drivers/etc1/SCsub
+++ /dev/null
@@ -1,15 +0,0 @@
-Import('env')
-
-
-etc_sources = [
-	"etc1/image_etc.cpp",
-	"etc1/rg_etc1.cpp",
-	"etc1/texture_loader_pkm.cpp"
-]
-
-if (env["etc1"] != "no"):
-    env.drivers_sources+=etc_sources
-
-#env.add_source_files(env.drivers_sources, etc_sources)
-
-Export('env')
diff --git a/drivers/freetype/SCsub b/drivers/freetype/SCsub
deleted file mode 100644
index 4ddc785088..0000000000
--- a/drivers/freetype/SCsub
+++ /dev/null
@@ -1,73 +0,0 @@
-Import('env')
-
-ft_sources=[\
-"src/autofit/autofit.c",\
-"src/base/ftapi.c",\
-"src/base/ftbase.c",\
-"src/base/ftbbox.c",\
-"src/base/ftbdf.c",\
-"src/base/ftbitmap.c",\
-"src/base/ftcid.c",\
-"src/base/ftdebug.c",\
-"src/base/ftfntfmt.c",\
-"src/base/ftfstype.c",\
-"src/base/ftgasp.c",\
-"src/base/ftglyph.c",\
-"src/base/ftgxval.c",\
-"src/base/ftinit.c",\
-"src/base/ftlcdfil.c",\
-"src/base/ftmm.c",\
-"src/base/ftotval.c",\
-"src/base/ftpatent.c",\
-"src/base/ftpfr.c",\
-"src/base/ftpic.c",\
-"src/base/ftstroke.c",\
-"src/base/ftsynth.c",\
-"src/base/ftsystem.c",\
-"src/base/fttype1.c",\
-"src/base/ftwinfnt.c",\
-"src/bdf/bdf.c",\
-"src/cache/ftcache.c",\
-"src/cff/cff.c",\
-"src/cid/type1cid.c",\
-"src/gxvalid/gxvalid.c",\
-"src/otvalid/otvalid.c",\
-"src/pcf/pcf.c",\
-"src/pfr/pfr.c",\
-"src/psaux/psaux.c",\
-"src/pshinter/pshinter.c",\
-"src/psnames/psnames.c",\
-"src/raster/raster.c",\
-"src/sfnt/sfnt.c",\
-"src/smooth/smooth.c",\
-"src/truetype/truetype.c",\
-"src/type1/type1.c",\
-"src/type42/type42.c",\
-"src/winfonts/winfnt.c",\
-]
-
-
-if (env["freetype"]=="builtin"):
-
-	# Include header for WinRT to fix build issues
-	if "platform" in env and env["platform"] == "winrt":
-		env.Append(CCFLAGS=['/FI', '"drivers/freetype/winrtdef.h"'])
-
-	# fix for Windows' shell miserably failing on long lines, split in two libraries
-	half1=[]
-	half2=[]
-	for x in ft_sources:
-		if (x.find("src/base")==0 or x.find("src/sfnt")==0):
-			half2.append(x)
-		else:
-			half1.append(x)
-
-	lib = env.Library("freetype_builtin1",half2)
-	env.Append(LIBS=[lib])
-	lib = env.Library("freetype_builtin2",half1)
-	env.Append(LIBS=[lib])
-
-	env.Append(CPPPATH=["#drivers/freetype/include"])
-
-
-Export('env')
diff --git a/drivers/freetype/src/Jamfile b/drivers/freetype/src/Jamfile
deleted file mode 100644
index ebc036983e..0000000000
--- a/drivers/freetype/src/Jamfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# FreeType 2 src Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) ;
-
-for xx in $(FT2_COMPONENTS)
-{
-  SubInclude FT2_TOP $(FT2_SRC_DIR) $(xx) ;
-}
-
-# end of src Jamfile
diff --git a/drivers/freetype/src/autofit/Jamfile b/drivers/freetype/src/autofit/Jamfile
deleted file mode 100644
index 638b229724..0000000000
--- a/drivers/freetype/src/autofit/Jamfile
+++ /dev/null
@@ -1,53 +0,0 @@
-# FreeType 2 src/autofit Jamfile
-#
-# Copyright 2003-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir FT2_TOP src autofit ;
-
-{
-  local  _sources ;
-
-  # define FT2_AUTOFIT2 to enable experimental latin hinter replacement
-  if $(FT2_AUTOFIT2)
-  {
-    CCFLAGS += FT_OPTION_AUTOFIT2 ;
-  }
-  if $(FT2_MULTI)
-  {
-    _sources = afangles
-               afblue
-               afcjk
-               afdummy
-               afglobal
-               afhints
-               afindic
-               aflatin
-               afloader
-               afmodule
-               afpic
-               afranges
-               afshaper
-               afwarp
-               ;
-
-    if $(FT2_AUTOFIT2)
-    {
-      _sources += aflatin2 ;
-    }
-  }
-  else
-  {
-    _sources = autofit ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/autofit Jamfile
diff --git a/drivers/freetype/src/base/Jamfile b/drivers/freetype/src/base/Jamfile
deleted file mode 100644
index cfc69657fe..0000000000
--- a/drivers/freetype/src/base/Jamfile
+++ /dev/null
@@ -1,88 +0,0 @@
-# FreeType 2 src/base Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) base ;
-
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = basepic
-               ftadvanc
-               ftcalc
-               ftdbgmem
-               ftgloadr
-               fthash
-               ftobjs
-               ftoutln
-               ftpic
-               ftrfork
-               ftsnames
-               ftstream
-               fttrigon
-               ftutil
-               ;
-  }
-  else
-  {
-    _sources = ftbase ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# Add the optional/replaceable files.
-#
-{
-  local  _sources = ftapi
-                    ftbbox
-                    ftbdf
-                    ftbitmap
-                    ftcid
-                    ftdebug
-                    ftfntfmt
-                    ftfstype
-                    ftgasp
-                    ftglyph
-                    ftgxval
-                    ftinit
-                    ftlcdfil
-                    ftmm
-                    ftotval
-                    ftpatent
-                    ftpfr
-                    ftstroke
-                    ftsynth
-                    ftsystem
-                    fttype1
-                    ftwinfnt
-                    ;
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# Add Macintosh-specific file to the library when necessary.
-#
-if $(MAC)
-{
-  Library  $(FT2_LIB) : ftmac.c ;
-}
-else if $(OS) = MACOSX
-{
-  if $(FT2_MULTI)
-  {
-    Library  $(FT2_LIB) : ftmac.c ;
-  }
-}
-
-# end of src/base Jamfile
diff --git a/drivers/freetype/src/bdf/Jamfile b/drivers/freetype/src/bdf/Jamfile
deleted file mode 100644
index 2f0147bbba..0000000000
--- a/drivers/freetype/src/bdf/Jamfile
+++ /dev/null
@@ -1,31 +0,0 @@
-# FreeType 2 src/bdf Jamfile
-#
-# Copyright 2002-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) bdf ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = bdfdrivr
-               bdflib
-               ;
-  }
-  else
-  {
-    _sources = bdf ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/bdf Jamfile
diff --git a/drivers/freetype/src/cache/Jamfile b/drivers/freetype/src/cache/Jamfile
deleted file mode 100644
index da6551015b..0000000000
--- a/drivers/freetype/src/cache/Jamfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# FreeType 2 src/cache Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) cache ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = ftcbasic
-               ftccache
-               ftcglyph
-               ftcimage
-               ftcmanag
-               ftccmap
-               ftcmru
-               ftcsbits
-               ;
-  }
-  else
-  {
-    _sources = ftcache ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/cache Jamfile
diff --git a/drivers/freetype/src/cff/Jamfile b/drivers/freetype/src/cff/Jamfile
deleted file mode 100644
index 8067e6b29c..0000000000
--- a/drivers/freetype/src/cff/Jamfile
+++ /dev/null
@@ -1,45 +0,0 @@
-# FreeType 2 src/cff Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) cff ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = cffcmap
-               cffdrivr
-               cffgload
-               cffload
-               cffobjs
-               cffparse
-               cffpic
-               cf2arrst
-               cf2blues
-               cf2error
-               cf2font
-               cf2ft
-               cf2hints
-               cf2intrp
-               cf2read
-               cf2stack
-               ;
-  }
-  else
-  {
-    _sources = cff ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/cff Jamfile
diff --git a/drivers/freetype/src/cid/Jamfile b/drivers/freetype/src/cid/Jamfile
deleted file mode 100644
index 4b4eea17d9..0000000000
--- a/drivers/freetype/src/cid/Jamfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# FreeType 2 src/cid Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) cid ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = cidgload
-               cidload
-               cidobjs
-               cidparse
-               cidriver
-               ;
-  }
-  else
-  {
-    _sources = type1cid ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/cid Jamfile
diff --git a/drivers/freetype/src/gxvalid/Jamfile b/drivers/freetype/src/gxvalid/Jamfile
deleted file mode 100644
index 9738677e05..0000000000
--- a/drivers/freetype/src/gxvalid/Jamfile
+++ /dev/null
@@ -1,52 +0,0 @@
-# FreeType 2 src/gxvalid Jamfile
-#
-# Copyright 2005-2016 by
-# suzuki toshiya, Masatake YAMATO and Red Hat K.K.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) gxvalid ;
-
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = gxvbsln
-               gxvcommn
-               gxvfeat
-               gxvjust
-               gxvkern
-               gxvlcar
-               gxvmod
-               gxvmort
-               gxvmort0
-               gxvmort1
-               gxvmort2
-               gxvmort4
-               gxvmort5
-               gxvmorx
-               gxvmorx0
-               gxvmorx1
-               gxvmorx2
-               gxvmorx4
-               gxvmorx5
-               gxvopbd
-               gxvprop
-               gxvtrak
-               ;
-  }
-  else
-  {
-    _sources = gxvalid ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/gxvalid Jamfile
diff --git a/drivers/freetype/src/otvalid/Jamfile b/drivers/freetype/src/otvalid/Jamfile
deleted file mode 100644
index eded89ab9f..0000000000
--- a/drivers/freetype/src/otvalid/Jamfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# FreeType 2 src/otvalid Jamfile
-#
-# Copyright 2004-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) otvalid ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = otvbase
-               otvcommn
-               otvgdef
-               otvgpos
-               otvgsub
-               otvjstf
-               otvmath
-               otvmod
-               ;
-  }
-  else
-  {
-    _sources = otvalid ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/otvalid Jamfile
diff --git a/drivers/freetype/src/pcf/Jamfile b/drivers/freetype/src/pcf/Jamfile
deleted file mode 100644
index 9ebe6a2cbd..0000000000
--- a/drivers/freetype/src/pcf/Jamfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# FreeType 2 src/pcf Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) pcf ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = pcfdrivr
-               pcfread
-               pcfutil
-               ;
-  }
-  else
-  {
-    _sources = pcf ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/pcf Jamfile
diff --git a/drivers/freetype/src/pfr/Jamfile b/drivers/freetype/src/pfr/Jamfile
deleted file mode 100644
index a5b294b79a..0000000000
--- a/drivers/freetype/src/pfr/Jamfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# FreeType 2 src/pfr Jamfile
-#
-# Copyright 2002-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) pfr ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = pfrcmap
-               pfrdrivr
-               pfrgload
-               pfrload
-               pfrobjs
-               pfrsbit
-               ;
-  }
-  else
-  {
-    _sources = pfr ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/pfr Jamfile
diff --git a/drivers/freetype/src/psaux/Jamfile b/drivers/freetype/src/psaux/Jamfile
deleted file mode 100644
index 9270eec687..0000000000
--- a/drivers/freetype/src/psaux/Jamfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# FreeType 2 src/psaux Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) psaux ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = afmparse
-               psauxmod
-               psconv
-               psobjs
-               t1cmap
-               t1decode
-               ;
-  }
-  else
-  {
-    _sources = psaux ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/psaux Jamfile
diff --git a/drivers/freetype/src/pshinter/Jamfile b/drivers/freetype/src/pshinter/Jamfile
deleted file mode 100644
index fcb225811e..0000000000
--- a/drivers/freetype/src/pshinter/Jamfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# FreeType 2 src/pshinter Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) pshinter ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = pshalgo
-               pshglob
-               pshmod
-               pshpic
-               pshrec
-               ;
-  }
-  else
-  {
-    _sources = pshinter ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/pshinter Jamfile
diff --git a/drivers/freetype/src/psnames/Jamfile b/drivers/freetype/src/psnames/Jamfile
deleted file mode 100644
index 35b8a99c8f..0000000000
--- a/drivers/freetype/src/psnames/Jamfile
+++ /dev/null
@@ -1,31 +0,0 @@
-# FreeType 2 src/psnames Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) psnames ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = psmodule
-               pspic
-               ;
-  }
-  else
-  {
-    _sources = psnames ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/psnames Jamfile
diff --git a/drivers/freetype/src/raster/Jamfile b/drivers/freetype/src/raster/Jamfile
deleted file mode 100644
index 2ec88f5601..0000000000
--- a/drivers/freetype/src/raster/Jamfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# FreeType 2 src/raster Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) raster ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = ftraster
-               ftrend1
-               rastpic
-               ;
-  }
-  else
-  {
-    _sources = raster ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/raster Jamfile
diff --git a/drivers/freetype/src/sfnt/Jamfile b/drivers/freetype/src/sfnt/Jamfile
deleted file mode 100644
index 089cc269ba..0000000000
--- a/drivers/freetype/src/sfnt/Jamfile
+++ /dev/null
@@ -1,40 +0,0 @@
-# FreeType 2 src/sfnt Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) sfnt ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = pngshim
-               sfdriver
-               sfntpic
-               sfobjs
-               ttbdf
-               ttcmap
-               ttkern
-               ttload
-               ttmtx
-               ttpost
-               ttsbit
-               ;
-  }
-  else
-  {
-    _sources = sfnt ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/sfnt Jamfile
diff --git a/drivers/freetype/src/smooth/Jamfile b/drivers/freetype/src/smooth/Jamfile
deleted file mode 100644
index a388c11d91..0000000000
--- a/drivers/freetype/src/smooth/Jamfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# FreeType 2 src/smooth Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) smooth ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = ftgrays
-               ftsmooth
-               ftspic
-               ;
-  }
-  else
-  {
-    _sources = smooth ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/smooth Jamfile
diff --git a/drivers/freetype/src/truetype/Jamfile b/drivers/freetype/src/truetype/Jamfile
deleted file mode 100644
index ecbb2dbdd2..0000000000
--- a/drivers/freetype/src/truetype/Jamfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# FreeType 2 src/truetype Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) truetype ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = ttdriver
-               ttgload
-               ttgxvar
-               ttinterp
-               ttobjs
-               ttpic
-               ttpload
-               ttsubpix
-               ;
-  }
-  else
-  {
-    _sources = truetype ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/truetype Jamfile
diff --git a/drivers/freetype/src/type1/Jamfile b/drivers/freetype/src/type1/Jamfile
deleted file mode 100644
index 948b40854a..0000000000
--- a/drivers/freetype/src/type1/Jamfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# FreeType 2 src/type1 Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) type1 ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = t1afm
-               t1driver
-               t1gload
-               t1load
-               t1objs
-               t1parse
-               ;
-  }
-  else
-  {
-    _sources = type1 ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/type1 Jamfile
diff --git a/drivers/freetype/src/type42/Jamfile b/drivers/freetype/src/type42/Jamfile
deleted file mode 100644
index a504ad17d3..0000000000
--- a/drivers/freetype/src/type42/Jamfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# FreeType 2 src/type42 Jamfile
-#
-# Copyright 2002-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) type42 ;
-
-{
-  local  _sources ;
-
-  if $(FT2_MULTI)
-  {
-    _sources = t42drivr
-               t42objs
-               t42parse
-               ;
-  }
-  else
-  {
-    _sources = type42 ;
-  }
-
-  Library  $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/type42 Jamfile
diff --git a/drivers/freetype/src/winfonts/Jamfile b/drivers/freetype/src/winfonts/Jamfile
deleted file mode 100644
index d81165e921..0000000000
--- a/drivers/freetype/src/winfonts/Jamfile
+++ /dev/null
@@ -1,16 +0,0 @@
-# FreeType 2 src/winfonts Jamfile
-#
-# Copyright 2001-2016 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir  FT2_TOP $(FT2_SRC_DIR) winfonts ;
-
-Library  $(FT2_LIB) : winfnt.c ;
-
-# end of src/winfonts Jamfile
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub
index dac27c0125..b05a96cb99 100644
--- a/drivers/gl_context/SCsub
+++ b/drivers/gl_context/SCsub
@@ -1,11 +1,21 @@
 Import('env')
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+if (env["platform"] in ["haiku","osx","windows","x11"]):
+	# Thirdparty source files
+	if (env["glew"] != "system"): # builtin
+		thirdparty_dir = "#thirdparty/glew/"
+		thirdparty_sources = [
+			"glew.c",
+		]
+		thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+		env.add_source_files(env.drivers_sources, thirdparty_sources)
+		env.Append(CPPFLAGS = ['-DGLEW_STATIC'])
+		env.Append(CPPPATH = [thirdparty_dir])
 
-if (env.get('glew') == 'yes'):
-	env.add_source_files(env.drivers_sources,"glew.c")
 	env.Append(CPPFLAGS = ['-DGLEW_ENABLED'])
-	env.Append(CPPFLAGS = ['-DGLEW_STATIC'])
-	env.Append(CPPPATH = ['.'])
+
+# Godot source files
+env.add_source_files(env.drivers_sources, "*.cpp")
 
 Export('env')
diff --git a/drivers/gles2/SCsub b/drivers/gles2/SCsub
index a17335b41b..89d7d86360 100644
--- a/drivers/gles2/SCsub
+++ b/drivers/gles2/SCsub
@@ -1,5 +1,7 @@
 Import('env')
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+env.add_source_files(env.drivers_sources, "*.cpp")
 
 SConscript("shaders/SCsub")
+
+Export('env')
diff --git a/drivers/gles2/shaders/SCsub b/drivers/gles2/shaders/SCsub
index 38177d725f..88445f34c1 100644
--- a/drivers/gles2/shaders/SCsub
+++ b/drivers/gles2/shaders/SCsub
@@ -6,3 +6,5 @@ if env['BUILDERS'].has_key('GLSL120GLES'):
 	env.GLSL120GLES('canvas_shadow.glsl');
 	env.GLSL120GLES('blur.glsl');
 	env.GLSL120GLES('copy.glsl');
+
+Export('env')
diff --git a/drivers/jpegd/SCsub b/drivers/jpegd/SCsub
deleted file mode 100644
index dfdb19402e..0000000000
--- a/drivers/jpegd/SCsub
+++ /dev/null
@@ -1,11 +0,0 @@
-Import('env')
-
-
-jpg_sources = [
-	"jpegd/jpgd.cpp",
-	"jpegd/image_loader_jpegd.cpp"
-	]
-
-env.drivers_sources+=jpg_sources
-
-#env.add_source_files(env.drivers_sources, jpg_sources)
diff --git a/drivers/mpc/SCsub b/drivers/mpc/SCsub
deleted file mode 100644
index 32ffdb863f..0000000000
--- a/drivers/mpc/SCsub
+++ /dev/null
@@ -1,21 +0,0 @@
-Import('env')
-
-
-mpc_sources = [
-	"mpc/huffman.c",
-	"mpc/mpc_bits_reader.c",
-	"mpc/mpc_decoder.c",
-	"mpc/mpc_demux.c",
-	"mpc/mpc_reader.c",
-	"mpc/requant.c",
-	"mpc/streaminfo.c",
-	"mpc/synth_filter.c",
-]
-
-env.drivers_sources+=mpc_sources
-
-env.add_source_files(env.drivers_sources,"*.cpp")
-
-#env.add_source_files(env.drivers_sources, mpc_sources)
-
-Export('env')
diff --git a/drivers/nrex/SCsub b/drivers/nrex/SCsub
index a00c7b86f4..0582e01978 100644
--- a/drivers/nrex/SCsub
+++ b/drivers/nrex/SCsub
@@ -1,7 +1,5 @@
 Import('env')
 
-sources = [
-	'nrex.cpp',
-	'regex.cpp',
-]
-env.add_source_files(env.drivers_sources, sources)
+env.add_source_files(env.drivers_sources, "*.cpp")
+
+Export('env')
diff --git a/drivers/ogg/SCsub b/drivers/ogg/SCsub
deleted file mode 100644
index 3ee1bb6408..0000000000
--- a/drivers/ogg/SCsub
+++ /dev/null
@@ -1,9 +0,0 @@
-Import('env')
-
-ogg_sources = [
-
-	"ogg/bitwise.c",
-	"ogg/framing.c",
-]
-
-env.drivers_sources+=ogg_sources
diff --git a/drivers/openssl/SCsub b/drivers/openssl/SCsub
deleted file mode 100644
index 40e3d0c0f0..0000000000
--- a/drivers/openssl/SCsub
+++ /dev/null
@@ -1,6 +0,0 @@
-Import('env_drivers')
-Import('env')
-
-env_drivers.add_source_files(env.drivers_sources,"*.cpp")
-env_drivers.add_source_files(env.drivers_sources,"*.c")
-
diff --git a/drivers/opus/SCsub b/drivers/opus/SCsub
deleted file mode 100644
index bed8b496fc..0000000000
--- a/drivers/opus/SCsub
+++ /dev/null
@@ -1,196 +0,0 @@
-Import('env')
-
-opus_sources = [
-	"opus/audio_stream_opus.cpp",
-]
-
-opus_sources_silk=[]
-
-opus_sources_lib = [
-	"opus/silk/tables_other.c",
-	"opus/silk/sum_sqr_shift.c",
-	"opus/silk/PLC.c",
-	"opus/silk/dec_API.c",
-	"opus/silk/decode_pulses.c",
-	"opus/silk/inner_prod_aligned.c",
-	"opus/silk/init_encoder.c",
-	"opus/silk/interpolate.c",
-	"opus/silk/stereo_encode_pred.c",
-	"opus/silk/decode_frame.c",
-	"opus/silk/NLSF_del_dec_quant.c",
-	"opus/silk/VAD.c",
-	"opus/silk/resampler_private_AR2.c",
-	"opus/silk/NLSF_unpack.c",
-	"opus/silk/resampler_down2.c",
-	"opus/silk/sort.c",
-	"opus/silk/resampler_private_IIR_FIR.c",
-	"opus/silk/resampler_down2_3.c",
-	"opus/silk/resampler_private_up2_HQ.c",
-	"opus/silk/tables_gain.c",
-	"opus/silk/stereo_find_predictor.c",
-	"opus/silk/stereo_quant_pred.c",
-	"opus/silk/NLSF_stabilize.c",
-	"opus/silk/ana_filt_bank_1.c",
-	"opus/silk/check_control_input.c",
-	"opus/silk/bwexpander.c",
-	"opus/silk/A2NLSF.c",
-	"opus/silk/LPC_inv_pred_gain.c",
-	"opus/silk/log2lin.c",
-	"opus/silk/process_NLSFs.c",
-	"opus/silk/sigm_Q15.c",
-	"opus/silk/VQ_WMat_EC.c",
-	"opus/silk/quant_LTP_gains.c",
-	"opus/silk/resampler_private_down_FIR.c",
-	"opus/silk/NLSF_decode.c",
-	"opus/silk/control_codec.c",
-	"opus/silk/NLSF_VQ_weights_laroia.c",
-	"opus/silk/decode_pitch.c",
-	"opus/silk/stereo_decode_pred.c",
-	"opus/silk/tables_pulses_per_block.c",
-	"opus/silk/init_decoder.c",
-	"opus/silk/table_LSF_cos.c",
-	"opus/silk/decode_core.c",
-	"opus/silk/code_signs.c",
-	"opus/silk/enc_API.c",
-	"opus/silk/tables_LTP.c",
-	"opus/silk/pitch_est_tables.c",
-	"opus/silk/biquad_alt.c",
-	"opus/silk/encode_indices.c",
-	"opus/silk/tables_NLSF_CB_WB.c",
-	"opus/silk/debug.c",
-	"opus/silk/decode_parameters.c",
-	"opus/silk/tables_pitch_lag.c",
-	"opus/silk/NLSF2A.c",
-	"opus/silk/resampler.c",
-	"opus/silk/decode_indices.c",
-	"opus/silk/NLSF_VQ.c",
-	"opus/silk/bwexpander_32.c",
-	"opus/silk/tables_NLSF_CB_NB_MB.c",
-	"opus/silk/encode_pulses.c",
-	"opus/silk/NSQ_del_dec.c",
-	"opus/silk/control_SNR.c",
-	"opus/silk/shell_coder.c",
-	"opus/silk/NLSF_encode.c",
-	"opus/silk/stereo_MS_to_LR.c",
-	"opus/silk/stereo_LR_to_MS.c",
-	"opus/silk/HP_variable_cutoff.c",
-	"opus/silk/LPC_analysis_filter.c",
-	"opus/silk/CNG.c",
-	"opus/silk/decoder_set_fs.c",
-	"opus/silk/resampler_rom.c",
-	"opus/silk/control_audio_bandwidth.c",
-	"opus/silk/lin2log.c",
-	"opus/silk/LP_variable_cutoff.c",
-	"opus/silk/NSQ.c",
-	"opus/silk/gain_quant.c",
-	"opus/celt/laplace.c",
-	"opus/celt/vq.c",
-	"opus/celt/quant_bands.c",
-	"opus/celt/kiss_fft.c",
-	"opus/celt/entcode.c",
-	"opus/celt/entenc.c",
-	"opus/celt/celt_lpc.c",
-	"opus/celt/pitch.c",
-	"opus/celt/rate.c",
-	"opus/celt/mathops.c",
-	#"opus/celt/arm/armcpu.c",
-	#"opus/celt/arm/celt_neon_intr.c",
-	#"opus/celt/arm/celt_ne10_mdct.c",
-	#"opus/celt/arm/celt_ne10_fft.c",
-	#"opus/celt/arm/arm_celt_map.c",
-	"opus/celt/celt_encoder.c",
-	"opus/celt/celt.c",
-	"opus/celt/bands.c",
-	"opus/celt/cwrs.c",
-	"opus/celt/entdec.c",
-	"opus/celt/celt_decoder.c",
-	"opus/celt/mdct.c",
-	"opus/celt/modes.c",
-	"opus/repacketizer.c",
-	"opus/mlp_data.c",
-	"opus/opus_multistream.c",
-	"opus/opusfile.c",
-	"opus/opus_encoder.c",
-	"opus/analysis.c",
-	"opus/mlp.c",
-	"opus/info.c",
-	"opus/stream.c",
-	"opus/opus_decoder.c",
-	"opus/internal.c",
-	"opus/wincerts.c",
-	"opus/opus.c",
-	"opus/opus_multistream_encoder.c",
-	"opus/http.c",
-	"opus/opus_multistream_decoder.c"
-]
-
-if("opus_fixed_point" in env and env.opus_fixed_point=="yes"):
-	env.Append(CFLAGS=["-DOPUS_FIXED_POINT"])
-	opus_sources_silk = [
-		"opus/silk/fixed/schur64_FIX.c",
-		"opus/silk/fixed/residual_energy16_FIX.c",
-		"opus/silk/fixed/encode_frame_FIX.c",
-		"opus/silk/fixed/regularize_correlations_FIX.c",
-		"opus/silk/fixed/apply_sine_window_FIX.c",
-		"opus/silk/fixed/solve_LS_FIX.c",
-		"opus/silk/fixed/schur_FIX.c",
-		"opus/silk/fixed/pitch_analysis_core_FIX.c",
-		"opus/silk/fixed/noise_shape_analysis_FIX.c",
-		"opus/silk/fixed/find_LTP_FIX.c",
-		"opus/silk/fixed/vector_ops_FIX.c",
-		"opus/silk/fixed/autocorr_FIX.c",
-		"opus/silk/fixed/warped_autocorrelation_FIX.c",
-		"opus/silk/fixed/find_pitch_lags_FIX.c",
-		"opus/silk/fixed/k2a_Q16_FIX.c",
-		"opus/silk/fixed/LTP_scale_ctrl_FIX.c",
-		"opus/silk/fixed/corrMatrix_FIX.c",
-		"opus/silk/fixed/prefilter_FIX.c",
-		"opus/silk/fixed/find_LPC_FIX.c",
-		"opus/silk/fixed/residual_energy_FIX.c",
-		"opus/silk/fixed/process_gains_FIX.c",
-		"opus/silk/fixed/LTP_analysis_filter_FIX.c",
-		"opus/silk/fixed/k2a_FIX.c",
-		"opus/silk/fixed/burg_modified_FIX.c",
-		"opus/silk/fixed/find_pred_coefs_FIX.c"
-	]
-else:
-	opus_sources_silk = [
-		"opus/silk/float/LTP_scale_ctrl_FLP.c",
-		"opus/silk/float/regularize_correlations_FLP.c",
-		"opus/silk/float/corrMatrix_FLP.c",
-		"opus/silk/float/LPC_analysis_filter_FLP.c",
-		"opus/silk/float/levinsondurbin_FLP.c",
-		"opus/silk/float/schur_FLP.c",
-		"opus/silk/float/scale_vector_FLP.c",
-		"opus/silk/float/apply_sine_window_FLP.c",
-		"opus/silk/float/pitch_analysis_core_FLP.c",
-		"opus/silk/float/wrappers_FLP.c",
-		"opus/silk/float/bwexpander_FLP.c",
-		"opus/silk/float/warped_autocorrelation_FLP.c",
-		"opus/silk/float/solve_LS_FLP.c",
-		"opus/silk/float/find_LPC_FLP.c",
-		"opus/silk/float/autocorrelation_FLP.c",
-		"opus/silk/float/find_pred_coefs_FLP.c",
-		"opus/silk/float/find_pitch_lags_FLP.c",
-		"opus/silk/float/burg_modified_FLP.c",
-		"opus/silk/float/find_LTP_FLP.c",
-		"opus/silk/float/energy_FLP.c",
-		"opus/silk/float/sort_FLP.c",
-		"opus/silk/float/LPC_inv_pred_gain_FLP.c",
-		"opus/silk/float/k2a_FLP.c",
-		"opus/silk/float/noise_shape_analysis_FLP.c",
-		"opus/silk/float/inner_product_FLP.c",
-		"opus/silk/float/process_gains_FLP.c",
-		"opus/silk/float/encode_frame_FLP.c",
-		"opus/silk/float/scale_copy_vector_FLP.c",
-		"opus/silk/float/residual_energy_FLP.c",
-		"opus/silk/float/LTP_analysis_filter_FLP.c",
-		"opus/silk/float/prefilter_FLP.c"
-	]
-
-
-env.drivers_sources+=opus_sources_silk
-env.drivers_sources+=opus_sources_lib
-env.drivers_sources+=opus_sources
-
-Export('env')
diff --git a/drivers/png/SCsub b/drivers/png/SCsub
index 96ef9fa5f8..1e3f54a9ca 100644
--- a/drivers/png/SCsub
+++ b/drivers/png/SCsub
@@ -1,42 +1,48 @@
 Import('env')
-Import('env_drivers')
 
+env_png = env.Clone()
 
-png_sources = [
-	"png/png.c",
-	"png/pngerror.c",
-	"png/pngget.c",
-	"png/pngmem.c",
-	"png/pngpread.c",
-	"png/pngread.c",
-	"png/pngrio.c",
-	"png/pngrtran.c",
-	"png/pngrutil.c",
-	"png/pngset.c",
-	"png/pngtrans.c",
-	"png/pngwio.c",
-	"png/pngwrite.c",
-	"png/pngwtran.c",
-	"png/pngwutil.c",
-	"png/resource_saver_png.cpp",
-	"png/image_loader_png.cpp"
-]
+# Thirdparty source files
+if (env["libpng"] == "builtin"):
+	thirdparty_dir = "#thirdparty/libpng/"
+	thirdparty_sources = [
+		"png.c",
+		"pngerror.c",
+		"pngget.c",
+		"pngmem.c",
+		"pngpread.c",
+		"pngread.c",
+		"pngrio.c",
+		"pngrtran.c",
+		"pngrutil.c",
+		"pngset.c",
+		"pngtrans.c",
+		"pngwio.c",
+		"pngwrite.c",
+		"pngwtran.c",
+		"pngwutil.c",
+	]
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-# Currently .ASM filter_neon.S does not compile on NT.
-import os
-if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt":
-	env_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"])
-	env_neon = env_drivers.Clone();
-	if "S_compiler" in env:
-		env_neon['CC'] = env['S_compiler']
-	#env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"])
-	png_sources.append(env_neon.Object("#drivers/png/arm/arm_init.c"))
-	png_sources.append(env_neon.Object("#drivers/png/arm/filter_neon.S"))
-else:
-	env_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"])
+	env_png.add_source_files(env.drivers_sources, thirdparty_sources)
+	env_png.Append(CPPPATH = [thirdparty_dir])
 
-env.drivers_sources+=png_sources
+	# Currently .ASM filter_neon.S does not compile on NT.
+	import os
+	if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt":
+		env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=2"])
+		env_neon = env_png.Clone();
+		if "S_compiler" in env:
+			env_neon['CC'] = env['S_compiler']
+		neon_sources = []
+		neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c"))
+		neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon_intrinsics.c"))
+		neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S"))
+		env.drivers_sources += neon_sources
+	else:
+		env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=0"])
 
-#env.add_source_files(env.drivers_sources, png_sources)
+# Godot source files
+env_png.add_source_files(env.drivers_sources, "*.cpp")
 
 Export('env')
diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp
index 4967b0f9df..ab3f3e78fc 100644
--- a/drivers/png/image_loader_png.cpp
+++ b/drivers/png/image_loader_png.cpp
@@ -30,6 +30,7 @@
 
 #include "print_string.h"
 #include "os/os.h"
+
 #include <string.h>
 
 
diff --git a/drivers/png/image_loader_png.h b/drivers/png/image_loader_png.h
index d87d67d898..c146e3f5a1 100644
--- a/drivers/png/image_loader_png.h
+++ b/drivers/png/image_loader_png.h
@@ -30,7 +30,8 @@
 #define IMAGE_LOADER_PNG_H
 
 #include "io/image_loader.h"
-#include "drivers/png/png.h"
+
+#include <png.h>
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
diff --git a/drivers/png/resource_saver_png.cpp b/drivers/png/resource_saver_png.cpp
index 2578fe9eb6..e7987f27bf 100644
--- a/drivers/png/resource_saver_png.cpp
+++ b/drivers/png/resource_saver_png.cpp
@@ -27,11 +27,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "resource_saver_png.h"
-#include "scene/resources/texture.h"
-#include "drivers/png/png.h"
-#include "os/file_access.h"
-#include "globals.h"
+
 #include "core/image.h"
+#include "globals.h"
+#include "os/file_access.h"
+#include "scene/resources/texture.h"
+
+#include <png.h>
 
 static void _write_png_data(png_structp png_ptr,png_bytep data, png_size_t p_length) {
 
diff --git a/drivers/pnm/SCsub b/drivers/pnm/SCsub
deleted file mode 100644
index 28b35773a4..0000000000
--- a/drivers/pnm/SCsub
+++ /dev/null
@@ -1,10 +0,0 @@
-Import('env')
-
-
-pnm_sources = [
-	"pnm/bitmap_loader_pnm.cpp"
-	]
-
-env.drivers_sources+=pnm_sources
-
-#env.add_source_files(env.drivers_sources, pnm_sources)
diff --git a/drivers/pulseaudio/SCsub b/drivers/pulseaudio/SCsub
index 9fbb467baa..0582e01978 100644
--- a/drivers/pulseaudio/SCsub
+++ b/drivers/pulseaudio/SCsub
@@ -1,5 +1,5 @@
 Import('env')
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+env.add_source_files(env.drivers_sources, "*.cpp")
 
 Export('env')
diff --git a/drivers/pvr/SCsub b/drivers/pvr/SCsub
deleted file mode 100644
index 44b8c3d6bb..0000000000
--- a/drivers/pvr/SCsub
+++ /dev/null
@@ -1,15 +0,0 @@
-Import('env')
-
-
-pvr_sources = [
-	"pvr/BitScale.cpp",
-	"pvr/MortonTable.cpp",
-	"pvr/PvrTcDecoder.cpp",
-	"pvr/PvrTcEncoder.cpp",
-	"pvr/PvrTcPacket.cpp",
-	"pvr/texture_loader_pvr.cpp"
-	]
-
-env.drivers_sources+=pvr_sources
-
-#env.add_source_files(env.drivers_sources, pvr_sources)
diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp
index ec02b7da8e..7486d4f217 100644
--- a/drivers/register_driver_types.cpp
+++ b/drivers/register_driver_types.cpp
@@ -28,21 +28,9 @@
 /*************************************************************************/
 #include "register_driver_types.h"
 
+#include "core/math/geometry.h"
 #include "png/image_loader_png.h"
-#include "webp/image_loader_webp.h"
 #include "png/resource_saver_png.h"
-#include "jpegd/image_loader_jpegd.h"
-#include "dds/texture_loader_dds.h"
-#include "etc1/texture_loader_pkm.h"
-#include "pvr/texture_loader_pvr.h"
-#include "etc1/image_etc.h"
-#include "chibi/event_stream_chibi.h"
-#include "pnm/bitmap_loader_pnm.h"
-
-
-#ifdef TOOLS_ENABLED
-#include "squish/image_compress_squish.h"
-#endif
 
 #ifdef TOOLS_ENABLED
 #include "convex_decomp/b2d_decompose.h"
@@ -52,258 +40,38 @@
 #include "platform/windows/export/export.h"
 #endif
 
-#ifdef TREMOR_ENABLED
-#include "teora/audio_stream_ogg.h"
-#endif
-
-#ifdef VORBIS_ENABLED
-#include "vorbis/audio_stream_ogg_vorbis.h"
-#endif
-
-#ifdef OPUS_ENABLED
-#include "opus/audio_stream_opus.h"
-#endif
-
-#ifdef THEORA_ENABLED
-#include "theora/video_stream_theora.h"
-#endif
-
-
 #include "drivers/nrex/regex.h"
 
-#ifdef MUSEPACK_ENABLED
-#include "mpc/audio_stream_mpc.h"
-#endif
-
-#ifdef PNG_ENABLED
 static ImageLoaderPNG *image_loader_png=NULL;
 static ResourceSaverPNG *resource_saver_png=NULL;
-#endif
-
-#ifdef WEBP_ENABLED
-static ImageLoaderWEBP *image_loader_webp=NULL;
-//static ResourceSaverPNG *resource_saver_png=NULL;
-#endif
-
-#ifdef JPG_ENABLED
-static ImageLoaderJPG *image_loader_jpg=NULL;
-#endif
-
-#ifdef DDS_ENABLED
-static ResourceFormatDDS *resource_loader_dds=NULL;
-#endif
-
-#ifdef ETC1_ENABLED
-static ResourceFormatPKM *resource_loader_pkm=NULL;
-#endif
-
-
-#ifdef PVR_ENABLED
-static ResourceFormatPVR *resource_loader_pvr=NULL;
-#endif
-
-#ifdef TREMOR_ENABLED
-static ResourceFormatLoaderAudioStreamOGG *vorbis_stream_loader=NULL;
-#endif
-
-#ifdef VORBIS_ENABLED
-static ResourceFormatLoaderAudioStreamOGGVorbis *vorbis_stream_loader=NULL;
-#endif
-
-#ifdef OPUS_ENABLED
-static ResourceFormatLoaderAudioStreamOpus *opus_stream_loader=NULL;
-#endif
-
-#ifdef THEORA_ENABLED
-static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL;
-#endif
-
-#ifdef MUSEPACK_ENABLED
-static ResourceFormatLoaderAudioStreamMPC * mpc_stream_loader=NULL;
-#endif
-
-#ifdef OPENSSL_ENABLED
-#include "openssl/register_openssl.h"
-#endif
 
 
-
-static ResourceFormatPBM * pbm_loader=NULL;
-
 void register_core_driver_types() {
 
-#ifdef PNG_ENABLED
 	image_loader_png = memnew( ImageLoaderPNG );
 	ImageLoader::add_image_format_loader( image_loader_png );
 
 	resource_saver_png = memnew( ResourceSaverPNG );
 	ResourceSaver::add_resource_format_saver(resource_saver_png);
 
-#endif
-
-#ifdef WEBP_ENABLED
-	image_loader_webp = memnew( ImageLoaderWEBP );
-	ImageLoader::add_image_format_loader( image_loader_webp );
-
-//	resource_saver_png = memnew( ResourceSaverPNG );
-//	ResourceSaver::add_resource_format_saver(resource_saver_png);
-
-#endif
-
-#ifdef JPG_ENABLED
-
-	image_loader_jpg = memnew( ImageLoaderJPG );
-	ImageLoader::add_image_format_loader( image_loader_jpg );
-#endif
-
-
-	pbm_loader = memnew( ResourceFormatPBM );
-	ResourceLoader::add_resource_format_loader(pbm_loader);
-
 	ObjectTypeDB::register_type<RegEx>();
 }
 
 void unregister_core_driver_types() {
 
-#ifdef PNG_ENABLED
 	if (image_loader_png)
 		memdelete( image_loader_png );
 	if (resource_saver_png)
 		memdelete( resource_saver_png );
-#endif
-
-#ifdef WEBP_ENABLED
-	if (image_loader_webp)
-		memdelete( image_loader_webp );
-//	if (resource_saver_png)
-//		memdelete( resource_saver_png );
-#endif
-
-#ifdef JPG_ENABLED
-	if (image_loader_jpg)
-		memdelete( image_loader_jpg );
-#endif
-
-	memdelete( pbm_loader );
 }
 
 
 void register_driver_types() {
 
-#ifdef TREMOR_ENABLED
-	vorbis_stream_loader=memnew( ResourceFormatLoaderAudioStreamOGG );
-	ResourceLoader::add_resource_format_loader(vorbis_stream_loader );
-	ObjectTypeDB::register_type<AudioStreamOGG>();
-#endif
-
-#ifdef VORBIS_ENABLED
-	vorbis_stream_loader=memnew( ResourceFormatLoaderAudioStreamOGGVorbis );
-	ResourceLoader::add_resource_format_loader(vorbis_stream_loader );
-	ObjectTypeDB::register_type<AudioStreamOGGVorbis>();
-#endif
-
-#ifdef OPUS_ENABLED
-	opus_stream_loader=memnew( ResourceFormatLoaderAudioStreamOpus );
-	ResourceLoader::add_resource_format_loader( opus_stream_loader );
-	ObjectTypeDB::register_type<AudioStreamOpus>();
-#endif
-
-#ifdef DDS_ENABLED
-	resource_loader_dds = memnew( ResourceFormatDDS );
-	ResourceLoader::add_resource_format_loader(resource_loader_dds );
-#endif
-
-#ifdef ETC1_ENABLED
-	resource_loader_pkm = memnew( ResourceFormatPKM );
-	ResourceLoader::add_resource_format_loader(resource_loader_pkm);
-#endif
-
-#ifdef PVR_ENABLED
-	resource_loader_pvr = memnew( ResourceFormatPVR );
-	ResourceLoader::add_resource_format_loader(resource_loader_pvr );
-#endif
-
 #ifdef TOOLS_ENABLED
-
 	Geometry::_decompose_func=b2d_decompose;
 #endif
-
-#ifdef MUSEPACK_ENABLED
-
-	mpc_stream_loader=memnew( ResourceFormatLoaderAudioStreamMPC );
-	ResourceLoader::add_resource_format_loader(mpc_stream_loader);
-	ObjectTypeDB::register_type<AudioStreamMPC>();
-
-#endif
-
-#ifdef OPENSSL_ENABLED
-
-	register_openssl();
-#endif
-
-#ifdef THEORA_ENABLED
-	theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora );
-	ResourceLoader::add_resource_format_loader(theora_stream_loader);
-	ObjectTypeDB::register_type<VideoStreamTheora>();
-#endif
-
-
-#ifdef TOOLS_ENABLED
-#ifdef SQUISH_ENABLED
-
-	Image::set_compress_bc_func(image_compress_squish);
-
-#endif
-#endif
-
-#ifdef ETC1_ENABLED
-	_register_etc1_compress_func();
-#endif
-	
-	initialize_chibi();
 }
 
 void unregister_driver_types() {
-
-
-#ifdef TREMOR_ENABLED
-	memdelete( vorbis_stream_loader );
-#endif
-
-#ifdef VORBIS_ENABLED
-	memdelete( vorbis_stream_loader );
-#endif
-
-#ifdef OPUS_ENABLED
-	memdelete( opus_stream_loader );
-#endif
-
-#ifdef THEORA_ENABLED
-	memdelete (theora_stream_loader);
-#endif
-
-
-#ifdef MUSEPACK_ENABLED
-
-	memdelete (mpc_stream_loader);
-#endif
-
-#ifdef DDS_ENABLED
-	memdelete(resource_loader_dds);
-#endif
-
-#ifdef ETC1_ENABLED
-	memdelete(resource_loader_pkm);
-#endif
-
-#ifdef PVR_ENABLED
-	memdelete(resource_loader_pvr);
-#endif
-
-#ifdef OPENSSL_ENABLED
-
-	unregister_openssl();
-#endif
-
-	finalize_chibi();
 }
diff --git a/drivers/rtaudio/SCsub b/drivers/rtaudio/SCsub
index 6699efef75..836c84c43c 100644
--- a/drivers/rtaudio/SCsub
+++ b/drivers/rtaudio/SCsub
@@ -1,4 +1,18 @@
 Import('env')
-Export('env');
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+# Not cloning the env, the includes need to be accessible for platform/
+
+# Thirdparty source files
+thirdparty_dir = "#thirdparty/rtaudio/"
+thirdparty_sources = [
+	"RtAudio.cpp",
+]
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+env.add_source_files(env.drivers_sources, thirdparty_sources)
+env.Append(CPPPATH = [thirdparty_dir])
+
+# Driver source files
+env.add_source_files(env.drivers_sources, "*.cpp")
+
+Export('env')
diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp
index 1bea828680..fbe7ac68d4 100644
--- a/drivers/rtaudio/audio_driver_rtaudio.cpp
+++ b/drivers/rtaudio/audio_driver_rtaudio.cpp
@@ -27,8 +27,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "audio_driver_rtaudio.h"
+
 #include "globals.h"
 #include "os/os.h"
+
 #ifdef RTAUDIO_ENABLED
 
 const char* AudioDriverRtAudio::get_name() const {
diff --git a/drivers/rtaudio/audio_driver_rtaudio.h b/drivers/rtaudio/audio_driver_rtaudio.h
index ccb3d005c1..82055f6d17 100644
--- a/drivers/rtaudio/audio_driver_rtaudio.h
+++ b/drivers/rtaudio/audio_driver_rtaudio.h
@@ -32,7 +32,8 @@
 #ifdef RTAUDIO_ENABLED
 
 #include "servers/audio/audio_server_sw.h"
-#include "drivers/rtaudio/RtAudio.h"
+
+#include <RtAudio.h>
 
 class AudioDriverRtAudio : public AudioDriverSW {
 
diff --git a/drivers/squish/SCsub b/drivers/squish/SCsub
deleted file mode 100644
index da39dc1ebc..0000000000
--- a/drivers/squish/SCsub
+++ /dev/null
@@ -1,23 +0,0 @@
-Import('env')
-
-
-squish_sources=[
-'squish/alpha.cpp',
-'squish/clusterfit.cpp',
-'squish/colourblock.cpp',
-'squish/colourfit.cpp',
-'squish/colourset.cpp',
-'squish/maths.cpp',
-'squish/rangefit.cpp',
-'squish/singlecolourfit.cpp',
-'squish/squish.cpp',
-'squish/image_compress_squish.cpp',
-]
-
-
-if (env["tools"]=="yes"):
-	env.drivers_sources+=squish_sources
-
-#env.add_source_files(env.drivers_sources, squish_sources)
-
-Export('env')
diff --git a/drivers/squish/alpha.cpp b/drivers/squish/alpha.cpp
deleted file mode 100644
index 2ddb7dc28b..0000000000
--- a/drivers/squish/alpha.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "alpha.h"
-#include <algorithm>
-
-namespace squish {
-
-static int FloatToInt( float a, int limit )
-{
-	// use ANSI round-to-zero behaviour to get round-to-nearest
-	int i = ( int )( a + 0.5f );
-
-	// clamp to the limit
-	if( i < 0 )
-		i = 0;
-	else if( i > limit )
-		i = limit; 
-
-	// done
-	return i;
-}
-
-void CompressAlphaDxt3( u8 const* rgba, int mask, void* block )
-{
-	u8* bytes = reinterpret_cast< u8* >( block );
-	
-	// quantise and pack the alpha values pairwise
-	for( int i = 0; i < 8; ++i )
-	{
-		// quantise down to 4 bits
-		float alpha1 = ( float )rgba[8*i + 3] * ( 15.0f/255.0f );
-		float alpha2 = ( float )rgba[8*i + 7] * ( 15.0f/255.0f );
-		int quant1 = FloatToInt( alpha1, 15 );
-		int quant2 = FloatToInt( alpha2, 15 );
-		
-		// set alpha to zero where masked
-		int bit1 = 1 << ( 2*i );
-		int bit2 = 1 << ( 2*i + 1 );
-		if( ( mask & bit1 ) == 0 )
-			quant1 = 0;
-		if( ( mask & bit2 ) == 0 )
-			quant2 = 0;
-
-		// pack into the byte
-		bytes[i] = ( u8 )( quant1 | ( quant2 << 4 ) );
-	}
-}
-
-void DecompressAlphaDxt3( u8* rgba, void const* block )
-{
-	u8 const* bytes = reinterpret_cast< u8 const* >( block );
-	
-	// unpack the alpha values pairwise
-	for( int i = 0; i < 8; ++i )
-	{
-		// quantise down to 4 bits
-		u8 quant = bytes[i];
-		
-		// unpack the values
-		u8 lo = quant & 0x0f;
-		u8 hi = quant & 0xf0;
-
-		// convert back up to bytes
-		rgba[8*i + 3] = lo | ( lo << 4 );
-		rgba[8*i + 7] = hi | ( hi >> 4 );
-	}
-}
-
-static void FixRange( int& min, int& max, int steps )
-{
-	if( max - min < steps )
-		max = std::min( min + steps, 255 );
-	if( max - min < steps )
-		min = std::max( 0, max - steps );
-}
-
-static int FitCodes( u8 const* rgba, int mask, u8 const* codes, u8* indices )
-{
-	// fit each alpha value to the codebook
-	int err = 0;
-	for( int i = 0; i < 16; ++i )
-	{
-		// check this pixel is valid
-		int bit = 1 << i;
-		if( ( mask & bit ) == 0 )
-		{
-			// use the first code
-			indices[i] = 0;
-			continue;
-		}
-		
-		// find the least error and corresponding index
-		int value = rgba[4*i + 3];
-		int least = 2147483647; //INT_MAX
-		int index = 0;
-		for( int j = 0; j < 8; ++j )
-		{
-			// get the squared error from this code
-			int dist = ( int )value - ( int )codes[j];
-			dist *= dist;
-			
-			// compare with the best so far
-			if( dist < least )
-			{
-				least = dist;
-				index = j;
-			}
-		}
-		
-		// save this index and accumulate the error
-		indices[i] = ( u8 )index;
-		err += least;
-	}
-	
-	// return the total error
-	return err;
-}
-
-static void WriteAlphaBlock( int alpha0, int alpha1, u8 const* indices, void* block )
-{
-	u8* bytes = reinterpret_cast< u8* >( block );
-	
-	// write the first two bytes
-	bytes[0] = ( u8 )alpha0;
-	bytes[1] = ( u8 )alpha1;
-	
-	// pack the indices with 3 bits each
-	u8* dest = bytes + 2;
-	u8 const* src = indices;
-	for( int i = 0; i < 2; ++i )
-	{
-		// pack 8 3-bit values
-		int value = 0;
-		for( int j = 0; j < 8; ++j )
-		{
-			int index = *src++;
-			value |= ( index << 3*j );
-		}
-			
-		// store in 3 bytes
-		for( int j = 0; j < 3; ++j )
-		{
-			int byte = ( value >> 8*j ) & 0xff;
-			*dest++ = ( u8 )byte;
-		}
-	}
-}
-
-static void WriteAlphaBlock5( int alpha0, int alpha1, u8 const* indices, void* block )
-{
-	// check the relative values of the endpoints
-	if( alpha0 > alpha1 )
-	{
-		// swap the indices
-		u8 swapped[16];
-		for( int i = 0; i < 16; ++i )
-		{
-			u8 index = indices[i];
-			if( index == 0 )
-				swapped[i] = 1;
-			else if( index == 1 )
-				swapped[i] = 0;
-			else if( index <= 5 )
-				swapped[i] = 7 - index;
-			else 
-				swapped[i] = index;
-		}
-		
-		// write the block
-		WriteAlphaBlock( alpha1, alpha0, swapped, block );
-	}
-	else
-	{
-		// write the block
-		WriteAlphaBlock( alpha0, alpha1, indices, block );
-	}	
-}
-
-static void WriteAlphaBlock7( int alpha0, int alpha1, u8 const* indices, void* block )
-{
-	// check the relative values of the endpoints
-	if( alpha0 < alpha1 )
-	{
-		// swap the indices
-		u8 swapped[16];
-		for( int i = 0; i < 16; ++i )
-		{
-			u8 index = indices[i];
-			if( index == 0 )
-				swapped[i] = 1;
-			else if( index == 1 )
-				swapped[i] = 0;
-			else
-				swapped[i] = 9 - index;
-		}
-		
-		// write the block
-		WriteAlphaBlock( alpha1, alpha0, swapped, block );
-	}
-	else
-	{
-		// write the block
-		WriteAlphaBlock( alpha0, alpha1, indices, block );
-	}	
-}
-
-void CompressAlphaDxt5( u8 const* rgba, int mask, void* block )
-{
-	// get the range for 5-alpha and 7-alpha interpolation
-	int min5 = 255;
-	int max5 = 0;
-	int min7 = 255;
-	int max7 = 0;
-	for( int i = 0; i < 16; ++i )
-	{
-		// check this pixel is valid
-		int bit = 1 << i;
-		if( ( mask & bit ) == 0 )
-			continue;
-
-		// incorporate into the min/max
-		int value = rgba[4*i + 3];
-		if( value < min7 )
-			min7 = value;
-		if( value > max7 )
-			max7 = value;
-		if( value != 0 && value < min5 )
-			min5 = value;
-		if( value != 255 && value > max5 )
-			max5 = value;
-	}
-	
-	// handle the case that no valid range was found
-	if( min5 > max5 )
-		min5 = max5;
-	if( min7 > max7 )
-		min7 = max7;
-		
-	// fix the range to be the minimum in each case
-	FixRange( min5, max5, 5 );
-	FixRange( min7, max7, 7 );
-	
-	// set up the 5-alpha code book
-	u8 codes5[8];
-	codes5[0] = ( u8 )min5;
-	codes5[1] = ( u8 )max5;
-	for( int i = 1; i < 5; ++i )
-		codes5[1 + i] = ( u8 )( ( ( 5 - i )*min5 + i*max5 )/5 );
-	codes5[6] = 0;
-	codes5[7] = 255;
-	
-	// set up the 7-alpha code book
-	u8 codes7[8];
-	codes7[0] = ( u8 )min7;
-	codes7[1] = ( u8 )max7;
-	for( int i = 1; i < 7; ++i )
-		codes7[1 + i] = ( u8 )( ( ( 7 - i )*min7 + i*max7 )/7 );
-		
-	// fit the data to both code books
-	u8 indices5[16];
-	u8 indices7[16];
-	int err5 = FitCodes( rgba, mask, codes5, indices5 );
-	int err7 = FitCodes( rgba, mask, codes7, indices7 );
-	
-	// save the block with least error
-	if( err5 <= err7 )
-		WriteAlphaBlock5( min5, max5, indices5, block );
-	else
-		WriteAlphaBlock7( min7, max7, indices7, block );
-}
-
-void DecompressAlphaDxt5( u8* rgba, void const* block )
-{
-	// get the two alpha values
-	u8 const* bytes = reinterpret_cast< u8 const* >( block );
-	int alpha0 = bytes[0];
-	int alpha1 = bytes[1];
-	
-	// compare the values to build the codebook
-	u8 codes[8];
-	codes[0] = ( u8 )alpha0;
-	codes[1] = ( u8 )alpha1;
-	if( alpha0 <= alpha1 )
-	{
-		// use 5-alpha codebook
-		for( int i = 1; i < 5; ++i )
-			codes[1 + i] = ( u8 )( ( ( 5 - i )*alpha0 + i*alpha1 )/5 );
-		codes[6] = 0;
-		codes[7] = 255;
-	}
-	else
-	{
-		// use 7-alpha codebook
-		for( int i = 1; i < 7; ++i )
-			codes[1 + i] = ( u8 )( ( ( 7 - i )*alpha0 + i*alpha1 )/7 );
-	}
-	
-	// decode the indices
-	u8 indices[16];
-	u8 const* src = bytes + 2;
-	u8* dest = indices;
-	for( int i = 0; i < 2; ++i )
-	{
-		// grab 3 bytes
-		int value = 0;
-		for( int j = 0; j < 3; ++j )
-		{
-			int byte = *src++;
-			value |= ( byte << 8*j );
-		}
-		
-		// unpack 8 3-bit values from it
-		for( int j = 0; j < 8; ++j )
-		{
-			int index = ( value >> 3*j ) & 0x7;
-			*dest++ = ( u8 )index;
-		}
-	}
-	
-	// write out the indexed codebook values
-	for( int i = 0; i < 16; ++i )
-		rgba[4*i + 3] = codes[indices[i]];
-}
-
-} // namespace squish
diff --git a/drivers/squish/alpha.h b/drivers/squish/alpha.h
deleted file mode 100644
index d56fe4d2c6..0000000000
--- a/drivers/squish/alpha.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_ALPHA_H
-#define SQUISH_ALPHA_H
-
-#include "squish/squish.h"
-
-namespace squish {
-
-void CompressAlphaDxt3( u8 const* rgba, int mask, void* block );
-void CompressAlphaDxt5( u8 const* rgba, int mask, void* block );
-
-void DecompressAlphaDxt3( u8* rgba, void const* block );
-void DecompressAlphaDxt5( u8* rgba, void const* block );
-
-} // namespace squish
-
-#endif // ndef SQUISH_ALPHA_H
diff --git a/drivers/squish/clusterfit.cpp b/drivers/squish/clusterfit.cpp
deleted file mode 100644
index afea84880c..0000000000
--- a/drivers/squish/clusterfit.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-	Copyright (c) 2007 Ignacio Castano                   icastano@nvidia.com
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "clusterfit.h"
-#include "colourset.h"
-#include "colourblock.h"
-#include <cfloat>
-
-namespace squish {
-
-ClusterFit::ClusterFit( ColourSet const* colours, int flags ) 
-  : ColourFit( colours, flags )
-{
-	// set the iteration count
-	m_iterationCount = ( m_flags & kColourIterativeClusterFit ) ? kMaxIterations : 1;
-
-	// initialise the best error
-	m_besterror = VEC4_CONST( FLT_MAX );
-
-	// initialise the metric
-	bool perceptual = ( ( m_flags & kColourMetricPerceptual ) != 0 );
-	if( perceptual )
-		m_metric = Vec4( 0.2126f, 0.7152f, 0.0722f, 0.0f );
-	else
-		m_metric = VEC4_CONST( 1.0f );	
-
-	// cache some values
-	int const count = m_colours->GetCount();
-	Vec3 const* values = m_colours->GetPoints();
-
-	// get the covariance matrix
-	Sym3x3 covariance = ComputeWeightedCovariance( count, values, m_colours->GetWeights() );
-	
-	// compute the principle component
-	m_principle = ComputePrincipleComponent( covariance );
-}
-
-bool ClusterFit::ConstructOrdering( Vec3 const& axis, int iteration )
-{
-	// cache some values
-	int const count = m_colours->GetCount();
-	Vec3 const* values = m_colours->GetPoints();
-
-	// build the list of dot products
-	float dps[16];
-	u8* order = ( u8* )m_order + 16*iteration;
-	for( int i = 0; i < count; ++i )
-	{
-		dps[i] = Dot( values[i], axis );
-		order[i] = ( u8 )i;
-	}
-		
-	// stable sort using them
-	for( int i = 0; i < count; ++i )
-	{
-		for( int j = i; j > 0 && dps[j] < dps[j - 1]; --j )
-		{
-			std::swap( dps[j], dps[j - 1] );
-			std::swap( order[j], order[j - 1] );
-		}
-	}
-	
-	// check this ordering is unique
-	for( int it = 0; it < iteration; ++it )
-	{
-		u8 const* prev = ( u8* )m_order + 16*it;
-		bool same = true;
-		for( int i = 0; i < count; ++i )
-		{
-			if( order[i] != prev[i] )
-			{
-				same = false;
-				break;
-			}
-		}
-		if( same )
-			return false;
-	}
-	
-	// copy the ordering and weight all the points
-	Vec3 const* unweighted = m_colours->GetPoints();
-	float const* weights = m_colours->GetWeights();
-	m_xsum_wsum = VEC4_CONST( 0.0f );
-	for( int i = 0; i < count; ++i )
-	{
-		int j = order[i];
-		Vec4 p( unweighted[j].X(), unweighted[j].Y(), unweighted[j].Z(), 1.0f );
-		Vec4 w( weights[j] );
-		Vec4 x = p*w;
-		m_points_weights[i] = x;
-		m_xsum_wsum += x;
-	}
-	return true;
-}
-
-void ClusterFit::Compress3( void* block )
-{
-	// declare variables
-	int const count = m_colours->GetCount();
-	Vec4 const two = VEC4_CONST( 2.0 );
-	Vec4 const one = VEC4_CONST( 1.0f );
-	Vec4 const half_half2( 0.5f, 0.5f, 0.5f, 0.25f );
-	Vec4 const zero = VEC4_CONST( 0.0f );
-	Vec4 const half = VEC4_CONST( 0.5f );
-	Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f );
-	Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
-
-	// prepare an ordering using the principle axis
-	ConstructOrdering( m_principle, 0 );
-	
-	// check all possible clusters and iterate on the total order
-	Vec4 beststart = VEC4_CONST( 0.0f );
-	Vec4 bestend = VEC4_CONST( 0.0f );
-	Vec4 besterror = m_besterror;
-	u8 bestindices[16];
-	int bestiteration = 0;
-	int besti = 0, bestj = 0;
-	
-	// loop over iterations (we avoid the case that all points in first or last cluster)
-	for( int iterationIndex = 0;; )
-	{
-		// first cluster [0,i) is at the start
-		Vec4 part0 = VEC4_CONST( 0.0f );
-		for( int i = 0; i < count; ++i )
-		{
-			// second cluster [i,j) is half along
-			Vec4 part1 = ( i == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f );
-			int jmin = ( i == 0 ) ? 1 : i;
-			for( int j = jmin;; )
-			{
-				// last cluster [j,count) is at the end
-				Vec4 part2 = m_xsum_wsum - part1 - part0;
-				
-				// compute least squares terms directly
-				Vec4 alphax_sum = MultiplyAdd( part1, half_half2, part0 );
-				Vec4 alpha2_sum = alphax_sum.SplatW();
-
-				Vec4 betax_sum = MultiplyAdd( part1, half_half2, part2 );
-				Vec4 beta2_sum = betax_sum.SplatW();
-
-				Vec4 alphabeta_sum = ( part1*half_half2 ).SplatW();
-
-				// compute the least-squares optimal points
-				Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) );
-				Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor;
-				Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor;
-
-				// clamp to the grid
-				a = Min( one, Max( zero, a ) );
-				b = Min( one, Max( zero, b ) );
-				a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp;
-				b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp;
-				
-				// compute the error (we skip the constant xxsum)
-				Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum );
-				Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum );
-				Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 );
-				Vec4 e4 = MultiplyAdd( two, e3, e1 );
-
-				// apply the metric to the error term
-				Vec4 e5 = e4*m_metric;
-				Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ();
-				
-				// keep the solution if it wins
-				if( CompareAnyLessThan( error, besterror ) )
-				{
-					beststart = a;
-					bestend = b;
-					besti = i;
-					bestj = j;
-					besterror = error;
-					bestiteration = iterationIndex;
-				}
-
-				// advance
-				if( j == count )
-					break;
-				part1 += m_points_weights[j];
-				++j;
-			}
-
-			// advance
-			part0 += m_points_weights[i];
-		}
-		
-		// stop if we didn't improve in this iteration
-		if( bestiteration != iterationIndex )
-			break;
-			
-		// advance if possible
-		++iterationIndex;
-		if( iterationIndex == m_iterationCount )
-			break;
-			
-		// stop if a new iteration is an ordering that has already been tried
-		Vec3 axis = ( bestend - beststart ).GetVec3();
-		if( !ConstructOrdering( axis, iterationIndex ) )
-			break;
-	}
-		
-	// save the block if necessary
-	if( CompareAnyLessThan( besterror, m_besterror ) )
-	{
-		// remap the indices
-		u8 const* order = ( u8* )m_order + 16*bestiteration;
-
-		u8 unordered[16];
-		for( int m = 0; m < besti; ++m )
-			unordered[order[m]] = 0;
-		for( int m = besti; m < bestj; ++m )
-			unordered[order[m]] = 2;
-		for( int m = bestj; m < count; ++m )
-			unordered[order[m]] = 1;
-
-		m_colours->RemapIndices( unordered, bestindices );
-		
-		// save the block
-		WriteColourBlock3( beststart.GetVec3(), bestend.GetVec3(), bestindices, block );
-
-		// save the error
-		m_besterror = besterror;
-	}
-}
-
-void ClusterFit::Compress4( void* block )
-{
-	// declare variables
-	int const count = m_colours->GetCount();
-	Vec4 const two = VEC4_CONST( 2.0f );
-	Vec4 const one = VEC4_CONST( 1.0f );
-	Vec4 const onethird_onethird2( 1.0f/3.0f, 1.0f/3.0f, 1.0f/3.0f, 1.0f/9.0f );
-	Vec4 const twothirds_twothirds2( 2.0f/3.0f, 2.0f/3.0f, 2.0f/3.0f, 4.0f/9.0f );
-	Vec4 const twonineths = VEC4_CONST( 2.0f/9.0f );
-	Vec4 const zero = VEC4_CONST( 0.0f );
-	Vec4 const half = VEC4_CONST( 0.5f );
-	Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f );
-	Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
-
-	// prepare an ordering using the principle axis
-	ConstructOrdering( m_principle, 0 );
-	
-	// check all possible clusters and iterate on the total order
-	Vec4 beststart = VEC4_CONST( 0.0f );
-	Vec4 bestend = VEC4_CONST( 0.0f );
-	Vec4 besterror = m_besterror;
-	u8 bestindices[16];
-	int bestiteration = 0;
-	int besti = 0, bestj = 0, bestk = 0;
-	
-	// loop over iterations (we avoid the case that all points in first or last cluster)
-	for( int iterationIndex = 0;; )
-	{
-		// first cluster [0,i) is at the start
-		Vec4 part0 = VEC4_CONST( 0.0f );
-		for( int i = 0; i < count; ++i )
-		{
-			// second cluster [i,j) is one third along
-			Vec4 part1 = VEC4_CONST( 0.0f );
-			for( int j = i;; )
-			{
-				// third cluster [j,k) is two thirds along
-				Vec4 part2 = ( j == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f );
-				int kmin = ( j == 0 ) ? 1 : j;
-				for( int k = kmin;; )
-				{
-					// last cluster [k,count) is at the end
-					Vec4 part3 = m_xsum_wsum - part2 - part1 - part0;
-
-					// compute least squares terms directly
-					Vec4 const alphax_sum = MultiplyAdd( part2, onethird_onethird2, MultiplyAdd( part1, twothirds_twothirds2, part0 ) );
-					Vec4 const alpha2_sum = alphax_sum.SplatW();
-					
-					Vec4 const betax_sum = MultiplyAdd( part1, onethird_onethird2, MultiplyAdd( part2, twothirds_twothirds2, part3 ) );
-					Vec4 const beta2_sum = betax_sum.SplatW();
-					
-					Vec4 const alphabeta_sum = twonineths*( part1 + part2 ).SplatW();
-
-					// compute the least-squares optimal points
-					Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) );
-					Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor;
-					Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor;
-
-					// clamp to the grid
-					a = Min( one, Max( zero, a ) );
-					b = Min( one, Max( zero, b ) );
-					a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp;
-					b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp;
-					
-					// compute the error (we skip the constant xxsum)
-					Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum );
-					Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum );
-					Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 );
-					Vec4 e4 = MultiplyAdd( two, e3, e1 );
-
-					// apply the metric to the error term
-					Vec4 e5 = e4*m_metric;
-					Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ();
-
-					// keep the solution if it wins
-					if( CompareAnyLessThan( error, besterror ) )
-					{
-						beststart = a;
-						bestend = b;
-						besterror = error;
-						besti = i;
-						bestj = j;
-						bestk = k;
-						bestiteration = iterationIndex;
-					}
-
-					// advance
-					if( k == count )
-						break;
-					part2 += m_points_weights[k];
-					++k;
-				}
-
-				// advance
-				if( j == count )
-					break;
-				part1 += m_points_weights[j];
-				++j;
-			}
-
-			// advance
-			part0 += m_points_weights[i];
-		}
-		
-		// stop if we didn't improve in this iteration
-		if( bestiteration != iterationIndex )
-			break;
-			
-		// advance if possible
-		++iterationIndex;
-		if( iterationIndex == m_iterationCount )
-			break;
-			
-		// stop if a new iteration is an ordering that has already been tried
-		Vec3 axis = ( bestend - beststart ).GetVec3();
-		if( !ConstructOrdering( axis, iterationIndex ) )
-			break;
-	}
-
-	// save the block if necessary
-	if( CompareAnyLessThan( besterror, m_besterror ) )
-	{
-		// remap the indices
-		u8 const* order = ( u8* )m_order + 16*bestiteration;
-
-		u8 unordered[16];
-		for( int m = 0; m < besti; ++m )
-			unordered[order[m]] = 0;
-		for( int m = besti; m < bestj; ++m )
-			unordered[order[m]] = 2;
-		for( int m = bestj; m < bestk; ++m )
-			unordered[order[m]] = 3;
-		for( int m = bestk; m < count; ++m )
-			unordered[order[m]] = 1;
-
-		m_colours->RemapIndices( unordered, bestindices );
-		
-		// save the block
-		WriteColourBlock4( beststart.GetVec3(), bestend.GetVec3(), bestindices, block );
-
-		// save the error
-		m_besterror = besterror;
-	}
-}
-
-} // namespace squish
diff --git a/drivers/squish/clusterfit.h b/drivers/squish/clusterfit.h
deleted file mode 100644
index 2d2b67103b..0000000000
--- a/drivers/squish/clusterfit.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-	Copyright (c) 2007 Ignacio Castano                   icastano@nvidia.com
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_CLUSTERFIT_H
-#define SQUISH_CLUSTERFIT_H
-
-#include "squish/squish.h"
-#include "maths.h"
-#include "simd.h"
-#include "colourfit.h"
-
-namespace squish {
-
-class ClusterFit : public ColourFit
-{
-public:
-	ClusterFit( ColourSet const* colours, int flags );
-	
-private:
-	bool ConstructOrdering( Vec3 const& axis, int iteration );
-
-	virtual void Compress3( void* block );
-	virtual void Compress4( void* block );
-
-	enum { kMaxIterations = 8 };
-
-	int m_iterationCount;
-	Vec3 m_principle;
-	u8 m_order[16*kMaxIterations];
-	Vec4 m_points_weights[16];
-	Vec4 m_xsum_wsum;
-	Vec4 m_metric;
-	Vec4 m_besterror;
-};
-
-} // namespace squish
-
-#endif // ndef SQUISH_CLUSTERFIT_H
diff --git a/drivers/squish/colourblock.cpp b/drivers/squish/colourblock.cpp
deleted file mode 100644
index e6a5788b74..0000000000
--- a/drivers/squish/colourblock.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "colourblock.h"
-
-namespace squish {
-
-static int FloatToInt( float a, int limit )
-{
-	// use ANSI round-to-zero behaviour to get round-to-nearest
-	int i = ( int )( a + 0.5f );
-
-	// clamp to the limit
-	if( i < 0 )
-		i = 0;
-	else if( i > limit )
-		i = limit; 
-
-	// done
-	return i;
-}
-
-static int FloatTo565( Vec3::Arg colour )
-{
-	// get the components in the correct range
-	int r = FloatToInt( 31.0f*colour.X(), 31 );
-	int g = FloatToInt( 63.0f*colour.Y(), 63 );
-	int b = FloatToInt( 31.0f*colour.Z(), 31 );
-	
-	// pack into a single value
-	return ( r << 11 ) | ( g << 5 ) | b;
-}
-
-static void WriteColourBlock( int a, int b, u8* indices, void* block )
-{
-	// get the block as bytes
-	u8* bytes = ( u8* )block;
-
-	// write the endpoints
-	bytes[0] = ( u8 )( a & 0xff );
-	bytes[1] = ( u8 )( a >> 8 );
-	bytes[2] = ( u8 )( b & 0xff );
-	bytes[3] = ( u8 )( b >> 8 );
-	
-	// write the indices
-	for( int i = 0; i < 4; ++i )
-	{
-		u8 const* ind = indices + 4*i;
-		bytes[4 + i] = ind[0] | ( ind[1] << 2 ) | ( ind[2] << 4 ) | ( ind[3] << 6 );
-	}
-}
-
-void WriteColourBlock3( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block )
-{
-	// get the packed values
-	int a = FloatTo565( start );
-	int b = FloatTo565( end );
-
-	// remap the indices
-	u8 remapped[16];
-	if( a <= b )
-	{
-		// use the indices directly
-		for( int i = 0; i < 16; ++i )
-			remapped[i] = indices[i];
-	}
-	else
-	{
-		// swap a and b
-		std::swap( a, b );
-		for( int i = 0; i < 16; ++i )
-		{
-			if( indices[i] == 0 )
-				remapped[i] = 1;
-			else if( indices[i] == 1 )
-				remapped[i] = 0;
-			else
-				remapped[i] = indices[i];
-		}
-	}
-	
-	// write the block
-	WriteColourBlock( a, b, remapped, block );
-}
-
-void WriteColourBlock4( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block )
-{
-	// get the packed values
-	int a = FloatTo565( start );
-	int b = FloatTo565( end );
-
-	// remap the indices
-	u8 remapped[16];
-	if( a < b )
-	{
-		// swap a and b
-		std::swap( a, b );
-		for( int i = 0; i < 16; ++i )
-			remapped[i] = ( indices[i] ^ 0x1 ) & 0x3;
-	}
-	else if( a == b )
-	{
-		// use index 0
-		for( int i = 0; i < 16; ++i )
-			remapped[i] = 0;
-	}
-	else
-	{
-		// use the indices directly
-		for( int i = 0; i < 16; ++i )
-			remapped[i] = indices[i];
-	}
-	
-	// write the block
-	WriteColourBlock( a, b, remapped, block );
-}
-
-static int Unpack565( u8 const* packed, u8* colour )
-{
-	// build the packed value
-	int value = ( int )packed[0] | ( ( int )packed[1] << 8 );
-	
-	// get the components in the stored range
-	u8 red = ( u8 )( ( value >> 11 ) & 0x1f );
-	u8 green = ( u8 )( ( value >> 5 ) & 0x3f );
-	u8 blue = ( u8 )( value & 0x1f );
-
-	// scale up to 8 bits
-	colour[0] = ( red << 3 ) | ( red >> 2 );
-	colour[1] = ( green << 2 ) | ( green >> 4 );
-	colour[2] = ( blue << 3 ) | ( blue >> 2 );
-	colour[3] = 255;
-	
-	// return the value
-	return value;
-}
-
-void DecompressColour( u8* rgba, void const* block, bool isDxt1 )
-{
-	// get the block bytes
-	u8 const* bytes = reinterpret_cast< u8 const* >( block );
-	
-	// unpack the endpoints
-	u8 codes[16];
-	int a = Unpack565( bytes, codes );
-	int b = Unpack565( bytes + 2, codes + 4 );
-	
-	// generate the midpoints
-	for( int i = 0; i < 3; ++i )
-	{
-		int c = codes[i];
-		int d = codes[4 + i];
-
-		if( isDxt1 && a <= b )
-		{
-			codes[8 + i] = ( u8 )( ( c + d )/2 );
-			codes[12 + i] = 0;
-		}
-		else
-		{
-			codes[8 + i] = ( u8 )( ( 2*c + d )/3 );
-			codes[12 + i] = ( u8 )( ( c + 2*d )/3 );
-		}
-	}
-	
-	// fill in alpha for the intermediate values
-	codes[8 + 3] = 255;
-	codes[12 + 3] = ( isDxt1 && a <= b ) ? 0 : 255;
-	
-	// unpack the indices
-	u8 indices[16];
-	for( int i = 0; i < 4; ++i )
-	{
-		u8* ind = indices + 4*i;
-		u8 packed = bytes[4 + i];
-		
-		ind[0] = packed & 0x3;
-		ind[1] = ( packed >> 2 ) & 0x3;
-		ind[2] = ( packed >> 4 ) & 0x3;
-		ind[3] = ( packed >> 6 ) & 0x3;
-	}
-
-	// store out the colours
-	for( int i = 0; i < 16; ++i )
-	{
-		u8 offset = 4*indices[i];
-		for( int j = 0; j < 4; ++j )
-			rgba[4*i + j] = codes[offset + j];
-	}
-}
-
-} // namespace squish
diff --git a/drivers/squish/colourblock.h b/drivers/squish/colourblock.h
deleted file mode 100644
index 8a25b42a63..0000000000
--- a/drivers/squish/colourblock.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_COLOURBLOCK_H
-#define SQUISH_COLOURBLOCK_H
-
-#include "squish/squish.h"
-#include "maths.h"
-
-namespace squish {
-
-void WriteColourBlock3( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block );
-void WriteColourBlock4( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block );
-
-void DecompressColour( u8* rgba, void const* block, bool isDxt1 );
-
-} // namespace squish
-
-#endif // ndef SQUISH_COLOURBLOCK_H
diff --git a/drivers/squish/colourfit.cpp b/drivers/squish/colourfit.cpp
deleted file mode 100644
index dba2b87e81..0000000000
--- a/drivers/squish/colourfit.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "colourfit.h"
-#include "colourset.h"
-
-namespace squish {
-
-ColourFit::ColourFit( ColourSet const* colours, int flags ) 
-  : m_colours( colours ), 
-	m_flags( flags )
-{
-}
-
-void ColourFit::Compress( void* block )
-{
-	bool isDxt1 = ( ( m_flags & kDxt1 ) != 0 );
-	if( isDxt1 )
-	{
-		Compress3( block );
-		if( !m_colours->IsTransparent() )
-			Compress4( block );
-	}
-	else
-		Compress4( block );
-}
-
-} // namespace squish
diff --git a/drivers/squish/colourfit.h b/drivers/squish/colourfit.h
deleted file mode 100644
index d048b48709..0000000000
--- a/drivers/squish/colourfit.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_COLOURFIT_H
-#define SQUISH_COLOURFIT_H
-
-#include "squish/squish.h"
-#include "maths.h"
-
-namespace squish {
-
-class ColourSet;
-
-class ColourFit
-{
-public:
-	ColourFit( ColourSet const* colours, int flags );
-
-	void Compress( void* block );
-
-protected:
-	virtual void Compress3( void* block ) = 0;
-	virtual void Compress4( void* block ) = 0;
-
-	ColourSet const* m_colours;
-	int m_flags;
-};
-
-} // namespace squish
-
-#endif // ndef SQUISH_COLOURFIT_H
diff --git a/drivers/squish/colourset.cpp b/drivers/squish/colourset.cpp
deleted file mode 100644
index 97d29d9873..0000000000
--- a/drivers/squish/colourset.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "colourset.h"
-
-namespace squish {
-
-ColourSet::ColourSet( u8 const* rgba, int mask, int flags )
-  : m_count( 0 ), 
-	m_transparent( false )
-{
-	// check the compression mode for dxt1
-	bool isDxt1 = ( ( flags & kDxt1 ) != 0 );
-	bool weightByAlpha = ( ( flags & kWeightColourByAlpha ) != 0 );
-
-	// create the minimal set
-	for( int i = 0; i < 16; ++i )
-	{
-		// check this pixel is enabled
-		int bit = 1 << i;
-		if( ( mask & bit ) == 0 )
-		{
-			m_remap[i] = -1;
-			continue;
-		}
-	
-		// check for transparent pixels when using dxt1
-		if( isDxt1 && rgba[4*i + 3] < 128 )
-		{
-			m_remap[i] = -1;
-			m_transparent = true;
-			continue;
-		}
-
-		// loop over previous points for a match
-		for( int j = 0;; ++j )
-		{
-			// allocate a new point
-			if( j == i )
-			{
-				// normalise coordinates to [0,1]
-				float x = ( float )rgba[4*i] / 255.0f;
-				float y = ( float )rgba[4*i + 1] / 255.0f;
-				float z = ( float )rgba[4*i + 2] / 255.0f;
-				
-				// ensure there is always non-zero weight even for zero alpha
-				float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f;
-
-				// add the point
-				m_points[m_count] = Vec3( x, y, z );
-				m_weights[m_count] = ( weightByAlpha ? w : 1.0f );
-				m_remap[i] = m_count;
-				
-				// advance
-				++m_count;
-				break;
-			}
-		
-			// check for a match
-			int oldbit = 1 << j;
-			bool match = ( ( mask & oldbit ) != 0 )
-				&& ( rgba[4*i] == rgba[4*j] )
-				&& ( rgba[4*i + 1] == rgba[4*j + 1] )
-				&& ( rgba[4*i + 2] == rgba[4*j + 2] )
-				&& ( rgba[4*j + 3] >= 128 || !isDxt1 );
-			if( match )
-			{
-				// get the index of the match
-				int index = m_remap[j];
-				
-				// ensure there is always non-zero weight even for zero alpha
-				float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f;
-
-				// map to this point and increase the weight
-				m_weights[index] += ( weightByAlpha ? w : 1.0f );
-				m_remap[i] = index;
-				break;
-			}
-		}
-	}
-
-	// square root the weights
-	for( int i = 0; i < m_count; ++i )
-		m_weights[i] = std::sqrt( m_weights[i] );
-}
-
-void ColourSet::RemapIndices( u8 const* source, u8* target ) const
-{
-	for( int i = 0; i < 16; ++i )
-	{
-		int j = m_remap[i];
-		if( j == -1 )
-			target[i] = 3;
-		else
-			target[i] = source[j];
-	}
-}
-
-} // namespace squish
diff --git a/drivers/squish/colourset.h b/drivers/squish/colourset.h
deleted file mode 100644
index 803e787f5b..0000000000
--- a/drivers/squish/colourset.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_COLOURSET_H
-#define SQUISH_COLOURSET_H
-
-#include "squish/squish.h"
-#include "maths.h"
-
-namespace squish {
-
-/*! @brief Represents a set of block colours
-*/
-class ColourSet
-{
-public:
-	ColourSet( u8 const* rgba, int mask, int flags );
-
-	int GetCount() const { return m_count; }
-	Vec3 const* GetPoints() const { return m_points; }
-	float const* GetWeights() const { return m_weights; }
-	bool IsTransparent() const { return m_transparent; }
-
-	void RemapIndices( u8 const* source, u8* target ) const;
-
-private:
-	int m_count;
-	Vec3 m_points[16];
-	float m_weights[16];
-	int m_remap[16];
-	bool m_transparent;
-};
-
-} // namespace sqish
-
-#endif // ndef SQUISH_COLOURSET_H
diff --git a/drivers/squish/config.h b/drivers/squish/config.h
deleted file mode 100644
index 7bf3760c26..0000000000
--- a/drivers/squish/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_CONFIG_H
-#define SQUISH_CONFIG_H
-
-// Set to 1 when building squish to use Altivec instructions.
-#ifndef SQUISH_USE_ALTIVEC
-#define SQUISH_USE_ALTIVEC 0
-#endif
-
-// Set to 1 or 2 when building squish to use SSE or SSE2 instructions.
-#ifndef SQUISH_USE_SSE
-#define SQUISH_USE_SSE 0
-#endif
-
-// Internally et SQUISH_USE_SIMD when either Altivec or SSE is available.
-#if SQUISH_USE_ALTIVEC && SQUISH_USE_SSE
-#error "Cannot enable both Altivec and SSE!"
-#endif
-#if SQUISH_USE_ALTIVEC || SQUISH_USE_SSE
-#define SQUISH_USE_SIMD 1
-#else
-#define SQUISH_USE_SIMD 0
-#endif
-
-#endif // ndef SQUISH_CONFIG_H
diff --git a/drivers/squish/maths.cpp b/drivers/squish/maths.cpp
deleted file mode 100644
index 59818a4d2b..0000000000
--- a/drivers/squish/maths.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-/*! @file
-
-	The symmetric eigensystem solver algorithm is from 
-	http://www.geometrictools.com/Documentation/EigenSymmetric3x3.pdf
-*/
-
-#include "maths.h"
-#include <cfloat>
-
-namespace squish {
-
-Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights )
-{
-	// compute the centroid
-	float total = 0.0f;
-	Vec3 centroid( 0.0f );
-	for( int i = 0; i < n; ++i )
-	{
-		total += weights[i];
-		centroid += weights[i]*points[i];
-	}
-	centroid /= total;
-
-	// accumulate the covariance matrix
-	Sym3x3 covariance( 0.0f );
-	for( int i = 0; i < n; ++i )
-	{
-		Vec3 a = points[i] - centroid;
-		Vec3 b = weights[i]*a;
-		
-		covariance[0] += a.X()*b.X();
-		covariance[1] += a.X()*b.Y();
-		covariance[2] += a.X()*b.Z();
-		covariance[3] += a.Y()*b.Y();
-		covariance[4] += a.Y()*b.Z();
-		covariance[5] += a.Z()*b.Z();
-	}
-	
-	// return it
-	return covariance;
-}
-
-static Vec3 GetMultiplicity1Evector( Sym3x3 const& matrix, float evalue )
-{
-	// compute M
-	Sym3x3 m;
-	m[0] = matrix[0] - evalue;
-	m[1] = matrix[1];
-	m[2] = matrix[2];
-	m[3] = matrix[3] - evalue;
-	m[4] = matrix[4];
-	m[5] = matrix[5] - evalue;
-
-	// compute U
-	Sym3x3 u;
-	u[0] = m[3]*m[5] - m[4]*m[4];
-	u[1] = m[2]*m[4] - m[1]*m[5];
-	u[2] = m[1]*m[4] - m[2]*m[3];
-	u[3] = m[0]*m[5] - m[2]*m[2];
-	u[4] = m[1]*m[2] - m[4]*m[0];
-	u[5] = m[0]*m[3] - m[1]*m[1];
-
-	// find the largest component
-	float mc = std::fabs( u[0] );
-	int mi = 0;
-	for( int i = 1; i < 6; ++i )
-	{
-		float c = std::fabs( u[i] );
-		if( c > mc )
-		{
-			mc = c;
-			mi = i;
-		}
-	}
-
-	// pick the column with this component
-	switch( mi )
-	{
-	case 0:
-		return Vec3( u[0], u[1], u[2] );
-
-	case 1:
-	case 3:
-		return Vec3( u[1], u[3], u[4] );
-
-	default:
-		return Vec3( u[2], u[4], u[5] );
-	}
-}
-
-static Vec3 GetMultiplicity2Evector( Sym3x3 const& matrix, float evalue )
-{
-	// compute M
-	Sym3x3 m;
-	m[0] = matrix[0] - evalue;
-	m[1] = matrix[1];
-	m[2] = matrix[2];
-	m[3] = matrix[3] - evalue;
-	m[4] = matrix[4];
-	m[5] = matrix[5] - evalue;
-
-	// find the largest component
-	float mc = std::fabs( m[0] );
-	int mi = 0;
-	for( int i = 1; i < 6; ++i )
-	{
-		float c = std::fabs( m[i] );
-		if( c > mc )
-		{
-			mc = c;
-			mi = i;
-		}
-	}
-
-	// pick the first eigenvector based on this index
-	switch( mi )
-	{
-	case 0:
-	case 1:
-		return Vec3( -m[1], m[0], 0.0f );
-
-	case 2:
-		return Vec3( m[2], 0.0f, -m[0] );
-
-	case 3:
-	case 4:
-		return Vec3( 0.0f, -m[4], m[3] );
-
-	default:
-		return Vec3( 0.0f, -m[5], m[4] );
-	}
-}
-
-Vec3 ComputePrincipleComponent( Sym3x3 const& matrix )
-{
-	// compute the cubic coefficients
-	float c0 = matrix[0]*matrix[3]*matrix[5] 
-		+ 2.0f*matrix[1]*matrix[2]*matrix[4] 
-		- matrix[0]*matrix[4]*matrix[4] 
-		- matrix[3]*matrix[2]*matrix[2] 
-		- matrix[5]*matrix[1]*matrix[1];
-	float c1 = matrix[0]*matrix[3] + matrix[0]*matrix[5] + matrix[3]*matrix[5]
-		- matrix[1]*matrix[1] - matrix[2]*matrix[2] - matrix[4]*matrix[4];
-	float c2 = matrix[0] + matrix[3] + matrix[5];
-
-	// compute the quadratic coefficients
-	float a = c1 - ( 1.0f/3.0f )*c2*c2;
-	float b = ( -2.0f/27.0f )*c2*c2*c2 + ( 1.0f/3.0f )*c1*c2 - c0;
-
-	// compute the root count check
-	float Q = 0.25f*b*b + ( 1.0f/27.0f )*a*a*a;
-
-	// test the multiplicity
-	if( FLT_EPSILON < Q )
-	{
-		// only one root, which implies we have a multiple of the identity
-        return Vec3( 1.0f );
-	}
-	else if( Q < -FLT_EPSILON )
-	{
-		// three distinct roots
-		float theta = std::atan2( std::sqrt( -Q ), -0.5f*b );
-		float rho = std::sqrt( 0.25f*b*b - Q );
-
-		float rt = std::pow( rho, 1.0f/3.0f );
-		float ct = std::cos( theta/3.0f );
-		float st = std::sin( theta/3.0f );
-
-		float l1 = ( 1.0f/3.0f )*c2 + 2.0f*rt*ct;
-		float l2 = ( 1.0f/3.0f )*c2 - rt*( ct + ( float )sqrt( 3.0f )*st );
-		float l3 = ( 1.0f/3.0f )*c2 - rt*( ct - ( float )sqrt( 3.0f )*st );
-
-		// pick the larger
-		if( std::fabs( l2 ) > std::fabs( l1 ) )
-			l1 = l2;
-		if( std::fabs( l3 ) > std::fabs( l1 ) )
-			l1 = l3;
-
-		// get the eigenvector
-		return GetMultiplicity1Evector( matrix, l1 );
-	}
-	else // if( -FLT_EPSILON <= Q && Q <= FLT_EPSILON )
-	{
-		// two roots
-		float rt;
-		if( b < 0.0f )
-			rt = -std::pow( -0.5f*b, 1.0f/3.0f );
-		else
-			rt = std::pow( 0.5f*b, 1.0f/3.0f );
-		
-		float l1 = ( 1.0f/3.0f )*c2 + rt;		// repeated
-		float l2 = ( 1.0f/3.0f )*c2 - 2.0f*rt;
-		
-		// get the eigenvector
-		if( std::fabs( l1 ) > std::fabs( l2 ) )
-			return GetMultiplicity2Evector( matrix, l1 );
-		else
-			return GetMultiplicity1Evector( matrix, l2 );
-	}
-}
-
-} // namespace squish
diff --git a/drivers/squish/maths.h b/drivers/squish/maths.h
deleted file mode 100644
index 769ae463f7..0000000000
--- a/drivers/squish/maths.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_MATHS_H
-#define SQUISH_MATHS_H
-
-#include <cmath>
-#include <algorithm>
-#include "config.h"
-
-namespace squish {
-
-class Vec3
-{
-public:
-	typedef Vec3 const& Arg;
-
-	Vec3()
-	{
-	}
-
-	explicit Vec3( float s )
-	{
-		m_x = s;
-		m_y = s;
-		m_z = s;
-	}
-
-	Vec3( float x, float y, float z )
-	{
-		m_x = x;
-		m_y = y;
-		m_z = z;
-	}
-	
-	float X() const { return m_x; }
-	float Y() const { return m_y; }
-	float Z() const { return m_z; }
-	
-	Vec3 operator-() const
-	{
-		return Vec3( -m_x, -m_y, -m_z );
-	}
-	
-	Vec3& operator+=( Arg v )
-	{
-		m_x += v.m_x;
-		m_y += v.m_y;
-		m_z += v.m_z;
-		return *this;
-	}
-	
-	Vec3& operator-=( Arg v )
-	{
-		m_x -= v.m_x;
-		m_y -= v.m_y;
-		m_z -= v.m_z;
-		return *this;
-	}
-	
-	Vec3& operator*=( Arg v )
-	{
-		m_x *= v.m_x;
-		m_y *= v.m_y;
-		m_z *= v.m_z;
-		return *this;
-	}
-	
-	Vec3& operator*=( float s )
-	{
-		m_x *= s;
-		m_y *= s;
-		m_z *= s;
-		return *this;
-	}
-	
-	Vec3& operator/=( Arg v )
-	{
-		m_x /= v.m_x;
-		m_y /= v.m_y;
-		m_z /= v.m_z;
-		return *this;
-	}
-	
-	Vec3& operator/=( float s )
-	{
-		float t = 1.0f/s;
-		m_x *= t;
-		m_y *= t;
-		m_z *= t;
-		return *this;
-	}
-	
-	friend Vec3 operator+( Arg left, Arg right )
-	{
-		Vec3 copy( left );
-		return copy += right;
-	}
-	
-	friend Vec3 operator-( Arg left, Arg right )
-	{
-		Vec3 copy( left );
-		return copy -= right;
-	}
-	
-	friend Vec3 operator*( Arg left, Arg right )
-	{
-		Vec3 copy( left );
-		return copy *= right;
-	}
-	
-	friend Vec3 operator*( Arg left, float right )
-	{
-		Vec3 copy( left );
-		return copy *= right;
-	}
-	
-	friend Vec3 operator*( float left, Arg right )
-	{
-		Vec3 copy( right );
-		return copy *= left;
-	}
-	
-	friend Vec3 operator/( Arg left, Arg right )
-	{
-		Vec3 copy( left );
-		return copy /= right;
-	}
-	
-	friend Vec3 operator/( Arg left, float right )
-	{
-		Vec3 copy( left );
-		return copy /= right;
-	}
-	
-	friend float Dot( Arg left, Arg right )
-	{
-		return left.m_x*right.m_x + left.m_y*right.m_y + left.m_z*right.m_z;
-	}
-	
-	friend Vec3 Min( Arg left, Arg right )
-	{
-		return Vec3(
-			std::min( left.m_x, right.m_x ), 
-			std::min( left.m_y, right.m_y ), 
-			std::min( left.m_z, right.m_z )
-		);
-	}
-
-	friend Vec3 Max( Arg left, Arg right )
-	{
-		return Vec3(
-			std::max( left.m_x, right.m_x ), 
-			std::max( left.m_y, right.m_y ), 
-			std::max( left.m_z, right.m_z )
-		);
-	}
-
-	friend Vec3 Truncate( Arg v )
-	{
-		return Vec3(
-			v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ), 
-			v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ), 
-			v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z )
-		);
-	}
-
-private:
-	float m_x;
-	float m_y;
-	float m_z;
-};
-
-inline float LengthSquared( Vec3::Arg v )
-{
-	return Dot( v, v );
-}
-
-class Sym3x3
-{
-public:
-	Sym3x3()
-	{
-	}
-
-	Sym3x3( float s )
-	{
-		for( int i = 0; i < 6; ++i )
-			m_x[i] = s;
-	}
-
-	float operator[]( int index ) const
-	{
-		return m_x[index];
-	}
-
-	float& operator[]( int index )
-	{
-		return m_x[index];
-	}
-
-private:
-	float m_x[6];
-};
-
-Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights );
-Vec3 ComputePrincipleComponent( Sym3x3 const& matrix );
-
-} // namespace squish
-
-#endif // ndef SQUISH_MATHS_H
diff --git a/drivers/squish/rangefit.cpp b/drivers/squish/rangefit.cpp
deleted file mode 100644
index 5a66436056..0000000000
--- a/drivers/squish/rangefit.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "rangefit.h"
-#include "colourset.h"
-#include "colourblock.h"
-#include <cfloat>
-
-namespace squish {
-
-RangeFit::RangeFit( ColourSet const* colours, int flags ) 
-  : ColourFit( colours, flags )
-{
-	// initialise the metric
-	bool perceptual = ( ( m_flags & kColourMetricPerceptual ) != 0 );
-	if( perceptual )
-		m_metric = Vec3( 0.2126f, 0.7152f, 0.0722f );
-	else
-		m_metric = Vec3( 1.0f );
-
-	// initialise the best error
-	m_besterror = FLT_MAX;
-
-	// cache some values
-	int const count = m_colours->GetCount();
-	Vec3 const* values = m_colours->GetPoints();
-	float const* weights = m_colours->GetWeights();
-	
-	// get the covariance matrix
-	Sym3x3 covariance = ComputeWeightedCovariance( count, values, weights );
-	
-	// compute the principle component
-	Vec3 principle = ComputePrincipleComponent( covariance );
-
-	// get the min and max range as the codebook endpoints
-	Vec3 start( 0.0f );
-	Vec3 end( 0.0f );
-	if( count > 0 )
-	{
-		float min, max;
-		
-		// compute the range
-		start = end = values[0];
-		min = max = Dot( values[0], principle );
-		for( int i = 1; i < count; ++i )
-		{
-			float val = Dot( values[i], principle );
-			if( val < min )
-			{
-				start = values[i];
-				min = val;
-			}
-			else if( val > max )
-			{
-				end = values[i];
-				max = val;
-			}
-		}
-	}
-			
-	// clamp the output to [0, 1]
-	Vec3 const one( 1.0f );
-	Vec3 const zero( 0.0f );
-	start = Min( one, Max( zero, start ) );
-	end = Min( one, Max( zero, end ) );
-
-	// clamp to the grid and save
-	Vec3 const grid( 31.0f, 63.0f, 31.0f );
-	Vec3 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f );
-	Vec3 const half( 0.5f );
-	m_start = Truncate( grid*start + half )*gridrcp;
-	m_end = Truncate( grid*end + half )*gridrcp;
-}
-
-void RangeFit::Compress3( void* block )
-{
-	// cache some values
-	int const count = m_colours->GetCount();
-	Vec3 const* values = m_colours->GetPoints();
-	
-	// create a codebook
-	Vec3 codes[3];
-	codes[0] = m_start;
-	codes[1] = m_end;
-	codes[2] = 0.5f*m_start + 0.5f*m_end;
-
-	// match each point to the closest code
-	u8 closest[16];
-	float error = 0.0f;
-	for( int i = 0; i < count; ++i )
-	{
-		// find the closest code
-		float dist = FLT_MAX;
-		int idx = 0;
-		for( int j = 0; j < 3; ++j )
-		{
-			float d = LengthSquared( m_metric*( values[i] - codes[j] ) );
-			if( d < dist )
-			{
-				dist = d;
-				idx = j;
-			}
-		}
-		
-		// save the index
-		closest[i] = ( u8 )idx;
-		
-		// accumulate the error
-		error += dist;
-	}
-	
-	// save this scheme if it wins
-	if( error < m_besterror )
-	{
-		// remap the indices
-		u8 indices[16];
-		m_colours->RemapIndices( closest, indices );
-		
-		// save the block
-		WriteColourBlock3( m_start, m_end, indices, block );
-		
-		// save the error
-		m_besterror = error;
-	}
-}
-
-void RangeFit::Compress4( void* block )
-{
-	// cache some values
-	int const count = m_colours->GetCount();
-	Vec3 const* values = m_colours->GetPoints();
-	
-	// create a codebook
-	Vec3 codes[4];
-	codes[0] = m_start;
-	codes[1] = m_end;
-	codes[2] = ( 2.0f/3.0f )*m_start + ( 1.0f/3.0f )*m_end;
-	codes[3] = ( 1.0f/3.0f )*m_start + ( 2.0f/3.0f )*m_end;
-
-	// match each point to the closest code
-	u8 closest[16];
-	float error = 0.0f;
-	for( int i = 0; i < count; ++i )
-	{
-		// find the closest code
-		float dist = FLT_MAX;
-		int idx = 0;
-		for( int j = 0; j < 4; ++j )
-		{
-			float d = LengthSquared( m_metric*( values[i] - codes[j] ) );
-			if( d < dist )
-			{
-				dist = d;
-				idx = j;
-			}
-		}
-		
-		// save the index
-		closest[i] = ( u8 )idx;
-		
-		// accumulate the error
-		error += dist;
-	}
-	
-	// save this scheme if it wins
-	if( error < m_besterror )
-	{
-		// remap the indices
-		u8 indices[16];
-		m_colours->RemapIndices( closest, indices );
-		
-		// save the block
-		WriteColourBlock4( m_start, m_end, indices, block );
-
-		// save the error
-		m_besterror = error;
-	}
-}
-
-} // namespace squish
diff --git a/drivers/squish/rangefit.h b/drivers/squish/rangefit.h
deleted file mode 100644
index 9d74f9c128..0000000000
--- a/drivers/squish/rangefit.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_RANGEFIT_H
-#define SQUISH_RANGEFIT_H
-
-#include "squish/squish.h"
-#include "colourfit.h"
-#include "maths.h"
-
-namespace squish {
-
-class ColourSet;
-
-class RangeFit : public ColourFit
-{
-public:
-	RangeFit( ColourSet const* colours, int flags );
-	
-private:
-	virtual void Compress3( void* block );
-	virtual void Compress4( void* block );
-	
-	Vec3 m_metric;
-	Vec3 m_start;
-	Vec3 m_end;
-	float m_besterror;
-};
-
-} // squish
-
-#endif // ndef SQUISH_RANGEFIT_H
diff --git a/drivers/squish/simd.h b/drivers/squish/simd.h
deleted file mode 100644
index 22bd10a460..0000000000
--- a/drivers/squish/simd.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_SIMD_H
-#define SQUISH_SIMD_H
-
-#include "maths.h"
-
-#if SQUISH_USE_ALTIVEC
-#include "simd_ve.h"
-#elif SQUISH_USE_SSE
-#include "simd_sse.h"
-#else
-#include "simd_float.h"
-#endif
-
-
-#endif // ndef SQUISH_SIMD_H
diff --git a/drivers/squish/simd_float.h b/drivers/squish/simd_float.h
deleted file mode 100644
index e6351b80eb..0000000000
--- a/drivers/squish/simd_float.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_SIMD_FLOAT_H
-#define SQUISH_SIMD_FLOAT_H
-
-#include <algorithm>
-
-namespace squish {
-
-#define VEC4_CONST( X ) Vec4( X )
-
-class Vec4
-{
-public:
-	typedef Vec4 const& Arg;
-
-	Vec4() {}
-		
-	explicit Vec4( float s )
-	  : m_x( s ),
-		m_y( s ),
-		m_z( s ),
-		m_w( s )
-	{
-	}
-	
-	Vec4( float x, float y, float z, float w )
-	  : m_x( x ),
-		m_y( y ),
-		m_z( z ),
-		m_w( w )
-	{
-	}
-	
-	Vec3 GetVec3() const
-	{
-		return Vec3( m_x, m_y, m_z );
-	}
-	
-	Vec4 SplatX() const { return Vec4( m_x ); }
-	Vec4 SplatY() const { return Vec4( m_y ); }
-	Vec4 SplatZ() const { return Vec4( m_z ); }
-	Vec4 SplatW() const { return Vec4( m_w ); }
-
-	Vec4& operator+=( Arg v )
-	{
-		m_x += v.m_x;
-		m_y += v.m_y;
-		m_z += v.m_z;
-		m_w += v.m_w;
-		return *this;
-	}
-	
-	Vec4& operator-=( Arg v )
-	{
-		m_x -= v.m_x;
-		m_y -= v.m_y;
-		m_z -= v.m_z;
-		m_w -= v.m_w;
-		return *this;
-	}
-	
-	Vec4& operator*=( Arg v )
-	{
-		m_x *= v.m_x;
-		m_y *= v.m_y;
-		m_z *= v.m_z;
-		m_w *= v.m_w;
-		return *this;
-	}
-	
-	friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right  )
-	{
-		Vec4 copy( left );
-		return copy += right;
-	}
-	
-	friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right  )
-	{
-		Vec4 copy( left );
-		return copy -= right;
-	}
-	
-	friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right  )
-	{
-		Vec4 copy( left );
-		return copy *= right;
-	}
-	
-	//! Returns a*b + c
-	friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
-	{
-		return a*b + c;
-	}
-	
-	//! Returns -( a*b - c )
-	friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
-	{
-		return c - a*b;
-	}
-	
-	friend Vec4 Reciprocal( Vec4::Arg v )
-	{
-		return Vec4( 
-			1.0f/v.m_x, 
-			1.0f/v.m_y, 
-			1.0f/v.m_z, 
-			1.0f/v.m_w 
-		);
-	}
-	
-	friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
-	{
-		return Vec4( 
-			std::min( left.m_x, right.m_x ), 
-			std::min( left.m_y, right.m_y ), 
-			std::min( left.m_z, right.m_z ), 
-			std::min( left.m_w, right.m_w ) 
-		);
-	}
-	
-	friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
-	{
-		return Vec4( 
-			std::max( left.m_x, right.m_x ), 
-			std::max( left.m_y, right.m_y ), 
-			std::max( left.m_z, right.m_z ), 
-			std::max( left.m_w, right.m_w ) 
-		);
-	}
-	
-	friend Vec4 Truncate( Vec4::Arg v )
-	{
-		return Vec4(
-			v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ), 
-			v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ), 
-			v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z ),
-			v.m_w > 0.0f ? std::floor( v.m_w ) : std::ceil( v.m_w )
-		);
-	}
-	
-	friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right ) 
-	{
-		return left.m_x < right.m_x
-			|| left.m_y < right.m_y
-			|| left.m_z < right.m_z
-			|| left.m_w < right.m_w;
-	}
-	
-private:
-	float m_x;
-	float m_y;
-	float m_z;
-	float m_w;
-};
-
-} // namespace squish
-
-#endif // ndef SQUISH_SIMD_FLOAT_H
-
diff --git a/drivers/squish/simd_sse.h b/drivers/squish/simd_sse.h
deleted file mode 100644
index e584f2a0e5..0000000000
--- a/drivers/squish/simd_sse.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_SIMD_SSE_H
-#define SQUISH_SIMD_SSE_H
-
-#include <xmmintrin.h>
-#if ( SQUISH_USE_SSE > 1 )
-#include <emmintrin.h>
-#endif
-
-#define SQUISH_SSE_SPLAT( a )										\
-	( ( a ) | ( ( a ) << 2 ) | ( ( a ) << 4 ) | ( ( a ) << 6 ) )
-
-#define SQUISH_SSE_SHUF( x, y, z, w )								\
-	( ( x ) | ( ( y ) << 2 ) | ( ( z ) << 4 ) | ( ( w ) << 6 ) )
-
-namespace squish {
-
-#define VEC4_CONST( X ) Vec4( X )
-
-class Vec4
-{
-public:
-	typedef Vec4 const& Arg;
-
-	Vec4() {}
-		
-	explicit Vec4( __m128 v ) : m_v( v ) {}
-	
-	Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
-	
-	Vec4& operator=( Vec4 const& arg )
-	{
-		m_v = arg.m_v;
-		return *this;
-	}
-	
-	explicit Vec4( float s ) : m_v( _mm_set1_ps( s ) ) {}
-	
-	Vec4( float x, float y, float z, float w ) : m_v( _mm_setr_ps( x, y, z, w ) ) {}
-	
-	Vec3 GetVec3() const
-	{
-#ifdef __GNUC__
-		__attribute__ ((__aligned__ (16))) float c[4];
-#else
-		__declspec(align(16)) float c[4];
-#endif
-		_mm_store_ps( c, m_v );
-		return Vec3( c[0], c[1], c[2] );
-	}
-	
-	Vec4 SplatX() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 0 ) ) ); }
-	Vec4 SplatY() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 1 ) ) ); }
-	Vec4 SplatZ() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 2 ) ) ); }
-	Vec4 SplatW() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 3 ) ) ); }
-
-	Vec4& operator+=( Arg v )
-	{
-		m_v = _mm_add_ps( m_v, v.m_v );
-		return *this;
-	}
-	
-	Vec4& operator-=( Arg v )
-	{
-		m_v = _mm_sub_ps( m_v, v.m_v );
-		return *this;
-	}
-	
-	Vec4& operator*=( Arg v )
-	{
-		m_v = _mm_mul_ps( m_v, v.m_v );
-		return *this;
-	}
-	
-	friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right  )
-	{
-		return Vec4( _mm_add_ps( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right  )
-	{
-		return Vec4( _mm_sub_ps( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right  )
-	{
-		return Vec4( _mm_mul_ps( left.m_v, right.m_v ) );
-	}
-	
-	//! Returns a*b + c
-	friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
-	{
-		return Vec4( _mm_add_ps( _mm_mul_ps( a.m_v, b.m_v ), c.m_v ) );
-	}
-	
-	//! Returns -( a*b - c )
-	friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
-	{
-		return Vec4( _mm_sub_ps( c.m_v, _mm_mul_ps( a.m_v, b.m_v ) ) );
-	}
-	
-	friend Vec4 Reciprocal( Vec4::Arg v )
-	{
-		// get the reciprocal estimate
-		__m128 estimate = _mm_rcp_ps( v.m_v );
-
-		// one round of Newton-Rhaphson refinement
-		__m128 diff = _mm_sub_ps( _mm_set1_ps( 1.0f ), _mm_mul_ps( estimate, v.m_v ) );
-		return Vec4( _mm_add_ps( _mm_mul_ps( diff, estimate ), estimate ) );
-	}
-	
-	friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
-	{
-		return Vec4( _mm_min_ps( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
-	{
-		return Vec4( _mm_max_ps( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 Truncate( Vec4::Arg v )
-	{
-#if ( SQUISH_USE_SSE == 1 )
-		// convert to ints
-		__m128 input = v.m_v;
-		__m64 lo = _mm_cvttps_pi32( input );
-		__m64 hi = _mm_cvttps_pi32( _mm_movehl_ps( input, input ) );
-
-		// convert to floats
-		__m128 part = _mm_movelh_ps( input, _mm_cvtpi32_ps( input, hi ) );
-		__m128 truncated = _mm_cvtpi32_ps( part, lo );
-		
-		// clear out the MMX multimedia state to allow FP calls later
-		_mm_empty(); 
-		return Vec4( truncated );
-#else
-		// use SSE2 instructions
-		return Vec4( _mm_cvtepi32_ps( _mm_cvttps_epi32( v.m_v ) ) );
-#endif
-	}
-	
-	friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right ) 
-	{
-		__m128 bits = _mm_cmplt_ps( left.m_v, right.m_v );
-		int value = _mm_movemask_ps( bits );
-		return value != 0;
-	}
-	
-private:
-	__m128 m_v;
-};
-
-} // namespace squish
-
-#endif // ndef SQUISH_SIMD_SSE_H
diff --git a/drivers/squish/simd_ve.h b/drivers/squish/simd_ve.h
deleted file mode 100644
index 9a33955ffc..0000000000
--- a/drivers/squish/simd_ve.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_SIMD_VE_H
-#define SQUISH_SIMD_VE_H
-
-#include <altivec.h>
-#undef bool
-
-namespace squish {
-
-#define VEC4_CONST( X ) Vec4( ( vector float )( X ) )
-
-class Vec4
-{
-public:
-	typedef Vec4 Arg;
-
-	Vec4() {}
-		
-	explicit Vec4( vector float v ) : m_v( v ) {}
-	
-	Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
-	
-	Vec4& operator=( Vec4 const& arg )
-	{
-		m_v = arg.m_v;
-		return *this;
-	}
-	
-	explicit Vec4( float s )
-	{
-		union { vector float v; float c[4]; } u;
-		u.c[0] = s;
-		u.c[1] = s;
-		u.c[2] = s;
-		u.c[3] = s;
-		m_v = u.v;
-	}
-	
-	Vec4( float x, float y, float z, float w )
-	{
-		union { vector float v; float c[4]; } u;
-		u.c[0] = x;
-		u.c[1] = y;
-		u.c[2] = z;
-		u.c[3] = w;
-		m_v = u.v;
-	}
-	
-	Vec3 GetVec3() const
-	{
-		union { vector float v; float c[4]; } u;
-		u.v = m_v;
-		return Vec3( u.c[0], u.c[1], u.c[2] );
-	}
-	
-	Vec4 SplatX() const { return Vec4( vec_splat( m_v, 0 ) ); }
-	Vec4 SplatY() const { return Vec4( vec_splat( m_v, 1 ) ); }
-	Vec4 SplatZ() const { return Vec4( vec_splat( m_v, 2 ) ); }
-	Vec4 SplatW() const { return Vec4( vec_splat( m_v, 3 ) ); }
-
-	Vec4& operator+=( Arg v )
-	{
-		m_v = vec_add( m_v, v.m_v );
-		return *this;
-	}
-	
-	Vec4& operator-=( Arg v )
-	{
-		m_v = vec_sub( m_v, v.m_v );
-		return *this;
-	}
-	
-	Vec4& operator*=( Arg v )
-	{
-		m_v = vec_madd( m_v, v.m_v, ( vector float )( -0.0f ) );
-		return *this;
-	}
-	
-	friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right  )
-	{
-		return Vec4( vec_add( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right  )
-	{
-		return Vec4( vec_sub( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right  )
-	{
-		return Vec4( vec_madd( left.m_v, right.m_v, ( vector float )( -0.0f ) ) );
-	}
-	
-	//! Returns a*b + c
-	friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
-	{
-		return Vec4( vec_madd( a.m_v, b.m_v, c.m_v ) );
-	}
-	
-	//! Returns -( a*b - c )
-	friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
-	{
-		return Vec4( vec_nmsub( a.m_v, b.m_v, c.m_v ) );
-	}
-	
-	friend Vec4 Reciprocal( Vec4::Arg v )
-	{
-		// get the reciprocal estimate
-		vector float estimate = vec_re( v.m_v );
-		
-		// one round of Newton-Rhaphson refinement
-		vector float diff = vec_nmsub( estimate, v.m_v, ( vector float )( 1.0f ) );
-		return Vec4( vec_madd( diff, estimate, estimate ) );
-	}
-	
-	friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
-	{
-		return Vec4( vec_min( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
-	{
-		return Vec4( vec_max( left.m_v, right.m_v ) );
-	}
-	
-	friend Vec4 Truncate( Vec4::Arg v )
-	{
-		return Vec4( vec_trunc( v.m_v ) );
-	}
-	
-	friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right ) 
-	{
-		return vec_any_lt( left.m_v, right.m_v ) != 0;
-	}
-	
-private:
-	vector float m_v;
-};
-
-} // namespace squish
-
-#endif // ndef SQUISH_SIMD_VE_H
diff --git a/drivers/squish/singlecolourfit.cpp b/drivers/squish/singlecolourfit.cpp
deleted file mode 100644
index ac8be1ad72..0000000000
--- a/drivers/squish/singlecolourfit.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "singlecolourfit.h"
-#include "colourset.h"
-#include "colourblock.h"
-
-namespace squish {
-
-struct SourceBlock
-{
-	u8 start;
-	u8 end;
-	u8 error;
-};
-
-struct SingleColourLookup
-{
-	SourceBlock sources[2];
-};
-
-#include "singlecolourlookup.inl"
-
-static int FloatToInt( float a, int limit )
-{
-	// use ANSI round-to-zero behaviour to get round-to-nearest
-	int i = ( int )( a + 0.5f );
-
-	// clamp to the limit
-	if( i < 0 )
-		i = 0;
-	else if( i > limit )
-		i = limit; 
-
-	// done
-	return i;
-}
-
-SingleColourFit::SingleColourFit( ColourSet const* colours, int flags )
-  : ColourFit( colours, flags )
-{
-	// grab the single colour
-	Vec3 const* values = m_colours->GetPoints();
-	m_colour[0] = ( u8 )FloatToInt( 255.0f*values->X(), 255 );
-	m_colour[1] = ( u8 )FloatToInt( 255.0f*values->Y(), 255 );
-	m_colour[2] = ( u8 )FloatToInt( 255.0f*values->Z(), 255 );
-		
-	// initialise the best error
-	m_besterror = 2147483647; //INT_MAX
-}
-
-void SingleColourFit::Compress3( void* block )
-{
-	// build the table of lookups
-	SingleColourLookup const* const lookups[] = 
-	{
-		lookup_5_3, 
-		lookup_6_3, 
-		lookup_5_3
-	};
-	
-	// find the best end-points and index
-	ComputeEndPoints( lookups );
-	
-	// build the block if we win
-	if( m_error < m_besterror )
-	{
-		// remap the indices
-		u8 indices[16];
-		m_colours->RemapIndices( &m_index, indices );
-		
-		// save the block
-		WriteColourBlock3( m_start, m_end, indices, block );
-
-		// save the error
-		m_besterror = m_error;
-	}
-}
-
-void SingleColourFit::Compress4( void* block )
-{
-	// build the table of lookups
-	SingleColourLookup const* const lookups[] = 
-	{
-		lookup_5_4, 
-		lookup_6_4, 
-		lookup_5_4
-	};
-	
-	// find the best end-points and index
-	ComputeEndPoints( lookups );
-	
-	// build the block if we win
-	if( m_error < m_besterror )
-	{
-		// remap the indices
-		u8 indices[16];
-		m_colours->RemapIndices( &m_index, indices );
-		
-		// save the block
-		WriteColourBlock4( m_start, m_end, indices, block );
-
-		// save the error
-		m_besterror = m_error;
-	}
-}
-
-void SingleColourFit::ComputeEndPoints( SingleColourLookup const* const* lookups )
-{
-	// check each index combination (endpoint or intermediate)
-	m_error = 2147483647; //INT_MAX
-	for( int index = 0; index < 2; ++index )
-	{
-		// check the error for this codebook index
-		SourceBlock const* sources[3];
-		int error = 0;
-		for( int channel = 0; channel < 3; ++channel )
-		{
-			// grab the lookup table and index for this channel
-			SingleColourLookup const* lookup = lookups[channel];
-			int target = m_colour[channel];
-			
-			// store a pointer to the source for this channel
-			sources[channel] = lookup[target].sources + index;
-			
-			// accumulate the error
-			int diff = sources[channel]->error;
-			error += diff*diff;			
-		}
-		
-		// keep it if the error is lower
-		if( error < m_error )
-		{
-			m_start = Vec3(
-				( float )sources[0]->start/31.0f, 
-				( float )sources[1]->start/63.0f, 
-				( float )sources[2]->start/31.0f
-			);
-			m_end = Vec3(
-				( float )sources[0]->end/31.0f, 
-				( float )sources[1]->end/63.0f, 
-				( float )sources[2]->end/31.0f
-			);
-			m_index = ( u8 )( 2*index );
-			m_error = error;
-		}
-	}
-}
-
-} // namespace squish
diff --git a/drivers/squish/singlecolourfit.h b/drivers/squish/singlecolourfit.h
deleted file mode 100644
index c8dce2a5a0..0000000000
--- a/drivers/squish/singlecolourfit.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_SINGLECOLOURFIT_H
-#define SQUISH_SINGLECOLOURFIT_H
-
-#include "squish/squish.h"
-#include "colourfit.h"
-
-namespace squish {
-
-class ColourSet;
-struct SingleColourLookup;
-
-class SingleColourFit : public ColourFit
-{
-public:
-	SingleColourFit( ColourSet const* colours, int flags );
-	
-private:
-	virtual void Compress3( void* block );
-	virtual void Compress4( void* block );
-	
-	void ComputeEndPoints( SingleColourLookup const* const* lookups );
-	
-	u8 m_colour[3];
-	Vec3 m_start;
-	Vec3 m_end;
-	u8 m_index;
-	int m_error;
-	int m_besterror;
-};
-
-} // namespace squish
-
-#endif // ndef SQUISH_SINGLECOLOURFIT_H
diff --git a/drivers/squish/singlecolourlookup.inl b/drivers/squish/singlecolourlookup.inl
deleted file mode 100644
index f1c95a1028..0000000000
--- a/drivers/squish/singlecolourlookup.inl
+++ /dev/null
@@ -1,1040 +0,0 @@
-
-static SingleColourLookup const lookup_5_3[] = 
-{
-	{ { { 0, 0, 0 }, { 0, 0, 0 } } },
-	{ { { 0, 0, 1 }, { 0, 0, 1 } } },
-	{ { { 0, 0, 2 }, { 0, 0, 2 } } },
-	{ { { 0, 0, 3 }, { 0, 1, 1 } } },
-	{ { { 0, 0, 4 }, { 0, 1, 0 } } },
-	{ { { 1, 0, 3 }, { 0, 1, 1 } } },
-	{ { { 1, 0, 2 }, { 0, 1, 2 } } },
-	{ { { 1, 0, 1 }, { 0, 2, 1 } } },
-	{ { { 1, 0, 0 }, { 0, 2, 0 } } },
-	{ { { 1, 0, 1 }, { 0, 2, 1 } } },
-	{ { { 1, 0, 2 }, { 0, 2, 2 } } },
-	{ { { 1, 0, 3 }, { 0, 3, 1 } } },
-	{ { { 1, 0, 4 }, { 0, 3, 0 } } },
-	{ { { 2, 0, 3 }, { 0, 3, 1 } } },
-	{ { { 2, 0, 2 }, { 0, 3, 2 } } },
-	{ { { 2, 0, 1 }, { 0, 4, 1 } } },
-	{ { { 2, 0, 0 }, { 0, 4, 0 } } },
-	{ { { 2, 0, 1 }, { 0, 4, 1 } } },
-	{ { { 2, 0, 2 }, { 0, 4, 2 } } },
-	{ { { 2, 0, 3 }, { 0, 5, 1 } } },
-	{ { { 2, 0, 4 }, { 0, 5, 0 } } },
-	{ { { 3, 0, 3 }, { 0, 5, 1 } } },
-	{ { { 3, 0, 2 }, { 0, 5, 2 } } },
-	{ { { 3, 0, 1 }, { 0, 6, 1 } } },
-	{ { { 3, 0, 0 }, { 0, 6, 0 } } },
-	{ { { 3, 0, 1 }, { 0, 6, 1 } } },
-	{ { { 3, 0, 2 }, { 0, 6, 2 } } },
-	{ { { 3, 0, 3 }, { 0, 7, 1 } } },
-	{ { { 3, 0, 4 }, { 0, 7, 0 } } },
-	{ { { 4, 0, 4 }, { 0, 7, 1 } } },
-	{ { { 4, 0, 3 }, { 0, 7, 2 } } },
-	{ { { 4, 0, 2 }, { 1, 7, 1 } } },
-	{ { { 4, 0, 1 }, { 1, 7, 0 } } },
-	{ { { 4, 0, 0 }, { 0, 8, 0 } } },
-	{ { { 4, 0, 1 }, { 0, 8, 1 } } },
-	{ { { 4, 0, 2 }, { 2, 7, 1 } } },
-	{ { { 4, 0, 3 }, { 2, 7, 0 } } },
-	{ { { 4, 0, 4 }, { 0, 9, 0 } } },
-	{ { { 5, 0, 3 }, { 0, 9, 1 } } },
-	{ { { 5, 0, 2 }, { 3, 7, 1 } } },
-	{ { { 5, 0, 1 }, { 3, 7, 0 } } },
-	{ { { 5, 0, 0 }, { 0, 10, 0 } } },
-	{ { { 5, 0, 1 }, { 0, 10, 1 } } },
-	{ { { 5, 0, 2 }, { 0, 10, 2 } } },
-	{ { { 5, 0, 3 }, { 0, 11, 1 } } },
-	{ { { 5, 0, 4 }, { 0, 11, 0 } } },
-	{ { { 6, 0, 3 }, { 0, 11, 1 } } },
-	{ { { 6, 0, 2 }, { 0, 11, 2 } } },
-	{ { { 6, 0, 1 }, { 0, 12, 1 } } },
-	{ { { 6, 0, 0 }, { 0, 12, 0 } } },
-	{ { { 6, 0, 1 }, { 0, 12, 1 } } },
-	{ { { 6, 0, 2 }, { 0, 12, 2 } } },
-	{ { { 6, 0, 3 }, { 0, 13, 1 } } },
-	{ { { 6, 0, 4 }, { 0, 13, 0 } } },
-	{ { { 7, 0, 3 }, { 0, 13, 1 } } },
-	{ { { 7, 0, 2 }, { 0, 13, 2 } } },
-	{ { { 7, 0, 1 }, { 0, 14, 1 } } },
-	{ { { 7, 0, 0 }, { 0, 14, 0 } } },
-	{ { { 7, 0, 1 }, { 0, 14, 1 } } },
-	{ { { 7, 0, 2 }, { 0, 14, 2 } } },
-	{ { { 7, 0, 3 }, { 0, 15, 1 } } },
-	{ { { 7, 0, 4 }, { 0, 15, 0 } } },
-	{ { { 8, 0, 4 }, { 0, 15, 1 } } },
-	{ { { 8, 0, 3 }, { 0, 15, 2 } } },
-	{ { { 8, 0, 2 }, { 1, 15, 1 } } },
-	{ { { 8, 0, 1 }, { 1, 15, 0 } } },
-	{ { { 8, 0, 0 }, { 0, 16, 0 } } },
-	{ { { 8, 0, 1 }, { 0, 16, 1 } } },
-	{ { { 8, 0, 2 }, { 2, 15, 1 } } },
-	{ { { 8, 0, 3 }, { 2, 15, 0 } } },
-	{ { { 8, 0, 4 }, { 0, 17, 0 } } },
-	{ { { 9, 0, 3 }, { 0, 17, 1 } } },
-	{ { { 9, 0, 2 }, { 3, 15, 1 } } },
-	{ { { 9, 0, 1 }, { 3, 15, 0 } } },
-	{ { { 9, 0, 0 }, { 0, 18, 0 } } },
-	{ { { 9, 0, 1 }, { 0, 18, 1 } } },
-	{ { { 9, 0, 2 }, { 0, 18, 2 } } },
-	{ { { 9, 0, 3 }, { 0, 19, 1 } } },
-	{ { { 9, 0, 4 }, { 0, 19, 0 } } },
-	{ { { 10, 0, 3 }, { 0, 19, 1 } } },
-	{ { { 10, 0, 2 }, { 0, 19, 2 } } },
-	{ { { 10, 0, 1 }, { 0, 20, 1 } } },
-	{ { { 10, 0, 0 }, { 0, 20, 0 } } },
-	{ { { 10, 0, 1 }, { 0, 20, 1 } } },
-	{ { { 10, 0, 2 }, { 0, 20, 2 } } },
-	{ { { 10, 0, 3 }, { 0, 21, 1 } } },
-	{ { { 10, 0, 4 }, { 0, 21, 0 } } },
-	{ { { 11, 0, 3 }, { 0, 21, 1 } } },
-	{ { { 11, 0, 2 }, { 0, 21, 2 } } },
-	{ { { 11, 0, 1 }, { 0, 22, 1 } } },
-	{ { { 11, 0, 0 }, { 0, 22, 0 } } },
-	{ { { 11, 0, 1 }, { 0, 22, 1 } } },
-	{ { { 11, 0, 2 }, { 0, 22, 2 } } },
-	{ { { 11, 0, 3 }, { 0, 23, 1 } } },
-	{ { { 11, 0, 4 }, { 0, 23, 0 } } },
-	{ { { 12, 0, 4 }, { 0, 23, 1 } } },
-	{ { { 12, 0, 3 }, { 0, 23, 2 } } },
-	{ { { 12, 0, 2 }, { 1, 23, 1 } } },
-	{ { { 12, 0, 1 }, { 1, 23, 0 } } },
-	{ { { 12, 0, 0 }, { 0, 24, 0 } } },
-	{ { { 12, 0, 1 }, { 0, 24, 1 } } },
-	{ { { 12, 0, 2 }, { 2, 23, 1 } } },
-	{ { { 12, 0, 3 }, { 2, 23, 0 } } },
-	{ { { 12, 0, 4 }, { 0, 25, 0 } } },
-	{ { { 13, 0, 3 }, { 0, 25, 1 } } },
-	{ { { 13, 0, 2 }, { 3, 23, 1 } } },
-	{ { { 13, 0, 1 }, { 3, 23, 0 } } },
-	{ { { 13, 0, 0 }, { 0, 26, 0 } } },
-	{ { { 13, 0, 1 }, { 0, 26, 1 } } },
-	{ { { 13, 0, 2 }, { 0, 26, 2 } } },
-	{ { { 13, 0, 3 }, { 0, 27, 1 } } },
-	{ { { 13, 0, 4 }, { 0, 27, 0 } } },
-	{ { { 14, 0, 3 }, { 0, 27, 1 } } },
-	{ { { 14, 0, 2 }, { 0, 27, 2 } } },
-	{ { { 14, 0, 1 }, { 0, 28, 1 } } },
-	{ { { 14, 0, 0 }, { 0, 28, 0 } } },
-	{ { { 14, 0, 1 }, { 0, 28, 1 } } },
-	{ { { 14, 0, 2 }, { 0, 28, 2 } } },
-	{ { { 14, 0, 3 }, { 0, 29, 1 } } },
-	{ { { 14, 0, 4 }, { 0, 29, 0 } } },
-	{ { { 15, 0, 3 }, { 0, 29, 1 } } },
-	{ { { 15, 0, 2 }, { 0, 29, 2 } } },
-	{ { { 15, 0, 1 }, { 0, 30, 1 } } },
-	{ { { 15, 0, 0 }, { 0, 30, 0 } } },
-	{ { { 15, 0, 1 }, { 0, 30, 1 } } },
-	{ { { 15, 0, 2 }, { 0, 30, 2 } } },
-	{ { { 15, 0, 3 }, { 0, 31, 1 } } },
-	{ { { 15, 0, 4 }, { 0, 31, 0 } } },
-	{ { { 16, 0, 4 }, { 0, 31, 1 } } },
-	{ { { 16, 0, 3 }, { 0, 31, 2 } } },
-	{ { { 16, 0, 2 }, { 1, 31, 1 } } },
-	{ { { 16, 0, 1 }, { 1, 31, 0 } } },
-	{ { { 16, 0, 0 }, { 4, 28, 0 } } },
-	{ { { 16, 0, 1 }, { 4, 28, 1 } } },
-	{ { { 16, 0, 2 }, { 2, 31, 1 } } },
-	{ { { 16, 0, 3 }, { 2, 31, 0 } } },
-	{ { { 16, 0, 4 }, { 4, 29, 0 } } },
-	{ { { 17, 0, 3 }, { 4, 29, 1 } } },
-	{ { { 17, 0, 2 }, { 3, 31, 1 } } },
-	{ { { 17, 0, 1 }, { 3, 31, 0 } } },
-	{ { { 17, 0, 0 }, { 4, 30, 0 } } },
-	{ { { 17, 0, 1 }, { 4, 30, 1 } } },
-	{ { { 17, 0, 2 }, { 4, 30, 2 } } },
-	{ { { 17, 0, 3 }, { 4, 31, 1 } } },
-	{ { { 17, 0, 4 }, { 4, 31, 0 } } },
-	{ { { 18, 0, 3 }, { 4, 31, 1 } } },
-	{ { { 18, 0, 2 }, { 4, 31, 2 } } },
-	{ { { 18, 0, 1 }, { 5, 31, 1 } } },
-	{ { { 18, 0, 0 }, { 5, 31, 0 } } },
-	{ { { 18, 0, 1 }, { 5, 31, 1 } } },
-	{ { { 18, 0, 2 }, { 5, 31, 2 } } },
-	{ { { 18, 0, 3 }, { 6, 31, 1 } } },
-	{ { { 18, 0, 4 }, { 6, 31, 0 } } },
-	{ { { 19, 0, 3 }, { 6, 31, 1 } } },
-	{ { { 19, 0, 2 }, { 6, 31, 2 } } },
-	{ { { 19, 0, 1 }, { 7, 31, 1 } } },
-	{ { { 19, 0, 0 }, { 7, 31, 0 } } },
-	{ { { 19, 0, 1 }, { 7, 31, 1 } } },
-	{ { { 19, 0, 2 }, { 7, 31, 2 } } },
-	{ { { 19, 0, 3 }, { 8, 31, 1 } } },
-	{ { { 19, 0, 4 }, { 8, 31, 0 } } },
-	{ { { 20, 0, 4 }, { 8, 31, 1 } } },
-	{ { { 20, 0, 3 }, { 8, 31, 2 } } },
-	{ { { 20, 0, 2 }, { 9, 31, 1 } } },
-	{ { { 20, 0, 1 }, { 9, 31, 0 } } },
-	{ { { 20, 0, 0 }, { 12, 28, 0 } } },
-	{ { { 20, 0, 1 }, { 12, 28, 1 } } },
-	{ { { 20, 0, 2 }, { 10, 31, 1 } } },
-	{ { { 20, 0, 3 }, { 10, 31, 0 } } },
-	{ { { 20, 0, 4 }, { 12, 29, 0 } } },
-	{ { { 21, 0, 3 }, { 12, 29, 1 } } },
-	{ { { 21, 0, 2 }, { 11, 31, 1 } } },
-	{ { { 21, 0, 1 }, { 11, 31, 0 } } },
-	{ { { 21, 0, 0 }, { 12, 30, 0 } } },
-	{ { { 21, 0, 1 }, { 12, 30, 1 } } },
-	{ { { 21, 0, 2 }, { 12, 30, 2 } } },
-	{ { { 21, 0, 3 }, { 12, 31, 1 } } },
-	{ { { 21, 0, 4 }, { 12, 31, 0 } } },
-	{ { { 22, 0, 3 }, { 12, 31, 1 } } },
-	{ { { 22, 0, 2 }, { 12, 31, 2 } } },
-	{ { { 22, 0, 1 }, { 13, 31, 1 } } },
-	{ { { 22, 0, 0 }, { 13, 31, 0 } } },
-	{ { { 22, 0, 1 }, { 13, 31, 1 } } },
-	{ { { 22, 0, 2 }, { 13, 31, 2 } } },
-	{ { { 22, 0, 3 }, { 14, 31, 1 } } },
-	{ { { 22, 0, 4 }, { 14, 31, 0 } } },
-	{ { { 23, 0, 3 }, { 14, 31, 1 } } },
-	{ { { 23, 0, 2 }, { 14, 31, 2 } } },
-	{ { { 23, 0, 1 }, { 15, 31, 1 } } },
-	{ { { 23, 0, 0 }, { 15, 31, 0 } } },
-	{ { { 23, 0, 1 }, { 15, 31, 1 } } },
-	{ { { 23, 0, 2 }, { 15, 31, 2 } } },
-	{ { { 23, 0, 3 }, { 16, 31, 1 } } },
-	{ { { 23, 0, 4 }, { 16, 31, 0 } } },
-	{ { { 24, 0, 4 }, { 16, 31, 1 } } },
-	{ { { 24, 0, 3 }, { 16, 31, 2 } } },
-	{ { { 24, 0, 2 }, { 17, 31, 1 } } },
-	{ { { 24, 0, 1 }, { 17, 31, 0 } } },
-	{ { { 24, 0, 0 }, { 20, 28, 0 } } },
-	{ { { 24, 0, 1 }, { 20, 28, 1 } } },
-	{ { { 24, 0, 2 }, { 18, 31, 1 } } },
-	{ { { 24, 0, 3 }, { 18, 31, 0 } } },
-	{ { { 24, 0, 4 }, { 20, 29, 0 } } },
-	{ { { 25, 0, 3 }, { 20, 29, 1 } } },
-	{ { { 25, 0, 2 }, { 19, 31, 1 } } },
-	{ { { 25, 0, 1 }, { 19, 31, 0 } } },
-	{ { { 25, 0, 0 }, { 20, 30, 0 } } },
-	{ { { 25, 0, 1 }, { 20, 30, 1 } } },
-	{ { { 25, 0, 2 }, { 20, 30, 2 } } },
-	{ { { 25, 0, 3 }, { 20, 31, 1 } } },
-	{ { { 25, 0, 4 }, { 20, 31, 0 } } },
-	{ { { 26, 0, 3 }, { 20, 31, 1 } } },
-	{ { { 26, 0, 2 }, { 20, 31, 2 } } },
-	{ { { 26, 0, 1 }, { 21, 31, 1 } } },
-	{ { { 26, 0, 0 }, { 21, 31, 0 } } },
-	{ { { 26, 0, 1 }, { 21, 31, 1 } } },
-	{ { { 26, 0, 2 }, { 21, 31, 2 } } },
-	{ { { 26, 0, 3 }, { 22, 31, 1 } } },
-	{ { { 26, 0, 4 }, { 22, 31, 0 } } },
-	{ { { 27, 0, 3 }, { 22, 31, 1 } } },
-	{ { { 27, 0, 2 }, { 22, 31, 2 } } },
-	{ { { 27, 0, 1 }, { 23, 31, 1 } } },
-	{ { { 27, 0, 0 }, { 23, 31, 0 } } },
-	{ { { 27, 0, 1 }, { 23, 31, 1 } } },
-	{ { { 27, 0, 2 }, { 23, 31, 2 } } },
-	{ { { 27, 0, 3 }, { 24, 31, 1 } } },
-	{ { { 27, 0, 4 }, { 24, 31, 0 } } },
-	{ { { 28, 0, 4 }, { 24, 31, 1 } } },
-	{ { { 28, 0, 3 }, { 24, 31, 2 } } },
-	{ { { 28, 0, 2 }, { 25, 31, 1 } } },
-	{ { { 28, 0, 1 }, { 25, 31, 0 } } },
-	{ { { 28, 0, 0 }, { 28, 28, 0 } } },
-	{ { { 28, 0, 1 }, { 28, 28, 1 } } },
-	{ { { 28, 0, 2 }, { 26, 31, 1 } } },
-	{ { { 28, 0, 3 }, { 26, 31, 0 } } },
-	{ { { 28, 0, 4 }, { 28, 29, 0 } } },
-	{ { { 29, 0, 3 }, { 28, 29, 1 } } },
-	{ { { 29, 0, 2 }, { 27, 31, 1 } } },
-	{ { { 29, 0, 1 }, { 27, 31, 0 } } },
-	{ { { 29, 0, 0 }, { 28, 30, 0 } } },
-	{ { { 29, 0, 1 }, { 28, 30, 1 } } },
-	{ { { 29, 0, 2 }, { 28, 30, 2 } } },
-	{ { { 29, 0, 3 }, { 28, 31, 1 } } },
-	{ { { 29, 0, 4 }, { 28, 31, 0 } } },
-	{ { { 30, 0, 3 }, { 28, 31, 1 } } },
-	{ { { 30, 0, 2 }, { 28, 31, 2 } } },
-	{ { { 30, 0, 1 }, { 29, 31, 1 } } },
-	{ { { 30, 0, 0 }, { 29, 31, 0 } } },
-	{ { { 30, 0, 1 }, { 29, 31, 1 } } },
-	{ { { 30, 0, 2 }, { 29, 31, 2 } } },
-	{ { { 30, 0, 3 }, { 30, 31, 1 } } },
-	{ { { 30, 0, 4 }, { 30, 31, 0 } } },
-	{ { { 31, 0, 3 }, { 30, 31, 1 } } },
-	{ { { 31, 0, 2 }, { 30, 31, 2 } } },
-	{ { { 31, 0, 1 }, { 31, 31, 1 } } },
-	{ { { 31, 0, 0 }, { 31, 31, 0 } } }
-};
-
-static SingleColourLookup const lookup_6_3[] = 
-{
-	{ { { 0, 0, 0 }, { 0, 0, 0 } } },
-	{ { { 0, 0, 1 }, { 0, 1, 1 } } },
-	{ { { 0, 0, 2 }, { 0, 1, 0 } } },
-	{ { { 1, 0, 1 }, { 0, 2, 1 } } },
-	{ { { 1, 0, 0 }, { 0, 2, 0 } } },
-	{ { { 1, 0, 1 }, { 0, 3, 1 } } },
-	{ { { 1, 0, 2 }, { 0, 3, 0 } } },
-	{ { { 2, 0, 1 }, { 0, 4, 1 } } },
-	{ { { 2, 0, 0 }, { 0, 4, 0 } } },
-	{ { { 2, 0, 1 }, { 0, 5, 1 } } },
-	{ { { 2, 0, 2 }, { 0, 5, 0 } } },
-	{ { { 3, 0, 1 }, { 0, 6, 1 } } },
-	{ { { 3, 0, 0 }, { 0, 6, 0 } } },
-	{ { { 3, 0, 1 }, { 0, 7, 1 } } },
-	{ { { 3, 0, 2 }, { 0, 7, 0 } } },
-	{ { { 4, 0, 1 }, { 0, 8, 1 } } },
-	{ { { 4, 0, 0 }, { 0, 8, 0 } } },
-	{ { { 4, 0, 1 }, { 0, 9, 1 } } },
-	{ { { 4, 0, 2 }, { 0, 9, 0 } } },
-	{ { { 5, 0, 1 }, { 0, 10, 1 } } },
-	{ { { 5, 0, 0 }, { 0, 10, 0 } } },
-	{ { { 5, 0, 1 }, { 0, 11, 1 } } },
-	{ { { 5, 0, 2 }, { 0, 11, 0 } } },
-	{ { { 6, 0, 1 }, { 0, 12, 1 } } },
-	{ { { 6, 0, 0 }, { 0, 12, 0 } } },
-	{ { { 6, 0, 1 }, { 0, 13, 1 } } },
-	{ { { 6, 0, 2 }, { 0, 13, 0 } } },
-	{ { { 7, 0, 1 }, { 0, 14, 1 } } },
-	{ { { 7, 0, 0 }, { 0, 14, 0 } } },
-	{ { { 7, 0, 1 }, { 0, 15, 1 } } },
-	{ { { 7, 0, 2 }, { 0, 15, 0 } } },
-	{ { { 8, 0, 1 }, { 0, 16, 1 } } },
-	{ { { 8, 0, 0 }, { 0, 16, 0 } } },
-	{ { { 8, 0, 1 }, { 0, 17, 1 } } },
-	{ { { 8, 0, 2 }, { 0, 17, 0 } } },
-	{ { { 9, 0, 1 }, { 0, 18, 1 } } },
-	{ { { 9, 0, 0 }, { 0, 18, 0 } } },
-	{ { { 9, 0, 1 }, { 0, 19, 1 } } },
-	{ { { 9, 0, 2 }, { 0, 19, 0 } } },
-	{ { { 10, 0, 1 }, { 0, 20, 1 } } },
-	{ { { 10, 0, 0 }, { 0, 20, 0 } } },
-	{ { { 10, 0, 1 }, { 0, 21, 1 } } },
-	{ { { 10, 0, 2 }, { 0, 21, 0 } } },
-	{ { { 11, 0, 1 }, { 0, 22, 1 } } },
-	{ { { 11, 0, 0 }, { 0, 22, 0 } } },
-	{ { { 11, 0, 1 }, { 0, 23, 1 } } },
-	{ { { 11, 0, 2 }, { 0, 23, 0 } } },
-	{ { { 12, 0, 1 }, { 0, 24, 1 } } },
-	{ { { 12, 0, 0 }, { 0, 24, 0 } } },
-	{ { { 12, 0, 1 }, { 0, 25, 1 } } },
-	{ { { 12, 0, 2 }, { 0, 25, 0 } } },
-	{ { { 13, 0, 1 }, { 0, 26, 1 } } },
-	{ { { 13, 0, 0 }, { 0, 26, 0 } } },
-	{ { { 13, 0, 1 }, { 0, 27, 1 } } },
-	{ { { 13, 0, 2 }, { 0, 27, 0 } } },
-	{ { { 14, 0, 1 }, { 0, 28, 1 } } },
-	{ { { 14, 0, 0 }, { 0, 28, 0 } } },
-	{ { { 14, 0, 1 }, { 0, 29, 1 } } },
-	{ { { 14, 0, 2 }, { 0, 29, 0 } } },
-	{ { { 15, 0, 1 }, { 0, 30, 1 } } },
-	{ { { 15, 0, 0 }, { 0, 30, 0 } } },
-	{ { { 15, 0, 1 }, { 0, 31, 1 } } },
-	{ { { 15, 0, 2 }, { 0, 31, 0 } } },
-	{ { { 16, 0, 2 }, { 1, 31, 1 } } },
-	{ { { 16, 0, 1 }, { 1, 31, 0 } } },
-	{ { { 16, 0, 0 }, { 0, 32, 0 } } },
-	{ { { 16, 0, 1 }, { 2, 31, 0 } } },
-	{ { { 16, 0, 2 }, { 0, 33, 0 } } },
-	{ { { 17, 0, 1 }, { 3, 31, 0 } } },
-	{ { { 17, 0, 0 }, { 0, 34, 0 } } },
-	{ { { 17, 0, 1 }, { 4, 31, 0 } } },
-	{ { { 17, 0, 2 }, { 0, 35, 0 } } },
-	{ { { 18, 0, 1 }, { 5, 31, 0 } } },
-	{ { { 18, 0, 0 }, { 0, 36, 0 } } },
-	{ { { 18, 0, 1 }, { 6, 31, 0 } } },
-	{ { { 18, 0, 2 }, { 0, 37, 0 } } },
-	{ { { 19, 0, 1 }, { 7, 31, 0 } } },
-	{ { { 19, 0, 0 }, { 0, 38, 0 } } },
-	{ { { 19, 0, 1 }, { 8, 31, 0 } } },
-	{ { { 19, 0, 2 }, { 0, 39, 0 } } },
-	{ { { 20, 0, 1 }, { 9, 31, 0 } } },
-	{ { { 20, 0, 0 }, { 0, 40, 0 } } },
-	{ { { 20, 0, 1 }, { 10, 31, 0 } } },
-	{ { { 20, 0, 2 }, { 0, 41, 0 } } },
-	{ { { 21, 0, 1 }, { 11, 31, 0 } } },
-	{ { { 21, 0, 0 }, { 0, 42, 0 } } },
-	{ { { 21, 0, 1 }, { 12, 31, 0 } } },
-	{ { { 21, 0, 2 }, { 0, 43, 0 } } },
-	{ { { 22, 0, 1 }, { 13, 31, 0 } } },
-	{ { { 22, 0, 0 }, { 0, 44, 0 } } },
-	{ { { 22, 0, 1 }, { 14, 31, 0 } } },
-	{ { { 22, 0, 2 }, { 0, 45, 0 } } },
-	{ { { 23, 0, 1 }, { 15, 31, 0 } } },
-	{ { { 23, 0, 0 }, { 0, 46, 0 } } },
-	{ { { 23, 0, 1 }, { 0, 47, 1 } } },
-	{ { { 23, 0, 2 }, { 0, 47, 0 } } },
-	{ { { 24, 0, 1 }, { 0, 48, 1 } } },
-	{ { { 24, 0, 0 }, { 0, 48, 0 } } },
-	{ { { 24, 0, 1 }, { 0, 49, 1 } } },
-	{ { { 24, 0, 2 }, { 0, 49, 0 } } },
-	{ { { 25, 0, 1 }, { 0, 50, 1 } } },
-	{ { { 25, 0, 0 }, { 0, 50, 0 } } },
-	{ { { 25, 0, 1 }, { 0, 51, 1 } } },
-	{ { { 25, 0, 2 }, { 0, 51, 0 } } },
-	{ { { 26, 0, 1 }, { 0, 52, 1 } } },
-	{ { { 26, 0, 0 }, { 0, 52, 0 } } },
-	{ { { 26, 0, 1 }, { 0, 53, 1 } } },
-	{ { { 26, 0, 2 }, { 0, 53, 0 } } },
-	{ { { 27, 0, 1 }, { 0, 54, 1 } } },
-	{ { { 27, 0, 0 }, { 0, 54, 0 } } },
-	{ { { 27, 0, 1 }, { 0, 55, 1 } } },
-	{ { { 27, 0, 2 }, { 0, 55, 0 } } },
-	{ { { 28, 0, 1 }, { 0, 56, 1 } } },
-	{ { { 28, 0, 0 }, { 0, 56, 0 } } },
-	{ { { 28, 0, 1 }, { 0, 57, 1 } } },
-	{ { { 28, 0, 2 }, { 0, 57, 0 } } },
-	{ { { 29, 0, 1 }, { 0, 58, 1 } } },
-	{ { { 29, 0, 0 }, { 0, 58, 0 } } },
-	{ { { 29, 0, 1 }, { 0, 59, 1 } } },
-	{ { { 29, 0, 2 }, { 0, 59, 0 } } },
-	{ { { 30, 0, 1 }, { 0, 60, 1 } } },
-	{ { { 30, 0, 0 }, { 0, 60, 0 } } },
-	{ { { 30, 0, 1 }, { 0, 61, 1 } } },
-	{ { { 30, 0, 2 }, { 0, 61, 0 } } },
-	{ { { 31, 0, 1 }, { 0, 62, 1 } } },
-	{ { { 31, 0, 0 }, { 0, 62, 0 } } },
-	{ { { 31, 0, 1 }, { 0, 63, 1 } } },
-	{ { { 31, 0, 2 }, { 0, 63, 0 } } },
-	{ { { 32, 0, 2 }, { 1, 63, 1 } } },
-	{ { { 32, 0, 1 }, { 1, 63, 0 } } },
-	{ { { 32, 0, 0 }, { 16, 48, 0 } } },
-	{ { { 32, 0, 1 }, { 2, 63, 0 } } },
-	{ { { 32, 0, 2 }, { 16, 49, 0 } } },
-	{ { { 33, 0, 1 }, { 3, 63, 0 } } },
-	{ { { 33, 0, 0 }, { 16, 50, 0 } } },
-	{ { { 33, 0, 1 }, { 4, 63, 0 } } },
-	{ { { 33, 0, 2 }, { 16, 51, 0 } } },
-	{ { { 34, 0, 1 }, { 5, 63, 0 } } },
-	{ { { 34, 0, 0 }, { 16, 52, 0 } } },
-	{ { { 34, 0, 1 }, { 6, 63, 0 } } },
-	{ { { 34, 0, 2 }, { 16, 53, 0 } } },
-	{ { { 35, 0, 1 }, { 7, 63, 0 } } },
-	{ { { 35, 0, 0 }, { 16, 54, 0 } } },
-	{ { { 35, 0, 1 }, { 8, 63, 0 } } },
-	{ { { 35, 0, 2 }, { 16, 55, 0 } } },
-	{ { { 36, 0, 1 }, { 9, 63, 0 } } },
-	{ { { 36, 0, 0 }, { 16, 56, 0 } } },
-	{ { { 36, 0, 1 }, { 10, 63, 0 } } },
-	{ { { 36, 0, 2 }, { 16, 57, 0 } } },
-	{ { { 37, 0, 1 }, { 11, 63, 0 } } },
-	{ { { 37, 0, 0 }, { 16, 58, 0 } } },
-	{ { { 37, 0, 1 }, { 12, 63, 0 } } },
-	{ { { 37, 0, 2 }, { 16, 59, 0 } } },
-	{ { { 38, 0, 1 }, { 13, 63, 0 } } },
-	{ { { 38, 0, 0 }, { 16, 60, 0 } } },
-	{ { { 38, 0, 1 }, { 14, 63, 0 } } },
-	{ { { 38, 0, 2 }, { 16, 61, 0 } } },
-	{ { { 39, 0, 1 }, { 15, 63, 0 } } },
-	{ { { 39, 0, 0 }, { 16, 62, 0 } } },
-	{ { { 39, 0, 1 }, { 16, 63, 1 } } },
-	{ { { 39, 0, 2 }, { 16, 63, 0 } } },
-	{ { { 40, 0, 1 }, { 17, 63, 1 } } },
-	{ { { 40, 0, 0 }, { 17, 63, 0 } } },
-	{ { { 40, 0, 1 }, { 18, 63, 1 } } },
-	{ { { 40, 0, 2 }, { 18, 63, 0 } } },
-	{ { { 41, 0, 1 }, { 19, 63, 1 } } },
-	{ { { 41, 0, 0 }, { 19, 63, 0 } } },
-	{ { { 41, 0, 1 }, { 20, 63, 1 } } },
-	{ { { 41, 0, 2 }, { 20, 63, 0 } } },
-	{ { { 42, 0, 1 }, { 21, 63, 1 } } },
-	{ { { 42, 0, 0 }, { 21, 63, 0 } } },
-	{ { { 42, 0, 1 }, { 22, 63, 1 } } },
-	{ { { 42, 0, 2 }, { 22, 63, 0 } } },
-	{ { { 43, 0, 1 }, { 23, 63, 1 } } },
-	{ { { 43, 0, 0 }, { 23, 63, 0 } } },
-	{ { { 43, 0, 1 }, { 24, 63, 1 } } },
-	{ { { 43, 0, 2 }, { 24, 63, 0 } } },
-	{ { { 44, 0, 1 }, { 25, 63, 1 } } },
-	{ { { 44, 0, 0 }, { 25, 63, 0 } } },
-	{ { { 44, 0, 1 }, { 26, 63, 1 } } },
-	{ { { 44, 0, 2 }, { 26, 63, 0 } } },
-	{ { { 45, 0, 1 }, { 27, 63, 1 } } },
-	{ { { 45, 0, 0 }, { 27, 63, 0 } } },
-	{ { { 45, 0, 1 }, { 28, 63, 1 } } },
-	{ { { 45, 0, 2 }, { 28, 63, 0 } } },
-	{ { { 46, 0, 1 }, { 29, 63, 1 } } },
-	{ { { 46, 0, 0 }, { 29, 63, 0 } } },
-	{ { { 46, 0, 1 }, { 30, 63, 1 } } },
-	{ { { 46, 0, 2 }, { 30, 63, 0 } } },
-	{ { { 47, 0, 1 }, { 31, 63, 1 } } },
-	{ { { 47, 0, 0 }, { 31, 63, 0 } } },
-	{ { { 47, 0, 1 }, { 32, 63, 1 } } },
-	{ { { 47, 0, 2 }, { 32, 63, 0 } } },
-	{ { { 48, 0, 2 }, { 33, 63, 1 } } },
-	{ { { 48, 0, 1 }, { 33, 63, 0 } } },
-	{ { { 48, 0, 0 }, { 48, 48, 0 } } },
-	{ { { 48, 0, 1 }, { 34, 63, 0 } } },
-	{ { { 48, 0, 2 }, { 48, 49, 0 } } },
-	{ { { 49, 0, 1 }, { 35, 63, 0 } } },
-	{ { { 49, 0, 0 }, { 48, 50, 0 } } },
-	{ { { 49, 0, 1 }, { 36, 63, 0 } } },
-	{ { { 49, 0, 2 }, { 48, 51, 0 } } },
-	{ { { 50, 0, 1 }, { 37, 63, 0 } } },
-	{ { { 50, 0, 0 }, { 48, 52, 0 } } },
-	{ { { 50, 0, 1 }, { 38, 63, 0 } } },
-	{ { { 50, 0, 2 }, { 48, 53, 0 } } },
-	{ { { 51, 0, 1 }, { 39, 63, 0 } } },
-	{ { { 51, 0, 0 }, { 48, 54, 0 } } },
-	{ { { 51, 0, 1 }, { 40, 63, 0 } } },
-	{ { { 51, 0, 2 }, { 48, 55, 0 } } },
-	{ { { 52, 0, 1 }, { 41, 63, 0 } } },
-	{ { { 52, 0, 0 }, { 48, 56, 0 } } },
-	{ { { 52, 0, 1 }, { 42, 63, 0 } } },
-	{ { { 52, 0, 2 }, { 48, 57, 0 } } },
-	{ { { 53, 0, 1 }, { 43, 63, 0 } } },
-	{ { { 53, 0, 0 }, { 48, 58, 0 } } },
-	{ { { 53, 0, 1 }, { 44, 63, 0 } } },
-	{ { { 53, 0, 2 }, { 48, 59, 0 } } },
-	{ { { 54, 0, 1 }, { 45, 63, 0 } } },
-	{ { { 54, 0, 0 }, { 48, 60, 0 } } },
-	{ { { 54, 0, 1 }, { 46, 63, 0 } } },
-	{ { { 54, 0, 2 }, { 48, 61, 0 } } },
-	{ { { 55, 0, 1 }, { 47, 63, 0 } } },
-	{ { { 55, 0, 0 }, { 48, 62, 0 } } },
-	{ { { 55, 0, 1 }, { 48, 63, 1 } } },
-	{ { { 55, 0, 2 }, { 48, 63, 0 } } },
-	{ { { 56, 0, 1 }, { 49, 63, 1 } } },
-	{ { { 56, 0, 0 }, { 49, 63, 0 } } },
-	{ { { 56, 0, 1 }, { 50, 63, 1 } } },
-	{ { { 56, 0, 2 }, { 50, 63, 0 } } },
-	{ { { 57, 0, 1 }, { 51, 63, 1 } } },
-	{ { { 57, 0, 0 }, { 51, 63, 0 } } },
-	{ { { 57, 0, 1 }, { 52, 63, 1 } } },
-	{ { { 57, 0, 2 }, { 52, 63, 0 } } },
-	{ { { 58, 0, 1 }, { 53, 63, 1 } } },
-	{ { { 58, 0, 0 }, { 53, 63, 0 } } },
-	{ { { 58, 0, 1 }, { 54, 63, 1 } } },
-	{ { { 58, 0, 2 }, { 54, 63, 0 } } },
-	{ { { 59, 0, 1 }, { 55, 63, 1 } } },
-	{ { { 59, 0, 0 }, { 55, 63, 0 } } },
-	{ { { 59, 0, 1 }, { 56, 63, 1 } } },
-	{ { { 59, 0, 2 }, { 56, 63, 0 } } },
-	{ { { 60, 0, 1 }, { 57, 63, 1 } } },
-	{ { { 60, 0, 0 }, { 57, 63, 0 } } },
-	{ { { 60, 0, 1 }, { 58, 63, 1 } } },
-	{ { { 60, 0, 2 }, { 58, 63, 0 } } },
-	{ { { 61, 0, 1 }, { 59, 63, 1 } } },
-	{ { { 61, 0, 0 }, { 59, 63, 0 } } },
-	{ { { 61, 0, 1 }, { 60, 63, 1 } } },
-	{ { { 61, 0, 2 }, { 60, 63, 0 } } },
-	{ { { 62, 0, 1 }, { 61, 63, 1 } } },
-	{ { { 62, 0, 0 }, { 61, 63, 0 } } },
-	{ { { 62, 0, 1 }, { 62, 63, 1 } } },
-	{ { { 62, 0, 2 }, { 62, 63, 0 } } },
-	{ { { 63, 0, 1 }, { 63, 63, 1 } } },
-	{ { { 63, 0, 0 }, { 63, 63, 0 } } }
-};
-
-static SingleColourLookup const lookup_5_4[] = 
-{
-	{ { { 0, 0, 0 }, { 0, 0, 0 } } },
-	{ { { 0, 0, 1 }, { 0, 1, 1 } } },
-	{ { { 0, 0, 2 }, { 0, 1, 0 } } },
-	{ { { 0, 0, 3 }, { 0, 1, 1 } } },
-	{ { { 0, 0, 4 }, { 0, 2, 1 } } },
-	{ { { 1, 0, 3 }, { 0, 2, 0 } } },
-	{ { { 1, 0, 2 }, { 0, 2, 1 } } },
-	{ { { 1, 0, 1 }, { 0, 3, 1 } } },
-	{ { { 1, 0, 0 }, { 0, 3, 0 } } },
-	{ { { 1, 0, 1 }, { 1, 2, 1 } } },
-	{ { { 1, 0, 2 }, { 1, 2, 0 } } },
-	{ { { 1, 0, 3 }, { 0, 4, 0 } } },
-	{ { { 1, 0, 4 }, { 0, 5, 1 } } },
-	{ { { 2, 0, 3 }, { 0, 5, 0 } } },
-	{ { { 2, 0, 2 }, { 0, 5, 1 } } },
-	{ { { 2, 0, 1 }, { 0, 6, 1 } } },
-	{ { { 2, 0, 0 }, { 0, 6, 0 } } },
-	{ { { 2, 0, 1 }, { 2, 3, 1 } } },
-	{ { { 2, 0, 2 }, { 2, 3, 0 } } },
-	{ { { 2, 0, 3 }, { 0, 7, 0 } } },
-	{ { { 2, 0, 4 }, { 1, 6, 1 } } },
-	{ { { 3, 0, 3 }, { 1, 6, 0 } } },
-	{ { { 3, 0, 2 }, { 0, 8, 0 } } },
-	{ { { 3, 0, 1 }, { 0, 9, 1 } } },
-	{ { { 3, 0, 0 }, { 0, 9, 0 } } },
-	{ { { 3, 0, 1 }, { 0, 9, 1 } } },
-	{ { { 3, 0, 2 }, { 0, 10, 1 } } },
-	{ { { 3, 0, 3 }, { 0, 10, 0 } } },
-	{ { { 3, 0, 4 }, { 2, 7, 1 } } },
-	{ { { 4, 0, 4 }, { 2, 7, 0 } } },
-	{ { { 4, 0, 3 }, { 0, 11, 0 } } },
-	{ { { 4, 0, 2 }, { 1, 10, 1 } } },
-	{ { { 4, 0, 1 }, { 1, 10, 0 } } },
-	{ { { 4, 0, 0 }, { 0, 12, 0 } } },
-	{ { { 4, 0, 1 }, { 0, 13, 1 } } },
-	{ { { 4, 0, 2 }, { 0, 13, 0 } } },
-	{ { { 4, 0, 3 }, { 0, 13, 1 } } },
-	{ { { 4, 0, 4 }, { 0, 14, 1 } } },
-	{ { { 5, 0, 3 }, { 0, 14, 0 } } },
-	{ { { 5, 0, 2 }, { 2, 11, 1 } } },
-	{ { { 5, 0, 1 }, { 2, 11, 0 } } },
-	{ { { 5, 0, 0 }, { 0, 15, 0 } } },
-	{ { { 5, 0, 1 }, { 1, 14, 1 } } },
-	{ { { 5, 0, 2 }, { 1, 14, 0 } } },
-	{ { { 5, 0, 3 }, { 0, 16, 0 } } },
-	{ { { 5, 0, 4 }, { 0, 17, 1 } } },
-	{ { { 6, 0, 3 }, { 0, 17, 0 } } },
-	{ { { 6, 0, 2 }, { 0, 17, 1 } } },
-	{ { { 6, 0, 1 }, { 0, 18, 1 } } },
-	{ { { 6, 0, 0 }, { 0, 18, 0 } } },
-	{ { { 6, 0, 1 }, { 2, 15, 1 } } },
-	{ { { 6, 0, 2 }, { 2, 15, 0 } } },
-	{ { { 6, 0, 3 }, { 0, 19, 0 } } },
-	{ { { 6, 0, 4 }, { 1, 18, 1 } } },
-	{ { { 7, 0, 3 }, { 1, 18, 0 } } },
-	{ { { 7, 0, 2 }, { 0, 20, 0 } } },
-	{ { { 7, 0, 1 }, { 0, 21, 1 } } },
-	{ { { 7, 0, 0 }, { 0, 21, 0 } } },
-	{ { { 7, 0, 1 }, { 0, 21, 1 } } },
-	{ { { 7, 0, 2 }, { 0, 22, 1 } } },
-	{ { { 7, 0, 3 }, { 0, 22, 0 } } },
-	{ { { 7, 0, 4 }, { 2, 19, 1 } } },
-	{ { { 8, 0, 4 }, { 2, 19, 0 } } },
-	{ { { 8, 0, 3 }, { 0, 23, 0 } } },
-	{ { { 8, 0, 2 }, { 1, 22, 1 } } },
-	{ { { 8, 0, 1 }, { 1, 22, 0 } } },
-	{ { { 8, 0, 0 }, { 0, 24, 0 } } },
-	{ { { 8, 0, 1 }, { 0, 25, 1 } } },
-	{ { { 8, 0, 2 }, { 0, 25, 0 } } },
-	{ { { 8, 0, 3 }, { 0, 25, 1 } } },
-	{ { { 8, 0, 4 }, { 0, 26, 1 } } },
-	{ { { 9, 0, 3 }, { 0, 26, 0 } } },
-	{ { { 9, 0, 2 }, { 2, 23, 1 } } },
-	{ { { 9, 0, 1 }, { 2, 23, 0 } } },
-	{ { { 9, 0, 0 }, { 0, 27, 0 } } },
-	{ { { 9, 0, 1 }, { 1, 26, 1 } } },
-	{ { { 9, 0, 2 }, { 1, 26, 0 } } },
-	{ { { 9, 0, 3 }, { 0, 28, 0 } } },
-	{ { { 9, 0, 4 }, { 0, 29, 1 } } },
-	{ { { 10, 0, 3 }, { 0, 29, 0 } } },
-	{ { { 10, 0, 2 }, { 0, 29, 1 } } },
-	{ { { 10, 0, 1 }, { 0, 30, 1 } } },
-	{ { { 10, 0, 0 }, { 0, 30, 0 } } },
-	{ { { 10, 0, 1 }, { 2, 27, 1 } } },
-	{ { { 10, 0, 2 }, { 2, 27, 0 } } },
-	{ { { 10, 0, 3 }, { 0, 31, 0 } } },
-	{ { { 10, 0, 4 }, { 1, 30, 1 } } },
-	{ { { 11, 0, 3 }, { 1, 30, 0 } } },
-	{ { { 11, 0, 2 }, { 4, 24, 0 } } },
-	{ { { 11, 0, 1 }, { 1, 31, 1 } } },
-	{ { { 11, 0, 0 }, { 1, 31, 0 } } },
-	{ { { 11, 0, 1 }, { 1, 31, 1 } } },
-	{ { { 11, 0, 2 }, { 2, 30, 1 } } },
-	{ { { 11, 0, 3 }, { 2, 30, 0 } } },
-	{ { { 11, 0, 4 }, { 2, 31, 1 } } },
-	{ { { 12, 0, 4 }, { 2, 31, 0 } } },
-	{ { { 12, 0, 3 }, { 4, 27, 0 } } },
-	{ { { 12, 0, 2 }, { 3, 30, 1 } } },
-	{ { { 12, 0, 1 }, { 3, 30, 0 } } },
-	{ { { 12, 0, 0 }, { 4, 28, 0 } } },
-	{ { { 12, 0, 1 }, { 3, 31, 1 } } },
-	{ { { 12, 0, 2 }, { 3, 31, 0 } } },
-	{ { { 12, 0, 3 }, { 3, 31, 1 } } },
-	{ { { 12, 0, 4 }, { 4, 30, 1 } } },
-	{ { { 13, 0, 3 }, { 4, 30, 0 } } },
-	{ { { 13, 0, 2 }, { 6, 27, 1 } } },
-	{ { { 13, 0, 1 }, { 6, 27, 0 } } },
-	{ { { 13, 0, 0 }, { 4, 31, 0 } } },
-	{ { { 13, 0, 1 }, { 5, 30, 1 } } },
-	{ { { 13, 0, 2 }, { 5, 30, 0 } } },
-	{ { { 13, 0, 3 }, { 8, 24, 0 } } },
-	{ { { 13, 0, 4 }, { 5, 31, 1 } } },
-	{ { { 14, 0, 3 }, { 5, 31, 0 } } },
-	{ { { 14, 0, 2 }, { 5, 31, 1 } } },
-	{ { { 14, 0, 1 }, { 6, 30, 1 } } },
-	{ { { 14, 0, 0 }, { 6, 30, 0 } } },
-	{ { { 14, 0, 1 }, { 6, 31, 1 } } },
-	{ { { 14, 0, 2 }, { 6, 31, 0 } } },
-	{ { { 14, 0, 3 }, { 8, 27, 0 } } },
-	{ { { 14, 0, 4 }, { 7, 30, 1 } } },
-	{ { { 15, 0, 3 }, { 7, 30, 0 } } },
-	{ { { 15, 0, 2 }, { 8, 28, 0 } } },
-	{ { { 15, 0, 1 }, { 7, 31, 1 } } },
-	{ { { 15, 0, 0 }, { 7, 31, 0 } } },
-	{ { { 15, 0, 1 }, { 7, 31, 1 } } },
-	{ { { 15, 0, 2 }, { 8, 30, 1 } } },
-	{ { { 15, 0, 3 }, { 8, 30, 0 } } },
-	{ { { 15, 0, 4 }, { 10, 27, 1 } } },
-	{ { { 16, 0, 4 }, { 10, 27, 0 } } },
-	{ { { 16, 0, 3 }, { 8, 31, 0 } } },
-	{ { { 16, 0, 2 }, { 9, 30, 1 } } },
-	{ { { 16, 0, 1 }, { 9, 30, 0 } } },
-	{ { { 16, 0, 0 }, { 12, 24, 0 } } },
-	{ { { 16, 0, 1 }, { 9, 31, 1 } } },
-	{ { { 16, 0, 2 }, { 9, 31, 0 } } },
-	{ { { 16, 0, 3 }, { 9, 31, 1 } } },
-	{ { { 16, 0, 4 }, { 10, 30, 1 } } },
-	{ { { 17, 0, 3 }, { 10, 30, 0 } } },
-	{ { { 17, 0, 2 }, { 10, 31, 1 } } },
-	{ { { 17, 0, 1 }, { 10, 31, 0 } } },
-	{ { { 17, 0, 0 }, { 12, 27, 0 } } },
-	{ { { 17, 0, 1 }, { 11, 30, 1 } } },
-	{ { { 17, 0, 2 }, { 11, 30, 0 } } },
-	{ { { 17, 0, 3 }, { 12, 28, 0 } } },
-	{ { { 17, 0, 4 }, { 11, 31, 1 } } },
-	{ { { 18, 0, 3 }, { 11, 31, 0 } } },
-	{ { { 18, 0, 2 }, { 11, 31, 1 } } },
-	{ { { 18, 0, 1 }, { 12, 30, 1 } } },
-	{ { { 18, 0, 0 }, { 12, 30, 0 } } },
-	{ { { 18, 0, 1 }, { 14, 27, 1 } } },
-	{ { { 18, 0, 2 }, { 14, 27, 0 } } },
-	{ { { 18, 0, 3 }, { 12, 31, 0 } } },
-	{ { { 18, 0, 4 }, { 13, 30, 1 } } },
-	{ { { 19, 0, 3 }, { 13, 30, 0 } } },
-	{ { { 19, 0, 2 }, { 16, 24, 0 } } },
-	{ { { 19, 0, 1 }, { 13, 31, 1 } } },
-	{ { { 19, 0, 0 }, { 13, 31, 0 } } },
-	{ { { 19, 0, 1 }, { 13, 31, 1 } } },
-	{ { { 19, 0, 2 }, { 14, 30, 1 } } },
-	{ { { 19, 0, 3 }, { 14, 30, 0 } } },
-	{ { { 19, 0, 4 }, { 14, 31, 1 } } },
-	{ { { 20, 0, 4 }, { 14, 31, 0 } } },
-	{ { { 20, 0, 3 }, { 16, 27, 0 } } },
-	{ { { 20, 0, 2 }, { 15, 30, 1 } } },
-	{ { { 20, 0, 1 }, { 15, 30, 0 } } },
-	{ { { 20, 0, 0 }, { 16, 28, 0 } } },
-	{ { { 20, 0, 1 }, { 15, 31, 1 } } },
-	{ { { 20, 0, 2 }, { 15, 31, 0 } } },
-	{ { { 20, 0, 3 }, { 15, 31, 1 } } },
-	{ { { 20, 0, 4 }, { 16, 30, 1 } } },
-	{ { { 21, 0, 3 }, { 16, 30, 0 } } },
-	{ { { 21, 0, 2 }, { 18, 27, 1 } } },
-	{ { { 21, 0, 1 }, { 18, 27, 0 } } },
-	{ { { 21, 0, 0 }, { 16, 31, 0 } } },
-	{ { { 21, 0, 1 }, { 17, 30, 1 } } },
-	{ { { 21, 0, 2 }, { 17, 30, 0 } } },
-	{ { { 21, 0, 3 }, { 20, 24, 0 } } },
-	{ { { 21, 0, 4 }, { 17, 31, 1 } } },
-	{ { { 22, 0, 3 }, { 17, 31, 0 } } },
-	{ { { 22, 0, 2 }, { 17, 31, 1 } } },
-	{ { { 22, 0, 1 }, { 18, 30, 1 } } },
-	{ { { 22, 0, 0 }, { 18, 30, 0 } } },
-	{ { { 22, 0, 1 }, { 18, 31, 1 } } },
-	{ { { 22, 0, 2 }, { 18, 31, 0 } } },
-	{ { { 22, 0, 3 }, { 20, 27, 0 } } },
-	{ { { 22, 0, 4 }, { 19, 30, 1 } } },
-	{ { { 23, 0, 3 }, { 19, 30, 0 } } },
-	{ { { 23, 0, 2 }, { 20, 28, 0 } } },
-	{ { { 23, 0, 1 }, { 19, 31, 1 } } },
-	{ { { 23, 0, 0 }, { 19, 31, 0 } } },
-	{ { { 23, 0, 1 }, { 19, 31, 1 } } },
-	{ { { 23, 0, 2 }, { 20, 30, 1 } } },
-	{ { { 23, 0, 3 }, { 20, 30, 0 } } },
-	{ { { 23, 0, 4 }, { 22, 27, 1 } } },
-	{ { { 24, 0, 4 }, { 22, 27, 0 } } },
-	{ { { 24, 0, 3 }, { 20, 31, 0 } } },
-	{ { { 24, 0, 2 }, { 21, 30, 1 } } },
-	{ { { 24, 0, 1 }, { 21, 30, 0 } } },
-	{ { { 24, 0, 0 }, { 24, 24, 0 } } },
-	{ { { 24, 0, 1 }, { 21, 31, 1 } } },
-	{ { { 24, 0, 2 }, { 21, 31, 0 } } },
-	{ { { 24, 0, 3 }, { 21, 31, 1 } } },
-	{ { { 24, 0, 4 }, { 22, 30, 1 } } },
-	{ { { 25, 0, 3 }, { 22, 30, 0 } } },
-	{ { { 25, 0, 2 }, { 22, 31, 1 } } },
-	{ { { 25, 0, 1 }, { 22, 31, 0 } } },
-	{ { { 25, 0, 0 }, { 24, 27, 0 } } },
-	{ { { 25, 0, 1 }, { 23, 30, 1 } } },
-	{ { { 25, 0, 2 }, { 23, 30, 0 } } },
-	{ { { 25, 0, 3 }, { 24, 28, 0 } } },
-	{ { { 25, 0, 4 }, { 23, 31, 1 } } },
-	{ { { 26, 0, 3 }, { 23, 31, 0 } } },
-	{ { { 26, 0, 2 }, { 23, 31, 1 } } },
-	{ { { 26, 0, 1 }, { 24, 30, 1 } } },
-	{ { { 26, 0, 0 }, { 24, 30, 0 } } },
-	{ { { 26, 0, 1 }, { 26, 27, 1 } } },
-	{ { { 26, 0, 2 }, { 26, 27, 0 } } },
-	{ { { 26, 0, 3 }, { 24, 31, 0 } } },
-	{ { { 26, 0, 4 }, { 25, 30, 1 } } },
-	{ { { 27, 0, 3 }, { 25, 30, 0 } } },
-	{ { { 27, 0, 2 }, { 28, 24, 0 } } },
-	{ { { 27, 0, 1 }, { 25, 31, 1 } } },
-	{ { { 27, 0, 0 }, { 25, 31, 0 } } },
-	{ { { 27, 0, 1 }, { 25, 31, 1 } } },
-	{ { { 27, 0, 2 }, { 26, 30, 1 } } },
-	{ { { 27, 0, 3 }, { 26, 30, 0 } } },
-	{ { { 27, 0, 4 }, { 26, 31, 1 } } },
-	{ { { 28, 0, 4 }, { 26, 31, 0 } } },
-	{ { { 28, 0, 3 }, { 28, 27, 0 } } },
-	{ { { 28, 0, 2 }, { 27, 30, 1 } } },
-	{ { { 28, 0, 1 }, { 27, 30, 0 } } },
-	{ { { 28, 0, 0 }, { 28, 28, 0 } } },
-	{ { { 28, 0, 1 }, { 27, 31, 1 } } },
-	{ { { 28, 0, 2 }, { 27, 31, 0 } } },
-	{ { { 28, 0, 3 }, { 27, 31, 1 } } },
-	{ { { 28, 0, 4 }, { 28, 30, 1 } } },
-	{ { { 29, 0, 3 }, { 28, 30, 0 } } },
-	{ { { 29, 0, 2 }, { 30, 27, 1 } } },
-	{ { { 29, 0, 1 }, { 30, 27, 0 } } },
-	{ { { 29, 0, 0 }, { 28, 31, 0 } } },
-	{ { { 29, 0, 1 }, { 29, 30, 1 } } },
-	{ { { 29, 0, 2 }, { 29, 30, 0 } } },
-	{ { { 29, 0, 3 }, { 29, 30, 1 } } },
-	{ { { 29, 0, 4 }, { 29, 31, 1 } } },
-	{ { { 30, 0, 3 }, { 29, 31, 0 } } },
-	{ { { 30, 0, 2 }, { 29, 31, 1 } } },
-	{ { { 30, 0, 1 }, { 30, 30, 1 } } },
-	{ { { 30, 0, 0 }, { 30, 30, 0 } } },
-	{ { { 30, 0, 1 }, { 30, 31, 1 } } },
-	{ { { 30, 0, 2 }, { 30, 31, 0 } } },
-	{ { { 30, 0, 3 }, { 30, 31, 1 } } },
-	{ { { 30, 0, 4 }, { 31, 30, 1 } } },
-	{ { { 31, 0, 3 }, { 31, 30, 0 } } },
-	{ { { 31, 0, 2 }, { 31, 30, 1 } } },
-	{ { { 31, 0, 1 }, { 31, 31, 1 } } },
-	{ { { 31, 0, 0 }, { 31, 31, 0 } } }
-};
-
-static SingleColourLookup const lookup_6_4[] = 
-{
-	{ { { 0, 0, 0 }, { 0, 0, 0 } } },
-	{ { { 0, 0, 1 }, { 0, 1, 0 } } },
-	{ { { 0, 0, 2 }, { 0, 2, 0 } } },
-	{ { { 1, 0, 1 }, { 0, 3, 1 } } },
-	{ { { 1, 0, 0 }, { 0, 3, 0 } } },
-	{ { { 1, 0, 1 }, { 0, 4, 0 } } },
-	{ { { 1, 0, 2 }, { 0, 5, 0 } } },
-	{ { { 2, 0, 1 }, { 0, 6, 1 } } },
-	{ { { 2, 0, 0 }, { 0, 6, 0 } } },
-	{ { { 2, 0, 1 }, { 0, 7, 0 } } },
-	{ { { 2, 0, 2 }, { 0, 8, 0 } } },
-	{ { { 3, 0, 1 }, { 0, 9, 1 } } },
-	{ { { 3, 0, 0 }, { 0, 9, 0 } } },
-	{ { { 3, 0, 1 }, { 0, 10, 0 } } },
-	{ { { 3, 0, 2 }, { 0, 11, 0 } } },
-	{ { { 4, 0, 1 }, { 0, 12, 1 } } },
-	{ { { 4, 0, 0 }, { 0, 12, 0 } } },
-	{ { { 4, 0, 1 }, { 0, 13, 0 } } },
-	{ { { 4, 0, 2 }, { 0, 14, 0 } } },
-	{ { { 5, 0, 1 }, { 0, 15, 1 } } },
-	{ { { 5, 0, 0 }, { 0, 15, 0 } } },
-	{ { { 5, 0, 1 }, { 0, 16, 0 } } },
-	{ { { 5, 0, 2 }, { 1, 15, 0 } } },
-	{ { { 6, 0, 1 }, { 0, 17, 0 } } },
-	{ { { 6, 0, 0 }, { 0, 18, 0 } } },
-	{ { { 6, 0, 1 }, { 0, 19, 0 } } },
-	{ { { 6, 0, 2 }, { 3, 14, 0 } } },
-	{ { { 7, 0, 1 }, { 0, 20, 0 } } },
-	{ { { 7, 0, 0 }, { 0, 21, 0 } } },
-	{ { { 7, 0, 1 }, { 0, 22, 0 } } },
-	{ { { 7, 0, 2 }, { 4, 15, 0 } } },
-	{ { { 8, 0, 1 }, { 0, 23, 0 } } },
-	{ { { 8, 0, 0 }, { 0, 24, 0 } } },
-	{ { { 8, 0, 1 }, { 0, 25, 0 } } },
-	{ { { 8, 0, 2 }, { 6, 14, 0 } } },
-	{ { { 9, 0, 1 }, { 0, 26, 0 } } },
-	{ { { 9, 0, 0 }, { 0, 27, 0 } } },
-	{ { { 9, 0, 1 }, { 0, 28, 0 } } },
-	{ { { 9, 0, 2 }, { 7, 15, 0 } } },
-	{ { { 10, 0, 1 }, { 0, 29, 0 } } },
-	{ { { 10, 0, 0 }, { 0, 30, 0 } } },
-	{ { { 10, 0, 1 }, { 0, 31, 0 } } },
-	{ { { 10, 0, 2 }, { 9, 14, 0 } } },
-	{ { { 11, 0, 1 }, { 0, 32, 0 } } },
-	{ { { 11, 0, 0 }, { 0, 33, 0 } } },
-	{ { { 11, 0, 1 }, { 2, 30, 0 } } },
-	{ { { 11, 0, 2 }, { 0, 34, 0 } } },
-	{ { { 12, 0, 1 }, { 0, 35, 0 } } },
-	{ { { 12, 0, 0 }, { 0, 36, 0 } } },
-	{ { { 12, 0, 1 }, { 3, 31, 0 } } },
-	{ { { 12, 0, 2 }, { 0, 37, 0 } } },
-	{ { { 13, 0, 1 }, { 0, 38, 0 } } },
-	{ { { 13, 0, 0 }, { 0, 39, 0 } } },
-	{ { { 13, 0, 1 }, { 5, 30, 0 } } },
-	{ { { 13, 0, 2 }, { 0, 40, 0 } } },
-	{ { { 14, 0, 1 }, { 0, 41, 0 } } },
-	{ { { 14, 0, 0 }, { 0, 42, 0 } } },
-	{ { { 14, 0, 1 }, { 6, 31, 0 } } },
-	{ { { 14, 0, 2 }, { 0, 43, 0 } } },
-	{ { { 15, 0, 1 }, { 0, 44, 0 } } },
-	{ { { 15, 0, 0 }, { 0, 45, 0 } } },
-	{ { { 15, 0, 1 }, { 8, 30, 0 } } },
-	{ { { 15, 0, 2 }, { 0, 46, 0 } } },
-	{ { { 16, 0, 2 }, { 0, 47, 0 } } },
-	{ { { 16, 0, 1 }, { 1, 46, 0 } } },
-	{ { { 16, 0, 0 }, { 0, 48, 0 } } },
-	{ { { 16, 0, 1 }, { 0, 49, 0 } } },
-	{ { { 16, 0, 2 }, { 0, 50, 0 } } },
-	{ { { 17, 0, 1 }, { 2, 47, 0 } } },
-	{ { { 17, 0, 0 }, { 0, 51, 0 } } },
-	{ { { 17, 0, 1 }, { 0, 52, 0 } } },
-	{ { { 17, 0, 2 }, { 0, 53, 0 } } },
-	{ { { 18, 0, 1 }, { 4, 46, 0 } } },
-	{ { { 18, 0, 0 }, { 0, 54, 0 } } },
-	{ { { 18, 0, 1 }, { 0, 55, 0 } } },
-	{ { { 18, 0, 2 }, { 0, 56, 0 } } },
-	{ { { 19, 0, 1 }, { 5, 47, 0 } } },
-	{ { { 19, 0, 0 }, { 0, 57, 0 } } },
-	{ { { 19, 0, 1 }, { 0, 58, 0 } } },
-	{ { { 19, 0, 2 }, { 0, 59, 0 } } },
-	{ { { 20, 0, 1 }, { 7, 46, 0 } } },
-	{ { { 20, 0, 0 }, { 0, 60, 0 } } },
-	{ { { 20, 0, 1 }, { 0, 61, 0 } } },
-	{ { { 20, 0, 2 }, { 0, 62, 0 } } },
-	{ { { 21, 0, 1 }, { 8, 47, 0 } } },
-	{ { { 21, 0, 0 }, { 0, 63, 0 } } },
-	{ { { 21, 0, 1 }, { 1, 62, 0 } } },
-	{ { { 21, 0, 2 }, { 1, 63, 0 } } },
-	{ { { 22, 0, 1 }, { 10, 46, 0 } } },
-	{ { { 22, 0, 0 }, { 2, 62, 0 } } },
-	{ { { 22, 0, 1 }, { 2, 63, 0 } } },
-	{ { { 22, 0, 2 }, { 3, 62, 0 } } },
-	{ { { 23, 0, 1 }, { 11, 47, 0 } } },
-	{ { { 23, 0, 0 }, { 3, 63, 0 } } },
-	{ { { 23, 0, 1 }, { 4, 62, 0 } } },
-	{ { { 23, 0, 2 }, { 4, 63, 0 } } },
-	{ { { 24, 0, 1 }, { 13, 46, 0 } } },
-	{ { { 24, 0, 0 }, { 5, 62, 0 } } },
-	{ { { 24, 0, 1 }, { 5, 63, 0 } } },
-	{ { { 24, 0, 2 }, { 6, 62, 0 } } },
-	{ { { 25, 0, 1 }, { 14, 47, 0 } } },
-	{ { { 25, 0, 0 }, { 6, 63, 0 } } },
-	{ { { 25, 0, 1 }, { 7, 62, 0 } } },
-	{ { { 25, 0, 2 }, { 7, 63, 0 } } },
-	{ { { 26, 0, 1 }, { 16, 45, 0 } } },
-	{ { { 26, 0, 0 }, { 8, 62, 0 } } },
-	{ { { 26, 0, 1 }, { 8, 63, 0 } } },
-	{ { { 26, 0, 2 }, { 9, 62, 0 } } },
-	{ { { 27, 0, 1 }, { 16, 48, 0 } } },
-	{ { { 27, 0, 0 }, { 9, 63, 0 } } },
-	{ { { 27, 0, 1 }, { 10, 62, 0 } } },
-	{ { { 27, 0, 2 }, { 10, 63, 0 } } },
-	{ { { 28, 0, 1 }, { 16, 51, 0 } } },
-	{ { { 28, 0, 0 }, { 11, 62, 0 } } },
-	{ { { 28, 0, 1 }, { 11, 63, 0 } } },
-	{ { { 28, 0, 2 }, { 12, 62, 0 } } },
-	{ { { 29, 0, 1 }, { 16, 54, 0 } } },
-	{ { { 29, 0, 0 }, { 12, 63, 0 } } },
-	{ { { 29, 0, 1 }, { 13, 62, 0 } } },
-	{ { { 29, 0, 2 }, { 13, 63, 0 } } },
-	{ { { 30, 0, 1 }, { 16, 57, 0 } } },
-	{ { { 30, 0, 0 }, { 14, 62, 0 } } },
-	{ { { 30, 0, 1 }, { 14, 63, 0 } } },
-	{ { { 30, 0, 2 }, { 15, 62, 0 } } },
-	{ { { 31, 0, 1 }, { 16, 60, 0 } } },
-	{ { { 31, 0, 0 }, { 15, 63, 0 } } },
-	{ { { 31, 0, 1 }, { 24, 46, 0 } } },
-	{ { { 31, 0, 2 }, { 16, 62, 0 } } },
-	{ { { 32, 0, 2 }, { 16, 63, 0 } } },
-	{ { { 32, 0, 1 }, { 17, 62, 0 } } },
-	{ { { 32, 0, 0 }, { 25, 47, 0 } } },
-	{ { { 32, 0, 1 }, { 17, 63, 0 } } },
-	{ { { 32, 0, 2 }, { 18, 62, 0 } } },
-	{ { { 33, 0, 1 }, { 18, 63, 0 } } },
-	{ { { 33, 0, 0 }, { 27, 46, 0 } } },
-	{ { { 33, 0, 1 }, { 19, 62, 0 } } },
-	{ { { 33, 0, 2 }, { 19, 63, 0 } } },
-	{ { { 34, 0, 1 }, { 20, 62, 0 } } },
-	{ { { 34, 0, 0 }, { 28, 47, 0 } } },
-	{ { { 34, 0, 1 }, { 20, 63, 0 } } },
-	{ { { 34, 0, 2 }, { 21, 62, 0 } } },
-	{ { { 35, 0, 1 }, { 21, 63, 0 } } },
-	{ { { 35, 0, 0 }, { 30, 46, 0 } } },
-	{ { { 35, 0, 1 }, { 22, 62, 0 } } },
-	{ { { 35, 0, 2 }, { 22, 63, 0 } } },
-	{ { { 36, 0, 1 }, { 23, 62, 0 } } },
-	{ { { 36, 0, 0 }, { 31, 47, 0 } } },
-	{ { { 36, 0, 1 }, { 23, 63, 0 } } },
-	{ { { 36, 0, 2 }, { 24, 62, 0 } } },
-	{ { { 37, 0, 1 }, { 24, 63, 0 } } },
-	{ { { 37, 0, 0 }, { 32, 47, 0 } } },
-	{ { { 37, 0, 1 }, { 25, 62, 0 } } },
-	{ { { 37, 0, 2 }, { 25, 63, 0 } } },
-	{ { { 38, 0, 1 }, { 26, 62, 0 } } },
-	{ { { 38, 0, 0 }, { 32, 50, 0 } } },
-	{ { { 38, 0, 1 }, { 26, 63, 0 } } },
-	{ { { 38, 0, 2 }, { 27, 62, 0 } } },
-	{ { { 39, 0, 1 }, { 27, 63, 0 } } },
-	{ { { 39, 0, 0 }, { 32, 53, 0 } } },
-	{ { { 39, 0, 1 }, { 28, 62, 0 } } },
-	{ { { 39, 0, 2 }, { 28, 63, 0 } } },
-	{ { { 40, 0, 1 }, { 29, 62, 0 } } },
-	{ { { 40, 0, 0 }, { 32, 56, 0 } } },
-	{ { { 40, 0, 1 }, { 29, 63, 0 } } },
-	{ { { 40, 0, 2 }, { 30, 62, 0 } } },
-	{ { { 41, 0, 1 }, { 30, 63, 0 } } },
-	{ { { 41, 0, 0 }, { 32, 59, 0 } } },
-	{ { { 41, 0, 1 }, { 31, 62, 0 } } },
-	{ { { 41, 0, 2 }, { 31, 63, 0 } } },
-	{ { { 42, 0, 1 }, { 32, 61, 0 } } },
-	{ { { 42, 0, 0 }, { 32, 62, 0 } } },
-	{ { { 42, 0, 1 }, { 32, 63, 0 } } },
-	{ { { 42, 0, 2 }, { 41, 46, 0 } } },
-	{ { { 43, 0, 1 }, { 33, 62, 0 } } },
-	{ { { 43, 0, 0 }, { 33, 63, 0 } } },
-	{ { { 43, 0, 1 }, { 34, 62, 0 } } },
-	{ { { 43, 0, 2 }, { 42, 47, 0 } } },
-	{ { { 44, 0, 1 }, { 34, 63, 0 } } },
-	{ { { 44, 0, 0 }, { 35, 62, 0 } } },
-	{ { { 44, 0, 1 }, { 35, 63, 0 } } },
-	{ { { 44, 0, 2 }, { 44, 46, 0 } } },
-	{ { { 45, 0, 1 }, { 36, 62, 0 } } },
-	{ { { 45, 0, 0 }, { 36, 63, 0 } } },
-	{ { { 45, 0, 1 }, { 37, 62, 0 } } },
-	{ { { 45, 0, 2 }, { 45, 47, 0 } } },
-	{ { { 46, 0, 1 }, { 37, 63, 0 } } },
-	{ { { 46, 0, 0 }, { 38, 62, 0 } } },
-	{ { { 46, 0, 1 }, { 38, 63, 0 } } },
-	{ { { 46, 0, 2 }, { 47, 46, 0 } } },
-	{ { { 47, 0, 1 }, { 39, 62, 0 } } },
-	{ { { 47, 0, 0 }, { 39, 63, 0 } } },
-	{ { { 47, 0, 1 }, { 40, 62, 0 } } },
-	{ { { 47, 0, 2 }, { 48, 46, 0 } } },
-	{ { { 48, 0, 2 }, { 40, 63, 0 } } },
-	{ { { 48, 0, 1 }, { 41, 62, 0 } } },
-	{ { { 48, 0, 0 }, { 41, 63, 0 } } },
-	{ { { 48, 0, 1 }, { 48, 49, 0 } } },
-	{ { { 48, 0, 2 }, { 42, 62, 0 } } },
-	{ { { 49, 0, 1 }, { 42, 63, 0 } } },
-	{ { { 49, 0, 0 }, { 43, 62, 0 } } },
-	{ { { 49, 0, 1 }, { 48, 52, 0 } } },
-	{ { { 49, 0, 2 }, { 43, 63, 0 } } },
-	{ { { 50, 0, 1 }, { 44, 62, 0 } } },
-	{ { { 50, 0, 0 }, { 44, 63, 0 } } },
-	{ { { 50, 0, 1 }, { 48, 55, 0 } } },
-	{ { { 50, 0, 2 }, { 45, 62, 0 } } },
-	{ { { 51, 0, 1 }, { 45, 63, 0 } } },
-	{ { { 51, 0, 0 }, { 46, 62, 0 } } },
-	{ { { 51, 0, 1 }, { 48, 58, 0 } } },
-	{ { { 51, 0, 2 }, { 46, 63, 0 } } },
-	{ { { 52, 0, 1 }, { 47, 62, 0 } } },
-	{ { { 52, 0, 0 }, { 47, 63, 0 } } },
-	{ { { 52, 0, 1 }, { 48, 61, 0 } } },
-	{ { { 52, 0, 2 }, { 48, 62, 0 } } },
-	{ { { 53, 0, 1 }, { 56, 47, 0 } } },
-	{ { { 53, 0, 0 }, { 48, 63, 0 } } },
-	{ { { 53, 0, 1 }, { 49, 62, 0 } } },
-	{ { { 53, 0, 2 }, { 49, 63, 0 } } },
-	{ { { 54, 0, 1 }, { 58, 46, 0 } } },
-	{ { { 54, 0, 0 }, { 50, 62, 0 } } },
-	{ { { 54, 0, 1 }, { 50, 63, 0 } } },
-	{ { { 54, 0, 2 }, { 51, 62, 0 } } },
-	{ { { 55, 0, 1 }, { 59, 47, 0 } } },
-	{ { { 55, 0, 0 }, { 51, 63, 0 } } },
-	{ { { 55, 0, 1 }, { 52, 62, 0 } } },
-	{ { { 55, 0, 2 }, { 52, 63, 0 } } },
-	{ { { 56, 0, 1 }, { 61, 46, 0 } } },
-	{ { { 56, 0, 0 }, { 53, 62, 0 } } },
-	{ { { 56, 0, 1 }, { 53, 63, 0 } } },
-	{ { { 56, 0, 2 }, { 54, 62, 0 } } },
-	{ { { 57, 0, 1 }, { 62, 47, 0 } } },
-	{ { { 57, 0, 0 }, { 54, 63, 0 } } },
-	{ { { 57, 0, 1 }, { 55, 62, 0 } } },
-	{ { { 57, 0, 2 }, { 55, 63, 0 } } },
-	{ { { 58, 0, 1 }, { 56, 62, 1 } } },
-	{ { { 58, 0, 0 }, { 56, 62, 0 } } },
-	{ { { 58, 0, 1 }, { 56, 63, 0 } } },
-	{ { { 58, 0, 2 }, { 57, 62, 0 } } },
-	{ { { 59, 0, 1 }, { 57, 63, 1 } } },
-	{ { { 59, 0, 0 }, { 57, 63, 0 } } },
-	{ { { 59, 0, 1 }, { 58, 62, 0 } } },
-	{ { { 59, 0, 2 }, { 58, 63, 0 } } },
-	{ { { 60, 0, 1 }, { 59, 62, 1 } } },
-	{ { { 60, 0, 0 }, { 59, 62, 0 } } },
-	{ { { 60, 0, 1 }, { 59, 63, 0 } } },
-	{ { { 60, 0, 2 }, { 60, 62, 0 } } },
-	{ { { 61, 0, 1 }, { 60, 63, 1 } } },
-	{ { { 61, 0, 0 }, { 60, 63, 0 } } },
-	{ { { 61, 0, 1 }, { 61, 62, 0 } } },
-	{ { { 61, 0, 2 }, { 61, 63, 0 } } },
-	{ { { 62, 0, 1 }, { 62, 62, 1 } } },
-	{ { { 62, 0, 0 }, { 62, 62, 0 } } },
-	{ { { 62, 0, 1 }, { 62, 63, 0 } } },
-	{ { { 62, 0, 2 }, { 63, 62, 0 } } },
-	{ { { 63, 0, 1 }, { 63, 63, 1 } } },
-	{ { { 63, 0, 0 }, { 63, 63, 0 } } }
-};
diff --git a/drivers/squish/squish.cpp b/drivers/squish/squish.cpp
deleted file mode 100644
index 400a3b0c46..0000000000
--- a/drivers/squish/squish.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#include "squish/squish.h"
-#include "colourset.h"
-#include "maths.h"
-#include "rangefit.h"
-#include "clusterfit.h"
-#include "colourblock.h"
-#include "alpha.h"
-#include "singlecolourfit.h"
-
-namespace squish {
-
-static int FixFlags( int flags )
-{
-	// grab the flag bits
-	int method = flags & ( kDxt1 | kDxt3 | kDxt5 );
-	int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit );
-	int metric = flags & ( kColourMetricPerceptual | kColourMetricUniform );
-	int extra = flags & kWeightColourByAlpha;
-	
-	// set defaults
-	if( method != kDxt3 && method != kDxt5 )
-		method = kDxt1;
-	if( fit != kColourRangeFit )
-		fit = kColourClusterFit;
-	if( metric != kColourMetricUniform )
-		metric = kColourMetricPerceptual;
-		
-	// done
-	return method | fit | metric | extra;
-}
-
-void Compress( u8 const* rgba, void* block, int flags )
-{
-	// compress with full mask
-	CompressMasked( rgba, 0xffff, block, flags );
-}
-
-void CompressMasked( u8 const* rgba, int mask, void* block, int flags )
-{
-	// fix any bad flags
-	flags = FixFlags( flags );
-
-	// get the block locations
-	void* colourBlock = block;
-	void* alphaBock = block;
-	if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 )
-		colourBlock = reinterpret_cast< u8* >( block ) + 8;
-
-	// create the minimal point set
-	ColourSet colours( rgba, mask, flags );
-	
-	// check the compression type and compress colour
-	if( colours.GetCount() == 1 )
-	{
-		// always do a single colour fit
-		SingleColourFit fit( &colours, flags );
-		fit.Compress( colourBlock );
-	}
-	else if( ( flags & kColourRangeFit ) != 0 || colours.GetCount() == 0 )
-	{
-		// do a range fit
-		RangeFit fit( &colours, flags );
-		fit.Compress( colourBlock );
-	}
-	else
-	{
-		// default to a cluster fit (could be iterative or not)
-		ClusterFit fit( &colours, flags );
-		fit.Compress( colourBlock );
-	}
-	
-	// compress alpha separately if necessary
-	if( ( flags & kDxt3 ) != 0 )
-		CompressAlphaDxt3( rgba, mask, alphaBock );
-	else if( ( flags & kDxt5 ) != 0 )
-		CompressAlphaDxt5( rgba, mask, alphaBock );
-}
-
-void Decompress( u8* rgba, void const* block, int flags )
-{
-	// fix any bad flags
-	flags = FixFlags( flags );
-
-	// get the block locations
-	void const* colourBlock = block;
-	void const* alphaBock = block;
-	if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 )
-		colourBlock = reinterpret_cast< u8 const* >( block ) + 8;
-
-	// decompress colour
-	DecompressColour( rgba, colourBlock, ( flags & kDxt1 ) != 0 );
-
-	// decompress alpha separately if necessary
-	if( ( flags & kDxt3 ) != 0 )
-		DecompressAlphaDxt3( rgba, alphaBock );
-	else if( ( flags & kDxt5 ) != 0 )
-		DecompressAlphaDxt5( rgba, alphaBock );
-}
-
-int GetStorageRequirements( int width, int height, int flags )
-{
-	// fix any bad flags
-	flags = FixFlags( flags );
-	
-	// compute the storage requirements
-	int blockcount = ( ( width + 3 )/4 ) * ( ( height + 3 )/4 );
-	int blocksize = ( ( flags & kDxt1 ) != 0 ) ? 8 : 16;
-	return blockcount*blocksize;	
-}
-
-void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags )
-{
-	// fix any bad flags
-	flags = FixFlags( flags );
-
-	// initialise the block output
-	u8* targetBlock = reinterpret_cast< u8* >( blocks );
-	int bytesPerBlock = ( ( flags & kDxt1 ) != 0 ) ? 8 : 16;
-
-	// loop over blocks
-	for( int y = 0; y < height; y += 4 )
-	{
-		for( int x = 0; x < width; x += 4 )
-		{
-			// build the 4x4 block of pixels
-			u8 sourceRgba[16*4];
-			u8* targetPixel = sourceRgba;
-			int mask = 0;
-			for( int py = 0; py < 4; ++py )
-			{
-				for( int px = 0; px < 4; ++px )
-				{
-					// get the source pixel in the image
-					int sx = x + px;
-					int sy = y + py;
-					
-					// enable if we're in the image
-					if( sx < width && sy < height )
-					{
-						// copy the rgba value
-						u8 const* sourcePixel = rgba + 4*( width*sy + sx );
-						for( int i = 0; i < 4; ++i )
-							*targetPixel++ = *sourcePixel++;
-							
-						// enable this pixel
-						mask |= ( 1 << ( 4*py + px ) );
-					}
-					else
-					{
-						// skip this pixel as its outside the image
-						targetPixel += 4;
-					}
-				}
-			}
-			
-			// compress it into the output
-			CompressMasked( sourceRgba, mask, targetBlock, flags );
-			
-			// advance
-			targetBlock += bytesPerBlock;
-		}
-	}
-}
-
-void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags )
-{
-	// fix any bad flags
-	flags = FixFlags( flags );
-
-	// initialise the block input
-	u8 const* sourceBlock = reinterpret_cast< u8 const* >( blocks );
-	int bytesPerBlock = ( ( flags & kDxt1 ) != 0 ) ? 8 : 16;
-
-	// loop over blocks
-	for( int y = 0; y < height; y += 4 )
-	{
-		for( int x = 0; x < width; x += 4 )
-		{
-			// decompress the block
-			u8 targetRgba[4*16];
-			Decompress( targetRgba, sourceBlock, flags );
-			
-			// write the decompressed pixels to the correct image locations
-			u8 const* sourcePixel = targetRgba;
-			for( int py = 0; py < 4; ++py )
-			{
-				for( int px = 0; px < 4; ++px )
-				{
-					// get the target location
-					int sx = x + px;
-					int sy = y + py;
-					if( sx < width && sy < height )
-					{
-						u8* targetPixel = rgba + 4*( width*sy + sx );
-						
-						// copy the rgba value
-						for( int i = 0; i < 4; ++i )
-							*targetPixel++ = *sourcePixel++;
-					}
-					else
-					{
-						// skip this pixel as its outside the image
-						sourcePixel += 4;
-					}
-				}
-			}
-			
-			// advance
-			sourceBlock += bytesPerBlock;
-		}
-	}
-}
-
-} // namespace squish
diff --git a/drivers/squish/squish.h b/drivers/squish/squish.h
deleted file mode 100644
index 5f5ac149d7..0000000000
--- a/drivers/squish/squish.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the 
-	"Software"), to	deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to 
-	permit persons to whom the Software is furnished to do so, subject to 
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
-   -------------------------------------------------------------------------- */
-   
-#ifndef SQUISH_H
-#define SQUISH_H
-
-//! All squish API functions live in this namespace.
-namespace squish {
-
-// -----------------------------------------------------------------------------
-
-//! Typedef a quantity that is a single unsigned byte.
-typedef unsigned char u8;
-
-// -----------------------------------------------------------------------------
-
-enum
-{
-	//! Use DXT1 compression.
-	kDxt1 = ( 1 << 0 ), 
-	
-	//! Use DXT3 compression.
-	kDxt3 = ( 1 << 1 ), 
-	
-	//! Use DXT5 compression.
-	kDxt5 = ( 1 << 2 ), 
-	
-	//! Use a very slow but very high quality colour compressor.
-	kColourIterativeClusterFit = ( 1 << 8 ),	
-	
-	//! Use a slow but high quality colour compressor (the default).
-	kColourClusterFit = ( 1 << 3 ),	
-	
-	//! Use a fast but low quality colour compressor.
-	kColourRangeFit	= ( 1 << 4 ),
-	
-	//! Use a perceptual metric for colour error (the default).
-	kColourMetricPerceptual = ( 1 << 5 ),
-
-	//! Use a uniform metric for colour error.
-	kColourMetricUniform = ( 1 << 6 ),
-	
-	//! Weight the colour by alpha during cluster fit (disabled by default).
-	kWeightColourByAlpha = ( 1 << 7 )
-};
-
-// -----------------------------------------------------------------------------
-
-/*! @brief Compresses a 4x4 block of pixels.
-
-	@param rgba		The rgba values of the 16 source pixels.
-	@param block	Storage for the compressed DXT block.
-	@param flags	Compression flags.
-	
-	The source pixels should be presented as a contiguous array of 16 rgba
-	values, with each component as 1 byte each. In memory this should be:
-	
-		{ r1, g1, b1, a1, .... , r16, g16, b16, a16 }
-	
-	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-	however, DXT1 will be used by default if none is specified. When using DXT1 
-	compression, 8 bytes of storage are required for the compressed DXT block. 
-	DXT3 and DXT5 compression require 16 bytes of storage per block.
-	
-	The flags parameter can also specify a preferred colour compressor and 
-	colour error metric to use when fitting the RGB components of the data. 
-	Possible colour compressors are: kColourClusterFit (the default), 
-	kColourRangeFit or kColourIterativeClusterFit. Possible colour error metrics 
-	are: kColourMetricPerceptual (the default) or kColourMetricUniform. If no 
-	flags are specified in any particular category then the default will be 
-	used. Unknown flags are ignored.
-	
-	When using kColourClusterFit, an additional flag can be specified to
-	weight the colour of each pixel by its alpha value. For images that are
-	rendered using alpha blending, this can significantly increase the 
-	perceived quality.
-*/
-void Compress( u8 const* rgba, void* block, int flags );
-
-// -----------------------------------------------------------------------------
-
-/*! @brief Compresses a 4x4 block of pixels.
-
-	@param rgba		The rgba values of the 16 source pixels.
-	@param mask		The valid pixel mask.
-	@param block	Storage for the compressed DXT block.
-	@param flags	Compression flags.
-	
-	The source pixels should be presented as a contiguous array of 16 rgba
-	values, with each component as 1 byte each. In memory this should be:
-	
-		{ r1, g1, b1, a1, .... , r16, g16, b16, a16 }
-		
-	The mask parameter enables only certain pixels within the block. The lowest
-	bit enables the first pixel and so on up to the 16th bit. Bits beyond the
-	16th bit are ignored. Pixels that are not enabled are allowed to take
-	arbitrary colours in the output block. An example of how this can be used
-	is in the CompressImage function to disable pixels outside the bounds of
-	the image when the width or height is not divisible by 4.
-	
-	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-	however, DXT1 will be used by default if none is specified. When using DXT1 
-	compression, 8 bytes of storage are required for the compressed DXT block. 
-	DXT3 and DXT5 compression require 16 bytes of storage per block.
-	
-	The flags parameter can also specify a preferred colour compressor and 
-	colour error metric to use when fitting the RGB components of the data. 
-	Possible colour compressors are: kColourClusterFit (the default), 
-	kColourRangeFit or kColourIterativeClusterFit. Possible colour error metrics 
-	are: kColourMetricPerceptual (the default) or kColourMetricUniform. If no 
-	flags are specified in any particular category then the default will be 
-	used. Unknown flags are ignored.
-	
-	When using kColourClusterFit, an additional flag can be specified to
-	weight the colour of each pixel by its alpha value. For images that are
-	rendered using alpha blending, this can significantly increase the 
-	perceived quality.
-*/
-void CompressMasked( u8 const* rgba, int mask, void* block, int flags );
-
-// -----------------------------------------------------------------------------
-
-/*! @brief Decompresses a 4x4 block of pixels.
-
-	@param rgba		Storage for the 16 decompressed pixels.
-	@param block	The compressed DXT block.
-	@param flags	Compression flags.
-
-	The decompressed pixels will be written as a contiguous array of 16 rgba
-	values, with each component as 1 byte each. In memory this is:
-	
-		{ r1, g1, b1, a1, .... , r16, g16, b16, a16 }
-	
-	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-	however, DXT1 will be used by default if none is specified. All other flags 
-	are ignored.
-*/
-void Decompress( u8* rgba, void const* block, int flags );
-
-// -----------------------------------------------------------------------------
-
-/*! @brief Computes the amount of compressed storage required.
-
-	@param width	The width of the image.
-	@param height	The height of the image.
-	@param flags	Compression flags.
-	
-	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-	however, DXT1 will be used by default if none is specified. All other flags 
-	are ignored.
-	
-	Most DXT images will be a multiple of 4 in each dimension, but this 
-	function supports arbitrary size images by allowing the outer blocks to
-	be only partially used.
-*/
-int GetStorageRequirements( int width, int height, int flags );
-
-// -----------------------------------------------------------------------------
-
-/*! @brief Compresses an image in memory.
-
-	@param rgba		The pixels of the source.
-	@param width	The width of the source image.
-	@param height	The height of the source image.
-	@param blocks	Storage for the compressed output.
-	@param flags	Compression flags.
-	
-	The source pixels should be presented as a contiguous array of width*height
-	rgba values, with each component as 1 byte each. In memory this should be:
-	
-		{ r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height
-		
-	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-	however, DXT1 will be used by default if none is specified. When using DXT1 
-	compression, 8 bytes of storage are required for each compressed DXT block. 
-	DXT3 and DXT5 compression require 16 bytes of storage per block.
-	
-	The flags parameter can also specify a preferred colour compressor and 
-	colour error metric to use when fitting the RGB components of the data. 
-	Possible colour compressors are: kColourClusterFit (the default), 
-	kColourRangeFit or kColourIterativeClusterFit. Possible colour error metrics 
-	are: kColourMetricPerceptual (the default) or kColourMetricUniform. If no 
-	flags are specified in any particular category then the default will be 
-	used. Unknown flags are ignored.
-	
-	When using kColourClusterFit, an additional flag can be specified to
-	weight the colour of each pixel by its alpha value. For images that are
-	rendered using alpha blending, this can significantly increase the 
-	perceived quality.
-	
-	Internally this function calls squish::Compress for each block. To see how
-	much memory is required in the compressed image, use
-	squish::GetStorageRequirements.
-*/
-void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags );
-
-// -----------------------------------------------------------------------------
-
-/*! @brief Decompresses an image in memory.
-
-	@param rgba		Storage for the decompressed pixels.
-	@param width	The width of the source image.
-	@param height	The height of the source image.
-	@param blocks	The compressed DXT blocks.
-	@param flags	Compression flags.
-	
-	The decompressed pixels will be written as a contiguous array of width*height
-	16 rgba values, with each component as 1 byte each. In memory this is:
-	
-		{ r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height
-		
-	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-	however, DXT1 will be used by default if none is specified. All other flags 
-	are ignored.
-
-	Internally this function calls squish::Decompress for each block.
-*/
-void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags );
-
-// -----------------------------------------------------------------------------
-
-} // namespace squish
-
-#endif // ndef SQUISH_H
-
diff --git a/drivers/theora/SCsub b/drivers/theora/SCsub
deleted file mode 100644
index 94477d2827..0000000000
--- a/drivers/theora/SCsub
+++ /dev/null
@@ -1,65 +0,0 @@
-Import('env')
-
-sources = [
-	#"theora/analyze.c",
-	#"theora/apiwrapper.c",
-	"theora/bitpack.c",
-	"theora/cpu.c",
-	#"theora/decapiwrapper.c",
-	"theora/decinfo.c",
-	"theora/decode.c",
-	"theora/dequant.c",
-	#"theora/encapiwrapper.c",
-	#"theora/encfrag.c",
-	#"theora/encinfo.c",
-	#"theora/encode.c",
-	#"theora/encoder_disabled.c",
-	#"theora/enquant.c",
-	#"theora/fdct.c",
-	"theora/fragment.c",
-	"theora/huffdec.c",
-	#"theora/huffenc.c",
-	"theora/idct.c",
-	"theora/info.c",
-	"theora/internal.c",
-	#"theora/mathops.c",
-	#"theora/mcenc.c",
-	"theora/quant.c",
-	#"theora/rate.c",
-	"theora/state.c",
-	#"theora/tokenize.c",
-	"theora/video_stream_theora.cpp",
-]
-
-sources_x86 = [
-	#"theora/x86/mmxencfrag.c",
-	#"theora/x86/mmxfdct.c",
-	"theora/x86/mmxfrag.c",
-	"theora/x86/mmxidct.c",
-	"theora/x86/mmxstate.c",
-	#"theora/x86/sse2fdct.c",
-	#"theora/x86/x86enc.c",
-	"theora/x86/x86state.c",
-]
-
-sources_x86_vc = [
-	#"theora/x86_vc/mmxencfrag.c",
-	#"theora/x86_vc/mmxfdct.c",
-	"theora/x86_vc/mmxfrag.c",
-	"theora/x86_vc/mmxidct.c",
-	"theora/x86_vc/mmxstate.c",
-	#"theora/x86_vc/x86enc.c",
-	"theora/x86_vc/x86state.c",
-]
-
-env.drivers_sources += sources
-
-if (env["x86_opt_gcc"]):
-	env.drivers_sources += sources_x86
-
-if (env["x86_opt_vc"]):
-	env.drivers_sources += sources_x86_vc
-
-if (env["x86_opt_gcc"] or env["x86_opt_vc"]):
-	Import('env_drivers')
-	env_drivers.Append(CCFLAGS=["-DOC_X86_ASM"])
diff --git a/drivers/theora/theora.exp b/drivers/theora/theora.exp
deleted file mode 100644
index b4e0225f1e..0000000000
--- a/drivers/theora/theora.exp
+++ /dev/null
@@ -1,55 +0,0 @@
-# export list for libtheora

-_theora_version_string

-_theora_version_number

-_theora_encode_init

-_theora_encode_YUVin

-_theora_encode_packetout

-_theora_encode_header

-_theora_encode_comment

-_theora_encode_tables

-_theora_decode_header

-_theora_decode_init

-_theora_decode_packetin

-_theora_decode_YUVout

-_theora_control

-_theora_packet_isheader

-_theora_packet_iskeyframe

-_theora_granule_shift

-_theora_granule_frame

-_theora_granule_time

-_theora_info_init

-_theora_info_clear

-_theora_clear

-_theora_comment_init

-_theora_comment_add

-_theora_comment_add_tag

-_theora_comment_query

-_theora_comment_query_count

-_theora_comment_clear

-_th_version_string

-_th_version_number

-_th_decode_headerin

-_th_decode_alloc

-_th_setup_free

-_th_decode_ctl

-_th_decode_packetin

-_th_decode_ycbcr_out

-_th_decode_free

-_th_packet_isheader

-_th_packet_iskeyframe

-_th_granule_frame

-_th_granule_time

-_th_info_init

-_th_info_clear

-_th_comment_init

-_th_comment_add

-_th_comment_add_tag

-_th_comment_query

-_th_comment_query_count

-_th_comment_clear

-_th_encode_alloc

-_th_encode_ctl

-_th_encode_flushheader

-_th_encode_packetout

-_th_encode_ycbcr_in

-_th_encode_free

diff --git a/drivers/unix/SCsub b/drivers/unix/SCsub
index 3d46a85cdf..36a172025d 100644
--- a/drivers/unix/SCsub
+++ b/drivers/unix/SCsub
@@ -10,6 +10,6 @@ f = open("os_unix_global_settings_path.cpp","wb")
 f.write(g_set_p)
 f.close()
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+env.add_source_files(env.drivers_sources, "*.cpp")
 
 Export('env')
diff --git a/drivers/vorbis/SCsub b/drivers/vorbis/SCsub
deleted file mode 100644
index 4afafcc4ba..0000000000
--- a/drivers/vorbis/SCsub
+++ /dev/null
@@ -1,36 +0,0 @@
-Import('env')
-
-sources = [
-	"vorbis/audio_stream_ogg_vorbis.cpp",
-]
-
-sources_lib = [
-	#"vorbis/analysis.c",
-	#"vorbis/barkmel.c",
-	"vorbis/bitrate.c",
-	"vorbis/block.c",
-	"vorbis/codebook.c",
-	"vorbis/envelope.c",
-	"vorbis/floor0.c",
-	"vorbis/floor1.c",
-	"vorbis/info.c",
-	"vorbis/lookup.c",
-	"vorbis/lpc.c",
-	"vorbis/lsp.c",
-	"vorbis/mapping0.c",
-	"vorbis/mdct.c",
-	"vorbis/psy.c",
-	#"vorbis/psytune.c",
-	"vorbis/registry.c",
-	"vorbis/res0.c",
-	"vorbis/sharedbook.c",
-	"vorbis/smallft.c",
-	"vorbis/synthesis.c",
-	#"vorbis/tone.c",
-	#"vorbis/vorbisenc.c",
-	"vorbis/vorbisfile.c",
-	"vorbis/window.c",
-]
-
-env.drivers_sources += sources
-env.drivers_sources += sources_lib
diff --git a/drivers/webp/SCsub b/drivers/webp/SCsub
deleted file mode 100644
index f65bd13dba..0000000000
--- a/drivers/webp/SCsub
+++ /dev/null
@@ -1,115 +0,0 @@
-Import('env')
-
-webp_sources = [
-"webp/enc/webpenc.c",\
-"webp/enc/near_lossless.c",\
-"webp/enc/frame.c",\
-"webp/enc/alpha.c",\
-"webp/enc/picture_csp.c",\
-"webp/enc/vp8l.c",\
-"webp/enc/picture_psnr.c",\
-"webp/enc/delta_palettization.c",\
-"webp/enc/syntax.c",\
-"webp/enc/backward_references.c",\
-"webp/enc/token.c",\
-"webp/enc/analysis.c",\
-"webp/enc/iterator.c",\
-"webp/enc/picture_tools.c",\
-"webp/enc/picture_rescale.c",\
-"webp/enc/config.c",\
-"webp/enc/tree.c",\
-"webp/enc/cost.c",\
-"webp/enc/picture.c",\
-"webp/enc/quant.c",\
-"webp/enc/filter.c",\
-"webp/enc/histogram.c",\
-"webp/image_loader_webp.cpp",\
-"webp/utils/rescaler.c",\
-"webp/utils/filters.c",\
-"webp/utils/quant_levels_dec.c",\
-"webp/utils/huffman.c",\
-"webp/utils/thread.c",\
-"webp/utils/quant_levels.c",\
-"webp/utils/bit_writer.c",\
-"webp/utils/bit_reader.c",\
-"webp/utils/random.c",\
-"webp/utils/utils.c",\
-"webp/utils/huffman_encode.c",\
-"webp/utils/color_cache.c",\
-"webp/mux/muxinternal.c",\
-"webp/mux/muxread.c",\
-"webp/mux/anim_encode.c",\
-"webp/mux/muxedit.c",\
-"webp/dec/webp.c",\
-"webp/dec/frame.c",\
-"webp/dec/alpha.c",\
-"webp/dec/vp8l.c",\
-"webp/dec/io.c",\
-"webp/dec/vp8.c",\
-"webp/dec/idec.c",\
-"webp/dec/tree.c",\
-"webp/dec/buffer.c",\
-"webp/dec/quant.c",\
-"webp/demux/demux.c",\
-"webp/demux/anim_decode.c",\
-"webp/dsp/yuv.c",\
-"webp/dsp/filters_sse2.c",\
-"webp/dsp/dec_sse41.c",\
-"webp/dsp/rescaler.c",\
-"webp/dsp/lossless_sse2.c",\
-"webp/dsp/alpha_processing_sse41.c",\
-"webp/dsp/alpha_processing_sse2.c",\
-"webp/dsp/filters.c",\
-"webp/dsp/upsampling_mips_dsp_r2.c",\
-"webp/dsp/dec_neon.c",\
-"webp/dsp/enc_neon.c",\
-"webp/dsp/lossless_enc_mips32.c",\
-"webp/dsp/lossless_enc_sse2.c",\
-"webp/dsp/upsampling.c",\
-"webp/dsp/lossless_enc_neon.c",\
-"webp/dsp/alpha_processing.c",\
-"webp/dsp/cost_sse2.c",\
-"webp/dsp/dec_mips32.c",\
-"webp/dsp/enc_avx2.c",\
-"webp/dsp/rescaler_mips32.c",\
-"webp/dsp/enc.c",\
-"webp/dsp/lossless_enc_sse41.c",\
-"webp/dsp/cost_mips32.c",\
-"webp/dsp/lossless_mips_dsp_r2.c",\
-"webp/dsp/filters_mips_dsp_r2.c",\
-"webp/dsp/upsampling_neon.c",\
-"webp/dsp/alpha_processing_mips_dsp_r2.c",\
-"webp/dsp/enc_mips_dsp_r2.c",\
-"webp/dsp/lossless.c",\
-"webp/dsp/yuv_mips_dsp_r2.c",\
-"webp/dsp/cost_mips_dsp_r2.c",\
-"webp/dsp/argb.c",\
-"webp/dsp/dec_sse2.c",\
-"webp/dsp/rescaler_sse2.c",\
-"webp/dsp/enc_sse41.c",\
-"webp/dsp/argb_mips_dsp_r2.c",\
-"webp/dsp/lossless_enc_mips_dsp_r2.c",\
-"webp/dsp/dec_clip_tables.c",\
-"webp/dsp/yuv_mips32.c",\
-"webp/dsp/cpu.c",\
-"webp/dsp/dec.c",\
-"webp/dsp/argb_sse2.c",\
-"webp/dsp/lossless_neon.c",\
-"webp/dsp/lossless_enc.c",\
-"webp/dsp/enc_mips32.c",\
-"webp/dsp/cost.c",\
-"webp/dsp/rescaler_mips_dsp_r2.c",\
-"webp/dsp/dec_mips_dsp_r2.c",\
-"webp/dsp/rescaler_neon.c",\
-"webp/dsp/yuv_sse2.c",\
-"webp/dsp/enc_sse2.c",\
-"webp/dsp/upsampling_sse2.c"
-]
-
-env.drivers_sources+=webp_sources
-
-#env.add_source_files(env.drivers_sources, webp_sources)
-
-
-Export('env')
-
diff --git a/drivers/webp/extras.h b/drivers/webp/extras.h
deleted file mode 100644
index 1c24be2e0c..0000000000
--- a/drivers/webp/extras.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015 Google Inc. All Rights Reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the COPYING file in the root of the source
-// tree. An additional intellectual property rights grant can be found
-// in the file PATENTS. All contributing project authors may
-// be found in the AUTHORS file in the root of the source tree.
-// -----------------------------------------------------------------------------
-//
-
-#ifndef WEBP_WEBP_EXTRAS_H_
-#define WEBP_WEBP_EXTRAS_H_
-
-#include "./types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "./encode.h"
-
-#define WEBP_EXTRAS_ABI_VERSION 0x0000    // MAJOR(8b) + MINOR(8b)
-
-//------------------------------------------------------------------------------
-
-// Returns the version number of the extras library, packed in hexadecimal using
-// 8bits for each of major/minor/revision. E.g: v2.5.7 is 0x020507.
-WEBP_EXTERN(int) WebPGetExtrasVersion(void);
-
-//------------------------------------------------------------------------------
-// Ad-hoc colorspace importers.
-
-// Import luma sample (gray scale image) into 'picture'. The 'picture'
-// width and height must be set prior to calling this function.
-WEBP_EXTERN(int) WebPImportGray(const uint8_t* gray, WebPPicture* picture);
-
-// Import rgb sample in RGB565 packed format into 'picture'. The 'picture'
-// width and height must be set prior to calling this function.
-WEBP_EXTERN(int) WebPImportRGB565(const uint8_t* rgb565, WebPPicture* pic);
-
-// Import rgb sample in RGB4444 packed format into 'picture'. The 'picture'
-// width and height must be set prior to calling this function.
-WEBP_EXTERN(int) WebPImportRGB4444(const uint8_t* rgb4444, WebPPicture* pic);
-
-//------------------------------------------------------------------------------
-
-#ifdef __cplusplus
-}    // extern "C"
-#endif
-
-#endif  /* WEBP_WEBP_EXTRAS_H_ */
diff --git a/drivers/windows/SCsub b/drivers/windows/SCsub
index 9fbb467baa..0582e01978 100644
--- a/drivers/windows/SCsub
+++ b/drivers/windows/SCsub
@@ -1,5 +1,5 @@
 Import('env')
 
-env.add_source_files(env.drivers_sources,"*.cpp")
+env.add_source_files(env.drivers_sources, "*.cpp")
 
 Export('env')
diff --git a/drivers/zlib/SCsub b/drivers/zlib/SCsub
new file mode 100644
index 0000000000..d0bbcd452b
--- /dev/null
+++ b/drivers/zlib/SCsub
@@ -0,0 +1,24 @@
+Import('env')
+
+# Not cloning the env, the includes need to be accessible for core/
+
+# Thirdparty source files
+# No check here as already done in drivers/SCsub
+thirdparty_dir = "#thirdparty/zlib/"
+thirdparty_sources = [
+	"adler32.c",
+	"compress.c",
+	"crc32.c",
+	"deflate.c",
+	"infback.c",
+	"inffast.c",
+	"inflate.c",
+	"inftrees.c",
+	"trees.c",
+	"uncompr.c",
+	"zutil.c",
+]
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+env.add_source_files(env.drivers_sources, thirdparty_sources)
+env.Append(CPPPATH = [thirdparty_dir])
diff --git a/modules/chibi/SCsub b/modules/chibi/SCsub
new file mode 100644
index 0000000000..e39554977a
--- /dev/null
+++ b/modules/chibi/SCsub
@@ -0,0 +1,7 @@
+Import('env')
+Import('env_modules')
+
+env_chibi = env_modules.Clone()
+
+# Godot source files
+env_chibi.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/chibi/config.py b/modules/chibi/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/chibi/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/drivers/chibi/cp_config.h b/modules/chibi/cp_config.h
index 2ad704ace7..2ad704ace7 100644
--- a/drivers/chibi/cp_config.h
+++ b/modules/chibi/cp_config.h
diff --git a/drivers/chibi/cp_envelope.cpp b/modules/chibi/cp_envelope.cpp
index 9892b6d4b0..9892b6d4b0 100644
--- a/drivers/chibi/cp_envelope.cpp
+++ b/modules/chibi/cp_envelope.cpp
diff --git a/drivers/chibi/cp_envelope.h b/modules/chibi/cp_envelope.h
index d1ada53f7d..d1ada53f7d 100644
--- a/drivers/chibi/cp_envelope.h
+++ b/modules/chibi/cp_envelope.h
diff --git a/drivers/chibi/cp_file_access_wrapper.h b/modules/chibi/cp_file_access_wrapper.h
index 5b361c0ea8..5b361c0ea8 100644
--- a/drivers/chibi/cp_file_access_wrapper.h
+++ b/modules/chibi/cp_file_access_wrapper.h
diff --git a/drivers/chibi/cp_instrument.cpp b/modules/chibi/cp_instrument.cpp
index 7a732e33a4..7a732e33a4 100644
--- a/drivers/chibi/cp_instrument.cpp
+++ b/modules/chibi/cp_instrument.cpp
diff --git a/drivers/chibi/cp_instrument.h b/modules/chibi/cp_instrument.h
index d8eb8333ee..d8eb8333ee 100644
--- a/drivers/chibi/cp_instrument.h
+++ b/modules/chibi/cp_instrument.h
diff --git a/drivers/chibi/cp_loader.h b/modules/chibi/cp_loader.h
index 9d1074d1b8..9d1074d1b8 100644
--- a/drivers/chibi/cp_loader.h
+++ b/modules/chibi/cp_loader.h
diff --git a/drivers/chibi/cp_loader_it.cpp b/modules/chibi/cp_loader_it.cpp
index 20a3960a23..20a3960a23 100644
--- a/drivers/chibi/cp_loader_it.cpp
+++ b/modules/chibi/cp_loader_it.cpp
diff --git a/drivers/chibi/cp_loader_it.h b/modules/chibi/cp_loader_it.h
index 38a1cdd9c4..38a1cdd9c4 100644
--- a/drivers/chibi/cp_loader_it.h
+++ b/modules/chibi/cp_loader_it.h
diff --git a/drivers/chibi/cp_loader_it_info.cpp b/modules/chibi/cp_loader_it_info.cpp
index 0360f7f9a4..0360f7f9a4 100644
--- a/drivers/chibi/cp_loader_it_info.cpp
+++ b/modules/chibi/cp_loader_it_info.cpp
diff --git a/drivers/chibi/cp_loader_it_instruments.cpp b/modules/chibi/cp_loader_it_instruments.cpp
index ccb24bd81c..ccb24bd81c 100644
--- a/drivers/chibi/cp_loader_it_instruments.cpp
+++ b/modules/chibi/cp_loader_it_instruments.cpp
diff --git a/drivers/chibi/cp_loader_it_patterns.cpp b/modules/chibi/cp_loader_it_patterns.cpp
index d951a91620..d951a91620 100644
--- a/drivers/chibi/cp_loader_it_patterns.cpp
+++ b/modules/chibi/cp_loader_it_patterns.cpp
diff --git a/drivers/chibi/cp_loader_it_samples.cpp b/modules/chibi/cp_loader_it_samples.cpp
index ced7252a6c..ced7252a6c 100644
--- a/drivers/chibi/cp_loader_it_samples.cpp
+++ b/modules/chibi/cp_loader_it_samples.cpp
diff --git a/drivers/chibi/cp_loader_mod.cpp b/modules/chibi/cp_loader_mod.cpp
index f867b77914..f867b77914 100644
--- a/drivers/chibi/cp_loader_mod.cpp
+++ b/modules/chibi/cp_loader_mod.cpp
diff --git a/drivers/chibi/cp_loader_mod.h b/modules/chibi/cp_loader_mod.h
index 636f4f00f2..636f4f00f2 100644
--- a/drivers/chibi/cp_loader_mod.h
+++ b/modules/chibi/cp_loader_mod.h
diff --git a/drivers/chibi/cp_loader_s3m.cpp b/modules/chibi/cp_loader_s3m.cpp
index 0fc15c1e2f..0fc15c1e2f 100644
--- a/drivers/chibi/cp_loader_s3m.cpp
+++ b/modules/chibi/cp_loader_s3m.cpp
diff --git a/drivers/chibi/cp_loader_s3m.h b/modules/chibi/cp_loader_s3m.h
index 175e5e80fe..175e5e80fe 100644
--- a/drivers/chibi/cp_loader_s3m.h
+++ b/modules/chibi/cp_loader_s3m.h
diff --git a/drivers/chibi/cp_loader_xm.cpp b/modules/chibi/cp_loader_xm.cpp
index bff8615a32..bff8615a32 100644
--- a/drivers/chibi/cp_loader_xm.cpp
+++ b/modules/chibi/cp_loader_xm.cpp
diff --git a/drivers/chibi/cp_loader_xm.h b/modules/chibi/cp_loader_xm.h
index 9ae480cc8f..9ae480cc8f 100644
--- a/drivers/chibi/cp_loader_xm.h
+++ b/modules/chibi/cp_loader_xm.h
diff --git a/drivers/chibi/cp_mixer.h b/modules/chibi/cp_mixer.h
index 7ad22ac146..7ad22ac146 100644
--- a/drivers/chibi/cp_mixer.h
+++ b/modules/chibi/cp_mixer.h
diff --git a/drivers/chibi/cp_note.h b/modules/chibi/cp_note.h
index 5cfa3f11ec..5cfa3f11ec 100644
--- a/drivers/chibi/cp_note.h
+++ b/modules/chibi/cp_note.h
diff --git a/drivers/chibi/cp_order.h b/modules/chibi/cp_order.h
index 03ecc00bba..03ecc00bba 100644
--- a/drivers/chibi/cp_order.h
+++ b/modules/chibi/cp_order.h
diff --git a/drivers/chibi/cp_pattern.cpp b/modules/chibi/cp_pattern.cpp
index 83e165bf87..83e165bf87 100644
--- a/drivers/chibi/cp_pattern.cpp
+++ b/modules/chibi/cp_pattern.cpp
diff --git a/drivers/chibi/cp_pattern.h b/modules/chibi/cp_pattern.h
index 4065caa5e5..4065caa5e5 100644
--- a/drivers/chibi/cp_pattern.h
+++ b/modules/chibi/cp_pattern.h
diff --git a/drivers/chibi/cp_player_data.cpp b/modules/chibi/cp_player_data.cpp
index 3f3e9a5202..3f3e9a5202 100644
--- a/drivers/chibi/cp_player_data.cpp
+++ b/modules/chibi/cp_player_data.cpp
diff --git a/drivers/chibi/cp_player_data.h b/modules/chibi/cp_player_data.h
index 282592b8f4..282592b8f4 100644
--- a/drivers/chibi/cp_player_data.h
+++ b/modules/chibi/cp_player_data.h
diff --git a/drivers/chibi/cp_player_data_control.cpp b/modules/chibi/cp_player_data_control.cpp
index d9aaed904f..d9aaed904f 100644
--- a/drivers/chibi/cp_player_data_control.cpp
+++ b/modules/chibi/cp_player_data_control.cpp
diff --git a/drivers/chibi/cp_player_data_effects.cpp b/modules/chibi/cp_player_data_effects.cpp
index 3a52a3b91b..3a52a3b91b 100644
--- a/drivers/chibi/cp_player_data_effects.cpp
+++ b/modules/chibi/cp_player_data_effects.cpp
diff --git a/drivers/chibi/cp_player_data_envelopes.cpp b/modules/chibi/cp_player_data_envelopes.cpp
index 96af42d19f..96af42d19f 100644
--- a/drivers/chibi/cp_player_data_envelopes.cpp
+++ b/modules/chibi/cp_player_data_envelopes.cpp
diff --git a/drivers/chibi/cp_player_data_events.cpp b/modules/chibi/cp_player_data_events.cpp
index fb5090461b..fb5090461b 100644
--- a/drivers/chibi/cp_player_data_events.cpp
+++ b/modules/chibi/cp_player_data_events.cpp
diff --git a/drivers/chibi/cp_player_data_filter.cpp b/modules/chibi/cp_player_data_filter.cpp
index 30db807eed..30db807eed 100644
--- a/drivers/chibi/cp_player_data_filter.cpp
+++ b/modules/chibi/cp_player_data_filter.cpp
diff --git a/drivers/chibi/cp_player_data_nna.cpp b/modules/chibi/cp_player_data_nna.cpp
index 844f043694..844f043694 100644
--- a/drivers/chibi/cp_player_data_nna.cpp
+++ b/modules/chibi/cp_player_data_nna.cpp
diff --git a/drivers/chibi/cp_player_data_notes.cpp b/modules/chibi/cp_player_data_notes.cpp
index 621be019e1..621be019e1 100644
--- a/drivers/chibi/cp_player_data_notes.cpp
+++ b/modules/chibi/cp_player_data_notes.cpp
diff --git a/drivers/chibi/cp_player_data_utils.cpp b/modules/chibi/cp_player_data_utils.cpp
index 170a849863..170a849863 100644
--- a/drivers/chibi/cp_player_data_utils.cpp
+++ b/modules/chibi/cp_player_data_utils.cpp
diff --git a/drivers/chibi/cp_sample.cpp b/modules/chibi/cp_sample.cpp
index 55c2c910a5..55c2c910a5 100644
--- a/drivers/chibi/cp_sample.cpp
+++ b/modules/chibi/cp_sample.cpp
diff --git a/drivers/chibi/cp_sample.h b/modules/chibi/cp_sample.h
index 4b3d218106..4b3d218106 100644
--- a/drivers/chibi/cp_sample.h
+++ b/modules/chibi/cp_sample.h
diff --git a/drivers/chibi/cp_sample_defs.h b/modules/chibi/cp_sample_defs.h
index 169963c98e..169963c98e 100644
--- a/drivers/chibi/cp_sample_defs.h
+++ b/modules/chibi/cp_sample_defs.h
diff --git a/drivers/chibi/cp_sample_manager.cpp b/modules/chibi/cp_sample_manager.cpp
index 5c2988e3f9..5c2988e3f9 100644
--- a/drivers/chibi/cp_sample_manager.cpp
+++ b/modules/chibi/cp_sample_manager.cpp
diff --git a/drivers/chibi/cp_sample_manager.h b/modules/chibi/cp_sample_manager.h
index 74bcafc0cf..74bcafc0cf 100644
--- a/drivers/chibi/cp_sample_manager.h
+++ b/modules/chibi/cp_sample_manager.h
diff --git a/drivers/chibi/cp_song.cpp b/modules/chibi/cp_song.cpp
index 4aa1a4228d..4aa1a4228d 100644
--- a/drivers/chibi/cp_song.cpp
+++ b/modules/chibi/cp_song.cpp
diff --git a/drivers/chibi/cp_song.h b/modules/chibi/cp_song.h
index da5d106a63..da5d106a63 100644
--- a/drivers/chibi/cp_song.h
+++ b/modules/chibi/cp_song.h
diff --git a/drivers/chibi/cp_tables.cpp b/modules/chibi/cp_tables.cpp
index 8c62150f31..8c62150f31 100644
--- a/drivers/chibi/cp_tables.cpp
+++ b/modules/chibi/cp_tables.cpp
diff --git a/drivers/chibi/cp_tables.h b/modules/chibi/cp_tables.h
index ac7ee562b7..ac7ee562b7 100644
--- a/drivers/chibi/cp_tables.h
+++ b/modules/chibi/cp_tables.h
diff --git a/drivers/chibi/event_stream_chibi.cpp b/modules/chibi/event_stream_chibi.cpp
index b88f4ee70e..b88f4ee70e 100644
--- a/drivers/chibi/event_stream_chibi.cpp
+++ b/modules/chibi/event_stream_chibi.cpp
diff --git a/drivers/chibi/event_stream_chibi.h b/modules/chibi/event_stream_chibi.h
index cc7b0ace86..cc7b0ace86 100644
--- a/drivers/chibi/event_stream_chibi.h
+++ b/modules/chibi/event_stream_chibi.h
diff --git a/modules/chibi/register_types.cpp b/modules/chibi/register_types.cpp
new file mode 100644
index 0000000000..b2ba16fa03
--- /dev/null
+++ b/modules/chibi/register_types.cpp
@@ -0,0 +1,41 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "event_stream_chibi.h"
+
+void register_chibi_types() {
+
+	initialize_chibi();
+}
+
+void unregister_chibi_types() {
+
+	finalize_chibi();
+}
diff --git a/modules/chibi/register_types.h b/modules/chibi/register_types.h
new file mode 100644
index 0000000000..159823b85d
--- /dev/null
+++ b/modules/chibi/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_chibi_types();
+void unregister_chibi_types();
diff --git a/modules/cscript/SCsub b/modules/cscript/SCsub
index 403fe68f66..9ff13fc43f 100644
--- a/modules/cscript/SCsub
+++ b/modules/cscript/SCsub
@@ -1,5 +1,5 @@
 Import('env')
 
-env.add_source_files(env.modules_sources,"*.cpp")
+env.add_source_files(env.modules_sources, "*.cpp")
 
 Export('env')
diff --git a/modules/dds/SCsub b/modules/dds/SCsub
new file mode 100644
index 0000000000..c54a58e079
--- /dev/null
+++ b/modules/dds/SCsub
@@ -0,0 +1,6 @@
+Import('env')
+Import('env_modules')
+
+env_dds = env_modules.Clone()
+
+env_dds.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/dds/config.py b/modules/dds/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/dds/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/dds/register_types.cpp b/modules/dds/register_types.cpp
new file mode 100644
index 0000000000..0d28e2bbef
--- /dev/null
+++ b/modules/dds/register_types.cpp
@@ -0,0 +1,44 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "texture_loader_dds.h"
+
+static ResourceFormatDDS *resource_loader_dds = NULL;
+
+void register_dds_types() {
+
+	resource_loader_dds = memnew( ResourceFormatDDS );
+	ResourceLoader::add_resource_format_loader(resource_loader_dds);
+}
+
+void unregister_dds_types() {
+
+	memdelete(resource_loader_dds);
+}
diff --git a/modules/dds/register_types.h b/modules/dds/register_types.h
new file mode 100644
index 0000000000..f9ecfb8ef9
--- /dev/null
+++ b/modules/dds/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_dds_types();
+void unregister_dds_types();
diff --git a/drivers/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp
index 0cc84f02f7..0cc84f02f7 100644
--- a/drivers/dds/texture_loader_dds.cpp
+++ b/modules/dds/texture_loader_dds.cpp
diff --git a/drivers/dds/texture_loader_dds.h b/modules/dds/texture_loader_dds.h
index 371eb1858c..371eb1858c 100644
--- a/drivers/dds/texture_loader_dds.h
+++ b/modules/dds/texture_loader_dds.h
diff --git a/modules/enet/SCsub b/modules/enet/SCsub
index d2bc8801e4..66c60baabe 100644
--- a/modules/enet/SCsub
+++ b/modules/enet/SCsub
@@ -1,8 +1,26 @@
 Import('env')
+Import('env_modules')
 
-env.add_source_files(env.modules_sources,"*.cpp")
-env.add_source_files(env.modules_sources,"*.c")
-#TODO: Make it possible to build against system enet
-env.Append(CPPPATH = ["#modules/enet"])
+# Thirdparty source files
 
-Export('env')
+env_enet = env_modules.Clone()
+
+if (env["enet"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/enet/"
+	thirdparty_sources = [
+		"callbacks.c",
+		"compress.c",
+		"host.c",
+		"list.c",
+		"packet.c",
+		"peer.c",
+		"protocol.c",
+		"unix.c",
+		"win32.c",
+	]
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_enet.add_source_files(env.modules_sources, thirdparty_sources)
+	env_enet.Append(CPPPATH = [thirdparty_dir])
+
+env_enet.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/enet/config.py b/modules/enet/config.py
index ea7e83378a..368e97e152 100644
--- a/modules/enet/config.py
+++ b/modules/enet/config.py
@@ -1,11 +1,6 @@
 
-
 def can_build(platform):
-  return True
-
+	return True
 
 def configure(env):
 	pass
-
-
-
diff --git a/modules/enet/networked_multiplayer_enet.cpp b/modules/enet/networked_multiplayer_enet.cpp
index ac89c0e9e9..b4dfa9c62e 100644
--- a/modules/enet/networked_multiplayer_enet.cpp
+++ b/modules/enet/networked_multiplayer_enet.cpp
@@ -1,3 +1,31 @@
+/*************************************************************************/
+/*  networked_multiplayer_enet.cpp                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
 #include "os/os.h"
 #include "io/marshalls.h"
 #include "networked_multiplayer_enet.h"
diff --git a/modules/enet/networked_multiplayer_enet.h b/modules/enet/networked_multiplayer_enet.h
index f64db4561e..3db318c96a 100644
--- a/modules/enet/networked_multiplayer_enet.h
+++ b/modules/enet/networked_multiplayer_enet.h
@@ -1,3 +1,31 @@
+/*************************************************************************/
+/*  networked_multiplayer_enet.h                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
 #ifndef NETWORKED_MULTIPLAYER_ENET_H
 #define NETWORKED_MULTIPLAYER_ENET_H
 
diff --git a/modules/etc1/SCsub b/modules/etc1/SCsub
new file mode 100644
index 0000000000..ad343ab579
--- /dev/null
+++ b/modules/etc1/SCsub
@@ -0,0 +1,18 @@
+Import('env')
+Import('env_modules')
+
+env_etc1 = env_modules.Clone()
+
+# Thirdparty source files
+# Not unbundled so far since not widespread as shared library
+thirdparty_dir = "#thirdparty/rg-etc1/"
+thirdparty_sources = [
+	"rg_etc1.cpp",
+]
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+env_etc1.add_source_files(env.modules_sources, thirdparty_sources)
+env_etc1.Append(CPPPATH = [thirdparty_dir])
+
+# Godot source files
+env_etc1.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/etc1/config.py b/modules/etc1/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/etc1/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/drivers/etc1/image_etc.cpp b/modules/etc1/image_etc.cpp
index cf2384240b..cf2384240b 100644
--- a/drivers/etc1/image_etc.cpp
+++ b/modules/etc1/image_etc.cpp
diff --git a/drivers/etc1/image_etc.h b/modules/etc1/image_etc.h
index edcff39bfd..edcff39bfd 100644
--- a/drivers/etc1/image_etc.h
+++ b/modules/etc1/image_etc.h
diff --git a/modules/etc1/register_types.cpp b/modules/etc1/register_types.cpp
new file mode 100644
index 0000000000..e9eba6c864
--- /dev/null
+++ b/modules/etc1/register_types.cpp
@@ -0,0 +1,47 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "image_etc.h"
+#include "texture_loader_pkm.h"
+
+static ResourceFormatPKM *resource_loader_pkm = NULL;
+
+void register_etc1_types() {
+
+	resource_loader_pkm = memnew( ResourceFormatPKM );
+	ResourceLoader::add_resource_format_loader(resource_loader_pkm);
+
+	_register_etc1_compress_func();
+}
+
+void unregister_etc1_types() {
+
+	memdelete(resource_loader_pkm);
+}
diff --git a/modules/etc1/register_types.h b/modules/etc1/register_types.h
new file mode 100644
index 0000000000..bc26699d54
--- /dev/null
+++ b/modules/etc1/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_etc1_types();
+void unregister_etc1_types();
diff --git a/drivers/etc1/texture_loader_pkm.cpp b/modules/etc1/texture_loader_pkm.cpp
index 275afc1fd6..275afc1fd6 100644
--- a/drivers/etc1/texture_loader_pkm.cpp
+++ b/modules/etc1/texture_loader_pkm.cpp
diff --git a/drivers/etc1/texture_loader_pkm.h b/modules/etc1/texture_loader_pkm.h
index 5788716d9f..5788716d9f 100644
--- a/drivers/etc1/texture_loader_pkm.h
+++ b/modules/etc1/texture_loader_pkm.h
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
new file mode 100644
index 0000000000..10c58558a5
--- /dev/null
+++ b/modules/freetype/SCsub
@@ -0,0 +1,88 @@
+Import('env')
+
+# Not building in a separate env as core needs it
+
+# Thirdparty source files
+if (env["freetype"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/freetype/"
+	thirdparty_sources = [
+		"src/autofit/autofit.c",
+		"src/base/ftapi.c",
+		"src/base/ftbase.c",
+		"src/base/ftbbox.c",
+		"src/base/ftbdf.c",
+		"src/base/ftbitmap.c",
+		"src/base/ftcid.c",
+		"src/base/ftdebug.c",
+		"src/base/ftfntfmt.c",
+		"src/base/ftfstype.c",
+		"src/base/ftgasp.c",
+		"src/base/ftglyph.c",
+		"src/base/ftgxval.c",
+		"src/base/ftinit.c",
+		"src/base/ftlcdfil.c",
+		"src/base/ftmm.c",
+		"src/base/ftotval.c",
+		"src/base/ftpatent.c",
+		"src/base/ftpfr.c",
+		"src/base/ftpic.c",
+		"src/base/ftstroke.c",
+		"src/base/ftsynth.c",
+		"src/base/ftsystem.c",
+		"src/base/fttype1.c",
+		"src/base/ftwinfnt.c",
+		"src/bdf/bdf.c",
+		"src/cache/ftcache.c",
+		"src/cff/cff.c",
+		"src/cid/type1cid.c",
+		"src/gxvalid/gxvalid.c",
+		"src/otvalid/otvalid.c",
+		"src/pcf/pcf.c",
+		"src/pfr/pfr.c",
+		"src/psaux/psaux.c",
+		"src/pshinter/pshinter.c",
+		"src/psnames/psnames.c",
+		"src/raster/raster.c",
+		"src/sfnt/sfnt.c",
+		"src/smooth/smooth.c",
+		"src/truetype/truetype.c",
+		"src/type1/type1.c",
+		"src/type42/type42.c",
+		"src/winfonts/winfnt.c",
+	]
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	# Include header for WinRT to fix build issues
+	if "platform" in env and env["platform"] == "winrt":
+		env.Append(CCFLAGS = ['/FI', '"modules/freetype/winrtdef.h"'])
+
+	env.Append(CPPPATH = [thirdparty_dir, thirdparty_dir + "/include"])
+
+	# also requires libpng headers
+	if (env["libpng"] != "system"): # builtin
+		env.Append(CPPPATH = ["#thirdparty/libpng"])
+
+	""" FIXME: Remove this commented code if Windows can handle the monolithic lib
+	# fix for Windows' shell miserably failing on long lines, split in two libraries
+	half1 = []
+	half2 = []
+	for x in thirdparty_sources:
+		if (x.find("src/base") != -1 and x.find("src/sfnt") != -1):
+			half1.append(x)
+		else:
+			half2.append(x)
+
+	lib = env.Library("freetype_builtin1", half2)
+	env.Append(LIBS = [lib])
+	lib = env.Library("freetype_builtin2", half1)
+	env.Append(LIBS = [lib])
+	"""
+
+	lib = env.Library("freetype_builtin", thirdparty_sources)
+	env.Append(LIBS = [lib])
+
+# Godot source files
+env.add_source_files(env.modules_sources, "*.cpp")
+env.Append(CCFLAGS = ['-DFREETYPE_ENABLED'])
+
+Export('env')
diff --git a/modules/freetype/config.py b/modules/freetype/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/freetype/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/freetype/register_types.cpp b/modules/freetype/register_types.cpp
new file mode 100644
index 0000000000..2b9f47f54c
--- /dev/null
+++ b/modules/freetype/register_types.cpp
@@ -0,0 +1,33 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+void register_freetype_types() {}
+
+void unregister_freetype_types() {}
diff --git a/modules/freetype/register_types.h b/modules/freetype/register_types.h
new file mode 100644
index 0000000000..326cd2e6ea
--- /dev/null
+++ b/modules/freetype/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_freetype_types();
+void unregister_freetype_types();
diff --git a/drivers/freetype/winrtdef.h b/modules/freetype/winrtdef.h
index 69c6baf532..69c6baf532 100644
--- a/drivers/freetype/winrtdef.h
+++ b/modules/freetype/winrtdef.h
diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub
index 403fe68f66..9ff13fc43f 100644
--- a/modules/gdscript/SCsub
+++ b/modules/gdscript/SCsub
@@ -1,5 +1,5 @@
 Import('env')
 
-env.add_source_files(env.modules_sources,"*.cpp")
+env.add_source_files(env.modules_sources, "*.cpp")
 
 Export('env')
diff --git a/modules/gridmap/SCsub b/modules/gridmap/SCsub
index 211a043468..9ff13fc43f 100644
--- a/modules/gridmap/SCsub
+++ b/modules/gridmap/SCsub
@@ -1,3 +1,5 @@
 Import('env')
 
-env.add_source_files(env.modules_sources,"*.cpp")
+env.add_source_files(env.modules_sources, "*.cpp")
+
+Export('env')
diff --git a/modules/ik/SCsub b/modules/ik/SCsub
index 211a043468..9ff13fc43f 100644
--- a/modules/ik/SCsub
+++ b/modules/ik/SCsub
@@ -1,3 +1,5 @@
 Import('env')
 
-env.add_source_files(env.modules_sources,"*.cpp")
+env.add_source_files(env.modules_sources, "*.cpp")
+
+Export('env')
diff --git a/modules/jpg/SCsub b/modules/jpg/SCsub
new file mode 100644
index 0000000000..258fd2f4ad
--- /dev/null
+++ b/modules/jpg/SCsub
@@ -0,0 +1,18 @@
+Import('env')
+Import('env_modules')
+
+env_jpg = env_modules.Clone()
+
+# Thirdparty source files
+# Not unbundled for now as they are not commonly available as shared library
+thirdparty_dir = "#thirdparty/jpeg-compressor/"
+thirdparty_sources = [
+	"jpgd.cpp",
+]
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+env_jpg.add_source_files(env.modules_sources, thirdparty_sources)
+env_jpg.Append(CPPPATH = [thirdparty_dir])
+
+# Godot's own source files
+env_jpg.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/jpg/config.py b/modules/jpg/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/jpg/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/drivers/jpegd/image_loader_jpegd.cpp b/modules/jpg/image_loader_jpegd.cpp
index 496334605d..03c3b19fc0 100644
--- a/drivers/jpegd/image_loader_jpegd.cpp
+++ b/modules/jpg/image_loader_jpegd.cpp
@@ -30,7 +30,8 @@
 
 #include "print_string.h"
 #include "os/os.h"
-#include "jpgd.h"
+
+#include <jpgd.h>
 #include <string.h>
 
 
diff --git a/drivers/jpegd/image_loader_jpegd.h b/modules/jpg/image_loader_jpegd.h
index 2c52309ab1..2c52309ab1 100644
--- a/drivers/jpegd/image_loader_jpegd.h
+++ b/modules/jpg/image_loader_jpegd.h
diff --git a/modules/jpg/register_types.cpp b/modules/jpg/register_types.cpp
new file mode 100644
index 0000000000..a648423cdf
--- /dev/null
+++ b/modules/jpg/register_types.cpp
@@ -0,0 +1,44 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "image_loader_jpegd.h"
+
+static ImageLoaderJPG *image_loader_jpg = NULL;
+
+void register_jpg_types() {
+
+	image_loader_jpg = memnew( ImageLoaderJPG );
+	ImageLoader::add_image_format_loader(image_loader_jpg);
+}
+
+void unregister_jpg_types() {
+
+	memdelete( image_loader_jpg );
+}
diff --git a/modules/jpg/register_types.h b/modules/jpg/register_types.h
new file mode 100644
index 0000000000..0e06c4ff81
--- /dev/null
+++ b/modules/jpg/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_jpg_types();
+void unregister_jpg_types();
diff --git a/modules/mpc/SCsub b/modules/mpc/SCsub
new file mode 100644
index 0000000000..d2662c34ab
--- /dev/null
+++ b/modules/mpc/SCsub
@@ -0,0 +1,26 @@
+Import('env')
+Import('env_modules')
+
+env_mpc = env_modules.Clone()
+
+# Thirdparty source files
+if (env["libmpcdec"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/libmpcdec/"
+	thirdparty_sources = [
+		"huffman.c",
+		"mpc_bits_reader.c",
+		"mpc_decoder.c",
+		"mpc_demux.c",
+		"mpc_reader.c",
+		"requant.c",
+		"streaminfo.c",
+		"synth_filter.c",
+	]
+
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_mpc.add_source_files(env.modules_sources, thirdparty_sources)
+	env_mpc.Append(CPPPATH = [thirdparty_dir])
+
+# Godot source files
+env_mpc.add_source_files(env.modules_sources, "*.cpp")
diff --git a/drivers/mpc/audio_stream_mpc.cpp b/modules/mpc/audio_stream_mpc.cpp
index 9713eb3c77..9713eb3c77 100644
--- a/drivers/mpc/audio_stream_mpc.cpp
+++ b/modules/mpc/audio_stream_mpc.cpp
diff --git a/drivers/mpc/audio_stream_mpc.h b/modules/mpc/audio_stream_mpc.h
index 27f55777d6..c982bdc358 100644
--- a/drivers/mpc/audio_stream_mpc.h
+++ b/modules/mpc/audio_stream_mpc.h
@@ -29,13 +29,12 @@
 #ifndef AUDIO_STREAM_MPC_H
 #define AUDIO_STREAM_MPC_H
 
-#include "scene/resources/audio_stream.h"
+#include "io/resource_loader.h"
 #include "os/file_access.h"
-#include "mpc/mpcdec.h"
 #include "os/thread_safe.h"
-#include "io/resource_loader.h"
-//#include "../libmpcdec/decoder.h"
-//#include "../libmpcdec/internal.h"
+#include "scene/resources/audio_stream.h"
+
+#include <mpc/mpcdec.h>
 
 class AudioStreamPlaybackMPC : public AudioStreamPlayback {
 
diff --git a/modules/mpc/config.py b/modules/mpc/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/mpc/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/mpc/register_types.cpp b/modules/mpc/register_types.cpp
new file mode 100644
index 0000000000..f6a1f59dca
--- /dev/null
+++ b/modules/mpc/register_types.cpp
@@ -0,0 +1,45 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "audio_stream_mpc.h"
+
+static ResourceFormatLoaderAudioStreamMPC* mpc_stream_loader = NULL;
+
+void register_mpc_types() {
+
+	mpc_stream_loader=memnew( ResourceFormatLoaderAudioStreamMPC );
+	ResourceLoader::add_resource_format_loader(mpc_stream_loader);
+	ObjectTypeDB::register_type<AudioStreamMPC>();
+}
+
+void unregister_mpc_types() {
+
+	memdelete( mpc_stream_loader );
+}
diff --git a/modules/mpc/register_types.h b/modules/mpc/register_types.h
new file mode 100644
index 0000000000..3d0661ed62
--- /dev/null
+++ b/modules/mpc/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_mpc_types();
+void unregister_mpc_types();
diff --git a/modules/ogg/SCsub b/modules/ogg/SCsub
new file mode 100644
index 0000000000..fd5ddf55c8
--- /dev/null
+++ b/modules/ogg/SCsub
@@ -0,0 +1,19 @@
+Import('env')
+Import('env_modules')
+
+env_ogg = env_modules.Clone()
+
+# Thirdparty source files
+if (env["libogg"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/libogg/"
+	thirdparty_sources = [
+		"bitwise.c",
+		"framing.c",
+	]
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_ogg.add_source_files(env.modules_sources, thirdparty_sources)
+	env_ogg.Append(CPPPATH = [thirdparty_dir])
+
+# Godot source files
+env_ogg.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/ogg/config.py b/modules/ogg/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/ogg/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/ogg/register_types.cpp b/modules/ogg/register_types.cpp
new file mode 100644
index 0000000000..823ca510ca
--- /dev/null
+++ b/modules/ogg/register_types.cpp
@@ -0,0 +1,35 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+// Dummy module as libogg is needed by other modules (vorbis, theora, opus, ...)
+
+void register_ogg_types() {}
+
+void unregister_ogg_types() {}
diff --git a/modules/ogg/register_types.h b/modules/ogg/register_types.h
new file mode 100644
index 0000000000..b5268a1df4
--- /dev/null
+++ b/modules/ogg/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_ogg_types();
+void unregister_ogg_types();
diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub
new file mode 100644
index 0000000000..79facba99a
--- /dev/null
+++ b/modules/openssl/SCsub
@@ -0,0 +1,685 @@
+Import('env')
+Import('env_modules')
+
+env_openssl = env_modules.Clone()
+
+# Thirdparty source files
+if (env["openssl"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/openssl/"
+
+	thirdparty_sources = [
+		"ssl/t1_lib.c",
+		"ssl/t1_ext.c",
+		"ssl/s3_srvr.c",
+		"ssl/t1_enc.c",
+		"ssl/t1_meth.c",
+		"ssl/s23_clnt.c",
+		"ssl/ssl_asn1.c",
+		"ssl/tls_srp.c",
+		"ssl/kssl.c",
+		"ssl/d1_both.c",
+		"ssl/t1_clnt.c",
+		"ssl/bio_ssl.c",
+		"ssl/d1_srtp.c",
+		"ssl/t1_reneg.c",
+		"ssl/ssl_cert.c",
+		"ssl/s3_lib.c",
+		"ssl/d1_srvr.c",
+		"ssl/s23_meth.c",
+		"ssl/ssl_stat.c",
+		"ssl/ssl_err.c",
+		"ssl/ssl_algs.c",
+		"ssl/s3_cbc.c",
+		"ssl/d1_clnt.c",
+		"ssl/s3_pkt.c",
+		"ssl/d1_meth.c",
+		"ssl/s3_both.c",
+		"ssl/s2_enc.c",
+		"ssl/s3_meth.c",
+		"ssl/s3_enc.c",
+		"ssl/s23_pkt.c",
+		"ssl/s2_pkt.c",
+		"ssl/d1_pkt.c",
+		"ssl/ssl_rsa.c",
+		"ssl/s23_srvr.c",
+		"ssl/s2_meth.c",
+		"ssl/s3_clnt.c",
+		"ssl/s23_lib.c",
+		"ssl/t1_srvr.c",
+		"ssl/ssl_lib.c",
+		"ssl/ssl_txt.c",
+		"ssl/s2_srvr.c",
+		"ssl/ssl_sess.c",
+		"ssl/s2_clnt.c",
+		"ssl/d1_lib.c",
+		"ssl/s2_lib.c",
+		"ssl/ssl_err2.c",
+		"ssl/ssl_ciph.c",
+		"crypto/dsa/dsa_lib.c",
+		"crypto/dsa/dsa_pmeth.c",
+		"crypto/dsa/dsa_ossl.c",
+		"crypto/dsa/dsa_gen.c",
+		"crypto/dsa/dsa_asn1.c",
+		"crypto/dsa/dsa_prn.c",
+		"crypto/dsa/dsa_sign.c",
+		"crypto/dsa/dsa_key.c",
+		"crypto/dsa/dsa_vrf.c",
+		"crypto/dsa/dsa_err.c",
+		"crypto/dsa/dsa_ameth.c",
+		"crypto/dsa/dsa_depr.c",
+		"crypto/x509/x509_lu.c",
+		"crypto/x509/x509cset.c",
+		"crypto/x509/x509_set.c",
+		"crypto/x509/x509_d2.c",
+		"crypto/x509/x509_txt.c",
+		"crypto/x509/x509rset.c",
+		"crypto/x509/by_dir.c",
+		"crypto/x509/x509_vpm.c",
+		"crypto/x509/x509_vfy.c",
+		"crypto/x509/x509_trs.c",
+		"crypto/x509/by_file.c",
+		"crypto/x509/x509_obj.c",
+		"crypto/x509/x509spki.c",
+		"crypto/x509/x509_v3.c",
+		"crypto/x509/x509_req.c",
+		"crypto/x509/x509_att.c",
+		"crypto/x509/x_all.c",
+		"crypto/x509/x509_ext.c",
+		"crypto/x509/x509type.c",
+		"crypto/x509/x509_def.c",
+		"crypto/x509/x509_err.c",
+		"crypto/x509/x509name.c",
+		"crypto/x509/x509_r2x.c",
+		"crypto/x509/x509_cmp.c",
+		"crypto/asn1/x_pkey.c",
+		"crypto/asn1/a_gentm.c",
+		"crypto/asn1/x_sig.c",
+		"crypto/asn1/t_req.c",
+		"crypto/asn1/t_pkey.c",
+		"crypto/asn1/p8_pkey.c",
+		"crypto/asn1/a_i2d_fp.c",
+		"crypto/asn1/x_val.c",
+		"crypto/asn1/f_string.c",
+		"crypto/asn1/p5_pbe.c",
+		"crypto/asn1/bio_ndef.c",
+		"crypto/asn1/a_bool.c",
+		"crypto/asn1/asn1_gen.c",
+		"crypto/asn1/x_algor.c",
+		"crypto/asn1/bio_asn1.c",
+		"crypto/asn1/asn_mime.c",
+		"crypto/asn1/t_x509.c",
+		"crypto/asn1/a_strex.c",
+		"crypto/asn1/x_nx509.c",
+		"crypto/asn1/asn1_err.c",
+		"crypto/asn1/x_crl.c",
+		"crypto/asn1/a_print.c",
+		"crypto/asn1/a_type.c",
+		"crypto/asn1/tasn_new.c",
+		"crypto/asn1/n_pkey.c",
+		"crypto/asn1/x_bignum.c",
+		"crypto/asn1/asn_pack.c",
+		"crypto/asn1/evp_asn1.c",
+		"crypto/asn1/t_bitst.c",
+		"crypto/asn1/x_req.c",
+		"crypto/asn1/a_time.c",
+		"crypto/asn1/x_name.c",
+		"crypto/asn1/x_pubkey.c",
+		"crypto/asn1/tasn_typ.c",
+		"crypto/asn1/asn_moid.c",
+		"crypto/asn1/a_utctm.c",
+		"crypto/asn1/asn1_lib.c",
+		"crypto/asn1/x_x509a.c",
+		"crypto/asn1/a_set.c",
+		"crypto/asn1/t_crl.c",
+		"crypto/asn1/p5_pbev2.c",
+		"crypto/asn1/tasn_enc.c",
+		"crypto/asn1/a_mbstr.c",
+		"crypto/asn1/tasn_dec.c",
+		"crypto/asn1/x_x509.c",
+		"crypto/asn1/a_octet.c",
+		"crypto/asn1/x_long.c",
+		"crypto/asn1/a_bytes.c",
+		"crypto/asn1/t_x509a.c",
+		"crypto/asn1/a_enum.c",
+		"crypto/asn1/a_int.c",
+		"crypto/asn1/tasn_prn.c",
+		"crypto/asn1/i2d_pr.c",
+		"crypto/asn1/a_utf8.c",
+		"crypto/asn1/t_spki.c",
+		"crypto/asn1/a_digest.c",
+		"crypto/asn1/a_dup.c",
+		"crypto/asn1/i2d_pu.c",
+		"crypto/asn1/a_verify.c",
+		"crypto/asn1/f_enum.c",
+		"crypto/asn1/a_sign.c",
+		"crypto/asn1/d2i_pr.c",
+		"crypto/asn1/asn1_par.c",
+		"crypto/asn1/x_spki.c",
+		"crypto/asn1/a_d2i_fp.c",
+		"crypto/asn1/f_int.c",
+		"crypto/asn1/x_exten.c",
+		"crypto/asn1/tasn_utl.c",
+		"crypto/asn1/nsseq.c",
+		"crypto/asn1/a_bitstr.c",
+		"crypto/asn1/x_info.c",
+		"crypto/asn1/a_strnid.c",
+		"crypto/asn1/a_object.c",
+		"crypto/asn1/tasn_fre.c",
+		"crypto/asn1/d2i_pu.c",
+		"crypto/asn1/ameth_lib.c",
+		"crypto/asn1/x_attrib.c",
+		"crypto/evp/m_sha.c",
+		"crypto/evp/e_camellia.c",
+		"crypto/evp/e_aes.c",
+		"crypto/evp/bio_b64.c",
+		"crypto/evp/m_sigver.c",
+		"crypto/evp/m_wp.c",
+		"crypto/evp/m_sha1.c",
+		"crypto/evp/p_seal.c",
+		"crypto/evp/c_alld.c",
+		"crypto/evp/p5_crpt.c",
+		"crypto/evp/e_rc4.c",
+		"crypto/evp/m_ecdsa.c",
+		"crypto/evp/bio_enc.c",
+		"crypto/evp/e_des3.c",
+		"crypto/evp/m_null.c",
+		"crypto/evp/bio_ok.c",
+		"crypto/evp/pmeth_gn.c",
+		"crypto/evp/e_rc5.c",
+		"crypto/evp/e_rc2.c",
+		"crypto/evp/p_dec.c",
+		"crypto/evp/p_verify.c",
+		"crypto/evp/e_rc4_hmac_md5.c",
+		"crypto/evp/pmeth_lib.c",
+		"crypto/evp/m_ripemd.c",
+		"crypto/evp/m_md5.c",
+		"crypto/evp/e_bf.c",
+		"crypto/evp/p_enc.c",
+		"crypto/evp/m_dss.c",
+		"crypto/evp/bio_md.c",
+		"crypto/evp/evp_pbe.c",
+		"crypto/evp/e_seed.c",
+		"crypto/evp/e_cast.c",
+		"crypto/evp/p_open.c",
+		"crypto/evp/p5_crpt2.c",
+		"crypto/evp/m_dss1.c",
+		"crypto/evp/names.c",
+		"crypto/evp/evp_acnf.c",
+		"crypto/evp/e_des.c",
+		"crypto/evp/evp_cnf.c",
+		"crypto/evp/evp_lib.c",
+		"crypto/evp/digest.c",
+		"crypto/evp/evp_err.c",
+		"crypto/evp/evp_enc.c",
+		"crypto/evp/e_old.c",
+		"crypto/evp/c_all.c",
+		"crypto/evp/m_md2.c",
+		"crypto/evp/e_xcbc_d.c",
+		"crypto/evp/pmeth_fn.c",
+		"crypto/evp/p_lib.c",
+		"crypto/evp/evp_key.c",
+		"crypto/evp/encode.c",
+		"crypto/evp/e_aes_cbc_hmac_sha1.c",
+		"crypto/evp/e_aes_cbc_hmac_sha256.c",
+		"crypto/evp/m_mdc2.c",
+		"crypto/evp/e_null.c",
+		"crypto/evp/p_sign.c",
+		"crypto/evp/e_idea.c",
+		"crypto/evp/c_allc.c",
+		"crypto/evp/evp_pkey.c",
+		"crypto/evp/m_md4.c",
+		"crypto/ex_data.c",
+		"crypto/pkcs12/p12_p8e.c",
+		"crypto/pkcs12/p12_crt.c",
+		"crypto/pkcs12/p12_utl.c",
+		"crypto/pkcs12/p12_attr.c",
+		"crypto/pkcs12/p12_npas.c",
+		"crypto/pkcs12/p12_decr.c",
+		"crypto/pkcs12/p12_init.c",
+		"crypto/pkcs12/p12_kiss.c",
+		"crypto/pkcs12/p12_add.c",
+		"crypto/pkcs12/p12_p8d.c",
+		"crypto/pkcs12/p12_mutl.c",
+		"crypto/pkcs12/p12_crpt.c",
+		"crypto/pkcs12/pk12err.c",
+		"crypto/pkcs12/p12_asn.c",
+		"crypto/pkcs12/p12_key.c",
+		"crypto/ecdh/ech_key.c",
+		"crypto/ecdh/ech_ossl.c",
+		"crypto/ecdh/ech_lib.c",
+		"crypto/ecdh/ech_err.c",
+		"crypto/ecdh/ech_kdf.c",
+		"crypto/o_str.c",
+		"crypto/conf/conf_api.c",
+		"crypto/conf/conf_err.c",
+		"crypto/conf/conf_def.c",
+		"crypto/conf/conf_lib.c",
+		"crypto/conf/conf_mall.c",
+		"crypto/conf/conf_sap.c",
+		"crypto/conf/conf_mod.c",
+		"crypto/ebcdic.c",
+		"crypto/ecdsa/ecs_lib.c",
+		"crypto/ecdsa/ecs_asn1.c",
+		"crypto/ecdsa/ecs_ossl.c",
+		"crypto/ecdsa/ecs_vrf.c",
+		"crypto/ecdsa/ecs_sign.c",
+		"crypto/ecdsa/ecs_err.c",
+		"crypto/dso/dso_win32.c",
+		"crypto/dso/dso_lib.c",
+		"crypto/dso/dso_dlfcn.c",
+		"crypto/dso/dso_dl.c",
+		"crypto/dso/dso_beos.c",
+		"crypto/dso/dso_null.c",
+		"crypto/dso/dso_vms.c",
+		"crypto/dso/dso_err.c",
+		"crypto/dso/dso_openssl.c",
+		"crypto/cryptlib.c",
+		"crypto/md5/md5_one.c",
+		"crypto/md5/md5_dgst.c",
+		"crypto/pkcs7/pkcs7err.c",
+		"crypto/pkcs7/pk7_smime.c",
+		"crypto/pkcs7/bio_pk7.c",
+		"crypto/pkcs7/pk7_mime.c",
+		"crypto/pkcs7/pk7_lib.c",
+		"crypto/pkcs7/pk7_asn1.c",
+		"crypto/pkcs7/pk7_doit.c",
+		"crypto/pkcs7/pk7_attr.c",
+		"crypto/md4/md4_one.c",
+		"crypto/md4/md4_dgst.c",
+		"crypto/o_dir.c",
+		"crypto/buffer/buf_err.c",
+		"crypto/buffer/buf_str.c",
+		"crypto/buffer/buffer.c",
+		"crypto/cms/cms_lib.c",
+		"crypto/cms/cms_io.c",
+		"crypto/cms/cms_err.c",
+		"crypto/cms/cms_dd.c",
+		"crypto/cms/cms_smime.c",
+		"crypto/cms/cms_att.c",
+		"crypto/cms/cms_pwri.c",
+		"crypto/cms/cms_cd.c",
+		"crypto/cms/cms_sd.c",
+		"crypto/cms/cms_asn1.c",
+		"crypto/cms/cms_env.c",
+		"crypto/cms/cms_enc.c",
+		"crypto/cms/cms_ess.c",
+		"crypto/cms/cms_kari.c",
+		"crypto/mem_dbg.c",
+		"crypto/uid.c",
+		"crypto/stack/stack.c",
+		"crypto/ec/ec_ameth.c",
+		"crypto/ec/ec_err.c",
+		"crypto/ec/ec_lib.c",
+		"crypto/ec/ec_curve.c",
+		"crypto/ec/ec_oct.c",
+		"crypto/ec/ec_asn1.c",
+		"crypto/ec/ecp_oct.c",
+		"crypto/ec/ec_print.c",
+		"crypto/ec/ec2_smpl.c",
+		"crypto/ec/ecp_nistp224.c",
+		"crypto/ec/ec2_oct.c",
+		"crypto/ec/eck_prn.c",
+		"crypto/ec/ec_key.c",
+		"crypto/ec/ecp_nist.c",
+		"crypto/ec/ec_check.c",
+		"crypto/ec/ecp_smpl.c",
+		"crypto/ec/ec2_mult.c",
+		"crypto/ec/ecp_mont.c",
+		"crypto/ec/ecp_nistp521.c",
+		"crypto/ec/ec_mult.c",
+		"crypto/ec/ecp_nistputil.c",
+		"crypto/ec/ec_pmeth.c",
+		"crypto/ec/ec_cvt.c",
+		"crypto/ec/ecp_nistp256.c",
+		"crypto/krb5/krb5_asn.c",
+		"crypto/hmac/hmac.c",
+		"crypto/hmac/hm_ameth.c",
+		"crypto/hmac/hm_pmeth.c",
+		"crypto/comp/c_rle.c",
+		"crypto/comp/c_zlib.c",
+		"crypto/comp/comp_lib.c",
+		"crypto/comp/comp_err.c",
+		"crypto/des/fcrypt.c",
+		"crypto/des/str2key.c",
+		"crypto/des/cbc_cksm.c",
+		"crypto/des/des_enc.c",
+		"crypto/des/ofb_enc.c",
+		"crypto/des/read2pwd.c",
+		"crypto/des/ecb3_enc.c",
+		"crypto/des/rand_key.c",
+		"crypto/des/cfb64ede.c",
+		"crypto/des/rpc_enc.c",
+		"crypto/des/ofb64ede.c",
+		"crypto/des/qud_cksm.c",
+		"crypto/des/enc_writ.c",
+		"crypto/des/set_key.c",
+		"crypto/des/xcbc_enc.c",
+		"crypto/des/fcrypt_b.c",
+		"crypto/des/ede_cbcm_enc.c",
+		"crypto/des/des_old2.c",
+		"crypto/des/cfb_enc.c",
+		"crypto/des/ecb_enc.c",
+		"crypto/des/enc_read.c",
+		"crypto/des/des_old.c",
+		"crypto/des/ofb64enc.c",
+		"crypto/des/pcbc_enc.c",
+		"crypto/des/cbc_enc.c",
+		"crypto/des/cfb64enc.c",
+		"crypto/lhash/lh_stats.c",
+		"crypto/lhash/lhash.c",
+		"crypto/x509v3/v3_genn.c",
+		"crypto/x509v3/pcy_cache.c",
+		"crypto/x509v3/v3_sxnet.c",
+		"crypto/x509v3/v3_scts.c",
+		"crypto/x509v3/v3err.c",
+		"crypto/x509v3/v3_conf.c",
+		"crypto/x509v3/v3_utl.c",
+		"crypto/x509v3/v3_akeya.c",
+		"crypto/x509v3/v3_lib.c",
+		"crypto/x509v3/pcy_lib.c",
+		"crypto/x509v3/v3_cpols.c",
+		"crypto/x509v3/v3_ia5.c",
+		"crypto/x509v3/v3_bitst.c",
+		"crypto/x509v3/v3_skey.c",
+		"crypto/x509v3/v3_info.c",
+		"crypto/x509v3/v3_asid.c",
+		"crypto/x509v3/pcy_tree.c",
+		"crypto/x509v3/v3_pcons.c",
+		"crypto/x509v3/v3_bcons.c",
+		"crypto/x509v3/v3_pku.c",
+		"crypto/x509v3/v3_ocsp.c",
+		"crypto/x509v3/pcy_map.c",
+		"crypto/x509v3/v3_ncons.c",
+		"crypto/x509v3/v3_purp.c",
+		"crypto/x509v3/v3_enum.c",
+		"crypto/x509v3/v3_pmaps.c",
+		"crypto/x509v3/pcy_node.c",
+		"crypto/x509v3/v3_pcia.c",
+		"crypto/x509v3/v3_crld.c",
+		"crypto/x509v3/v3_pci.c",
+		"crypto/x509v3/v3_akey.c",
+		"crypto/x509v3/v3_addr.c",
+		"crypto/x509v3/v3_int.c",
+		"crypto/x509v3/v3_alt.c",
+		"crypto/x509v3/v3_extku.c",
+		"crypto/x509v3/v3_prn.c",
+		"crypto/x509v3/pcy_data.c",
+		"crypto/aes/aes_ofb.c",
+		"crypto/aes/aes_ctr.c",
+		"crypto/aes/aes_ecb.c",
+		"crypto/aes/aes_cfb.c",
+		"crypto/aes/aes_wrap.c",
+		"crypto/aes/aes_ige.c",
+		"crypto/aes/aes_misc.c",
+		"crypto/pqueue/pqueue.c",
+		"crypto/sha/sha_one.c",
+		"crypto/sha/sha_dgst.c",
+		"crypto/sha/sha512.c",
+		"crypto/sha/sha1_one.c",
+		"crypto/sha/sha1dgst.c",
+		"crypto/sha/sha256.c",
+		"crypto/whrlpool/wp_dgst.c",
+		"crypto/objects/obj_xref.c",
+		"crypto/objects/o_names.c",
+		"crypto/objects/obj_err.c",
+		"crypto/objects/obj_dat.c",
+		"crypto/objects/obj_lib.c",
+		"crypto/mem.c",
+		"crypto/fips_ers.c",
+		"crypto/o_fips.c",
+		"crypto/engine/eng_rdrand.c",
+		"crypto/engine/eng_err.c",
+		"crypto/engine/tb_ecdsa.c",
+		"crypto/engine/tb_rsa.c",
+		"crypto/engine/tb_cipher.c",
+		"crypto/engine/tb_dsa.c",
+		"crypto/engine/eng_lib.c",
+		"crypto/engine/tb_asnmth.c",
+		"crypto/engine/tb_ecdh.c",
+		"crypto/engine/tb_dh.c",
+		"crypto/engine/tb_store.c",
+		"crypto/engine/eng_init.c",
+		"crypto/engine/eng_cnf.c",
+		"crypto/engine/eng_all.c",
+		"crypto/engine/tb_digest.c",
+		"crypto/engine/tb_pkmeth.c",
+		"crypto/engine/eng_table.c",
+		"crypto/engine/eng_ctrl.c",
+		"crypto/engine/eng_list.c",
+		"crypto/engine/eng_cryptodev.c",
+		"crypto/engine/eng_pkey.c",
+		"crypto/engine/tb_rand.c",
+		"crypto/engine/eng_openssl.c",
+		"crypto/engine/eng_fat.c",
+		"crypto/engine/eng_dyn.c",
+		"crypto/ts/ts_rsp_verify.c",
+		"crypto/ts/ts_req_print.c",
+		"crypto/ts/ts_verify_ctx.c",
+		"crypto/ts/ts_req_utils.c",
+		"crypto/ts/ts_err.c",
+		"crypto/ts/ts_rsp_print.c",
+		"crypto/ts/ts_rsp_utils.c",
+		"crypto/ts/ts_lib.c",
+		"crypto/ts/ts_conf.c",
+		"crypto/ts/ts_asn1.c",
+		"crypto/ts/ts_rsp_sign.c",
+		"crypto/ocsp/ocsp_ext.c",
+		"crypto/ocsp/ocsp_cl.c",
+		"crypto/ocsp/ocsp_ht.c",
+		"crypto/ocsp/ocsp_lib.c",
+		"crypto/ocsp/ocsp_srv.c",
+		"crypto/ocsp/ocsp_vfy.c",
+		"crypto/ocsp/ocsp_err.c",
+		"crypto/ocsp/ocsp_prn.c",
+		"crypto/ocsp/ocsp_asn.c",
+		"crypto/bf/bf_cfb64.c",
+		"crypto/bf/bf_ecb.c",
+		"crypto/bf/bf_enc.c",
+		"crypto/bf/bf_skey.c",
+		"crypto/bf/bf_ofb64.c",
+		"crypto/idea/i_skey.c",
+		"crypto/idea/i_ofb64.c",
+		"crypto/idea/i_cbc.c",
+		"crypto/idea/i_ecb.c",
+		"crypto/idea/i_cfb64.c",
+		"crypto/cmac/cm_ameth.c",
+		"crypto/cmac/cmac.c",
+		"crypto/cmac/cm_pmeth.c",
+		"crypto/dh/dh_lib.c",
+		"crypto/dh/dh_key.c",
+		"crypto/dh/dh_asn1.c",
+		"crypto/dh/dh_depr.c",
+		"crypto/dh/dh_pmeth.c",
+		"crypto/dh/dh_prn.c",
+		"crypto/dh/dh_gen.c",
+		"crypto/dh/dh_ameth.c",
+		"crypto/dh/dh_check.c",
+		"crypto/dh/dh_err.c",
+		"crypto/dh/dh_kdf.c",
+		"crypto/dh/dh_rfc5114.c",
+		"crypto/modes/ccm128.c",
+		"crypto/modes/ofb128.c",
+		"crypto/modes/cts128.c",
+		"crypto/modes/ctr128.c",
+		"crypto/modes/gcm128.c",
+		"crypto/modes/cbc128.c",
+		"crypto/modes/cfb128.c",
+		"crypto/modes/xts128.c",
+		"crypto/modes/wrap128.c",
+		"crypto/camellia/cmll_cfb.c",
+		"crypto/camellia/cmll_ecb.c",
+		"crypto/camellia/cmll_utl.c",
+		"crypto/camellia/cmll_misc.c",
+		"crypto/camellia/cmll_ofb.c",
+		"crypto/camellia/cmll_ctr.c",
+		"crypto/seed/seed_ecb.c",
+		"crypto/seed/seed_cbc.c",
+		"crypto/seed/seed.c",
+		"crypto/seed/seed_ofb.c",
+		"crypto/seed/seed_cfb.c",
+		"crypto/txt_db/txt_db.c",
+		"crypto/cpt_err.c",
+		"crypto/pem/pem_pk8.c",
+		"crypto/pem/pem_lib.c",
+		"crypto/pem/pem_sign.c",
+		"crypto/pem/pem_all.c",
+		"crypto/pem/pem_info.c",
+		"crypto/pem/pem_pkey.c",
+		"crypto/pem/pem_seal.c",
+		"crypto/pem/pem_err.c",
+		"crypto/pem/pem_xaux.c",
+		"crypto/pem/pvkfmt.c",
+		"crypto/pem/pem_x509.c",
+		"crypto/pem/pem_oth.c",
+		"crypto/rand/rand_lib.c",
+		"crypto/rand/randfile.c",
+		"crypto/rand/rand_os2.c",
+		"crypto/rand/rand_unix.c",
+		"crypto/rand/rand_nw.c",
+		"crypto/rand/md_rand.c",
+		"crypto/rand/rand_err.c",
+		"crypto/rand/rand_win.c",
+		"crypto/rand/rand_egd.c",
+		"crypto/cversion.c",
+		"crypto/cast/c_ecb.c",
+		"crypto/cast/c_skey.c",
+		"crypto/cast/c_ofb64.c",
+		"crypto/cast/c_enc.c",
+		"crypto/cast/c_cfb64.c",
+		"crypto/o_time.c",
+		"crypto/mdc2/mdc2dgst.c",
+		"crypto/mdc2/mdc2_one.c",
+		"crypto/rc4/rc4_utl.c",
+		"crypto/ui/ui_compat.c",
+		"crypto/ui/ui_util.c",
+		"crypto/ui/ui_lib.c",
+		"crypto/ui/ui_err.c",
+		"crypto/ui/ui_openssl.c",
+		"crypto/bio/bf_buff.c",
+		"crypto/bio/bss_null.c",
+		"crypto/bio/bss_acpt.c",
+		"crypto/bio/bss_conn.c",
+		"crypto/bio/bss_fd.c",
+		"crypto/bio/bf_null.c",
+		"crypto/bio/bio_err.c",
+		"crypto/bio/bss_sock.c",
+		"crypto/bio/bss_mem.c",
+		"crypto/bio/b_dump.c",
+		"crypto/bio/b_print.c",
+		"crypto/bio/b_sock.c",
+		"crypto/bio/bss_dgram.c",
+		"crypto/bio/bf_nbio.c",
+		"crypto/bio/bio_lib.c",
+		"crypto/bio/bss_file.c",
+		"crypto/bio/bss_bio.c",
+		"crypto/bio/bss_log.c",
+		"crypto/bio/bio_cb.c",
+		"crypto/o_init.c",
+		"crypto/rc2/rc2_skey.c",
+		"crypto/rc2/rc2_cbc.c",
+		"crypto/rc2/rc2cfb64.c",
+		"crypto/rc2/rc2_ecb.c",
+		"crypto/rc2/rc2ofb64.c",
+		"crypto/bn/bn_x931p.c",
+		"crypto/bn/bn_blind.c",
+		"crypto/bn/bn_gf2m.c",
+		"crypto/bn/bn_const.c",
+		"crypto/bn/bn_sqr.c",
+		"crypto/bn/bn_nist.c",
+		"crypto/bn/bn_rand.c",
+		"crypto/bn/bn_err.c",
+		"crypto/bn/bn_div.c",
+		"crypto/bn/bn_kron.c",
+		"crypto/bn/bn_ctx.c",
+		"crypto/bn/bn_shift.c",
+		"crypto/bn/bn_mod.c",
+		"crypto/bn/bn_exp2.c",
+		"crypto/bn/bn_word.c",
+		"crypto/bn/bn_add.c",
+		"crypto/bn/bn_exp.c",
+		"crypto/bn/bn_mont.c",
+		"crypto/bn/bn_print.c",
+		"crypto/bn/bn_mul.c",
+		"crypto/bn/bn_prime.c",
+		"crypto/bn/bn_depr.c",
+		"crypto/bn/bn_gcd.c",
+		"crypto/bn/bn_mpi.c",
+		"crypto/bn/bn_sqrt.c",
+		"crypto/bn/bn_recp.c",
+		"crypto/bn/bn_lib.c",
+		"crypto/ripemd/rmd_dgst.c",
+		"crypto/ripemd/rmd_one.c",
+		"crypto/rsa/rsa_x931.c",
+		"crypto/rsa/rsa_depr.c",
+		"crypto/rsa/rsa_saos.c",
+		"crypto/rsa/rsa_crpt.c",
+		"crypto/rsa/rsa_pss.c",
+		"crypto/rsa/rsa_oaep.c",
+		"crypto/rsa/rsa_null.c",
+		"crypto/rsa/rsa_gen.c",
+		"crypto/rsa/rsa_prn.c",
+		"crypto/rsa/rsa_pmeth.c",
+		"crypto/rsa/rsa_asn1.c",
+		"crypto/rsa/rsa_ssl.c",
+		"crypto/rsa/rsa_ameth.c",
+		"crypto/rsa/rsa_pk1.c",
+		"crypto/rsa/rsa_err.c",
+		"crypto/rsa/rsa_lib.c",
+		"crypto/rsa/rsa_none.c",
+		"crypto/rsa/rsa_chk.c",
+		"crypto/rsa/rsa_eay.c",
+		"crypto/rsa/rsa_sign.c",
+		"crypto/srp/srp_lib.c",
+		"crypto/srp/srp_vfy.c",
+		"crypto/err/err.c",
+		"crypto/err/err_prn.c",
+		"crypto/err/err_all.c",
+		"crypto/mem_clr.c",
+		"crypto/rc4/rc4_skey.c",
+		"crypto/rc4/rc4_enc.c",
+		"crypto/camellia/camellia.c",
+		"crypto/camellia/cmll_cbc.c",
+		#"crypto/aes/aes_x86core.c",
+		"crypto/aes/aes_core.c",
+		"crypto/aes/aes_cbc.c",
+		"crypto/whrlpool/wp_block.c",
+		"crypto/bn/bn_asm.c",
+	]
+
+	if "platform" in env and env["platform"] == "winrt":
+		thirdparty_sources += ['winrt.cpp']
+
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_openssl.add_source_files(env.modules_sources, thirdparty_sources)
+
+	# FIXME: Clone the environment to make a env_openssl and not pollute the modules env
+	thirdparty_include_paths = [
+		"",
+		"crypto",
+		"crypto/asn1",
+		"crypto/evp",
+		"crypto/modes",
+		"openssl",
+	]
+	env_openssl.Append(CPPPATH = [thirdparty_dir + "/" + dir for dir in thirdparty_include_paths])
+
+	env_openssl.Append(CPPFLAGS = ["-DOPENSSL_NO_ASM", "-DOPENSSL_THREADS", "-DL_ENDIAN"])
+
+	# Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517)
+	import os
+	import methods
+	if not (os.name=="nt" and methods.msvc_is_detected()): # not Windows and not MSVC
+		env_openssl.Append(CFLAGS = ["-Wno-error=implicit-function-declaration"])
+
+
+# Module sources
+env_openssl.add_source_files(env.modules_sources, "*.cpp")
+env_openssl.add_source_files(env.modules_sources, "*.c")
+
+# platform/winrt need to know openssl is available, pass to main env
+if "platform" in env and env["platform"] == "winrt":
+	env.Append(CPPPATH = [thirdparty_dir])
+	env.Append(CPPFLAGS = ['-DOPENSSL_ENABLED']);
+
+Export('env')
diff --git a/modules/openssl/config.py b/modules/openssl/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/openssl/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/drivers/openssl/curl_hostcheck.c b/modules/openssl/curl_hostcheck.c
index f5d44bfaf1..feef232619 100644
--- a/drivers/openssl/curl_hostcheck.c
+++ b/modules/openssl/curl_hostcheck.c
@@ -46,8 +46,6 @@ be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization of the copyright holder.
 */
 
-#ifdef OPENSSL_ENABLED
-
 #include "curl_hostcheck.h"
 #include <string.h>
 
@@ -217,5 +215,3 @@ int Tool_Curl_cert_hostcheck(const char *match_pattern, const char *hostname)
     return 1;
   return 0;
 }
-
-#endif
diff --git a/drivers/openssl/curl_hostcheck.h b/modules/openssl/curl_hostcheck.h
index 7611c6e443..1b7fbe81e3 100644
--- a/drivers/openssl/curl_hostcheck.h
+++ b/modules/openssl/curl_hostcheck.h
@@ -1,8 +1,6 @@
 #ifndef HEADER_TOOL_CURL_HOSTCHECK_H
 #define HEADER_TOOL_CURL_HOSTCHECK_H
 
-#ifdef OPENSSL_ENABLED
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,7 +35,5 @@ int Tool_Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
 }
 #endif
 
-#endif
-
 #endif /* HEADER_CURL_HOSTCHECK_H */
 
diff --git a/drivers/openssl/register_openssl.cpp b/modules/openssl/register_types.cpp
index 0d2f9fd537..4aba9f530e 100644
--- a/drivers/openssl/register_openssl.cpp
+++ b/modules/openssl/register_types.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  register_openssl.cpp                                                 */
+/*  register_types.cpp                                                   */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,22 +26,17 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "register_openssl.h"
+#include "register_types.h"
 
 #include "stream_peer_openssl.h"
-#ifdef OPENSSL_ENABLED
 
-void register_openssl() {
+void register_openssl_types() {
 
 	ObjectTypeDB::register_type<StreamPeerOpenSSL>();
 	StreamPeerOpenSSL::initialize_ssl();
-
 }
 
-void unregister_openssl() {
+void unregister_openssl_types() {
 
 	StreamPeerOpenSSL::finalize_ssl();
-
 }
-#endif
-
diff --git a/modules/openssl/register_types.h b/modules/openssl/register_types.h
new file mode 100644
index 0000000000..2db140cc80
--- /dev/null
+++ b/modules/openssl/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_openssl_types();
+void unregister_openssl_types();
diff --git a/drivers/openssl/stream_peer_openssl.cpp b/modules/openssl/stream_peer_openssl.cpp
index aa3d8a8f7f..b9bec4ca0b 100644
--- a/drivers/openssl/stream_peer_openssl.cpp
+++ b/modules/openssl/stream_peer_openssl.cpp
@@ -26,7 +26,6 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifdef OPENSSL_ENABLED
 #include "stream_peer_openssl.h"
 //hostname matching code from curl
 
@@ -645,5 +644,3 @@ void StreamPeerOpenSSL::finalize_ssl(){
 	}
 	certs.clear();
 }
-
-#endif
diff --git a/drivers/openssl/stream_peer_openssl.h b/modules/openssl/stream_peer_openssl.h
index f1f25f4fc5..853ede2036 100644
--- a/drivers/openssl/stream_peer_openssl.h
+++ b/modules/openssl/stream_peer_openssl.h
@@ -29,9 +29,6 @@
 #ifndef STREAM_PEER_OPEN_SSL_H
 #define STREAM_PEER_OPEN_SSL_H
 
-#ifdef OPENSSL_ENABLED
-
-
 #include <stdio.h> // If you don't know what this is for stop reading now.
 #include "io/stream_peer_ssl.h"
 #include "globals.h"
@@ -109,5 +106,4 @@ public:
 	~StreamPeerOpenSSL();
 };
 
-#endif
 #endif // STREAM_PEER_SSL_H
diff --git a/modules/opus/SCsub b/modules/opus/SCsub
new file mode 100644
index 0000000000..5c587a0783
--- /dev/null
+++ b/modules/opus/SCsub
@@ -0,0 +1,213 @@
+Import('env')
+Import('env_modules')
+
+env_opus = env_modules.Clone()
+
+# Thirdparty source files
+if (env["opus"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/opus/"
+
+	thirdparty_sources = [
+		"silk/tables_other.c",
+		"silk/sum_sqr_shift.c",
+		"silk/PLC.c",
+		"silk/dec_API.c",
+		"silk/decode_pulses.c",
+		"silk/inner_prod_aligned.c",
+		"silk/init_encoder.c",
+		"silk/interpolate.c",
+		"silk/stereo_encode_pred.c",
+		"silk/decode_frame.c",
+		"silk/NLSF_del_dec_quant.c",
+		"silk/VAD.c",
+		"silk/resampler_private_AR2.c",
+		"silk/NLSF_unpack.c",
+		"silk/resampler_down2.c",
+		"silk/sort.c",
+		"silk/resampler_private_IIR_FIR.c",
+		"silk/resampler_down2_3.c",
+		"silk/resampler_private_up2_HQ.c",
+		"silk/tables_gain.c",
+		"silk/stereo_find_predictor.c",
+		"silk/stereo_quant_pred.c",
+		"silk/NLSF_stabilize.c",
+		"silk/ana_filt_bank_1.c",
+		"silk/check_control_input.c",
+		"silk/bwexpander.c",
+		"silk/A2NLSF.c",
+		"silk/LPC_inv_pred_gain.c",
+		"silk/log2lin.c",
+		"silk/process_NLSFs.c",
+		"silk/sigm_Q15.c",
+		"silk/VQ_WMat_EC.c",
+		"silk/quant_LTP_gains.c",
+		"silk/resampler_private_down_FIR.c",
+		"silk/NLSF_decode.c",
+		"silk/control_codec.c",
+		"silk/NLSF_VQ_weights_laroia.c",
+		"silk/decode_pitch.c",
+		"silk/stereo_decode_pred.c",
+		"silk/tables_pulses_per_block.c",
+		"silk/init_decoder.c",
+		"silk/table_LSF_cos.c",
+		"silk/decode_core.c",
+		"silk/code_signs.c",
+		"silk/enc_API.c",
+		"silk/tables_LTP.c",
+		"silk/pitch_est_tables.c",
+		"silk/biquad_alt.c",
+		"silk/encode_indices.c",
+		"silk/tables_NLSF_CB_WB.c",
+		"silk/debug.c",
+		"silk/decode_parameters.c",
+		"silk/tables_pitch_lag.c",
+		"silk/NLSF2A.c",
+		"silk/resampler.c",
+		"silk/decode_indices.c",
+		"silk/NLSF_VQ.c",
+		"silk/bwexpander_32.c",
+		"silk/tables_NLSF_CB_NB_MB.c",
+		"silk/encode_pulses.c",
+		"silk/NSQ_del_dec.c",
+		"silk/control_SNR.c",
+		"silk/shell_coder.c",
+		"silk/NLSF_encode.c",
+		"silk/stereo_MS_to_LR.c",
+		"silk/stereo_LR_to_MS.c",
+		"silk/HP_variable_cutoff.c",
+		"silk/LPC_analysis_filter.c",
+		"silk/CNG.c",
+		"silk/decoder_set_fs.c",
+		"silk/resampler_rom.c",
+		"silk/control_audio_bandwidth.c",
+		"silk/lin2log.c",
+		"silk/LP_variable_cutoff.c",
+		"silk/NSQ.c",
+		"silk/gain_quant.c",
+		"celt/laplace.c",
+		"celt/vq.c",
+		"celt/quant_bands.c",
+		"celt/kiss_fft.c",
+		"celt/entcode.c",
+		"celt/entenc.c",
+		"celt/celt_lpc.c",
+		"celt/pitch.c",
+		"celt/rate.c",
+		"celt/mathops.c",
+		#"celt/arm/armcpu.c",
+		#"celt/arm/celt_neon_intr.c",
+		#"celt/arm/celt_ne10_mdct.c",
+		#"celt/arm/celt_ne10_fft.c",
+		#"celt/arm/arm_celt_map.c",
+		"celt/celt_encoder.c",
+		"celt/celt.c",
+		"celt/bands.c",
+		"celt/cwrs.c",
+		"celt/entdec.c",
+		"celt/celt_decoder.c",
+		"celt/mdct.c",
+		"celt/modes.c",
+		"repacketizer.c",
+		"mlp_data.c",
+		"opus_multistream.c",
+		"opusfile.c",
+		"opus_encoder.c",
+		"analysis.c",
+		"mlp.c",
+		"info.c",
+		"stream.c",
+		"opus_decoder.c",
+		"internal.c",
+		"wincerts.c",
+		"opus.c",
+		"opus_multistream_encoder.c",
+		"http.c",
+		"opus_multistream_decoder.c"
+	]
+
+	opus_sources_silk = []
+
+	if("opus_fixed_point" in env and env.opus_fixed_point=="yes"):
+		env_opus.Append(CFLAGS = ["-DFIXED_POINT"])
+		opus_sources_silk = [
+			"silk/fixed/schur64_FIX.c",
+			"silk/fixed/residual_energy16_FIX.c",
+			"silk/fixed/encode_frame_FIX.c",
+			"silk/fixed/regularize_correlations_FIX.c",
+			"silk/fixed/apply_sine_window_FIX.c",
+			"silk/fixed/solve_LS_FIX.c",
+			"silk/fixed/schur_FIX.c",
+			"silk/fixed/pitch_analysis_core_FIX.c",
+			"silk/fixed/noise_shape_analysis_FIX.c",
+			"silk/fixed/find_LTP_FIX.c",
+			"silk/fixed/vector_ops_FIX.c",
+			"silk/fixed/autocorr_FIX.c",
+			"silk/fixed/warped_autocorrelation_FIX.c",
+			"silk/fixed/find_pitch_lags_FIX.c",
+			"silk/fixed/k2a_Q16_FIX.c",
+			"silk/fixed/LTP_scale_ctrl_FIX.c",
+			"silk/fixed/corrMatrix_FIX.c",
+			"silk/fixed/prefilter_FIX.c",
+			"silk/fixed/find_LPC_FIX.c",
+			"silk/fixed/residual_energy_FIX.c",
+			"silk/fixed/process_gains_FIX.c",
+			"silk/fixed/LTP_analysis_filter_FIX.c",
+			"silk/fixed/k2a_FIX.c",
+			"silk/fixed/burg_modified_FIX.c",
+			"silk/fixed/find_pred_coefs_FIX.c"
+		]
+	else:
+		opus_sources_silk = [
+			"silk/float/LTP_scale_ctrl_FLP.c",
+			"silk/float/regularize_correlations_FLP.c",
+			"silk/float/corrMatrix_FLP.c",
+			"silk/float/LPC_analysis_filter_FLP.c",
+			"silk/float/levinsondurbin_FLP.c",
+			"silk/float/schur_FLP.c",
+			"silk/float/scale_vector_FLP.c",
+			"silk/float/apply_sine_window_FLP.c",
+			"silk/float/pitch_analysis_core_FLP.c",
+			"silk/float/wrappers_FLP.c",
+			"silk/float/bwexpander_FLP.c",
+			"silk/float/warped_autocorrelation_FLP.c",
+			"silk/float/solve_LS_FLP.c",
+			"silk/float/find_LPC_FLP.c",
+			"silk/float/autocorrelation_FLP.c",
+			"silk/float/find_pred_coefs_FLP.c",
+			"silk/float/find_pitch_lags_FLP.c",
+			"silk/float/burg_modified_FLP.c",
+			"silk/float/find_LTP_FLP.c",
+			"silk/float/energy_FLP.c",
+			"silk/float/sort_FLP.c",
+			"silk/float/LPC_inv_pred_gain_FLP.c",
+			"silk/float/k2a_FLP.c",
+			"silk/float/noise_shape_analysis_FLP.c",
+			"silk/float/inner_product_FLP.c",
+			"silk/float/process_gains_FLP.c",
+			"silk/float/encode_frame_FLP.c",
+			"silk/float/scale_copy_vector_FLP.c",
+			"silk/float/residual_energy_FLP.c",
+			"silk/float/LTP_analysis_filter_FLP.c",
+			"silk/float/prefilter_FLP.c"
+	]
+
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources + opus_sources_silk]
+
+	env_opus.add_source_files(env.modules_sources, thirdparty_sources)
+	env_opus.Append(CFLAGS=["-DHAVE_CONFIG_H"])
+
+	thirdparty_include_paths = [
+		"",
+		"celt",
+		"silk",
+		"silk/fixed",
+		"silk/float",
+	]
+	env_opus.Append(CPPPATH = [thirdparty_dir + "/" + dir for dir in thirdparty_include_paths])
+
+	# also requires libogg
+	if (env["libogg"] != "system"): # builtin
+		env_opus.Append(CPPPATH = ["#thirdparty/libogg"])
+
+# Module files
+env_opus.add_source_files(env.modules_sources, "*.cpp")
diff --git a/drivers/opus/audio_stream_opus.cpp b/modules/opus/audio_stream_opus.cpp
index ab53fee0c9..ab53fee0c9 100644
--- a/drivers/opus/audio_stream_opus.cpp
+++ b/modules/opus/audio_stream_opus.cpp
diff --git a/drivers/opus/audio_stream_opus.h b/modules/opus/audio_stream_opus.h
index fc5531470d..4da66fe167 100644
--- a/drivers/opus/audio_stream_opus.h
+++ b/modules/opus/audio_stream_opus.h
@@ -32,11 +32,11 @@
 #ifndef AUDIO_STREAM_OPUS_H
 #define AUDIO_STREAM_OPUS_H
 
-#include "scene/resources/audio_stream.h"
-#include "opus/opusfile.h"
-#include "opus/internal.h"
-#include "os/file_access.h"
 #include "io/resource_loader.h"
+#include "os/file_access.h"
+#include "scene/resources/audio_stream.h"
+
+#include <opusfile.h>
 
 class AudioStreamPlaybackOpus : public AudioStreamPlayback {
 
diff --git a/modules/opus/config.py b/modules/opus/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/opus/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/opus/register_types.cpp b/modules/opus/register_types.cpp
new file mode 100644
index 0000000000..a4d71a52c7
--- /dev/null
+++ b/modules/opus/register_types.cpp
@@ -0,0 +1,45 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "audio_stream_opus.h"
+
+static ResourceFormatLoaderAudioStreamOpus *opus_stream_loader = NULL;
+
+void register_opus_types() {
+
+	opus_stream_loader = memnew( ResourceFormatLoaderAudioStreamOpus );
+	ResourceLoader::add_resource_format_loader(opus_stream_loader);
+	ObjectTypeDB::register_type<AudioStreamOpus>();
+}
+
+void unregister_opus_types() {
+
+	memdelete( opus_stream_loader );
+}
diff --git a/modules/opus/register_types.h b/modules/opus/register_types.h
new file mode 100644
index 0000000000..f4386c373a
--- /dev/null
+++ b/modules/opus/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_opus_types();
+void unregister_opus_types();
diff --git a/modules/pbm/SCsub b/modules/pbm/SCsub
new file mode 100644
index 0000000000..e0b19fb2a3
--- /dev/null
+++ b/modules/pbm/SCsub
@@ -0,0 +1,6 @@
+Import('env')
+Import('env_modules')
+
+env_pbm = env_modules.Clone()
+
+env_pbm.add_source_files(env.modules_sources, "*.cpp")
diff --git a/drivers/pnm/bitmap_loader_pnm.cpp b/modules/pbm/bitmap_loader_pbm.cpp
index e06d4c80f0..1d08b10824 100644
--- a/drivers/pnm/bitmap_loader_pnm.cpp
+++ b/modules/pbm/bitmap_loader_pbm.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  bitmap_loader_pnm.cpp                                                */
+/*  bitmap_loader_pbm.cpp                                                */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,7 +26,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "bitmap_loader_pnm.h"
+#include "bitmap_loader_pbm.h"
 #include "os/file_access.h"
 #include "scene/resources/bit_mask.h"
 
diff --git a/drivers/pnm/bitmap_loader_pnm.h b/modules/pbm/bitmap_loader_pbm.h
index 965cf7a451..4f7144b3e0 100644
--- a/drivers/pnm/bitmap_loader_pnm.h
+++ b/modules/pbm/bitmap_loader_pbm.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  bitmap_loader_pnm.h                                                  */
+/*  bitmap_loader_pbm.h                                                  */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,8 +26,8 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef BITMAP_LOADER_PNM_H
-#define BITMAP_LOADER_PNM_H
+#ifndef BITMAP_LOADER_PBM_H
+#define BITMAP_LOADER_PBM_H
 
 #include "io/resource_loader.h"
 
diff --git a/modules/pbm/config.py b/modules/pbm/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/pbm/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/pbm/register_types.cpp b/modules/pbm/register_types.cpp
new file mode 100644
index 0000000000..181083773a
--- /dev/null
+++ b/modules/pbm/register_types.cpp
@@ -0,0 +1,44 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "bitmap_loader_pbm.h"
+
+static ResourceFormatPBM * pbm_loader = NULL;
+
+void register_pbm_types() {
+
+	pbm_loader = memnew( ResourceFormatPBM );
+	ResourceLoader::add_resource_format_loader(pbm_loader);
+}
+
+void unregister_pbm_types() {
+
+	memdelete( pbm_loader );
+}
diff --git a/modules/pbm/register_types.h b/modules/pbm/register_types.h
new file mode 100644
index 0000000000..20c8133c2c
--- /dev/null
+++ b/modules/pbm/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_pbm_types();
+void unregister_pbm_types();
diff --git a/modules/pvr/SCsub b/modules/pvr/SCsub
new file mode 100644
index 0000000000..cd0a3129da
--- /dev/null
+++ b/modules/pvr/SCsub
@@ -0,0 +1,22 @@
+Import('env')
+Import('env_modules')
+
+env_pvr = env_modules.Clone()
+
+# Thirdparty source files
+# Not unbundled so far since not widespread as shared library
+thirdparty_dir = "#thirdparty/pvrtccompressor/"
+thirdparty_sources = [
+	"BitScale.cpp",
+	"MortonTable.cpp",
+	"PvrTcDecoder.cpp",
+	"PvrTcEncoder.cpp",
+	"PvrTcPacket.cpp",
+]
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+env_pvr.add_source_files(env.modules_sources, thirdparty_sources)
+env_pvr.Append(CPPPATH = [thirdparty_dir])
+
+# Godot source files
+env_pvr.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/pvr/config.py b/modules/pvr/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/pvr/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/pvr/register_types.cpp b/modules/pvr/register_types.cpp
new file mode 100644
index 0000000000..e5e18fb3d1
--- /dev/null
+++ b/modules/pvr/register_types.cpp
@@ -0,0 +1,44 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "texture_loader_pvr.h"
+
+static ResourceFormatPVR *resource_loader_pvr = NULL;
+
+void register_pvr_types() {
+
+	resource_loader_pvr = memnew( ResourceFormatPVR );
+	ResourceLoader::add_resource_format_loader(resource_loader_pvr);
+}
+
+void unregister_pvr_types() {
+
+	memdelete(resource_loader_pvr);
+}
diff --git a/modules/pvr/register_types.h b/modules/pvr/register_types.h
new file mode 100644
index 0000000000..d600f54d51
--- /dev/null
+++ b/modules/pvr/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_pvr_types();
+void unregister_pvr_types();
diff --git a/drivers/pvr/texture_loader_pvr.cpp b/modules/pvr/texture_loader_pvr.cpp
index 3ab3240512..3ab3240512 100644
--- a/drivers/pvr/texture_loader_pvr.cpp
+++ b/modules/pvr/texture_loader_pvr.cpp
diff --git a/drivers/pvr/texture_loader_pvr.h b/modules/pvr/texture_loader_pvr.h
index 5efb3b2507..5efb3b2507 100644
--- a/drivers/pvr/texture_loader_pvr.h
+++ b/modules/pvr/texture_loader_pvr.h
diff --git a/modules/squish/SCsub b/modules/squish/SCsub
new file mode 100644
index 0000000000..072921ef64
--- /dev/null
+++ b/modules/squish/SCsub
@@ -0,0 +1,27 @@
+Import('env')
+Import('env_modules')
+
+env_squish = env_modules.Clone()
+
+# Thirdparty source files
+if (env["squish"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/squish/"
+	thirdparty_sources = [
+		"alpha.cpp",
+		"clusterfit.cpp",
+		"colourblock.cpp",
+		"colourfit.cpp",
+		"colourset.cpp",
+		"maths.cpp",
+		"rangefit.cpp",
+		"singlecolourfit.cpp",
+		"squish.cpp",
+	]
+
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_squish.add_source_files(env.modules_sources, thirdparty_sources)
+	env_squish.Append(CPPPATH = [thirdparty_dir])
+
+# Godot source files
+env_squish.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/squish/config.py b/modules/squish/config.py
new file mode 100644
index 0000000000..d28d9c702e
--- /dev/null
+++ b/modules/squish/config.py
@@ -0,0 +1,10 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	# Tools only, disabled for non-tools
+	# TODO: Find a cleaner way to achieve that
+	if (env["tools"] == "no"):
+		env["module_squish_enabled"] = "no"
+		env.disabled_modules.append("squish")
diff --git a/drivers/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp
index 95de83d5a5..ac7c935ceb 100644
--- a/drivers/squish/image_compress_squish.cpp
+++ b/modules/squish/image_compress_squish.cpp
@@ -27,9 +27,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "image_compress_squish.h"
-#include "squish/squish.h"
+
 #include "print_string.h"
 
+#include <squish.h>
+
 void image_compress_squish(Image *p_image) {
 
 	int w=p_image->get_width();
@@ -88,4 +90,3 @@ void image_compress_squish(Image *p_image) {
 	p_image->create(p_image->get_width(),p_image->get_height(),p_image->get_mipmaps(),target_format,data);
 
 }
-
diff --git a/drivers/squish/image_compress_squish.h b/modules/squish/image_compress_squish.h
index 8c37ac2caa..19dd900674 100644
--- a/drivers/squish/image_compress_squish.h
+++ b/modules/squish/image_compress_squish.h
@@ -29,11 +29,8 @@
 #ifndef IMAGE_COMPRESS_SQUISH_H
 #define IMAGE_COMPRESS_SQUISH_H
 
-
 #include "image.h"
 
-
 void image_compress_squish(Image *p_image);
 
-
 #endif // IMAGE_COMPRESS_SQUISH_H
diff --git a/modules/squish/register_types.cpp b/modules/squish/register_types.cpp
new file mode 100644
index 0000000000..9e9621eb64
--- /dev/null
+++ b/modules/squish/register_types.cpp
@@ -0,0 +1,42 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#ifdef TOOLS_ENABLED
+
+#include "image_compress_squish.h"
+
+void register_squish_types() {
+
+	Image::set_compress_bc_func(image_compress_squish);
+}
+
+void unregister_squish_types() {}
+
+#endif
diff --git a/drivers/openssl/register_openssl.h b/modules/squish/register_types.h
index a66ca1e9c0..bbde6a44bf 100644
--- a/drivers/openssl/register_openssl.h
+++ b/modules/squish/register_types.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  register_openssl.h                                                   */
+/*  register_types.h                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,14 +26,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef REGISTER_OPENSSL_H
-#define REGISTER_OPENSSL_H
-
-#ifdef OPENSSL_ENABLED
-
-void register_openssl();
-void unregister_openssl();
-
+#ifdef TOOLS_ENABLED
+void register_squish_types();
+void unregister_squish_types();
 #endif
-
-#endif // REGISTER_OPENSSL_H
diff --git a/modules/theora/SCsub b/modules/theora/SCsub
new file mode 100644
index 0000000000..cdb78e955e
--- /dev/null
+++ b/modules/theora/SCsub
@@ -0,0 +1,81 @@
+Import('env')
+Import('env_modules')
+
+env_theora = env_modules.Clone()
+
+# Thirdparty source files
+if (env["libtheora"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/libtheora/"
+	thirdparty_sources = [
+		"analyze.c",
+		"apiwrapper.c",
+		"bitpack.c",
+		"cpu.c",
+		"decapiwrapper.c",
+		"decinfo.c",
+		"decode.c",
+		"dequant.c",
+		"encapiwrapper.c",
+		"encfrag.c",
+		"encinfo.c",
+		"encode.c",
+		"encoder_disabled.c",
+		"enquant.c",
+		"fdct.c",
+		"fragment.c",
+		"huffdec.c",
+		"huffenc.c",
+		"idct.c",
+		"info.c",
+		"internal.c",
+		"mathops.c",
+		"mcenc.c",
+		"quant.c",
+		"rate.c",
+		"state.c",
+		"tokenize.c",
+	]
+
+	thirdparty_sources_x86 = [
+		"x86/mmxencfrag.c",
+		"x86/mmxfdct.c",
+		"x86/mmxfrag.c",
+		"x86/mmxidct.c",
+		"x86/mmxstate.c",
+		"x86/sse2fdct.c",
+		"x86/x86enc.c",
+		"x86/x86state.c",
+	]
+
+	thirdparty_sources_x86_vc = [
+		"x86_vc/mmxencfrag.c",
+		"x86_vc/mmxfdct.c",
+		"x86_vc/mmxfrag.c",
+		"x86_vc/mmxidct.c",
+		"x86_vc/mmxstate.c",
+		"x86_vc/x86enc.c",
+		"x86_vc/x86state.c",
+	]
+
+	if (env["x86_opt_gcc"]):
+		thirdparty_sources += thirdparty_sources_x86
+
+	if (env["x86_opt_vc"]):
+		thirdparty_sources += thirdparty_sources_x86_vc
+
+	if (env["x86_opt_gcc"] or env["x86_opt_vc"]):
+		env_theora.Append(CCFLAGS = ["-DOC_X86_ASM"])
+
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_theora.add_source_files(env.modules_sources, thirdparty_sources)
+	env_theora.Append(CPPPATH = [thirdparty_dir])
+
+	# also requires libogg and libvorbis
+	if (env["libogg"] != "system"): # builtin
+		env_theora.Append(CPPPATH = ["#thirdparty/libogg"])
+	if (env["libvorbis"] != "system"): # builtin
+		env_theora.Append(CPPPATH = ["#thirdparty/libvorbis"])
+
+# Godot source files
+env_theora.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/theora/config.py b/modules/theora/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/theora/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/theora/register_types.cpp b/modules/theora/register_types.cpp
new file mode 100644
index 0000000000..282b59b0ec
--- /dev/null
+++ b/modules/theora/register_types.cpp
@@ -0,0 +1,45 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "video_stream_theora.h"
+
+static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL;
+
+void register_theora_types() {
+
+	theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora );
+	ResourceLoader::add_resource_format_loader(theora_stream_loader);
+	ObjectTypeDB::register_type<VideoStreamTheora>();
+}
+
+void unregister_theora_types() {
+
+	memdelete( theora_stream_loader );
+}
diff --git a/modules/theora/register_types.h b/modules/theora/register_types.h
new file mode 100644
index 0000000000..18bdbf0c4c
--- /dev/null
+++ b/modules/theora/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_theora_types();
+void unregister_theora_types();
diff --git a/drivers/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp
index 1f3832ec16..3ddfee3a1d 100644
--- a/drivers/theora/video_stream_theora.cpp
+++ b/modules/theora/video_stream_theora.cpp
@@ -26,13 +26,11 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifdef THEORA_ENABLED
-
 #include "video_stream_theora.h"
+
+#include "globals.h"
 #include "os/os.h"
 #include "yuv2rgb.h"
-#include "globals.h"
-
 
 int VideoStreamPlaybackTheora::	buffer_data() {
 
@@ -940,6 +938,3 @@ String ResourceFormatLoaderVideoStreamTheora::get_resource_type(const String &p_
 		return "VideoStreamTheora";
 	return "";
 }
-
-#endif
-
diff --git a/drivers/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h
index 5484815844..04a5c56ee5 100644
--- a/drivers/theora/video_stream_theora.h
+++ b/modules/theora/video_stream_theora.h
@@ -29,16 +29,15 @@
 #ifndef VIDEO_STREAM_THEORA_H
 #define VIDEO_STREAM_THEORA_H
 
-#ifdef THEORA_ENABLED
-
-#include "theora/theoradec.h"
-#include "vorbis/codec.h"
-#include "os/file_access.h"
-#include "ring_buffer.h"
 #include "io/resource_loader.h"
-#include "scene/resources/video_stream.h"
+#include "os/file_access.h"
 #include "os/thread.h"
 #include "os/semaphore.h"
+#include "ring_buffer.h"
+#include "scene/resources/video_stream.h"
+
+#include <theora/theoradec.h>
+#include <vorbis/codec.h>
 
 //#define THEORA_USE_THREAD_STREAMING
 
@@ -197,8 +196,4 @@ public:
 
 };
 
-
-
-#endif
-
 #endif
diff --git a/drivers/theora/yuv2rgb.h b/modules/theora/yuv2rgb.h
index 59101bd057..59101bd057 100644
--- a/drivers/theora/yuv2rgb.h
+++ b/modules/theora/yuv2rgb.h
diff --git a/modules/visual_script/SCsub b/modules/visual_script/SCsub
index 403fe68f66..9ff13fc43f 100644
--- a/modules/visual_script/SCsub
+++ b/modules/visual_script/SCsub
@@ -1,5 +1,5 @@
 Import('env')
 
-env.add_source_files(env.modules_sources,"*.cpp")
+env.add_source_files(env.modules_sources, "*.cpp")
 
 Export('env')
diff --git a/modules/vorbis/SCsub b/modules/vorbis/SCsub
new file mode 100644
index 0000000000..f3dbc893fc
--- /dev/null
+++ b/modules/vorbis/SCsub
@@ -0,0 +1,47 @@
+Import('env')
+Import('env_modules')
+
+env_vorbis = env_modules.Clone()
+
+# Thirdparty source files
+if (env["libvorbis"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/libvorbis/"
+	thirdparty_sources = [
+		#"analysis.c",
+		#"barkmel.c",
+		"bitrate.c",
+		"block.c",
+		"codebook.c",
+		"envelope.c",
+		"floor0.c",
+		"floor1.c",
+		"info.c",
+		"lookup.c",
+		"lpc.c",
+		"lsp.c",
+		"mapping0.c",
+		"mdct.c",
+		"psy.c",
+		#"psytune.c",
+		"registry.c",
+		"res0.c",
+		"sharedbook.c",
+		"smallft.c",
+		"synthesis.c",
+		#"tone.c",
+		#"vorbisenc.c",
+		"vorbisfile.c",
+		"window.c",
+	]
+
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_vorbis.add_source_files(env.modules_sources, thirdparty_sources)
+	env_vorbis.Append(CPPPATH = [thirdparty_dir])
+
+	# also requires libogg
+	if (env["libogg"] != "system"): # builtin
+		env_vorbis.Append(CPPPATH = ["#thirdparty/libogg"])
+
+# Godot source files
+env_vorbis.add_source_files(env.modules_sources, "*.cpp")
diff --git a/drivers/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp
index 4ce7940a01..4ce7940a01 100644
--- a/drivers/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp
diff --git a/drivers/vorbis/audio_stream_ogg_vorbis.h b/modules/vorbis/audio_stream_ogg_vorbis.h
index bb4d521c1e..8d8d7392b5 100644
--- a/drivers/vorbis/audio_stream_ogg_vorbis.h
+++ b/modules/vorbis/audio_stream_ogg_vorbis.h
@@ -29,12 +29,12 @@
 #ifndef AUDIO_STREAM_OGG_VORBIS_H
 #define AUDIO_STREAM_OGG_VORBIS_H
 
-#include "scene/resources/audio_stream.h"
-#include "vorbis/vorbisfile.h"
-#include "os/file_access.h"
 #include "io/resource_loader.h"
+#include "os/file_access.h"
 #include "os/thread_safe.h"
+#include "scene/resources/audio_stream.h"
 
+#include <vorbis/vorbisfile.h>
 
 class AudioStreamPlaybackOGGVorbis : public AudioStreamPlayback {
 
diff --git a/modules/vorbis/config.py b/modules/vorbis/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/vorbis/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/modules/vorbis/register_types.cpp b/modules/vorbis/register_types.cpp
new file mode 100644
index 0000000000..ae63b5af3c
--- /dev/null
+++ b/modules/vorbis/register_types.cpp
@@ -0,0 +1,45 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "audio_stream_ogg_vorbis.h"
+
+static ResourceFormatLoaderAudioStreamOGGVorbis *vorbis_stream_loader = NULL;
+
+void register_vorbis_types() {
+
+	vorbis_stream_loader = memnew( ResourceFormatLoaderAudioStreamOGGVorbis );
+	ResourceLoader::add_resource_format_loader(vorbis_stream_loader);
+	ObjectTypeDB::register_type<AudioStreamOGGVorbis>();
+}
+
+void unregister_vorbis_types() {
+
+	memdelete( vorbis_stream_loader );
+}
diff --git a/modules/vorbis/register_types.h b/modules/vorbis/register_types.h
new file mode 100644
index 0000000000..6baaed7ce8
--- /dev/null
+++ b/modules/vorbis/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_vorbis_types();
+void unregister_vorbis_types();
diff --git a/modules/webp/SCsub b/modules/webp/SCsub
new file mode 100644
index 0000000000..4997aa3359
--- /dev/null
+++ b/modules/webp/SCsub
@@ -0,0 +1,119 @@
+Import('env')
+Import('env_modules')
+
+env_webp = env_modules.Clone()
+
+# Thirdparty source files
+if (env["libwebp"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/libwebp/"
+	thirdparty_sources = [
+		"enc/webpenc.c",
+		"enc/near_lossless.c",
+		"enc/frame.c",
+		"enc/alpha.c",
+		"enc/picture_csp.c",
+		"enc/vp8l.c",
+		"enc/picture_psnr.c",
+		"enc/delta_palettization.c",
+		"enc/syntax.c",
+		"enc/backward_references.c",
+		"enc/token.c",
+		"enc/analysis.c",
+		"enc/iterator.c",
+		"enc/picture_tools.c",
+		"enc/picture_rescale.c",
+		"enc/config.c",
+		"enc/tree.c",
+		"enc/cost.c",
+		"enc/picture.c",
+		"enc/quant.c",
+		"enc/filter.c",
+		"enc/histogram.c",
+		"utils/rescaler.c",
+		"utils/filters.c",
+		"utils/quant_levels_dec.c",
+		"utils/huffman.c",
+		"utils/thread.c",
+		"utils/quant_levels.c",
+		"utils/bit_writer.c",
+		"utils/bit_reader.c",
+		"utils/random.c",
+		"utils/utils.c",
+		"utils/huffman_encode.c",
+		"utils/color_cache.c",
+		"mux/muxinternal.c",
+		"mux/muxread.c",
+		"mux/anim_encode.c",
+		"mux/muxedit.c",
+		"dec/webp.c",
+		"dec/frame.c",
+		"dec/alpha.c",
+		"dec/vp8l.c",
+		"dec/io.c",
+		"dec/vp8.c",
+		"dec/idec.c",
+		"dec/tree.c",
+		"dec/buffer.c",
+		"dec/quant.c",
+		"demux/demux.c",
+		"demux/anim_decode.c",
+		"dsp/yuv.c",
+		"dsp/filters_sse2.c",
+		"dsp/dec_sse41.c",
+		"dsp/rescaler.c",
+		"dsp/lossless_sse2.c",
+		"dsp/alpha_processing_sse41.c",
+		"dsp/alpha_processing_sse2.c",
+		"dsp/filters.c",
+		"dsp/upsampling_mips_dsp_r2.c",
+		"dsp/dec_neon.c",
+		"dsp/enc_neon.c",
+		"dsp/lossless_enc_mips32.c",
+		"dsp/lossless_enc_sse2.c",
+		"dsp/upsampling.c",
+		"dsp/lossless_enc_neon.c",
+		"dsp/alpha_processing.c",
+		"dsp/cost_sse2.c",
+		"dsp/dec_mips32.c",
+		"dsp/enc_avx2.c",
+		"dsp/rescaler_mips32.c",
+		"dsp/enc.c",
+		"dsp/lossless_enc_sse41.c",
+		"dsp/cost_mips32.c",
+		"dsp/lossless_mips_dsp_r2.c",
+		"dsp/filters_mips_dsp_r2.c",
+		"dsp/upsampling_neon.c",
+		"dsp/alpha_processing_mips_dsp_r2.c",
+		"dsp/enc_mips_dsp_r2.c",
+		"dsp/lossless.c",
+		"dsp/yuv_mips_dsp_r2.c",
+		"dsp/cost_mips_dsp_r2.c",
+		"dsp/argb.c",
+		"dsp/dec_sse2.c",
+		"dsp/rescaler_sse2.c",
+		"dsp/enc_sse41.c",
+		"dsp/argb_mips_dsp_r2.c",
+		"dsp/lossless_enc_mips_dsp_r2.c",
+		"dsp/dec_clip_tables.c",
+		"dsp/yuv_mips32.c",
+		"dsp/cpu.c",
+		"dsp/dec.c",
+		"dsp/argb_sse2.c",
+		"dsp/lossless_neon.c",
+		"dsp/lossless_enc.c",
+		"dsp/enc_mips32.c",
+		"dsp/cost.c",
+		"dsp/rescaler_mips_dsp_r2.c",
+		"dsp/dec_mips_dsp_r2.c",
+		"dsp/rescaler_neon.c",
+		"dsp/yuv_sse2.c",
+		"dsp/enc_sse2.c",
+		"dsp/upsampling_sse2.c",
+	]
+	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+	env_webp.add_source_files(env.modules_sources, thirdparty_sources)
+	env_webp.Append(CPPPATH = [thirdparty_dir])
+
+# Godot source files
+env_webp.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/webp/config.py b/modules/webp/config.py
new file mode 100644
index 0000000000..368e97e152
--- /dev/null
+++ b/modules/webp/config.py
@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass
diff --git a/drivers/webp/image_loader_webp.cpp b/modules/webp/image_loader_webp.cpp
index 68bb857293..0fe2db3261 100644
--- a/drivers/webp/image_loader_webp.cpp
+++ b/modules/webp/image_loader_webp.cpp
@@ -28,12 +28,13 @@
 /*************************************************************************/
 #include "image_loader_webp.h"
 
+#include "io/marshalls.h"
 #include "print_string.h"
 #include "os/os.h"
-#include "drivers/webp/decode.h"
-#include "drivers/webp/encode.h"
-#include "io/marshalls.h"
+
 #include <stdlib.h>
+#include <webp/decode.h>
+#include <webp/encode.h>
 
 static DVector<uint8_t> _webp_lossy_pack(const Image& p_image,float p_quality) {
 
diff --git a/drivers/webp/image_loader_webp.h b/modules/webp/image_loader_webp.h
index 24f79708db..24f79708db 100644
--- a/drivers/webp/image_loader_webp.h
+++ b/modules/webp/image_loader_webp.h
diff --git a/modules/webp/register_types.cpp b/modules/webp/register_types.cpp
new file mode 100644
index 0000000000..039876bbb9
--- /dev/null
+++ b/modules/webp/register_types.cpp
@@ -0,0 +1,44 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "register_types.h"
+
+#include "image_loader_webp.h"
+
+static ImageLoaderWEBP *image_loader_webp = NULL;
+
+void register_webp_types() {
+
+	image_loader_webp = memnew( ImageLoaderWEBP );
+	ImageLoader::add_image_format_loader(image_loader_webp);
+}
+
+void unregister_webp_types() {
+
+	memdelete( image_loader_webp );
+}
diff --git a/modules/webp/register_types.h b/modules/webp/register_types.h
new file mode 100644
index 0000000000..a200188e47
--- /dev/null
+++ b/modules/webp/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_webp_types();
+void unregister_webp_types();
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 8e9a58da19..8d56dbcdaa 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -34,7 +34,6 @@ def get_flags():
 
 	return [
 		('tools', 'no'),
-		('builtin_zlib', 'no'),
 		('openssl', 'builtin'), #use builtin openssl
 	]
 
@@ -203,7 +202,8 @@ def configure(env):
 	env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT'])
 #	env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT'])
 
-	if(env["opus"]=="yes"):
+	# TODO: Move that to opus module's config
+	if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
 		if (env["android_arch"]=="armv6" or env["android_arch"]=="armv7"):
 			env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
 		env.opus_fixed_point="yes"
diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py
index 2860b7f090..2b76aa3496 100644
--- a/platform/bb10/detect.py
+++ b/platform/bb10/detect.py
@@ -33,8 +33,8 @@ def get_flags():
 
 	return [
 		('tools', 'no'),
-		('theora', 'no'),
-
+		('builtin_zlib', 'yes'),
+		('module_theora_enabled', 'no'),
 	]
 
 def configure(env):
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index f36b0c567e..af997a5737 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -23,8 +23,6 @@ def get_opts():
 
 def get_flags():
 	return [
-		('builtin_zlib', 'no'),
-		('glew', 'yes'),
 	]
 
 def configure(env):
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 9cb52d4561..1be63891b1 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -38,6 +38,7 @@ def get_flags():
 	return [
 		('tools', 'no'),
 		('webp', 'yes'),
+		('builtin_zlib', 'yes'),
 		('openssl','builtin'), #use builtin openssl
 	]
 
@@ -165,7 +166,8 @@ def configure(env):
 	env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
 	env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DMPC_FIXED_POINT'])
 
-	if(env["opus"]=="yes"):
+	# TODO: Move that to opus module's config
+	if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
 		env.opus_fixed_point="yes"
 		if env["arch"]=="x86":
 			pass
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index 0f1fd23177..e1f91cf948 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -26,10 +26,10 @@ def get_flags():
 
 	return [
 		('tools', 'no'),
-		('theora', 'no'),
-		('musepack', 'no'),
-		('squish', 'no'),
-		('etc1', 'no'),
+		('builtin_zlib', 'yes'),
+		('module_etc1_enabled', 'no'),
+		('module_mpc_enabled', 'no'),
+		('module_theora_enabled', 'no'),
 	]
 
 
@@ -70,8 +70,9 @@ def configure(env):
 		#env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g4', '-DDEBUG_ENABLED'])
 		env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
 
-	if(env["opus"]=="yes"):
-		env.opus_fixed_point="yes"
+	# TODO: Move that to opus module's config
+	if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
+		env.opus_fixed_point = "yes"
 
 	env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti'])
 	env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS'])
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 01ea09fa21..8d8e882527 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -28,9 +28,6 @@ def get_opts():
 def get_flags():
 
 	return [
-	('legacygl', 'yes'),
-	('builtin_zlib', 'no'),
-	('glew', 'yes'),
 	]
 
 
@@ -83,10 +80,6 @@ def configure(env):
 		env['AS'] = basecmd+"as"
 
 
-#	env.Append(CPPPATH=['#platform/osx/include/freetype2', '#platform/osx/include'])
-#	env.Append(LIBPATH=['#platform/osx/lib'])
-
-
 	env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"])
 	env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED'])
 	env.Append(LIBS=['pthread'])
diff --git a/platform/osx/platform_config.h b/platform/osx/platform_config.h
index 86505206ae..f02a4bc444 100644
--- a/platform/osx/platform_config.h
+++ b/platform/osx/platform_config.h
@@ -27,5 +27,5 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include <alloca.h>
-#define GLES2_INCLUDE_H "gl_context/GL/glew.h"
+#define GLES2_INCLUDE_H "GL/glew.h"
 #define PTHREAD_RENAME_SELF
diff --git a/platform/server/detect.py b/platform/server/detect.py
index e6fab2043b..2f6fb00e0d 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -27,7 +27,6 @@ def get_opts():
 def get_flags():
 
 	return [
-	('builtin_zlib', 'no'),
 	]
 
 
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 12ea5a93ee..af9a0aca41 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -176,7 +176,7 @@ def get_opts():
 def get_flags():
 
 	return [
-		('glew','yes'),
+		('builtin_zlib', 'yes'),
 		('openssl','builtin'), #use builtin openssl
 	]
 
diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h
index 9e20750816..31512a1054 100644
--- a/platform/windows/platform_config.h
+++ b/platform/windows/platform_config.h
@@ -30,6 +30,4 @@
 //#else
 //#include <alloca.h>
 //#endif
-#define GLES2_INCLUDE_H "gl_context/GL/glew.h"
-
-
+#define GLES2_INCLUDE_H "GL/glew.h"
diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py
index 7f220736d7..79fc3651e9 100644
--- a/platform/winrt/detect.py
+++ b/platform/winrt/detect.py
@@ -29,6 +29,7 @@ def get_flags():
 
 	return [
 	('tools', 'no'),
+	('builtin_zlib', 'yes'),
 	('openssl', 'builtin'),
 	]
 
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index ba232f6d4e..92bc58d7b0 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -68,13 +68,10 @@ def get_opts():
 def get_flags():
 
 	return [
-	('builtin_zlib', 'no'),
-	('glew', 'yes'),
-	("openssl", "yes"),
-	('freetype','yes'), #use system freetype
-
-	#("theora","no"),
-        ]
+	("openssl", "system"),
+	('freetype', 'system'),
+	('libpng', 'system'),
+	]
 
 
 
@@ -140,18 +137,50 @@ def configure(env):
 	env.ParseConfig('pkg-config xcursor --cflags --libs')
 	env.ParseConfig('pkg-config xrandr --cflags --libs')
 
-	if (env["openssl"]=="yes"):
+	if (env["openssl"] == "system"):
 		env.ParseConfig('pkg-config openssl --cflags --libs')
 
+	if (env["libwebp"] == "system"):
+		env.ParseConfig('pkg-config libwebp --cflags --libs')
 
-	if (env["freetype"]=="yes"):
+	if (env["freetype"] == "system"):
+		env["libpng"] = "system"  # Freetype links against libpng
 		env.ParseConfig('pkg-config freetype2 --cflags --libs')
 
+	if (env["libpng"] == "system"):
+		env.ParseConfig('pkg-config libpng --cflags --libs')
+
+	if (env["enet"] == "system"):
+		env.ParseConfig('pkg-config libenet --cflags --libs')
+
+	if (env["squish"] == "system" and env["tools"] == "yes"):
+		env.ParseConfig('pkg-config libsquish --cflags --libs')
+
+	# Sound and video libraries
+	# Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
 
+	if (env["libtheora"] == "system"):
+		env["libogg"] = "system"  # Needed to link against system libtheora
+		env["libvorbis"] = "system"  # Needed to link against system libtheora
+		env.ParseConfig('pkg-config theora theoradec --cflags --libs')
+
+	if (env["libvorbis"] == "system"):
+		env["libogg"] = "system"  # Needed to link against system libvorbis
+		env.ParseConfig('pkg-config vorbis vorbisfile --cflags --libs')
+
+	if (env["opus"] == "system"):
+		env["libogg"] = "system"  # Needed to link against system opus
+		env.ParseConfig('pkg-config opus opusfile --cflags --libs')
+
+	if (env["libogg"] == "system"):
+		env.ParseConfig('pkg-config ogg --cflags --libs')
 
 
 	env.Append(CPPFLAGS=['-DOPENGL_ENABLED'])
 
+	if (env["glew"] == "system"):
+		env.ParseConfig('pkg-config glew --cflags --libs')
+
 	if os.system("pkg-config --exists alsa")==0:
 		print("Enabling ALSA")
 		env.Append(CPPFLAGS=["-DALSA_ENABLED"])
diff --git a/platform/x11/platform_config.h b/platform/x11/platform_config.h
index 3b47b2c92d..015953157d 100644
--- a/platform/x11/platform_config.h
+++ b/platform/x11/platform_config.h
@@ -34,6 +34,4 @@
 #define PTHREAD_BSD_SET_NAME
 #endif
 
-#define GLES2_INCLUDE_H "gl_context/GL/glew.h"
-
-
+#define GLES2_INCLUDE_H "GL/glew.h"
diff --git a/thirdparty/README.md b/thirdparty/README.md
new file mode 100644
index 0000000000..f073bef8ec
--- /dev/null
+++ b/thirdparty/README.md
@@ -0,0 +1,218 @@
+# Third party libraries
+
+
+## enet
+
+- Upstream: http://enet.bespin.org
+- Version: 1.3.13
+- License: MIT
+
+Files extracted from upstream source:
+
+- all .c files in the main directory
+- the include/enet/ folder as enet/
+- LICENSE file
+
+Important: Some files have been modified by Godot developers so that they work
+for all platforms (especially WinRT). Check the diff with the 1.3.13 tarball
+before the next update.
+
+
+## freetype
+
+- Upstream: https://www.freetype.org
+- Version: 2.6.5
+- License: FreeType License (BSD-like)
+
+Files extracted from upstream source:
+
+- the src/ folder, stripped of the `Jamfile` files
+- the include/ folder
+- `docs/{FTL.TXT,LICENSE.TXT}`
+
+
+## glew
+
+- Upstream: http://glew.sourceforge.net
+- Version: 1.13.0
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- `src/glew.c`
+- include/GL/ as GL/
+- LICENSE.txt
+
+
+## jpeg-compressor
+
+- Upstream: https://github.com/richgel999/jpeg-compressor
+- Version: 1.04
+- License: Public domain
+
+Files extracted from upstream source:
+
+- `jpgd.{c,h}`
+
+
+## libmpcdec
+
+- Upstream: https://www.musepack.net
+- Version: SVN somewhere between SV7 and SV8 (r475)
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- all .c and .h files in libmpcdec/
+- include/mpc as mpc/
+- COPYING from libmpcdec/
+
+
+## libogg
+
+- Upstream: https://www.xiph.org/ogg
+- Version: 1.3.2
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- `src/*.c`
+- `include/ogg/*.h` in ogg/
+- COPYING
+
+
+## libpng
+
+- Upstream: http://libpng.org/pub/png/libpng.html
+- Version: 1.6.23
+- License: libpng/zlib
+
+Files extracted from upstream source:
+
+- all .c and .h files of the main directory, except from
+  `example.c` and `pngtest.c`
+- the arm/ folder
+- `scripts/pnglibconf.h.prebuilt` as `pnglibconf.h`
+
+
+## libvorbis
+
+- Upstream: https://www.xiph.org/vorbis
+- Version: 1.3.5
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- `src/*` except from: `lookups.pl`, `Makefile.*`
+- `include/vorbis/*.h` as vorbis/
+- COPYING
+
+
+## libwebp
+
+- Upstream: https://chromium.googlesource.com/webm/libwebp/
+- Version: 0.5.1
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- `src/*` except from: .am and .in, files, extras/, `webp/extras.h`
+- AUTHORS, COPYING, PATENTS
+
+Important: The files `utils/bit_reader.{c,h}` have Godot-made
+changes to ensure they build for Javascript/HTML5. Those
+changes are marked with `// -- GODOT --` comments.
+
+
+## openssl
+
+- Upstream: https://www.openssl.org
+- Version: 1.2.0h
+- License: OpenSSL license / BSD-like
+
+Files extracted from the upstream source:
+
+TODO.
+
+
+## opus
+
+- Upstream: https://opus-codec.org
+- Version: 1.1.2 (opus) and 0.7 (opusfile)
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- all .c and .h files in src/ (both opus and opusfile),
+  except `opus_demo.c`
+- all .h files in include/ (both opus and opusfile)
+- COPYING
+
+
+## pvrtccompressor
+
+- Upstream: https://bitbucket.org/jthlim/pvrtccompressor
+- Version: hg commit cf71777 - 2015-01-08
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- all .cpp and .h files apart from `main.cpp`
+- LICENSE.TXT
+
+
+## rg-etc1
+
+- Upstream: https://github.com/richgel999/rg-etc1
+- Version: 1.04
+- License: zlib
+
+Files extracted from upstream source:
+
+- `rg_etc1.{cpp,h}`
+
+
+## rtaudio
+
+- Upstream: http://www.music.mcgill.ca/~gary/rtaudio/
+- Version: 4.1.2
+- License: MIT-like
+
+Files extracted from upstream source:
+
+- `RtAudio.{cpp,h}`
+
+
+## squish
+
+- Upstream: https://sourceforge.net/projects/libsquish
+- Version: 1.14
+- License: MIT
+
+Files extracted from upstream source:
+
+- all .cpp, .h and .inl files
+
+
+## theora
+
+- Upstream: https://www.theora.org
+- Version: 1.1.1
+- License: BSD-3-Clause
+
+Files extracted from upstream source:
+
+- all .c, .h in lib/
+- all .h files in include/theora/ as theora/
+- COPYING and LICENSE
+
+
+## zlib
+
+- Upstream: http://www.zlib.net/
+- Version: 1.2.8
+- License: zlib
+
+Files extracted from upstream source:
+
+- all .c and .h files apart from `gz*`
diff --git a/thirdparty/enet/LICENSE b/thirdparty/enet/LICENSE
new file mode 100644
index 0000000000..39af84a8f6
--- /dev/null
+++ b/thirdparty/enet/LICENSE
@@ -0,0 +1,7 @@
+Copyright (c) 2002-2016 Lee Salzman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/modules/enet/callbacks.c b/thirdparty/enet/callbacks.c
index b3990af1fb..b3990af1fb 100644
--- a/modules/enet/callbacks.c
+++ b/thirdparty/enet/callbacks.c
diff --git a/modules/enet/compress.c b/thirdparty/enet/compress.c
index 784489a787..784489a787 100644
--- a/modules/enet/compress.c
+++ b/thirdparty/enet/compress.c
diff --git a/modules/enet/enet/callbacks.h b/thirdparty/enet/enet/callbacks.h
index 340a4a9896..340a4a9896 100644
--- a/modules/enet/enet/callbacks.h
+++ b/thirdparty/enet/enet/callbacks.h
diff --git a/modules/enet/enet/enet.h b/thirdparty/enet/enet/enet.h
index 650b199ee5..650b199ee5 100644
--- a/modules/enet/enet/enet.h
+++ b/thirdparty/enet/enet/enet.h
diff --git a/modules/enet/enet/list.h b/thirdparty/enet/enet/list.h
index d7b2600848..d7b2600848 100644
--- a/modules/enet/enet/list.h
+++ b/thirdparty/enet/enet/list.h
diff --git a/modules/enet/enet/protocol.h b/thirdparty/enet/enet/protocol.h
index f8c73d8a66..f8c73d8a66 100644
--- a/modules/enet/enet/protocol.h
+++ b/thirdparty/enet/enet/protocol.h
diff --git a/modules/enet/enet/time.h b/thirdparty/enet/enet/time.h
index c82a546035..c82a546035 100644
--- a/modules/enet/enet/time.h
+++ b/thirdparty/enet/enet/time.h
diff --git a/modules/enet/enet/types.h b/thirdparty/enet/enet/types.h
index ab010a4b13..ab010a4b13 100644
--- a/modules/enet/enet/types.h
+++ b/thirdparty/enet/enet/types.h
diff --git a/modules/enet/enet/unix.h b/thirdparty/enet/enet/unix.h
index a59e340606..a59e340606 100644
--- a/modules/enet/enet/unix.h
+++ b/thirdparty/enet/enet/unix.h
diff --git a/modules/enet/enet/utility.h b/thirdparty/enet/enet/utility.h
index e48a476be3..e48a476be3 100644
--- a/modules/enet/enet/utility.h
+++ b/thirdparty/enet/enet/utility.h
diff --git a/modules/enet/enet/win32.h b/thirdparty/enet/enet/win32.h
index e73ca9d052..e73ca9d052 100644
--- a/modules/enet/enet/win32.h
+++ b/thirdparty/enet/enet/win32.h
diff --git a/modules/enet/host.c b/thirdparty/enet/host.c
index 3be6c0922c..3be6c0922c 100644
--- a/modules/enet/host.c
+++ b/thirdparty/enet/host.c
diff --git a/modules/enet/list.c b/thirdparty/enet/list.c
index 1c1a8dfaaf..1c1a8dfaaf 100644
--- a/modules/enet/list.c
+++ b/thirdparty/enet/list.c
diff --git a/modules/enet/packet.c b/thirdparty/enet/packet.c
index 5fa78b28ae..5fa78b28ae 100644
--- a/modules/enet/packet.c
+++ b/thirdparty/enet/packet.c
diff --git a/modules/enet/peer.c b/thirdparty/enet/peer.c
index e2d0872bd3..e2d0872bd3 100644
--- a/modules/enet/peer.c
+++ b/thirdparty/enet/peer.c
diff --git a/modules/enet/protocol.c b/thirdparty/enet/protocol.c
index 4a2a4ed185..4a2a4ed185 100644
--- a/modules/enet/protocol.c
+++ b/thirdparty/enet/protocol.c
diff --git a/modules/enet/unix.c b/thirdparty/enet/unix.c
index 3138cc04b6..3138cc04b6 100644
--- a/modules/enet/unix.c
+++ b/thirdparty/enet/unix.c
diff --git a/modules/enet/win32.c b/thirdparty/enet/win32.c
index 15edd7acbb..15edd7acbb 100644
--- a/modules/enet/win32.c
+++ b/thirdparty/enet/win32.c
diff --git a/drivers/freetype/FTL.TXT b/thirdparty/freetype/FTL.TXT
index 433ab060e3..433ab060e3 100644
--- a/drivers/freetype/FTL.TXT
+++ b/thirdparty/freetype/FTL.TXT
diff --git a/drivers/freetype/LICENSE.TXT b/thirdparty/freetype/LICENSE.TXT
index af5a1c50f6..af5a1c50f6 100644
--- a/drivers/freetype/LICENSE.TXT
+++ b/thirdparty/freetype/LICENSE.TXT
diff --git a/drivers/freetype/include/freetype/config/ftconfig.h b/thirdparty/freetype/include/freetype/config/ftconfig.h
index 157a704fa8..157a704fa8 100644
--- a/drivers/freetype/include/freetype/config/ftconfig.h
+++ b/thirdparty/freetype/include/freetype/config/ftconfig.h
diff --git a/drivers/freetype/include/freetype/config/ftheader.h b/thirdparty/freetype/include/freetype/config/ftheader.h
index 68e14834d4..68e14834d4 100644
--- a/drivers/freetype/include/freetype/config/ftheader.h
+++ b/thirdparty/freetype/include/freetype/config/ftheader.h
diff --git a/drivers/freetype/include/freetype/config/ftmodule.h b/thirdparty/freetype/include/freetype/config/ftmodule.h
index 76d271a74b..76d271a74b 100644
--- a/drivers/freetype/include/freetype/config/ftmodule.h
+++ b/thirdparty/freetype/include/freetype/config/ftmodule.h
diff --git a/drivers/freetype/include/freetype/config/ftoption.h b/thirdparty/freetype/include/freetype/config/ftoption.h
index afd32f1cda..afd32f1cda 100644
--- a/drivers/freetype/include/freetype/config/ftoption.h
+++ b/thirdparty/freetype/include/freetype/config/ftoption.h
diff --git a/drivers/freetype/include/freetype/config/ftstdlib.h b/thirdparty/freetype/include/freetype/config/ftstdlib.h
index 562e255810..562e255810 100644
--- a/drivers/freetype/include/freetype/config/ftstdlib.h
+++ b/thirdparty/freetype/include/freetype/config/ftstdlib.h
diff --git a/drivers/freetype/include/freetype/freetype.h b/thirdparty/freetype/include/freetype/freetype.h
index 45e10c48a2..45e10c48a2 100644
--- a/drivers/freetype/include/freetype/freetype.h
+++ b/thirdparty/freetype/include/freetype/freetype.h
diff --git a/drivers/freetype/include/freetype/ftadvanc.h b/thirdparty/freetype/include/freetype/ftadvanc.h
index 023dd84b7a..023dd84b7a 100644
--- a/drivers/freetype/include/freetype/ftadvanc.h
+++ b/thirdparty/freetype/include/freetype/ftadvanc.h
diff --git a/drivers/freetype/include/freetype/ftautoh.h b/thirdparty/freetype/include/freetype/ftautoh.h
index 40c8003c4a..40c8003c4a 100644
--- a/drivers/freetype/include/freetype/ftautoh.h
+++ b/thirdparty/freetype/include/freetype/ftautoh.h
diff --git a/drivers/freetype/include/freetype/ftbbox.h b/thirdparty/freetype/include/freetype/ftbbox.h
index 2a4d214416..2a4d214416 100644
--- a/drivers/freetype/include/freetype/ftbbox.h
+++ b/thirdparty/freetype/include/freetype/ftbbox.h
diff --git a/drivers/freetype/include/freetype/ftbdf.h b/thirdparty/freetype/include/freetype/ftbdf.h
index 016dba086d..016dba086d 100644
--- a/drivers/freetype/include/freetype/ftbdf.h
+++ b/thirdparty/freetype/include/freetype/ftbdf.h
diff --git a/drivers/freetype/include/freetype/ftbitmap.h b/thirdparty/freetype/include/freetype/ftbitmap.h
index 0eac7b9d7d..0eac7b9d7d 100644
--- a/drivers/freetype/include/freetype/ftbitmap.h
+++ b/thirdparty/freetype/include/freetype/ftbitmap.h
diff --git a/drivers/freetype/include/freetype/ftbzip2.h b/thirdparty/freetype/include/freetype/ftbzip2.h
index b7f2eee87d..b7f2eee87d 100644
--- a/drivers/freetype/include/freetype/ftbzip2.h
+++ b/thirdparty/freetype/include/freetype/ftbzip2.h
diff --git a/drivers/freetype/include/freetype/ftcache.h b/thirdparty/freetype/include/freetype/ftcache.h
index 883c88d5d2..883c88d5d2 100644
--- a/drivers/freetype/include/freetype/ftcache.h
+++ b/thirdparty/freetype/include/freetype/ftcache.h
diff --git a/drivers/freetype/include/freetype/ftcffdrv.h b/thirdparty/freetype/include/freetype/ftcffdrv.h
index ad34541fdb..ad34541fdb 100644
--- a/drivers/freetype/include/freetype/ftcffdrv.h
+++ b/thirdparty/freetype/include/freetype/ftcffdrv.h
diff --git a/drivers/freetype/include/freetype/ftchapters.h b/thirdparty/freetype/include/freetype/ftchapters.h
index ab4389530e..ab4389530e 100644
--- a/drivers/freetype/include/freetype/ftchapters.h
+++ b/thirdparty/freetype/include/freetype/ftchapters.h
diff --git a/drivers/freetype/include/freetype/ftcid.h b/thirdparty/freetype/include/freetype/ftcid.h
index e1bc9fe015..e1bc9fe015 100644
--- a/drivers/freetype/include/freetype/ftcid.h
+++ b/thirdparty/freetype/include/freetype/ftcid.h
diff --git a/drivers/freetype/include/freetype/fterrdef.h b/thirdparty/freetype/include/freetype/fterrdef.h
index 3f53dd5820..3f53dd5820 100644
--- a/drivers/freetype/include/freetype/fterrdef.h
+++ b/thirdparty/freetype/include/freetype/fterrdef.h
diff --git a/drivers/freetype/include/freetype/fterrors.h b/thirdparty/freetype/include/freetype/fterrors.h
index e15bfb001e..e15bfb001e 100644
--- a/drivers/freetype/include/freetype/fterrors.h
+++ b/thirdparty/freetype/include/freetype/fterrors.h
diff --git a/drivers/freetype/include/freetype/ftfntfmt.h b/thirdparty/freetype/include/freetype/ftfntfmt.h
index bd423247bb..bd423247bb 100644
--- a/drivers/freetype/include/freetype/ftfntfmt.h
+++ b/thirdparty/freetype/include/freetype/ftfntfmt.h
diff --git a/drivers/freetype/include/freetype/ftgasp.h b/thirdparty/freetype/include/freetype/ftgasp.h
index 3f5b3bc695..3f5b3bc695 100644
--- a/drivers/freetype/include/freetype/ftgasp.h
+++ b/thirdparty/freetype/include/freetype/ftgasp.h
diff --git a/drivers/freetype/include/freetype/ftglyph.h b/thirdparty/freetype/include/freetype/ftglyph.h
index d9840a81fc..d9840a81fc 100644
--- a/drivers/freetype/include/freetype/ftglyph.h
+++ b/thirdparty/freetype/include/freetype/ftglyph.h
diff --git a/drivers/freetype/include/freetype/ftgxval.h b/thirdparty/freetype/include/freetype/ftgxval.h
index a58e86a040..a58e86a040 100644
--- a/drivers/freetype/include/freetype/ftgxval.h
+++ b/thirdparty/freetype/include/freetype/ftgxval.h
diff --git a/drivers/freetype/include/freetype/ftgzip.h b/thirdparty/freetype/include/freetype/ftgzip.h
index 3932ce6887..3932ce6887 100644
--- a/drivers/freetype/include/freetype/ftgzip.h
+++ b/thirdparty/freetype/include/freetype/ftgzip.h
diff --git a/drivers/freetype/include/freetype/ftimage.h b/thirdparty/freetype/include/freetype/ftimage.h
index 28b2704e80..28b2704e80 100644
--- a/drivers/freetype/include/freetype/ftimage.h
+++ b/thirdparty/freetype/include/freetype/ftimage.h
diff --git a/drivers/freetype/include/freetype/ftincrem.h b/thirdparty/freetype/include/freetype/ftincrem.h
index 46b58b7917..46b58b7917 100644
--- a/drivers/freetype/include/freetype/ftincrem.h
+++ b/thirdparty/freetype/include/freetype/ftincrem.h
diff --git a/drivers/freetype/include/freetype/ftlcdfil.h b/thirdparty/freetype/include/freetype/ftlcdfil.h
index e06a8957f5..e06a8957f5 100644
--- a/drivers/freetype/include/freetype/ftlcdfil.h
+++ b/thirdparty/freetype/include/freetype/ftlcdfil.h
diff --git a/drivers/freetype/include/freetype/ftlist.h b/thirdparty/freetype/include/freetype/ftlist.h
index 82f437ac61..82f437ac61 100644
--- a/drivers/freetype/include/freetype/ftlist.h
+++ b/thirdparty/freetype/include/freetype/ftlist.h
diff --git a/drivers/freetype/include/freetype/ftlzw.h b/thirdparty/freetype/include/freetype/ftlzw.h
index 582e2c1465..582e2c1465 100644
--- a/drivers/freetype/include/freetype/ftlzw.h
+++ b/thirdparty/freetype/include/freetype/ftlzw.h
diff --git a/drivers/freetype/include/freetype/ftmac.h b/thirdparty/freetype/include/freetype/ftmac.h
index adb15cadf3..adb15cadf3 100644
--- a/drivers/freetype/include/freetype/ftmac.h
+++ b/thirdparty/freetype/include/freetype/ftmac.h
diff --git a/drivers/freetype/include/freetype/ftmm.h b/thirdparty/freetype/include/freetype/ftmm.h
index 6c05f0c390..6c05f0c390 100644
--- a/drivers/freetype/include/freetype/ftmm.h
+++ b/thirdparty/freetype/include/freetype/ftmm.h
diff --git a/drivers/freetype/include/freetype/ftmodapi.h b/thirdparty/freetype/include/freetype/ftmodapi.h
index b4d2758efa..b4d2758efa 100644
--- a/drivers/freetype/include/freetype/ftmodapi.h
+++ b/thirdparty/freetype/include/freetype/ftmodapi.h
diff --git a/drivers/freetype/include/freetype/ftmoderr.h b/thirdparty/freetype/include/freetype/ftmoderr.h
index 2a7671c816..2a7671c816 100644
--- a/drivers/freetype/include/freetype/ftmoderr.h
+++ b/thirdparty/freetype/include/freetype/ftmoderr.h
diff --git a/drivers/freetype/include/freetype/ftotval.h b/thirdparty/freetype/include/freetype/ftotval.h
index 3e6e18d8a6..3e6e18d8a6 100644
--- a/drivers/freetype/include/freetype/ftotval.h
+++ b/thirdparty/freetype/include/freetype/ftotval.h
diff --git a/drivers/freetype/include/freetype/ftoutln.h b/thirdparty/freetype/include/freetype/ftoutln.h
index 6a6451207c..6a6451207c 100644
--- a/drivers/freetype/include/freetype/ftoutln.h
+++ b/thirdparty/freetype/include/freetype/ftoutln.h
diff --git a/drivers/freetype/include/freetype/ftpfr.h b/thirdparty/freetype/include/freetype/ftpfr.h
index 2e1bff2f67..2e1bff2f67 100644
--- a/drivers/freetype/include/freetype/ftpfr.h
+++ b/thirdparty/freetype/include/freetype/ftpfr.h
diff --git a/drivers/freetype/include/freetype/ftrender.h b/thirdparty/freetype/include/freetype/ftrender.h
index 9f7ed9e9d9..9f7ed9e9d9 100644
--- a/drivers/freetype/include/freetype/ftrender.h
+++ b/thirdparty/freetype/include/freetype/ftrender.h
diff --git a/drivers/freetype/include/freetype/ftsizes.h b/thirdparty/freetype/include/freetype/ftsizes.h
index 55e0d5ccfd..55e0d5ccfd 100644
--- a/drivers/freetype/include/freetype/ftsizes.h
+++ b/thirdparty/freetype/include/freetype/ftsizes.h
diff --git a/drivers/freetype/include/freetype/ftsnames.h b/thirdparty/freetype/include/freetype/ftsnames.h
index a7b51c2cba..a7b51c2cba 100644
--- a/drivers/freetype/include/freetype/ftsnames.h
+++ b/thirdparty/freetype/include/freetype/ftsnames.h
diff --git a/drivers/freetype/include/freetype/ftstroke.h b/thirdparty/freetype/include/freetype/ftstroke.h
index b3b9922dad..b3b9922dad 100644
--- a/drivers/freetype/include/freetype/ftstroke.h
+++ b/thirdparty/freetype/include/freetype/ftstroke.h
diff --git a/drivers/freetype/include/freetype/ftsynth.h b/thirdparty/freetype/include/freetype/ftsynth.h
index fdfcb6912b..fdfcb6912b 100644
--- a/drivers/freetype/include/freetype/ftsynth.h
+++ b/thirdparty/freetype/include/freetype/ftsynth.h
diff --git a/drivers/freetype/include/freetype/ftsystem.h b/thirdparty/freetype/include/freetype/ftsystem.h
index a75f958022..a75f958022 100644
--- a/drivers/freetype/include/freetype/ftsystem.h
+++ b/thirdparty/freetype/include/freetype/ftsystem.h
diff --git a/drivers/freetype/include/freetype/fttrigon.h b/thirdparty/freetype/include/freetype/fttrigon.h
index f789b524cb..f789b524cb 100644
--- a/drivers/freetype/include/freetype/fttrigon.h
+++ b/thirdparty/freetype/include/freetype/fttrigon.h
diff --git a/drivers/freetype/include/freetype/ftttdrv.h b/thirdparty/freetype/include/freetype/ftttdrv.h
index 0d868bc259..0d868bc259 100644
--- a/drivers/freetype/include/freetype/ftttdrv.h
+++ b/thirdparty/freetype/include/freetype/ftttdrv.h
diff --git a/drivers/freetype/include/freetype/fttypes.h b/thirdparty/freetype/include/freetype/fttypes.h
index 2673e79c3c..2673e79c3c 100644
--- a/drivers/freetype/include/freetype/fttypes.h
+++ b/thirdparty/freetype/include/freetype/fttypes.h
diff --git a/drivers/freetype/include/freetype/ftwinfnt.h b/thirdparty/freetype/include/freetype/ftwinfnt.h
index a1a715baa1..a1a715baa1 100644
--- a/drivers/freetype/include/freetype/ftwinfnt.h
+++ b/thirdparty/freetype/include/freetype/ftwinfnt.h
diff --git a/drivers/freetype/include/freetype/internal/autohint.h b/thirdparty/freetype/include/freetype/internal/autohint.h
index 7ef82b8f3c..7ef82b8f3c 100644
--- a/drivers/freetype/include/freetype/internal/autohint.h
+++ b/thirdparty/freetype/include/freetype/internal/autohint.h
diff --git a/drivers/freetype/include/freetype/internal/ftcalc.h b/thirdparty/freetype/include/freetype/internal/ftcalc.h
index 8a884f680a..8a884f680a 100644
--- a/drivers/freetype/include/freetype/internal/ftcalc.h
+++ b/thirdparty/freetype/include/freetype/internal/ftcalc.h
diff --git a/drivers/freetype/include/freetype/internal/ftdebug.h b/thirdparty/freetype/include/freetype/internal/ftdebug.h
index d110457157..d110457157 100644
--- a/drivers/freetype/include/freetype/internal/ftdebug.h
+++ b/thirdparty/freetype/include/freetype/internal/ftdebug.h
diff --git a/drivers/freetype/include/freetype/internal/ftdriver.h b/thirdparty/freetype/include/freetype/internal/ftdriver.h
index 3e1e66e979..3e1e66e979 100644
--- a/drivers/freetype/include/freetype/internal/ftdriver.h
+++ b/thirdparty/freetype/include/freetype/internal/ftdriver.h
diff --git a/drivers/freetype/include/freetype/internal/ftgloadr.h b/thirdparty/freetype/include/freetype/internal/ftgloadr.h
index bebf5dbba2..bebf5dbba2 100644
--- a/drivers/freetype/include/freetype/internal/ftgloadr.h
+++ b/thirdparty/freetype/include/freetype/internal/ftgloadr.h
diff --git a/drivers/freetype/include/freetype/internal/fthash.h b/thirdparty/freetype/include/freetype/internal/fthash.h
index f22f9d5d39..f22f9d5d39 100644
--- a/drivers/freetype/include/freetype/internal/fthash.h
+++ b/thirdparty/freetype/include/freetype/internal/fthash.h
diff --git a/drivers/freetype/include/freetype/internal/ftmemory.h b/thirdparty/freetype/include/freetype/internal/ftmemory.h
index 8c06fc21a5..8c06fc21a5 100644
--- a/drivers/freetype/include/freetype/internal/ftmemory.h
+++ b/thirdparty/freetype/include/freetype/internal/ftmemory.h
diff --git a/drivers/freetype/include/freetype/internal/ftobjs.h b/thirdparty/freetype/include/freetype/internal/ftobjs.h
index e3fa32083b..e3fa32083b 100644
--- a/drivers/freetype/include/freetype/internal/ftobjs.h
+++ b/thirdparty/freetype/include/freetype/internal/ftobjs.h
diff --git a/drivers/freetype/include/freetype/internal/ftpic.h b/thirdparty/freetype/include/freetype/internal/ftpic.h
index 6d800a08a1..6d800a08a1 100644
--- a/drivers/freetype/include/freetype/internal/ftpic.h
+++ b/thirdparty/freetype/include/freetype/internal/ftpic.h
diff --git a/drivers/freetype/include/freetype/internal/ftrfork.h b/thirdparty/freetype/include/freetype/internal/ftrfork.h
index b923401e68..b923401e68 100644
--- a/drivers/freetype/include/freetype/internal/ftrfork.h
+++ b/thirdparty/freetype/include/freetype/internal/ftrfork.h
diff --git a/drivers/freetype/include/freetype/internal/ftserv.h b/thirdparty/freetype/include/freetype/internal/ftserv.h
index 91897177ba..91897177ba 100644
--- a/drivers/freetype/include/freetype/internal/ftserv.h
+++ b/thirdparty/freetype/include/freetype/internal/ftserv.h
diff --git a/drivers/freetype/include/freetype/internal/ftstream.h b/thirdparty/freetype/include/freetype/internal/ftstream.h
index 6d04875657..6d04875657 100644
--- a/drivers/freetype/include/freetype/internal/ftstream.h
+++ b/thirdparty/freetype/include/freetype/internal/ftstream.h
diff --git a/drivers/freetype/include/freetype/internal/fttrace.h b/thirdparty/freetype/include/freetype/internal/fttrace.h
index efb3355954..efb3355954 100644
--- a/drivers/freetype/include/freetype/internal/fttrace.h
+++ b/thirdparty/freetype/include/freetype/internal/fttrace.h
diff --git a/drivers/freetype/include/freetype/internal/ftvalid.h b/thirdparty/freetype/include/freetype/internal/ftvalid.h
index aac92c9af8..aac92c9af8 100644
--- a/drivers/freetype/include/freetype/internal/ftvalid.h
+++ b/thirdparty/freetype/include/freetype/internal/ftvalid.h
diff --git a/drivers/freetype/include/freetype/internal/internal.h b/thirdparty/freetype/include/freetype/internal/internal.h
index 8c3c14c12a..8c3c14c12a 100644
--- a/drivers/freetype/include/freetype/internal/internal.h
+++ b/thirdparty/freetype/include/freetype/internal/internal.h
diff --git a/drivers/freetype/include/freetype/internal/psaux.h b/thirdparty/freetype/include/freetype/internal/psaux.h
index 15dedfd28e..15dedfd28e 100644
--- a/drivers/freetype/include/freetype/internal/psaux.h
+++ b/thirdparty/freetype/include/freetype/internal/psaux.h
diff --git a/drivers/freetype/include/freetype/internal/pshints.h b/thirdparty/freetype/include/freetype/internal/pshints.h
index e60dc9cd55..e60dc9cd55 100644
--- a/drivers/freetype/include/freetype/internal/pshints.h
+++ b/thirdparty/freetype/include/freetype/internal/pshints.h
diff --git a/drivers/freetype/include/freetype/internal/services/svbdf.h b/thirdparty/freetype/include/freetype/internal/services/svbdf.h
index c24475fc20..c24475fc20 100644
--- a/drivers/freetype/include/freetype/internal/services/svbdf.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svbdf.h
diff --git a/drivers/freetype/include/freetype/internal/services/svcid.h b/thirdparty/freetype/include/freetype/internal/services/svcid.h
index dbbe6044a4..dbbe6044a4 100644
--- a/drivers/freetype/include/freetype/internal/services/svcid.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svcid.h
diff --git a/drivers/freetype/include/freetype/internal/services/svfntfmt.h b/thirdparty/freetype/include/freetype/internal/services/svfntfmt.h
index bd295c9c6b..bd295c9c6b 100644
--- a/drivers/freetype/include/freetype/internal/services/svfntfmt.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svfntfmt.h
diff --git a/drivers/freetype/include/freetype/internal/services/svgldict.h b/thirdparty/freetype/include/freetype/internal/services/svgldict.h
index fff29bc40c..fff29bc40c 100644
--- a/drivers/freetype/include/freetype/internal/services/svgldict.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svgldict.h
diff --git a/drivers/freetype/include/freetype/internal/services/svgxval.h b/thirdparty/freetype/include/freetype/internal/services/svgxval.h
index fb8ffba83c..fb8ffba83c 100644
--- a/drivers/freetype/include/freetype/internal/services/svgxval.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svgxval.h
diff --git a/drivers/freetype/include/freetype/internal/services/svkern.h b/thirdparty/freetype/include/freetype/internal/services/svkern.h
index a636f1af1c..a636f1af1c 100644
--- a/drivers/freetype/include/freetype/internal/services/svkern.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svkern.h
diff --git a/drivers/freetype/include/freetype/internal/services/svmm.h b/thirdparty/freetype/include/freetype/internal/services/svmm.h
index b78a19f8e0..b78a19f8e0 100644
--- a/drivers/freetype/include/freetype/internal/services/svmm.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svmm.h
diff --git a/drivers/freetype/include/freetype/internal/services/svotval.h b/thirdparty/freetype/include/freetype/internal/services/svotval.h
index bc929d4bd9..bc929d4bd9 100644
--- a/drivers/freetype/include/freetype/internal/services/svotval.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svotval.h
diff --git a/drivers/freetype/include/freetype/internal/services/svpfr.h b/thirdparty/freetype/include/freetype/internal/services/svpfr.h
index d0f7c4df95..d0f7c4df95 100644
--- a/drivers/freetype/include/freetype/internal/services/svpfr.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svpfr.h
diff --git a/drivers/freetype/include/freetype/internal/services/svpostnm.h b/thirdparty/freetype/include/freetype/internal/services/svpostnm.h
index f124380050..f124380050 100644
--- a/drivers/freetype/include/freetype/internal/services/svpostnm.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svpostnm.h
diff --git a/drivers/freetype/include/freetype/internal/services/svprop.h b/thirdparty/freetype/include/freetype/internal/services/svprop.h
index 870e90ed7c..870e90ed7c 100644
--- a/drivers/freetype/include/freetype/internal/services/svprop.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svprop.h
diff --git a/drivers/freetype/include/freetype/internal/services/svpscmap.h b/thirdparty/freetype/include/freetype/internal/services/svpscmap.h
index 9acc21690f..9acc21690f 100644
--- a/drivers/freetype/include/freetype/internal/services/svpscmap.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svpscmap.h
diff --git a/drivers/freetype/include/freetype/internal/services/svpsinfo.h b/thirdparty/freetype/include/freetype/internal/services/svpsinfo.h
index f2c8060440..f2c8060440 100644
--- a/drivers/freetype/include/freetype/internal/services/svpsinfo.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svpsinfo.h
diff --git a/drivers/freetype/include/freetype/internal/services/svsfnt.h b/thirdparty/freetype/include/freetype/internal/services/svsfnt.h
index 0f38cf195f..0f38cf195f 100644
--- a/drivers/freetype/include/freetype/internal/services/svsfnt.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svsfnt.h
diff --git a/drivers/freetype/include/freetype/internal/services/svttcmap.h b/thirdparty/freetype/include/freetype/internal/services/svttcmap.h
index 772c72189e..772c72189e 100644
--- a/drivers/freetype/include/freetype/internal/services/svttcmap.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svttcmap.h
diff --git a/drivers/freetype/include/freetype/internal/services/svtteng.h b/thirdparty/freetype/include/freetype/internal/services/svtteng.h
index c55061a034..c55061a034 100644
--- a/drivers/freetype/include/freetype/internal/services/svtteng.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svtteng.h
diff --git a/drivers/freetype/include/freetype/internal/services/svttglyf.h b/thirdparty/freetype/include/freetype/internal/services/svttglyf.h
index c33edd46de..c33edd46de 100644
--- a/drivers/freetype/include/freetype/internal/services/svttglyf.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svttglyf.h
diff --git a/drivers/freetype/include/freetype/internal/services/svwinfnt.h b/thirdparty/freetype/include/freetype/internal/services/svwinfnt.h
index c2f6d4c6d3..c2f6d4c6d3 100644
--- a/drivers/freetype/include/freetype/internal/services/svwinfnt.h
+++ b/thirdparty/freetype/include/freetype/internal/services/svwinfnt.h
diff --git a/drivers/freetype/include/freetype/internal/sfnt.h b/thirdparty/freetype/include/freetype/internal/sfnt.h
index e139315a1f..e139315a1f 100644
--- a/drivers/freetype/include/freetype/internal/sfnt.h
+++ b/thirdparty/freetype/include/freetype/internal/sfnt.h
diff --git a/drivers/freetype/include/freetype/internal/t1types.h b/thirdparty/freetype/include/freetype/internal/t1types.h
index 494c011fc7..494c011fc7 100644
--- a/drivers/freetype/include/freetype/internal/t1types.h
+++ b/thirdparty/freetype/include/freetype/internal/t1types.h
diff --git a/drivers/freetype/include/freetype/internal/tttypes.h b/thirdparty/freetype/include/freetype/internal/tttypes.h
index 4110d50285..4110d50285 100644
--- a/drivers/freetype/include/freetype/internal/tttypes.h
+++ b/thirdparty/freetype/include/freetype/internal/tttypes.h
diff --git a/drivers/freetype/include/freetype/t1tables.h b/thirdparty/freetype/include/freetype/t1tables.h
index e272324ba2..e272324ba2 100644
--- a/drivers/freetype/include/freetype/t1tables.h
+++ b/thirdparty/freetype/include/freetype/t1tables.h
diff --git a/drivers/freetype/include/freetype/ttnameid.h b/thirdparty/freetype/include/freetype/ttnameid.h
index ce707f1645..ce707f1645 100644
--- a/drivers/freetype/include/freetype/ttnameid.h
+++ b/thirdparty/freetype/include/freetype/ttnameid.h
diff --git a/drivers/freetype/include/freetype/tttables.h b/thirdparty/freetype/include/freetype/tttables.h
index 1c075dcf66..1c075dcf66 100644
--- a/drivers/freetype/include/freetype/tttables.h
+++ b/thirdparty/freetype/include/freetype/tttables.h
diff --git a/drivers/freetype/include/freetype/tttags.h b/thirdparty/freetype/include/freetype/tttags.h
index f3c9aa5fc7..f3c9aa5fc7 100644
--- a/drivers/freetype/include/freetype/tttags.h
+++ b/thirdparty/freetype/include/freetype/tttags.h
diff --git a/drivers/freetype/include/freetype/ttunpat.h b/thirdparty/freetype/include/freetype/ttunpat.h
index ca4676baf8..ca4676baf8 100644
--- a/drivers/freetype/include/freetype/ttunpat.h
+++ b/thirdparty/freetype/include/freetype/ttunpat.h
diff --git a/drivers/freetype/include/ft2build.h b/thirdparty/freetype/include/ft2build.h
index 1e8a9b4994..1e8a9b4994 100644
--- a/drivers/freetype/include/ft2build.h
+++ b/thirdparty/freetype/include/ft2build.h
diff --git a/drivers/freetype/src/autofit/afangles.c b/thirdparty/freetype/src/autofit/afangles.c
index b856e57a8b..b856e57a8b 100644
--- a/drivers/freetype/src/autofit/afangles.c
+++ b/thirdparty/freetype/src/autofit/afangles.c
diff --git a/drivers/freetype/src/autofit/afangles.h b/thirdparty/freetype/src/autofit/afangles.h
index f33f9e108e..f33f9e108e 100644
--- a/drivers/freetype/src/autofit/afangles.h
+++ b/thirdparty/freetype/src/autofit/afangles.h
diff --git a/drivers/freetype/src/autofit/afblue.c b/thirdparty/freetype/src/autofit/afblue.c
index 95786ed6f2..95786ed6f2 100644
--- a/drivers/freetype/src/autofit/afblue.c
+++ b/thirdparty/freetype/src/autofit/afblue.c
diff --git a/drivers/freetype/src/autofit/afblue.cin b/thirdparty/freetype/src/autofit/afblue.cin
index 0c3cae818f..0c3cae818f 100644
--- a/drivers/freetype/src/autofit/afblue.cin
+++ b/thirdparty/freetype/src/autofit/afblue.cin
diff --git a/drivers/freetype/src/autofit/afblue.dat b/thirdparty/freetype/src/autofit/afblue.dat
index 0734ec71f0..0734ec71f0 100644
--- a/drivers/freetype/src/autofit/afblue.dat
+++ b/thirdparty/freetype/src/autofit/afblue.dat
diff --git a/drivers/freetype/src/autofit/afblue.h b/thirdparty/freetype/src/autofit/afblue.h
index 41f838e457..41f838e457 100644
--- a/drivers/freetype/src/autofit/afblue.h
+++ b/thirdparty/freetype/src/autofit/afblue.h
diff --git a/drivers/freetype/src/autofit/afblue.hin b/thirdparty/freetype/src/autofit/afblue.hin
index dd44e77254..dd44e77254 100644
--- a/drivers/freetype/src/autofit/afblue.hin
+++ b/thirdparty/freetype/src/autofit/afblue.hin
diff --git a/drivers/freetype/src/autofit/afcjk.c b/thirdparty/freetype/src/autofit/afcjk.c
index 4823c1d7f8..4823c1d7f8 100644
--- a/drivers/freetype/src/autofit/afcjk.c
+++ b/thirdparty/freetype/src/autofit/afcjk.c
diff --git a/drivers/freetype/src/autofit/afcjk.h b/thirdparty/freetype/src/autofit/afcjk.h
index 40d1184386..40d1184386 100644
--- a/drivers/freetype/src/autofit/afcjk.h
+++ b/thirdparty/freetype/src/autofit/afcjk.h
diff --git a/drivers/freetype/src/autofit/afcover.h b/thirdparty/freetype/src/autofit/afcover.h
index 1c39a707ef..1c39a707ef 100644
--- a/drivers/freetype/src/autofit/afcover.h
+++ b/thirdparty/freetype/src/autofit/afcover.h
diff --git a/drivers/freetype/src/autofit/afdummy.c b/thirdparty/freetype/src/autofit/afdummy.c
index f3960c85fd..f3960c85fd 100644
--- a/drivers/freetype/src/autofit/afdummy.c
+++ b/thirdparty/freetype/src/autofit/afdummy.c
diff --git a/drivers/freetype/src/autofit/afdummy.h b/thirdparty/freetype/src/autofit/afdummy.h
index 7e58d1a9a5..7e58d1a9a5 100644
--- a/drivers/freetype/src/autofit/afdummy.h
+++ b/thirdparty/freetype/src/autofit/afdummy.h
diff --git a/drivers/freetype/src/autofit/aferrors.h b/thirdparty/freetype/src/autofit/aferrors.h
index 53c01f64dd..53c01f64dd 100644
--- a/drivers/freetype/src/autofit/aferrors.h
+++ b/thirdparty/freetype/src/autofit/aferrors.h
diff --git a/drivers/freetype/src/autofit/afglobal.c b/thirdparty/freetype/src/autofit/afglobal.c
index ac6dcafc0f..ac6dcafc0f 100644
--- a/drivers/freetype/src/autofit/afglobal.c
+++ b/thirdparty/freetype/src/autofit/afglobal.c
diff --git a/drivers/freetype/src/autofit/afglobal.h b/thirdparty/freetype/src/autofit/afglobal.h
index ce6b9e8f26..ce6b9e8f26 100644
--- a/drivers/freetype/src/autofit/afglobal.h
+++ b/thirdparty/freetype/src/autofit/afglobal.h
diff --git a/drivers/freetype/src/autofit/afhints.c b/thirdparty/freetype/src/autofit/afhints.c
index 6c3d032d1c..6c3d032d1c 100644
--- a/drivers/freetype/src/autofit/afhints.c
+++ b/thirdparty/freetype/src/autofit/afhints.c
diff --git a/drivers/freetype/src/autofit/afhints.h b/thirdparty/freetype/src/autofit/afhints.h
index 5142e6ed21..5142e6ed21 100644
--- a/drivers/freetype/src/autofit/afhints.h
+++ b/thirdparty/freetype/src/autofit/afhints.h
diff --git a/drivers/freetype/src/autofit/afindic.c b/thirdparty/freetype/src/autofit/afindic.c
index 097a2b2995..097a2b2995 100644
--- a/drivers/freetype/src/autofit/afindic.c
+++ b/thirdparty/freetype/src/autofit/afindic.c
diff --git a/drivers/freetype/src/autofit/afindic.h b/thirdparty/freetype/src/autofit/afindic.h
index 0772e07a29..0772e07a29 100644
--- a/drivers/freetype/src/autofit/afindic.h
+++ b/thirdparty/freetype/src/autofit/afindic.h
diff --git a/drivers/freetype/src/autofit/aflatin.c b/thirdparty/freetype/src/autofit/aflatin.c
index 7ccf3f6e37..7ccf3f6e37 100644
--- a/drivers/freetype/src/autofit/aflatin.c
+++ b/thirdparty/freetype/src/autofit/aflatin.c
diff --git a/drivers/freetype/src/autofit/aflatin.h b/thirdparty/freetype/src/autofit/aflatin.h
index fe6bbd801a..fe6bbd801a 100644
--- a/drivers/freetype/src/autofit/aflatin.h
+++ b/thirdparty/freetype/src/autofit/aflatin.h
diff --git a/drivers/freetype/src/autofit/aflatin2.c b/thirdparty/freetype/src/autofit/aflatin2.c
index 5db4a41141..5db4a41141 100644
--- a/drivers/freetype/src/autofit/aflatin2.c
+++ b/thirdparty/freetype/src/autofit/aflatin2.c
diff --git a/drivers/freetype/src/autofit/aflatin2.h b/thirdparty/freetype/src/autofit/aflatin2.h
index f83f704289..f83f704289 100644
--- a/drivers/freetype/src/autofit/aflatin2.h
+++ b/thirdparty/freetype/src/autofit/aflatin2.h
diff --git a/drivers/freetype/src/autofit/afloader.c b/thirdparty/freetype/src/autofit/afloader.c
index 26bba065bb..26bba065bb 100644
--- a/drivers/freetype/src/autofit/afloader.c
+++ b/thirdparty/freetype/src/autofit/afloader.c
diff --git a/drivers/freetype/src/autofit/afloader.h b/thirdparty/freetype/src/autofit/afloader.h
index 0062eb9b07..0062eb9b07 100644
--- a/drivers/freetype/src/autofit/afloader.h
+++ b/thirdparty/freetype/src/autofit/afloader.h
diff --git a/drivers/freetype/src/autofit/afmodule.c b/thirdparty/freetype/src/autofit/afmodule.c
index 4127382c00..4127382c00 100644
--- a/drivers/freetype/src/autofit/afmodule.c
+++ b/thirdparty/freetype/src/autofit/afmodule.c
diff --git a/drivers/freetype/src/autofit/afmodule.h b/thirdparty/freetype/src/autofit/afmodule.h
index e65db5f5cb..e65db5f5cb 100644
--- a/drivers/freetype/src/autofit/afmodule.h
+++ b/thirdparty/freetype/src/autofit/afmodule.h
diff --git a/drivers/freetype/src/autofit/afpic.c b/thirdparty/freetype/src/autofit/afpic.c
index 3cbd9168e3..3cbd9168e3 100644
--- a/drivers/freetype/src/autofit/afpic.c
+++ b/thirdparty/freetype/src/autofit/afpic.c
diff --git a/drivers/freetype/src/autofit/afpic.h b/thirdparty/freetype/src/autofit/afpic.h
index 98a45a26ba..98a45a26ba 100644
--- a/drivers/freetype/src/autofit/afpic.h
+++ b/thirdparty/freetype/src/autofit/afpic.h
diff --git a/drivers/freetype/src/autofit/afranges.c b/thirdparty/freetype/src/autofit/afranges.c
index 732f3d1629..732f3d1629 100644
--- a/drivers/freetype/src/autofit/afranges.c
+++ b/thirdparty/freetype/src/autofit/afranges.c
diff --git a/drivers/freetype/src/autofit/afranges.h b/thirdparty/freetype/src/autofit/afranges.h
index 1a0e4b1535..1a0e4b1535 100644
--- a/drivers/freetype/src/autofit/afranges.h
+++ b/thirdparty/freetype/src/autofit/afranges.h
diff --git a/drivers/freetype/src/autofit/afscript.h b/thirdparty/freetype/src/autofit/afscript.h
index 33c3012981..33c3012981 100644
--- a/drivers/freetype/src/autofit/afscript.h
+++ b/thirdparty/freetype/src/autofit/afscript.h
diff --git a/drivers/freetype/src/autofit/afshaper.c b/thirdparty/freetype/src/autofit/afshaper.c
index 6d13b65859..6d13b65859 100644
--- a/drivers/freetype/src/autofit/afshaper.c
+++ b/thirdparty/freetype/src/autofit/afshaper.c
diff --git a/drivers/freetype/src/autofit/afshaper.h b/thirdparty/freetype/src/autofit/afshaper.h
index 0d41f78762..0d41f78762 100644
--- a/drivers/freetype/src/autofit/afshaper.h
+++ b/thirdparty/freetype/src/autofit/afshaper.h
diff --git a/drivers/freetype/src/autofit/afstyles.h b/thirdparty/freetype/src/autofit/afstyles.h
index e83a95bb59..e83a95bb59 100644
--- a/drivers/freetype/src/autofit/afstyles.h
+++ b/thirdparty/freetype/src/autofit/afstyles.h
diff --git a/drivers/freetype/src/autofit/aftypes.h b/thirdparty/freetype/src/autofit/aftypes.h
index ef62043c8a..ef62043c8a 100644
--- a/drivers/freetype/src/autofit/aftypes.h
+++ b/thirdparty/freetype/src/autofit/aftypes.h
diff --git a/drivers/freetype/src/autofit/afwarp.c b/thirdparty/freetype/src/autofit/afwarp.c
index ce1806c9d3..ce1806c9d3 100644
--- a/drivers/freetype/src/autofit/afwarp.c
+++ b/thirdparty/freetype/src/autofit/afwarp.c
diff --git a/drivers/freetype/src/autofit/afwarp.h b/thirdparty/freetype/src/autofit/afwarp.h
index 6d96f86d73..6d96f86d73 100644
--- a/drivers/freetype/src/autofit/afwarp.h
+++ b/thirdparty/freetype/src/autofit/afwarp.h
diff --git a/drivers/freetype/src/autofit/afwrtsys.h b/thirdparty/freetype/src/autofit/afwrtsys.h
index 842f4921a4..842f4921a4 100644
--- a/drivers/freetype/src/autofit/afwrtsys.h
+++ b/thirdparty/freetype/src/autofit/afwrtsys.h
diff --git a/drivers/freetype/src/autofit/autofit.c b/thirdparty/freetype/src/autofit/autofit.c
index dda9aeb6d7..dda9aeb6d7 100644
--- a/drivers/freetype/src/autofit/autofit.c
+++ b/thirdparty/freetype/src/autofit/autofit.c
diff --git a/drivers/freetype/src/autofit/module.mk b/thirdparty/freetype/src/autofit/module.mk
index 98f0612b99..98f0612b99 100644
--- a/drivers/freetype/src/autofit/module.mk
+++ b/thirdparty/freetype/src/autofit/module.mk
diff --git a/drivers/freetype/src/autofit/rules.mk b/thirdparty/freetype/src/autofit/rules.mk
index 1ef4704649..1ef4704649 100644
--- a/drivers/freetype/src/autofit/rules.mk
+++ b/thirdparty/freetype/src/autofit/rules.mk
diff --git a/drivers/freetype/src/base/basepic.c b/thirdparty/freetype/src/base/basepic.c
index f2cea90d7c..f2cea90d7c 100644
--- a/drivers/freetype/src/base/basepic.c
+++ b/thirdparty/freetype/src/base/basepic.c
diff --git a/drivers/freetype/src/base/basepic.h b/thirdparty/freetype/src/base/basepic.h
index a1a75a0bad..a1a75a0bad 100644
--- a/drivers/freetype/src/base/basepic.h
+++ b/thirdparty/freetype/src/base/basepic.h
diff --git a/drivers/freetype/src/base/ftadvanc.c b/thirdparty/freetype/src/base/ftadvanc.c
index 9e2ab89845..9e2ab89845 100644
--- a/drivers/freetype/src/base/ftadvanc.c
+++ b/thirdparty/freetype/src/base/ftadvanc.c
diff --git a/drivers/freetype/src/base/ftapi.c b/thirdparty/freetype/src/base/ftapi.c
index b94c3eb9fb..b94c3eb9fb 100644
--- a/drivers/freetype/src/base/ftapi.c
+++ b/thirdparty/freetype/src/base/ftapi.c
diff --git a/drivers/freetype/src/base/ftbase.c b/thirdparty/freetype/src/base/ftbase.c
index ab1af6f9f3..ab1af6f9f3 100644
--- a/drivers/freetype/src/base/ftbase.c
+++ b/thirdparty/freetype/src/base/ftbase.c
diff --git a/drivers/freetype/src/base/ftbase.h b/thirdparty/freetype/src/base/ftbase.h
index 717fdaae24..717fdaae24 100644
--- a/drivers/freetype/src/base/ftbase.h
+++ b/thirdparty/freetype/src/base/ftbase.h
diff --git a/drivers/freetype/src/base/ftbbox.c b/thirdparty/freetype/src/base/ftbbox.c
index d3e45ffa0d..d3e45ffa0d 100644
--- a/drivers/freetype/src/base/ftbbox.c
+++ b/thirdparty/freetype/src/base/ftbbox.c
diff --git a/drivers/freetype/src/base/ftbdf.c b/thirdparty/freetype/src/base/ftbdf.c
index 4aafc2b98e..4aafc2b98e 100644
--- a/drivers/freetype/src/base/ftbdf.c
+++ b/thirdparty/freetype/src/base/ftbdf.c
diff --git a/drivers/freetype/src/base/ftbitmap.c b/thirdparty/freetype/src/base/ftbitmap.c
index 24fead3e15..24fead3e15 100644
--- a/drivers/freetype/src/base/ftbitmap.c
+++ b/thirdparty/freetype/src/base/ftbitmap.c
diff --git a/drivers/freetype/src/base/ftcalc.c b/thirdparty/freetype/src/base/ftcalc.c
index 67549d0c43..67549d0c43 100644
--- a/drivers/freetype/src/base/ftcalc.c
+++ b/thirdparty/freetype/src/base/ftcalc.c
diff --git a/drivers/freetype/src/base/ftcid.c b/thirdparty/freetype/src/base/ftcid.c
index 251bbd009a..251bbd009a 100644
--- a/drivers/freetype/src/base/ftcid.c
+++ b/thirdparty/freetype/src/base/ftcid.c
diff --git a/drivers/freetype/src/base/ftdbgmem.c b/thirdparty/freetype/src/base/ftdbgmem.c
index 6ab5072748..6ab5072748 100644
--- a/drivers/freetype/src/base/ftdbgmem.c
+++ b/thirdparty/freetype/src/base/ftdbgmem.c
diff --git a/drivers/freetype/src/base/ftdebug.c b/thirdparty/freetype/src/base/ftdebug.c
index 40925d14a0..40925d14a0 100644
--- a/drivers/freetype/src/base/ftdebug.c
+++ b/thirdparty/freetype/src/base/ftdebug.c
diff --git a/drivers/freetype/src/base/ftfntfmt.c b/thirdparty/freetype/src/base/ftfntfmt.c
index c6eb3190c6..c6eb3190c6 100644
--- a/drivers/freetype/src/base/ftfntfmt.c
+++ b/thirdparty/freetype/src/base/ftfntfmt.c
diff --git a/drivers/freetype/src/base/ftfstype.c b/thirdparty/freetype/src/base/ftfstype.c
index ae56c8fc8d..ae56c8fc8d 100644
--- a/drivers/freetype/src/base/ftfstype.c
+++ b/thirdparty/freetype/src/base/ftfstype.c
diff --git a/drivers/freetype/src/base/ftgasp.c b/thirdparty/freetype/src/base/ftgasp.c
index e38e55b6c0..e38e55b6c0 100644
--- a/drivers/freetype/src/base/ftgasp.c
+++ b/thirdparty/freetype/src/base/ftgasp.c
diff --git a/drivers/freetype/src/base/ftgloadr.c b/thirdparty/freetype/src/base/ftgloadr.c
index c4f0ff70f4..c4f0ff70f4 100644
--- a/drivers/freetype/src/base/ftgloadr.c
+++ b/thirdparty/freetype/src/base/ftgloadr.c
diff --git a/drivers/freetype/src/base/ftglyph.c b/thirdparty/freetype/src/base/ftglyph.c
index c2376dd03a..c2376dd03a 100644
--- a/drivers/freetype/src/base/ftglyph.c
+++ b/thirdparty/freetype/src/base/ftglyph.c
diff --git a/drivers/freetype/src/base/ftgxval.c b/thirdparty/freetype/src/base/ftgxval.c
index 6667b371a1..6667b371a1 100644
--- a/drivers/freetype/src/base/ftgxval.c
+++ b/thirdparty/freetype/src/base/ftgxval.c
diff --git a/drivers/freetype/src/base/fthash.c b/thirdparty/freetype/src/base/fthash.c
index 21bc8dd5b4..21bc8dd5b4 100644
--- a/drivers/freetype/src/base/fthash.c
+++ b/thirdparty/freetype/src/base/fthash.c
diff --git a/drivers/freetype/src/base/ftinit.c b/thirdparty/freetype/src/base/ftinit.c
index c2dd0a7b37..c2dd0a7b37 100644
--- a/drivers/freetype/src/base/ftinit.c
+++ b/thirdparty/freetype/src/base/ftinit.c
diff --git a/drivers/freetype/src/base/ftlcdfil.c b/thirdparty/freetype/src/base/ftlcdfil.c
index 8bcbed7aab..8bcbed7aab 100644
--- a/drivers/freetype/src/base/ftlcdfil.c
+++ b/thirdparty/freetype/src/base/ftlcdfil.c
diff --git a/drivers/freetype/src/base/ftmac.c b/thirdparty/freetype/src/base/ftmac.c
index e97fdbfc22..e97fdbfc22 100644
--- a/drivers/freetype/src/base/ftmac.c
+++ b/thirdparty/freetype/src/base/ftmac.c
diff --git a/drivers/freetype/src/base/ftmm.c b/thirdparty/freetype/src/base/ftmm.c
index 6b759ca467..6b759ca467 100644
--- a/drivers/freetype/src/base/ftmm.c
+++ b/thirdparty/freetype/src/base/ftmm.c
diff --git a/drivers/freetype/src/base/ftobjs.c b/thirdparty/freetype/src/base/ftobjs.c
index c2dc6183b0..c2dc6183b0 100644
--- a/drivers/freetype/src/base/ftobjs.c
+++ b/thirdparty/freetype/src/base/ftobjs.c
diff --git a/drivers/freetype/src/base/ftotval.c b/thirdparty/freetype/src/base/ftotval.c
index fe54e0228a..fe54e0228a 100644
--- a/drivers/freetype/src/base/ftotval.c
+++ b/thirdparty/freetype/src/base/ftotval.c
diff --git a/drivers/freetype/src/base/ftoutln.c b/thirdparty/freetype/src/base/ftoutln.c
index fc28225c6a..fc28225c6a 100644
--- a/drivers/freetype/src/base/ftoutln.c
+++ b/thirdparty/freetype/src/base/ftoutln.c
diff --git a/drivers/freetype/src/base/ftpatent.c b/thirdparty/freetype/src/base/ftpatent.c
index 4861be130e..4861be130e 100644
--- a/drivers/freetype/src/base/ftpatent.c
+++ b/thirdparty/freetype/src/base/ftpatent.c
diff --git a/drivers/freetype/src/base/ftpfr.c b/thirdparty/freetype/src/base/ftpfr.c
index 81faa529c3..81faa529c3 100644
--- a/drivers/freetype/src/base/ftpfr.c
+++ b/thirdparty/freetype/src/base/ftpfr.c
diff --git a/drivers/freetype/src/base/ftpic.c b/thirdparty/freetype/src/base/ftpic.c
index 03769dba22..03769dba22 100644
--- a/drivers/freetype/src/base/ftpic.c
+++ b/thirdparty/freetype/src/base/ftpic.c
diff --git a/drivers/freetype/src/base/ftrfork.c b/thirdparty/freetype/src/base/ftrfork.c
index 4660c971cf..4660c971cf 100644
--- a/drivers/freetype/src/base/ftrfork.c
+++ b/thirdparty/freetype/src/base/ftrfork.c
diff --git a/drivers/freetype/src/base/ftsnames.c b/thirdparty/freetype/src/base/ftsnames.c
index ce7964118c..ce7964118c 100644
--- a/drivers/freetype/src/base/ftsnames.c
+++ b/thirdparty/freetype/src/base/ftsnames.c
diff --git a/drivers/freetype/src/base/ftstream.c b/thirdparty/freetype/src/base/ftstream.c
index bb512a7ccb..bb512a7ccb 100644
--- a/drivers/freetype/src/base/ftstream.c
+++ b/thirdparty/freetype/src/base/ftstream.c
diff --git a/drivers/freetype/src/base/ftstroke.c b/thirdparty/freetype/src/base/ftstroke.c
index 4f3c4937b5..4f3c4937b5 100644
--- a/drivers/freetype/src/base/ftstroke.c
+++ b/thirdparty/freetype/src/base/ftstroke.c
diff --git a/drivers/freetype/src/base/ftsynth.c b/thirdparty/freetype/src/base/ftsynth.c
index 4b66a33c3f..4b66a33c3f 100644
--- a/drivers/freetype/src/base/ftsynth.c
+++ b/thirdparty/freetype/src/base/ftsynth.c
diff --git a/drivers/freetype/src/base/ftsystem.c b/thirdparty/freetype/src/base/ftsystem.c
index ac1f01c8bc..ac1f01c8bc 100644
--- a/drivers/freetype/src/base/ftsystem.c
+++ b/thirdparty/freetype/src/base/ftsystem.c
diff --git a/drivers/freetype/src/base/fttrigon.c b/thirdparty/freetype/src/base/fttrigon.c
index 7b582c8a3d..7b582c8a3d 100644
--- a/drivers/freetype/src/base/fttrigon.c
+++ b/thirdparty/freetype/src/base/fttrigon.c
diff --git a/drivers/freetype/src/base/fttype1.c b/thirdparty/freetype/src/base/fttype1.c
index 5c0fce8686..5c0fce8686 100644
--- a/drivers/freetype/src/base/fttype1.c
+++ b/thirdparty/freetype/src/base/fttype1.c
diff --git a/drivers/freetype/src/base/ftutil.c b/thirdparty/freetype/src/base/ftutil.c
index fad7d1a5fb..fad7d1a5fb 100644
--- a/drivers/freetype/src/base/ftutil.c
+++ b/thirdparty/freetype/src/base/ftutil.c
diff --git a/drivers/freetype/src/base/ftwinfnt.c b/thirdparty/freetype/src/base/ftwinfnt.c
index 89e9155098..89e9155098 100644
--- a/drivers/freetype/src/base/ftwinfnt.c
+++ b/thirdparty/freetype/src/base/ftwinfnt.c
diff --git a/drivers/freetype/src/base/md5.c b/thirdparty/freetype/src/base/md5.c
index b235e17a56..b235e17a56 100644
--- a/drivers/freetype/src/base/md5.c
+++ b/thirdparty/freetype/src/base/md5.c
diff --git a/drivers/freetype/src/base/md5.h b/thirdparty/freetype/src/base/md5.h
index 2da44bf355..2da44bf355 100644
--- a/drivers/freetype/src/base/md5.h
+++ b/thirdparty/freetype/src/base/md5.h
diff --git a/drivers/freetype/src/base/rules.mk b/thirdparty/freetype/src/base/rules.mk
index aa424c5463..aa424c5463 100644
--- a/drivers/freetype/src/base/rules.mk
+++ b/thirdparty/freetype/src/base/rules.mk
diff --git a/drivers/freetype/src/bdf/README b/thirdparty/freetype/src/bdf/README
index b761aba2b2..b761aba2b2 100644
--- a/drivers/freetype/src/bdf/README
+++ b/thirdparty/freetype/src/bdf/README
diff --git a/drivers/freetype/src/bdf/bdf.c b/thirdparty/freetype/src/bdf/bdf.c
index f95fb76225..f95fb76225 100644
--- a/drivers/freetype/src/bdf/bdf.c
+++ b/thirdparty/freetype/src/bdf/bdf.c
diff --git a/drivers/freetype/src/bdf/bdf.h b/thirdparty/freetype/src/bdf/bdf.h
index 9012727c7e..9012727c7e 100644
--- a/drivers/freetype/src/bdf/bdf.h
+++ b/thirdparty/freetype/src/bdf/bdf.h
diff --git a/drivers/freetype/src/bdf/bdfdrivr.c b/thirdparty/freetype/src/bdf/bdfdrivr.c
index a381cf68f5..a381cf68f5 100644
--- a/drivers/freetype/src/bdf/bdfdrivr.c
+++ b/thirdparty/freetype/src/bdf/bdfdrivr.c
diff --git a/drivers/freetype/src/bdf/bdfdrivr.h b/thirdparty/freetype/src/bdf/bdfdrivr.h
index 94550818c1..94550818c1 100644
--- a/drivers/freetype/src/bdf/bdfdrivr.h
+++ b/thirdparty/freetype/src/bdf/bdfdrivr.h
diff --git a/drivers/freetype/src/bdf/bdferror.h b/thirdparty/freetype/src/bdf/bdferror.h
index b462c7d3b5..b462c7d3b5 100644
--- a/drivers/freetype/src/bdf/bdferror.h
+++ b/thirdparty/freetype/src/bdf/bdferror.h
diff --git a/drivers/freetype/src/bdf/bdflib.c b/thirdparty/freetype/src/bdf/bdflib.c
index e1dce954ff..e1dce954ff 100644
--- a/drivers/freetype/src/bdf/bdflib.c
+++ b/thirdparty/freetype/src/bdf/bdflib.c
diff --git a/drivers/freetype/src/bdf/module.mk b/thirdparty/freetype/src/bdf/module.mk
index fe06ae8e06..fe06ae8e06 100644
--- a/drivers/freetype/src/bdf/module.mk
+++ b/thirdparty/freetype/src/bdf/module.mk
diff --git a/drivers/freetype/src/bdf/rules.mk b/thirdparty/freetype/src/bdf/rules.mk
index d1dd76b1c3..d1dd76b1c3 100644
--- a/drivers/freetype/src/bdf/rules.mk
+++ b/thirdparty/freetype/src/bdf/rules.mk
diff --git a/drivers/freetype/src/cache/ftcache.c b/thirdparty/freetype/src/cache/ftcache.c
index 50941df4c4..50941df4c4 100644
--- a/drivers/freetype/src/cache/ftcache.c
+++ b/thirdparty/freetype/src/cache/ftcache.c
diff --git a/drivers/freetype/src/cache/ftcbasic.c b/thirdparty/freetype/src/cache/ftcbasic.c
index 8e6de8c41c..8e6de8c41c 100644
--- a/drivers/freetype/src/cache/ftcbasic.c
+++ b/thirdparty/freetype/src/cache/ftcbasic.c
diff --git a/drivers/freetype/src/cache/ftccache.c b/thirdparty/freetype/src/cache/ftccache.c
index 3b1a4bc7e4..3b1a4bc7e4 100644
--- a/drivers/freetype/src/cache/ftccache.c
+++ b/thirdparty/freetype/src/cache/ftccache.c
diff --git a/drivers/freetype/src/cache/ftccache.h b/thirdparty/freetype/src/cache/ftccache.h
index 1b1295951f..1b1295951f 100644
--- a/drivers/freetype/src/cache/ftccache.h
+++ b/thirdparty/freetype/src/cache/ftccache.h
diff --git a/drivers/freetype/src/cache/ftccback.h b/thirdparty/freetype/src/cache/ftccback.h
index 279e94d923..279e94d923 100644
--- a/drivers/freetype/src/cache/ftccback.h
+++ b/thirdparty/freetype/src/cache/ftccback.h
diff --git a/drivers/freetype/src/cache/ftccmap.c b/thirdparty/freetype/src/cache/ftccmap.c
index 41a0ce97dd..41a0ce97dd 100644
--- a/drivers/freetype/src/cache/ftccmap.c
+++ b/thirdparty/freetype/src/cache/ftccmap.c
diff --git a/drivers/freetype/src/cache/ftcerror.h b/thirdparty/freetype/src/cache/ftcerror.h
index 1fd7357a8b..1fd7357a8b 100644
--- a/drivers/freetype/src/cache/ftcerror.h
+++ b/thirdparty/freetype/src/cache/ftcerror.h
diff --git a/drivers/freetype/src/cache/ftcglyph.c b/thirdparty/freetype/src/cache/ftcglyph.c
index c4046812dd..c4046812dd 100644
--- a/drivers/freetype/src/cache/ftcglyph.c
+++ b/thirdparty/freetype/src/cache/ftcglyph.c
diff --git a/drivers/freetype/src/cache/ftcglyph.h b/thirdparty/freetype/src/cache/ftcglyph.h
index dc7be06f03..dc7be06f03 100644
--- a/drivers/freetype/src/cache/ftcglyph.h
+++ b/thirdparty/freetype/src/cache/ftcglyph.h
diff --git a/drivers/freetype/src/cache/ftcimage.c b/thirdparty/freetype/src/cache/ftcimage.c
index 74040aa745..74040aa745 100644
--- a/drivers/freetype/src/cache/ftcimage.c
+++ b/thirdparty/freetype/src/cache/ftcimage.c
diff --git a/drivers/freetype/src/cache/ftcimage.h b/thirdparty/freetype/src/cache/ftcimage.h
index 25aa43b97e..25aa43b97e 100644
--- a/drivers/freetype/src/cache/ftcimage.h
+++ b/thirdparty/freetype/src/cache/ftcimage.h
diff --git a/drivers/freetype/src/cache/ftcmanag.c b/thirdparty/freetype/src/cache/ftcmanag.c
index 661a32af5b..661a32af5b 100644
--- a/drivers/freetype/src/cache/ftcmanag.c
+++ b/thirdparty/freetype/src/cache/ftcmanag.c
diff --git a/drivers/freetype/src/cache/ftcmanag.h b/thirdparty/freetype/src/cache/ftcmanag.h
index f2c434a135..f2c434a135 100644
--- a/drivers/freetype/src/cache/ftcmanag.h
+++ b/thirdparty/freetype/src/cache/ftcmanag.h
diff --git a/drivers/freetype/src/cache/ftcmru.c b/thirdparty/freetype/src/cache/ftcmru.c
index d107584a19..d107584a19 100644
--- a/drivers/freetype/src/cache/ftcmru.c
+++ b/thirdparty/freetype/src/cache/ftcmru.c
diff --git a/drivers/freetype/src/cache/ftcmru.h b/thirdparty/freetype/src/cache/ftcmru.h
index ae3c4ce23a..ae3c4ce23a 100644
--- a/drivers/freetype/src/cache/ftcmru.h
+++ b/thirdparty/freetype/src/cache/ftcmru.h
diff --git a/drivers/freetype/src/cache/ftcsbits.c b/thirdparty/freetype/src/cache/ftcsbits.c
index d6f1ddcd4e..d6f1ddcd4e 100644
--- a/drivers/freetype/src/cache/ftcsbits.c
+++ b/thirdparty/freetype/src/cache/ftcsbits.c
diff --git a/drivers/freetype/src/cache/ftcsbits.h b/thirdparty/freetype/src/cache/ftcsbits.h
index a0600ede09..a0600ede09 100644
--- a/drivers/freetype/src/cache/ftcsbits.h
+++ b/thirdparty/freetype/src/cache/ftcsbits.h
diff --git a/drivers/freetype/src/cache/rules.mk b/thirdparty/freetype/src/cache/rules.mk
index 827e259f90..827e259f90 100644
--- a/drivers/freetype/src/cache/rules.mk
+++ b/thirdparty/freetype/src/cache/rules.mk
diff --git a/drivers/freetype/src/cff/cf2arrst.c b/thirdparty/freetype/src/cff/cf2arrst.c
index 89f3e9f1d7..89f3e9f1d7 100644
--- a/drivers/freetype/src/cff/cf2arrst.c
+++ b/thirdparty/freetype/src/cff/cf2arrst.c
diff --git a/drivers/freetype/src/cff/cf2arrst.h b/thirdparty/freetype/src/cff/cf2arrst.h
index 3c21a3b672..3c21a3b672 100644
--- a/drivers/freetype/src/cff/cf2arrst.h
+++ b/thirdparty/freetype/src/cff/cf2arrst.h
diff --git a/drivers/freetype/src/cff/cf2blues.c b/thirdparty/freetype/src/cff/cf2blues.c
index 250f89e0df..250f89e0df 100644
--- a/drivers/freetype/src/cff/cf2blues.c
+++ b/thirdparty/freetype/src/cff/cf2blues.c
diff --git a/drivers/freetype/src/cff/cf2blues.h b/thirdparty/freetype/src/cff/cf2blues.h
index 96fb60f38d..96fb60f38d 100644
--- a/drivers/freetype/src/cff/cf2blues.h
+++ b/thirdparty/freetype/src/cff/cf2blues.h
diff --git a/drivers/freetype/src/cff/cf2error.c b/thirdparty/freetype/src/cff/cf2error.c
index b5595a3d1f..b5595a3d1f 100644
--- a/drivers/freetype/src/cff/cf2error.c
+++ b/thirdparty/freetype/src/cff/cf2error.c
diff --git a/drivers/freetype/src/cff/cf2error.h b/thirdparty/freetype/src/cff/cf2error.h
index 512edd1d21..512edd1d21 100644
--- a/drivers/freetype/src/cff/cf2error.h
+++ b/thirdparty/freetype/src/cff/cf2error.h
diff --git a/drivers/freetype/src/cff/cf2fixed.h b/thirdparty/freetype/src/cff/cf2fixed.h
index 74af37708b..74af37708b 100644
--- a/drivers/freetype/src/cff/cf2fixed.h
+++ b/thirdparty/freetype/src/cff/cf2fixed.h
diff --git a/drivers/freetype/src/cff/cf2font.c b/thirdparty/freetype/src/cff/cf2font.c
index 83fd348f2d..83fd348f2d 100644
--- a/drivers/freetype/src/cff/cf2font.c
+++ b/thirdparty/freetype/src/cff/cf2font.c
diff --git a/drivers/freetype/src/cff/cf2font.h b/thirdparty/freetype/src/cff/cf2font.h
index bd05e69e7b..bd05e69e7b 100644
--- a/drivers/freetype/src/cff/cf2font.h
+++ b/thirdparty/freetype/src/cff/cf2font.h
diff --git a/drivers/freetype/src/cff/cf2ft.c b/thirdparty/freetype/src/cff/cf2ft.c
index 55f3206ac2..55f3206ac2 100644
--- a/drivers/freetype/src/cff/cf2ft.c
+++ b/thirdparty/freetype/src/cff/cf2ft.c
diff --git a/drivers/freetype/src/cff/cf2ft.h b/thirdparty/freetype/src/cff/cf2ft.h
index 8e55e841a0..8e55e841a0 100644
--- a/drivers/freetype/src/cff/cf2ft.h
+++ b/thirdparty/freetype/src/cff/cf2ft.h
diff --git a/drivers/freetype/src/cff/cf2glue.h b/thirdparty/freetype/src/cff/cf2glue.h
index 56a7c248f4..56a7c248f4 100644
--- a/drivers/freetype/src/cff/cf2glue.h
+++ b/thirdparty/freetype/src/cff/cf2glue.h
diff --git a/drivers/freetype/src/cff/cf2hints.c b/thirdparty/freetype/src/cff/cf2hints.c
index bbbe8e3c32..bbbe8e3c32 100644
--- a/drivers/freetype/src/cff/cf2hints.c
+++ b/thirdparty/freetype/src/cff/cf2hints.c
diff --git a/drivers/freetype/src/cff/cf2hints.h b/thirdparty/freetype/src/cff/cf2hints.h
index a8984542a0..a8984542a0 100644
--- a/drivers/freetype/src/cff/cf2hints.h
+++ b/thirdparty/freetype/src/cff/cf2hints.h
diff --git a/drivers/freetype/src/cff/cf2intrp.c b/thirdparty/freetype/src/cff/cf2intrp.c
index 7d663dd0ec..7d663dd0ec 100644
--- a/drivers/freetype/src/cff/cf2intrp.c
+++ b/thirdparty/freetype/src/cff/cf2intrp.c
diff --git a/drivers/freetype/src/cff/cf2intrp.h b/thirdparty/freetype/src/cff/cf2intrp.h
index ec030e8944..ec030e8944 100644
--- a/drivers/freetype/src/cff/cf2intrp.h
+++ b/thirdparty/freetype/src/cff/cf2intrp.h
diff --git a/drivers/freetype/src/cff/cf2read.c b/thirdparty/freetype/src/cff/cf2read.c
index 2b429e3eeb..2b429e3eeb 100644
--- a/drivers/freetype/src/cff/cf2read.c
+++ b/thirdparty/freetype/src/cff/cf2read.c
diff --git a/drivers/freetype/src/cff/cf2read.h b/thirdparty/freetype/src/cff/cf2read.h
index b0b0db803a..b0b0db803a 100644
--- a/drivers/freetype/src/cff/cf2read.h
+++ b/thirdparty/freetype/src/cff/cf2read.h
diff --git a/drivers/freetype/src/cff/cf2stack.c b/thirdparty/freetype/src/cff/cf2stack.c
index 6fafd901f3..6fafd901f3 100644
--- a/drivers/freetype/src/cff/cf2stack.c
+++ b/thirdparty/freetype/src/cff/cf2stack.c
diff --git a/drivers/freetype/src/cff/cf2stack.h b/thirdparty/freetype/src/cff/cf2stack.h
index e740a7ac41..e740a7ac41 100644
--- a/drivers/freetype/src/cff/cf2stack.h
+++ b/thirdparty/freetype/src/cff/cf2stack.h
diff --git a/drivers/freetype/src/cff/cf2types.h b/thirdparty/freetype/src/cff/cf2types.h
index 5b7e1239af..5b7e1239af 100644
--- a/drivers/freetype/src/cff/cf2types.h
+++ b/thirdparty/freetype/src/cff/cf2types.h
diff --git a/drivers/freetype/src/cff/cff.c b/thirdparty/freetype/src/cff/cff.c
index 86ca1be040..86ca1be040 100644
--- a/drivers/freetype/src/cff/cff.c
+++ b/thirdparty/freetype/src/cff/cff.c
diff --git a/drivers/freetype/src/cff/cffcmap.c b/thirdparty/freetype/src/cff/cffcmap.c
index 3ef48328c5..3ef48328c5 100644
--- a/drivers/freetype/src/cff/cffcmap.c
+++ b/thirdparty/freetype/src/cff/cffcmap.c
diff --git a/drivers/freetype/src/cff/cffcmap.h b/thirdparty/freetype/src/cff/cffcmap.h
index 23795d5090..23795d5090 100644
--- a/drivers/freetype/src/cff/cffcmap.h
+++ b/thirdparty/freetype/src/cff/cffcmap.h
diff --git a/drivers/freetype/src/cff/cffdrivr.c b/thirdparty/freetype/src/cff/cffdrivr.c
index 950a9605c3..950a9605c3 100644
--- a/drivers/freetype/src/cff/cffdrivr.c
+++ b/thirdparty/freetype/src/cff/cffdrivr.c
diff --git a/drivers/freetype/src/cff/cffdrivr.h b/thirdparty/freetype/src/cff/cffdrivr.h
index d7b0598374..d7b0598374 100644
--- a/drivers/freetype/src/cff/cffdrivr.h
+++ b/thirdparty/freetype/src/cff/cffdrivr.h
diff --git a/drivers/freetype/src/cff/cfferrs.h b/thirdparty/freetype/src/cff/cfferrs.h
index e7fc6eb71c..e7fc6eb71c 100644
--- a/drivers/freetype/src/cff/cfferrs.h
+++ b/thirdparty/freetype/src/cff/cfferrs.h
diff --git a/drivers/freetype/src/cff/cffgload.c b/thirdparty/freetype/src/cff/cffgload.c
index 752c18ed92..752c18ed92 100644
--- a/drivers/freetype/src/cff/cffgload.c
+++ b/thirdparty/freetype/src/cff/cffgload.c
diff --git a/drivers/freetype/src/cff/cffgload.h b/thirdparty/freetype/src/cff/cffgload.h
index b875fbed90..b875fbed90 100644
--- a/drivers/freetype/src/cff/cffgload.h
+++ b/thirdparty/freetype/src/cff/cffgload.h
diff --git a/drivers/freetype/src/cff/cffload.c b/thirdparty/freetype/src/cff/cffload.c
index 3d1bda97b9..3d1bda97b9 100644
--- a/drivers/freetype/src/cff/cffload.c
+++ b/thirdparty/freetype/src/cff/cffload.c
diff --git a/drivers/freetype/src/cff/cffload.h b/thirdparty/freetype/src/cff/cffload.h
index 1dd07baf11..1dd07baf11 100644
--- a/drivers/freetype/src/cff/cffload.h
+++ b/thirdparty/freetype/src/cff/cffload.h
diff --git a/drivers/freetype/src/cff/cffobjs.c b/thirdparty/freetype/src/cff/cffobjs.c
index 0f0769677f..0f0769677f 100644
--- a/drivers/freetype/src/cff/cffobjs.c
+++ b/thirdparty/freetype/src/cff/cffobjs.c
diff --git a/drivers/freetype/src/cff/cffobjs.h b/thirdparty/freetype/src/cff/cffobjs.h
index 9dc77536bd..9dc77536bd 100644
--- a/drivers/freetype/src/cff/cffobjs.h
+++ b/thirdparty/freetype/src/cff/cffobjs.h
diff --git a/drivers/freetype/src/cff/cffparse.c b/thirdparty/freetype/src/cff/cffparse.c
index a4f986b67c..a4f986b67c 100644
--- a/drivers/freetype/src/cff/cffparse.c
+++ b/thirdparty/freetype/src/cff/cffparse.c
diff --git a/drivers/freetype/src/cff/cffparse.h b/thirdparty/freetype/src/cff/cffparse.h
index a95970edcb..a95970edcb 100644
--- a/drivers/freetype/src/cff/cffparse.h
+++ b/thirdparty/freetype/src/cff/cffparse.h
diff --git a/drivers/freetype/src/cff/cffpic.c b/thirdparty/freetype/src/cff/cffpic.c
index a0bc34fd5f..a0bc34fd5f 100644
--- a/drivers/freetype/src/cff/cffpic.c
+++ b/thirdparty/freetype/src/cff/cffpic.c
diff --git a/drivers/freetype/src/cff/cffpic.h b/thirdparty/freetype/src/cff/cffpic.h
index bed6b35a86..bed6b35a86 100644
--- a/drivers/freetype/src/cff/cffpic.h
+++ b/thirdparty/freetype/src/cff/cffpic.h
diff --git a/drivers/freetype/src/cff/cfftoken.h b/thirdparty/freetype/src/cff/cfftoken.h
index 22637c780b..22637c780b 100644
--- a/drivers/freetype/src/cff/cfftoken.h
+++ b/thirdparty/freetype/src/cff/cfftoken.h
diff --git a/drivers/freetype/src/cff/cfftypes.h b/thirdparty/freetype/src/cff/cfftypes.h
index 4426c7e4f1..4426c7e4f1 100644
--- a/drivers/freetype/src/cff/cfftypes.h
+++ b/thirdparty/freetype/src/cff/cfftypes.h
diff --git a/drivers/freetype/src/cff/module.mk b/thirdparty/freetype/src/cff/module.mk
index 1b4781afed..1b4781afed 100644
--- a/drivers/freetype/src/cff/module.mk
+++ b/thirdparty/freetype/src/cff/module.mk
diff --git a/drivers/freetype/src/cff/rules.mk b/thirdparty/freetype/src/cff/rules.mk
index 92f68b1ede..92f68b1ede 100644
--- a/drivers/freetype/src/cff/rules.mk
+++ b/thirdparty/freetype/src/cff/rules.mk
diff --git a/drivers/freetype/src/cid/ciderrs.h b/thirdparty/freetype/src/cid/ciderrs.h
index 1dc98c7cdd..1dc98c7cdd 100644
--- a/drivers/freetype/src/cid/ciderrs.h
+++ b/thirdparty/freetype/src/cid/ciderrs.h
diff --git a/drivers/freetype/src/cid/cidgload.c b/thirdparty/freetype/src/cid/cidgload.c
index c7b95593ee..c7b95593ee 100644
--- a/drivers/freetype/src/cid/cidgload.c
+++ b/thirdparty/freetype/src/cid/cidgload.c
diff --git a/drivers/freetype/src/cid/cidgload.h b/thirdparty/freetype/src/cid/cidgload.h
index 62d664b3af..62d664b3af 100644
--- a/drivers/freetype/src/cid/cidgload.h
+++ b/thirdparty/freetype/src/cid/cidgload.h
diff --git a/drivers/freetype/src/cid/cidload.c b/thirdparty/freetype/src/cid/cidload.c
index d4f1ad1a7f..d4f1ad1a7f 100644
--- a/drivers/freetype/src/cid/cidload.c
+++ b/thirdparty/freetype/src/cid/cidload.c
diff --git a/drivers/freetype/src/cid/cidload.h b/thirdparty/freetype/src/cid/cidload.h
index 680f0d8fc5..680f0d8fc5 100644
--- a/drivers/freetype/src/cid/cidload.h
+++ b/thirdparty/freetype/src/cid/cidload.h
diff --git a/drivers/freetype/src/cid/cidobjs.c b/thirdparty/freetype/src/cid/cidobjs.c
index 2d2600fd4c..2d2600fd4c 100644
--- a/drivers/freetype/src/cid/cidobjs.c
+++ b/thirdparty/freetype/src/cid/cidobjs.c
diff --git a/drivers/freetype/src/cid/cidobjs.h b/thirdparty/freetype/src/cid/cidobjs.h
index 5dd377a9f8..5dd377a9f8 100644
--- a/drivers/freetype/src/cid/cidobjs.h
+++ b/thirdparty/freetype/src/cid/cidobjs.h
diff --git a/drivers/freetype/src/cid/cidparse.c b/thirdparty/freetype/src/cid/cidparse.c
index 73aca2ac6a..73aca2ac6a 100644
--- a/drivers/freetype/src/cid/cidparse.c
+++ b/thirdparty/freetype/src/cid/cidparse.c
diff --git a/drivers/freetype/src/cid/cidparse.h b/thirdparty/freetype/src/cid/cidparse.h
index 7268dc6ae8..7268dc6ae8 100644
--- a/drivers/freetype/src/cid/cidparse.h
+++ b/thirdparty/freetype/src/cid/cidparse.h
diff --git a/drivers/freetype/src/cid/cidriver.c b/thirdparty/freetype/src/cid/cidriver.c
index 64141ab6b1..64141ab6b1 100644
--- a/drivers/freetype/src/cid/cidriver.c
+++ b/thirdparty/freetype/src/cid/cidriver.c
diff --git a/drivers/freetype/src/cid/cidriver.h b/thirdparty/freetype/src/cid/cidriver.h
index a359a78907..a359a78907 100644
--- a/drivers/freetype/src/cid/cidriver.h
+++ b/thirdparty/freetype/src/cid/cidriver.h
diff --git a/drivers/freetype/src/cid/cidtoken.h b/thirdparty/freetype/src/cid/cidtoken.h
index 9c773fd094..9c773fd094 100644
--- a/drivers/freetype/src/cid/cidtoken.h
+++ b/thirdparty/freetype/src/cid/cidtoken.h
diff --git a/drivers/freetype/src/cid/module.mk b/thirdparty/freetype/src/cid/module.mk
index d9585d7816..d9585d7816 100644
--- a/drivers/freetype/src/cid/module.mk
+++ b/thirdparty/freetype/src/cid/module.mk
diff --git a/drivers/freetype/src/cid/rules.mk b/thirdparty/freetype/src/cid/rules.mk
index f33aab00d6..f33aab00d6 100644
--- a/drivers/freetype/src/cid/rules.mk
+++ b/thirdparty/freetype/src/cid/rules.mk
diff --git a/drivers/freetype/src/cid/type1cid.c b/thirdparty/freetype/src/cid/type1cid.c
index de3bdf7705..de3bdf7705 100644
--- a/drivers/freetype/src/cid/type1cid.c
+++ b/thirdparty/freetype/src/cid/type1cid.c
diff --git a/drivers/freetype/src/gxvalid/README b/thirdparty/freetype/src/gxvalid/README
index d3ac49c3e2..d3ac49c3e2 100644
--- a/drivers/freetype/src/gxvalid/README
+++ b/thirdparty/freetype/src/gxvalid/README
diff --git a/drivers/freetype/src/gxvalid/gxvalid.c b/thirdparty/freetype/src/gxvalid/gxvalid.c
index 7fb868cad1..7fb868cad1 100644
--- a/drivers/freetype/src/gxvalid/gxvalid.c
+++ b/thirdparty/freetype/src/gxvalid/gxvalid.c
diff --git a/drivers/freetype/src/gxvalid/gxvalid.h b/thirdparty/freetype/src/gxvalid/gxvalid.h
index 7a3ab795ef..7a3ab795ef 100644
--- a/drivers/freetype/src/gxvalid/gxvalid.h
+++ b/thirdparty/freetype/src/gxvalid/gxvalid.h
diff --git a/drivers/freetype/src/gxvalid/gxvbsln.c b/thirdparty/freetype/src/gxvalid/gxvbsln.c
index 493b20c31a..493b20c31a 100644
--- a/drivers/freetype/src/gxvalid/gxvbsln.c
+++ b/thirdparty/freetype/src/gxvalid/gxvbsln.c
diff --git a/drivers/freetype/src/gxvalid/gxvcommn.c b/thirdparty/freetype/src/gxvalid/gxvcommn.c
index 4b5e41539a..4b5e41539a 100644
--- a/drivers/freetype/src/gxvalid/gxvcommn.c
+++ b/thirdparty/freetype/src/gxvalid/gxvcommn.c
diff --git a/drivers/freetype/src/gxvalid/gxvcommn.h b/thirdparty/freetype/src/gxvalid/gxvcommn.h
index 9470c8412b..9470c8412b 100644
--- a/drivers/freetype/src/gxvalid/gxvcommn.h
+++ b/thirdparty/freetype/src/gxvalid/gxvcommn.h
diff --git a/drivers/freetype/src/gxvalid/gxverror.h b/thirdparty/freetype/src/gxvalid/gxverror.h
index 2e53355ce4..2e53355ce4 100644
--- a/drivers/freetype/src/gxvalid/gxverror.h
+++ b/thirdparty/freetype/src/gxvalid/gxverror.h
diff --git a/drivers/freetype/src/gxvalid/gxvfeat.c b/thirdparty/freetype/src/gxvalid/gxvfeat.c
index 5bff7c261d..5bff7c261d 100644
--- a/drivers/freetype/src/gxvalid/gxvfeat.c
+++ b/thirdparty/freetype/src/gxvalid/gxvfeat.c
diff --git a/drivers/freetype/src/gxvalid/gxvfeat.h b/thirdparty/freetype/src/gxvalid/gxvfeat.h
index 284bada891..284bada891 100644
--- a/drivers/freetype/src/gxvalid/gxvfeat.h
+++ b/thirdparty/freetype/src/gxvalid/gxvfeat.h
diff --git a/drivers/freetype/src/gxvalid/gxvfgen.c b/thirdparty/freetype/src/gxvalid/gxvfgen.c
index 667dac3cde..667dac3cde 100644
--- a/drivers/freetype/src/gxvalid/gxvfgen.c
+++ b/thirdparty/freetype/src/gxvalid/gxvfgen.c
diff --git a/drivers/freetype/src/gxvalid/gxvjust.c b/thirdparty/freetype/src/gxvalid/gxvjust.c
index 20d29bfbc8..20d29bfbc8 100644
--- a/drivers/freetype/src/gxvalid/gxvjust.c
+++ b/thirdparty/freetype/src/gxvalid/gxvjust.c
diff --git a/drivers/freetype/src/gxvalid/gxvkern.c b/thirdparty/freetype/src/gxvalid/gxvkern.c
index ee1ab36f70..ee1ab36f70 100644
--- a/drivers/freetype/src/gxvalid/gxvkern.c
+++ b/thirdparty/freetype/src/gxvalid/gxvkern.c
diff --git a/drivers/freetype/src/gxvalid/gxvlcar.c b/thirdparty/freetype/src/gxvalid/gxvlcar.c
index d31b6410bd..d31b6410bd 100644
--- a/drivers/freetype/src/gxvalid/gxvlcar.c
+++ b/thirdparty/freetype/src/gxvalid/gxvlcar.c
diff --git a/drivers/freetype/src/gxvalid/gxvmod.c b/thirdparty/freetype/src/gxvalid/gxvmod.c
index e589a7fb79..e589a7fb79 100644
--- a/drivers/freetype/src/gxvalid/gxvmod.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmod.c
diff --git a/drivers/freetype/src/gxvalid/gxvmod.h b/thirdparty/freetype/src/gxvalid/gxvmod.h
index 8b82e91070..8b82e91070 100644
--- a/drivers/freetype/src/gxvalid/gxvmod.h
+++ b/thirdparty/freetype/src/gxvalid/gxvmod.h
diff --git a/drivers/freetype/src/gxvalid/gxvmort.c b/thirdparty/freetype/src/gxvalid/gxvmort.c
index b83a2b2c0f..b83a2b2c0f 100644
--- a/drivers/freetype/src/gxvalid/gxvmort.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmort.c
diff --git a/drivers/freetype/src/gxvalid/gxvmort.h b/thirdparty/freetype/src/gxvalid/gxvmort.h
index 5fd228212a..5fd228212a 100644
--- a/drivers/freetype/src/gxvalid/gxvmort.h
+++ b/thirdparty/freetype/src/gxvalid/gxvmort.h
diff --git a/drivers/freetype/src/gxvalid/gxvmort0.c b/thirdparty/freetype/src/gxvalid/gxvmort0.c
index e11f5ddc49..e11f5ddc49 100644
--- a/drivers/freetype/src/gxvalid/gxvmort0.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmort0.c
diff --git a/drivers/freetype/src/gxvalid/gxvmort1.c b/thirdparty/freetype/src/gxvalid/gxvmort1.c
index fd761d0692..fd761d0692 100644
--- a/drivers/freetype/src/gxvalid/gxvmort1.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmort1.c
diff --git a/drivers/freetype/src/gxvalid/gxvmort2.c b/thirdparty/freetype/src/gxvalid/gxvmort2.c
index 08455dec6b..08455dec6b 100644
--- a/drivers/freetype/src/gxvalid/gxvmort2.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmort2.c
diff --git a/drivers/freetype/src/gxvalid/gxvmort4.c b/thirdparty/freetype/src/gxvalid/gxvmort4.c
index 6f7bbb8710..6f7bbb8710 100644
--- a/drivers/freetype/src/gxvalid/gxvmort4.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmort4.c
diff --git a/drivers/freetype/src/gxvalid/gxvmort5.c b/thirdparty/freetype/src/gxvalid/gxvmort5.c
index 54ddbe2b15..54ddbe2b15 100644
--- a/drivers/freetype/src/gxvalid/gxvmort5.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmort5.c
diff --git a/drivers/freetype/src/gxvalid/gxvmorx.c b/thirdparty/freetype/src/gxvalid/gxvmorx.c
index a3abe435a6..a3abe435a6 100644
--- a/drivers/freetype/src/gxvalid/gxvmorx.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmorx.c
diff --git a/drivers/freetype/src/gxvalid/gxvmorx.h b/thirdparty/freetype/src/gxvalid/gxvmorx.h
index 9ba25c14a4..9ba25c14a4 100644
--- a/drivers/freetype/src/gxvalid/gxvmorx.h
+++ b/thirdparty/freetype/src/gxvalid/gxvmorx.h
diff --git a/drivers/freetype/src/gxvalid/gxvmorx0.c b/thirdparty/freetype/src/gxvalid/gxvmorx0.c
index 4abb7368f2..4abb7368f2 100644
--- a/drivers/freetype/src/gxvalid/gxvmorx0.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmorx0.c
diff --git a/drivers/freetype/src/gxvalid/gxvmorx1.c b/thirdparty/freetype/src/gxvalid/gxvmorx1.c
index e581848c2b..e581848c2b 100644
--- a/drivers/freetype/src/gxvalid/gxvmorx1.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmorx1.c
diff --git a/drivers/freetype/src/gxvalid/gxvmorx2.c b/thirdparty/freetype/src/gxvalid/gxvmorx2.c
index 9495cca489..9495cca489 100644
--- a/drivers/freetype/src/gxvalid/gxvmorx2.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmorx2.c
diff --git a/drivers/freetype/src/gxvalid/gxvmorx4.c b/thirdparty/freetype/src/gxvalid/gxvmorx4.c
index 3b7731bbce..3b7731bbce 100644
--- a/drivers/freetype/src/gxvalid/gxvmorx4.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmorx4.c
diff --git a/drivers/freetype/src/gxvalid/gxvmorx5.c b/thirdparty/freetype/src/gxvalid/gxvmorx5.c
index 0e96166c02..0e96166c02 100644
--- a/drivers/freetype/src/gxvalid/gxvmorx5.c
+++ b/thirdparty/freetype/src/gxvalid/gxvmorx5.c
diff --git a/drivers/freetype/src/gxvalid/gxvopbd.c b/thirdparty/freetype/src/gxvalid/gxvopbd.c
index e3ba082e16..e3ba082e16 100644
--- a/drivers/freetype/src/gxvalid/gxvopbd.c
+++ b/thirdparty/freetype/src/gxvalid/gxvopbd.c
diff --git a/drivers/freetype/src/gxvalid/gxvprop.c b/thirdparty/freetype/src/gxvalid/gxvprop.c
index 61b3aeee30..61b3aeee30 100644
--- a/drivers/freetype/src/gxvalid/gxvprop.c
+++ b/thirdparty/freetype/src/gxvalid/gxvprop.c
diff --git a/drivers/freetype/src/gxvalid/gxvtrak.c b/thirdparty/freetype/src/gxvalid/gxvtrak.c
index 0f07c04e2a..0f07c04e2a 100644
--- a/drivers/freetype/src/gxvalid/gxvtrak.c
+++ b/thirdparty/freetype/src/gxvalid/gxvtrak.c
diff --git a/drivers/freetype/src/gxvalid/module.mk b/thirdparty/freetype/src/gxvalid/module.mk
index b431384a5c..b431384a5c 100644
--- a/drivers/freetype/src/gxvalid/module.mk
+++ b/thirdparty/freetype/src/gxvalid/module.mk
diff --git a/drivers/freetype/src/gxvalid/rules.mk b/thirdparty/freetype/src/gxvalid/rules.mk
index 424f2a6377..424f2a6377 100644
--- a/drivers/freetype/src/gxvalid/rules.mk
+++ b/thirdparty/freetype/src/gxvalid/rules.mk
diff --git a/drivers/freetype/src/otvalid/module.mk b/thirdparty/freetype/src/otvalid/module.mk
index b929cdbab0..b929cdbab0 100644
--- a/drivers/freetype/src/otvalid/module.mk
+++ b/thirdparty/freetype/src/otvalid/module.mk
diff --git a/drivers/freetype/src/otvalid/otvalid.c b/thirdparty/freetype/src/otvalid/otvalid.c
index 932a974a31..932a974a31 100644
--- a/drivers/freetype/src/otvalid/otvalid.c
+++ b/thirdparty/freetype/src/otvalid/otvalid.c
diff --git a/drivers/freetype/src/otvalid/otvalid.h b/thirdparty/freetype/src/otvalid/otvalid.h
index 93438a0639..93438a0639 100644
--- a/drivers/freetype/src/otvalid/otvalid.h
+++ b/thirdparty/freetype/src/otvalid/otvalid.h
diff --git a/drivers/freetype/src/otvalid/otvbase.c b/thirdparty/freetype/src/otvalid/otvbase.c
index e86e8bb2f0..e86e8bb2f0 100644
--- a/drivers/freetype/src/otvalid/otvbase.c
+++ b/thirdparty/freetype/src/otvalid/otvbase.c
diff --git a/drivers/freetype/src/otvalid/otvcommn.c b/thirdparty/freetype/src/otvalid/otvcommn.c
index 2e88e102be..2e88e102be 100644
--- a/drivers/freetype/src/otvalid/otvcommn.c
+++ b/thirdparty/freetype/src/otvalid/otvcommn.c
diff --git a/drivers/freetype/src/otvalid/otvcommn.h b/thirdparty/freetype/src/otvalid/otvcommn.h
index 44e0c63793..44e0c63793 100644
--- a/drivers/freetype/src/otvalid/otvcommn.h
+++ b/thirdparty/freetype/src/otvalid/otvcommn.h
diff --git a/drivers/freetype/src/otvalid/otverror.h b/thirdparty/freetype/src/otvalid/otverror.h
index e7c8db0d58..e7c8db0d58 100644
--- a/drivers/freetype/src/otvalid/otverror.h
+++ b/thirdparty/freetype/src/otvalid/otverror.h
diff --git a/drivers/freetype/src/otvalid/otvgdef.c b/thirdparty/freetype/src/otvalid/otvgdef.c
index f19e300e51..f19e300e51 100644
--- a/drivers/freetype/src/otvalid/otvgdef.c
+++ b/thirdparty/freetype/src/otvalid/otvgdef.c
diff --git a/drivers/freetype/src/otvalid/otvgpos.c b/thirdparty/freetype/src/otvalid/otvgpos.c
index e904ea5d6c..e904ea5d6c 100644
--- a/drivers/freetype/src/otvalid/otvgpos.c
+++ b/thirdparty/freetype/src/otvalid/otvgpos.c
diff --git a/drivers/freetype/src/otvalid/otvgpos.h b/thirdparty/freetype/src/otvalid/otvgpos.h
index 2c09e64f97..2c09e64f97 100644
--- a/drivers/freetype/src/otvalid/otvgpos.h
+++ b/thirdparty/freetype/src/otvalid/otvgpos.h
diff --git a/drivers/freetype/src/otvalid/otvgsub.c b/thirdparty/freetype/src/otvalid/otvgsub.c
index c2b28569f1..c2b28569f1 100644
--- a/drivers/freetype/src/otvalid/otvgsub.c
+++ b/thirdparty/freetype/src/otvalid/otvgsub.c
diff --git a/drivers/freetype/src/otvalid/otvjstf.c b/thirdparty/freetype/src/otvalid/otvjstf.c
index e19c1c1213..e19c1c1213 100644
--- a/drivers/freetype/src/otvalid/otvjstf.c
+++ b/thirdparty/freetype/src/otvalid/otvjstf.c
diff --git a/drivers/freetype/src/otvalid/otvmath.c b/thirdparty/freetype/src/otvalid/otvmath.c
index 6c785b6fda..6c785b6fda 100644
--- a/drivers/freetype/src/otvalid/otvmath.c
+++ b/thirdparty/freetype/src/otvalid/otvmath.c
diff --git a/drivers/freetype/src/otvalid/otvmod.c b/thirdparty/freetype/src/otvalid/otvmod.c
index 972bd1baac..972bd1baac 100644
--- a/drivers/freetype/src/otvalid/otvmod.c
+++ b/thirdparty/freetype/src/otvalid/otvmod.c
diff --git a/drivers/freetype/src/otvalid/otvmod.h b/thirdparty/freetype/src/otvalid/otvmod.h
index e464030ab0..e464030ab0 100644
--- a/drivers/freetype/src/otvalid/otvmod.h
+++ b/thirdparty/freetype/src/otvalid/otvmod.h
diff --git a/drivers/freetype/src/otvalid/rules.mk b/thirdparty/freetype/src/otvalid/rules.mk
index 077447fcb6..077447fcb6 100644
--- a/drivers/freetype/src/otvalid/rules.mk
+++ b/thirdparty/freetype/src/otvalid/rules.mk
diff --git a/drivers/freetype/src/pcf/README b/thirdparty/freetype/src/pcf/README
index 10eff15fbe..10eff15fbe 100644
--- a/drivers/freetype/src/pcf/README
+++ b/thirdparty/freetype/src/pcf/README
diff --git a/drivers/freetype/src/pcf/module.mk b/thirdparty/freetype/src/pcf/module.mk
index df383ff0fb..df383ff0fb 100644
--- a/drivers/freetype/src/pcf/module.mk
+++ b/thirdparty/freetype/src/pcf/module.mk
diff --git a/drivers/freetype/src/pcf/pcf.c b/thirdparty/freetype/src/pcf/pcf.c
index 11d5b7b2a0..11d5b7b2a0 100644
--- a/drivers/freetype/src/pcf/pcf.c
+++ b/thirdparty/freetype/src/pcf/pcf.c
diff --git a/drivers/freetype/src/pcf/pcf.h b/thirdparty/freetype/src/pcf/pcf.h
index c726e5ec6b..c726e5ec6b 100644
--- a/drivers/freetype/src/pcf/pcf.h
+++ b/thirdparty/freetype/src/pcf/pcf.h
diff --git a/drivers/freetype/src/pcf/pcfdrivr.c b/thirdparty/freetype/src/pcf/pcfdrivr.c
index 0996d10793..0996d10793 100644
--- a/drivers/freetype/src/pcf/pcfdrivr.c
+++ b/thirdparty/freetype/src/pcf/pcfdrivr.c
diff --git a/drivers/freetype/src/pcf/pcfdrivr.h b/thirdparty/freetype/src/pcf/pcfdrivr.h
index 29d30497cd..29d30497cd 100644
--- a/drivers/freetype/src/pcf/pcfdrivr.h
+++ b/thirdparty/freetype/src/pcf/pcfdrivr.h
diff --git a/drivers/freetype/src/pcf/pcferror.h b/thirdparty/freetype/src/pcf/pcferror.h
index add8ef2230..add8ef2230 100644
--- a/drivers/freetype/src/pcf/pcferror.h
+++ b/thirdparty/freetype/src/pcf/pcferror.h
diff --git a/drivers/freetype/src/pcf/pcfread.c b/thirdparty/freetype/src/pcf/pcfread.c
index a86b45d6bf..a86b45d6bf 100644
--- a/drivers/freetype/src/pcf/pcfread.c
+++ b/thirdparty/freetype/src/pcf/pcfread.c
diff --git a/drivers/freetype/src/pcf/pcfread.h b/thirdparty/freetype/src/pcf/pcfread.h
index bed30e5030..bed30e5030 100644
--- a/drivers/freetype/src/pcf/pcfread.h
+++ b/thirdparty/freetype/src/pcf/pcfread.h
diff --git a/drivers/freetype/src/pcf/pcfutil.c b/thirdparty/freetype/src/pcf/pcfutil.c
index 0451ee8def..0451ee8def 100644
--- a/drivers/freetype/src/pcf/pcfutil.c
+++ b/thirdparty/freetype/src/pcf/pcfutil.c
diff --git a/drivers/freetype/src/pcf/pcfutil.h b/thirdparty/freetype/src/pcf/pcfutil.h
index be986e756b..be986e756b 100644
--- a/drivers/freetype/src/pcf/pcfutil.h
+++ b/thirdparty/freetype/src/pcf/pcfutil.h
diff --git a/drivers/freetype/src/pcf/rules.mk b/thirdparty/freetype/src/pcf/rules.mk
index 1b55daf4f4..1b55daf4f4 100644
--- a/drivers/freetype/src/pcf/rules.mk
+++ b/thirdparty/freetype/src/pcf/rules.mk
diff --git a/drivers/freetype/src/pfr/module.mk b/thirdparty/freetype/src/pfr/module.mk
index bf7808c72f..bf7808c72f 100644
--- a/drivers/freetype/src/pfr/module.mk
+++ b/thirdparty/freetype/src/pfr/module.mk
diff --git a/drivers/freetype/src/pfr/pfr.c b/thirdparty/freetype/src/pfr/pfr.c
index 1a433960a5..1a433960a5 100644
--- a/drivers/freetype/src/pfr/pfr.c
+++ b/thirdparty/freetype/src/pfr/pfr.c
diff --git a/drivers/freetype/src/pfr/pfrcmap.c b/thirdparty/freetype/src/pfr/pfrcmap.c
index a1439c2e9f..a1439c2e9f 100644
--- a/drivers/freetype/src/pfr/pfrcmap.c
+++ b/thirdparty/freetype/src/pfr/pfrcmap.c
diff --git a/drivers/freetype/src/pfr/pfrcmap.h b/thirdparty/freetype/src/pfr/pfrcmap.h
index 4a8a4d0a67..4a8a4d0a67 100644
--- a/drivers/freetype/src/pfr/pfrcmap.h
+++ b/thirdparty/freetype/src/pfr/pfrcmap.h
diff --git a/drivers/freetype/src/pfr/pfrdrivr.c b/thirdparty/freetype/src/pfr/pfrdrivr.c
index b81c15e560..b81c15e560 100644
--- a/drivers/freetype/src/pfr/pfrdrivr.c
+++ b/thirdparty/freetype/src/pfr/pfrdrivr.c
diff --git a/drivers/freetype/src/pfr/pfrdrivr.h b/thirdparty/freetype/src/pfr/pfrdrivr.h
index 32b2d9eab3..32b2d9eab3 100644
--- a/drivers/freetype/src/pfr/pfrdrivr.h
+++ b/thirdparty/freetype/src/pfr/pfrdrivr.h
diff --git a/drivers/freetype/src/pfr/pfrerror.h b/thirdparty/freetype/src/pfr/pfrerror.h
index 9305f8fb58..9305f8fb58 100644
--- a/drivers/freetype/src/pfr/pfrerror.h
+++ b/thirdparty/freetype/src/pfr/pfrerror.h
diff --git a/drivers/freetype/src/pfr/pfrgload.c b/thirdparty/freetype/src/pfr/pfrgload.c
index f9cd1f63bb..f9cd1f63bb 100644
--- a/drivers/freetype/src/pfr/pfrgload.c
+++ b/thirdparty/freetype/src/pfr/pfrgload.c
diff --git a/drivers/freetype/src/pfr/pfrgload.h b/thirdparty/freetype/src/pfr/pfrgload.h
index 908d4378a4..908d4378a4 100644
--- a/drivers/freetype/src/pfr/pfrgload.h
+++ b/thirdparty/freetype/src/pfr/pfrgload.h
diff --git a/drivers/freetype/src/pfr/pfrload.c b/thirdparty/freetype/src/pfr/pfrload.c
index e509e70b5d..e509e70b5d 100644
--- a/drivers/freetype/src/pfr/pfrload.c
+++ b/thirdparty/freetype/src/pfr/pfrload.c
diff --git a/drivers/freetype/src/pfr/pfrload.h b/thirdparty/freetype/src/pfr/pfrload.h
index 0f7a2bb239..0f7a2bb239 100644
--- a/drivers/freetype/src/pfr/pfrload.h
+++ b/thirdparty/freetype/src/pfr/pfrload.h
diff --git a/drivers/freetype/src/pfr/pfrobjs.c b/thirdparty/freetype/src/pfr/pfrobjs.c
index 769a3b6164..769a3b6164 100644
--- a/drivers/freetype/src/pfr/pfrobjs.c
+++ b/thirdparty/freetype/src/pfr/pfrobjs.c
diff --git a/drivers/freetype/src/pfr/pfrobjs.h b/thirdparty/freetype/src/pfr/pfrobjs.h
index 335aca8854..335aca8854 100644
--- a/drivers/freetype/src/pfr/pfrobjs.h
+++ b/thirdparty/freetype/src/pfr/pfrobjs.h
diff --git a/drivers/freetype/src/pfr/pfrsbit.c b/thirdparty/freetype/src/pfr/pfrsbit.c
index 144f50c0b3..144f50c0b3 100644
--- a/drivers/freetype/src/pfr/pfrsbit.c
+++ b/thirdparty/freetype/src/pfr/pfrsbit.c
diff --git a/drivers/freetype/src/pfr/pfrsbit.h b/thirdparty/freetype/src/pfr/pfrsbit.h
index 94ead28ca7..94ead28ca7 100644
--- a/drivers/freetype/src/pfr/pfrsbit.h
+++ b/thirdparty/freetype/src/pfr/pfrsbit.h
diff --git a/drivers/freetype/src/pfr/pfrtypes.h b/thirdparty/freetype/src/pfr/pfrtypes.h
index bd6c2cd30c..bd6c2cd30c 100644
--- a/drivers/freetype/src/pfr/pfrtypes.h
+++ b/thirdparty/freetype/src/pfr/pfrtypes.h
diff --git a/drivers/freetype/src/pfr/rules.mk b/thirdparty/freetype/src/pfr/rules.mk
index 39bb9e941a..39bb9e941a 100644
--- a/drivers/freetype/src/pfr/rules.mk
+++ b/thirdparty/freetype/src/pfr/rules.mk
diff --git a/drivers/freetype/src/psaux/afmparse.c b/thirdparty/freetype/src/psaux/afmparse.c
index 9fb0ac0e2b..9fb0ac0e2b 100644
--- a/drivers/freetype/src/psaux/afmparse.c
+++ b/thirdparty/freetype/src/psaux/afmparse.c
diff --git a/drivers/freetype/src/psaux/afmparse.h b/thirdparty/freetype/src/psaux/afmparse.h
index 6d8b193ffc..6d8b193ffc 100644
--- a/drivers/freetype/src/psaux/afmparse.h
+++ b/thirdparty/freetype/src/psaux/afmparse.h
diff --git a/drivers/freetype/src/psaux/module.mk b/thirdparty/freetype/src/psaux/module.mk
index 630c4f39dd..630c4f39dd 100644
--- a/drivers/freetype/src/psaux/module.mk
+++ b/thirdparty/freetype/src/psaux/module.mk
diff --git a/drivers/freetype/src/psaux/psaux.c b/thirdparty/freetype/src/psaux/psaux.c
index 33b462ef15..33b462ef15 100644
--- a/drivers/freetype/src/psaux/psaux.c
+++ b/thirdparty/freetype/src/psaux/psaux.c
diff --git a/drivers/freetype/src/psaux/psauxerr.h b/thirdparty/freetype/src/psaux/psauxerr.h
index 9739157fc4..9739157fc4 100644
--- a/drivers/freetype/src/psaux/psauxerr.h
+++ b/thirdparty/freetype/src/psaux/psauxerr.h
diff --git a/drivers/freetype/src/psaux/psauxmod.c b/thirdparty/freetype/src/psaux/psauxmod.c
index 80805e6951..80805e6951 100644
--- a/drivers/freetype/src/psaux/psauxmod.c
+++ b/thirdparty/freetype/src/psaux/psauxmod.c
diff --git a/drivers/freetype/src/psaux/psauxmod.h b/thirdparty/freetype/src/psaux/psauxmod.h
index b1dbb06904..b1dbb06904 100644
--- a/drivers/freetype/src/psaux/psauxmod.h
+++ b/thirdparty/freetype/src/psaux/psauxmod.h
diff --git a/drivers/freetype/src/psaux/psconv.c b/thirdparty/freetype/src/psaux/psconv.c
index fdaca7fb5d..fdaca7fb5d 100644
--- a/drivers/freetype/src/psaux/psconv.c
+++ b/thirdparty/freetype/src/psaux/psconv.c
diff --git a/drivers/freetype/src/psaux/psconv.h b/thirdparty/freetype/src/psaux/psconv.h
index 062de36413..062de36413 100644
--- a/drivers/freetype/src/psaux/psconv.h
+++ b/thirdparty/freetype/src/psaux/psconv.h
diff --git a/drivers/freetype/src/psaux/psobjs.c b/thirdparty/freetype/src/psaux/psobjs.c
index f208b5fc63..f208b5fc63 100644
--- a/drivers/freetype/src/psaux/psobjs.c
+++ b/thirdparty/freetype/src/psaux/psobjs.c
diff --git a/drivers/freetype/src/psaux/psobjs.h b/thirdparty/freetype/src/psaux/psobjs.h
index 4c7178e79f..4c7178e79f 100644
--- a/drivers/freetype/src/psaux/psobjs.h
+++ b/thirdparty/freetype/src/psaux/psobjs.h
diff --git a/drivers/freetype/src/psaux/rules.mk b/thirdparty/freetype/src/psaux/rules.mk
index 19787b5f82..19787b5f82 100644
--- a/drivers/freetype/src/psaux/rules.mk
+++ b/thirdparty/freetype/src/psaux/rules.mk
diff --git a/drivers/freetype/src/psaux/t1cmap.c b/thirdparty/freetype/src/psaux/t1cmap.c
index 43abb98615..43abb98615 100644
--- a/drivers/freetype/src/psaux/t1cmap.c
+++ b/thirdparty/freetype/src/psaux/t1cmap.c
diff --git a/drivers/freetype/src/psaux/t1cmap.h b/thirdparty/freetype/src/psaux/t1cmap.h
index 5e1277dc63..5e1277dc63 100644
--- a/drivers/freetype/src/psaux/t1cmap.h
+++ b/thirdparty/freetype/src/psaux/t1cmap.h
diff --git a/drivers/freetype/src/psaux/t1decode.c b/thirdparty/freetype/src/psaux/t1decode.c
index 98f6ce1c87..98f6ce1c87 100644
--- a/drivers/freetype/src/psaux/t1decode.c
+++ b/thirdparty/freetype/src/psaux/t1decode.c
diff --git a/drivers/freetype/src/psaux/t1decode.h b/thirdparty/freetype/src/psaux/t1decode.h
index 0f5adfa156..0f5adfa156 100644
--- a/drivers/freetype/src/psaux/t1decode.h
+++ b/thirdparty/freetype/src/psaux/t1decode.h
diff --git a/drivers/freetype/src/pshinter/module.mk b/thirdparty/freetype/src/pshinter/module.mk
index 63110c46a6..63110c46a6 100644
--- a/drivers/freetype/src/pshinter/module.mk
+++ b/thirdparty/freetype/src/pshinter/module.mk
diff --git a/drivers/freetype/src/pshinter/pshalgo.c b/thirdparty/freetype/src/pshinter/pshalgo.c
index 8f131be759..8f131be759 100644
--- a/drivers/freetype/src/pshinter/pshalgo.c
+++ b/thirdparty/freetype/src/pshinter/pshalgo.c
diff --git a/drivers/freetype/src/pshinter/pshalgo.h b/thirdparty/freetype/src/pshinter/pshalgo.h
index f1bda65013..f1bda65013 100644
--- a/drivers/freetype/src/pshinter/pshalgo.h
+++ b/thirdparty/freetype/src/pshinter/pshalgo.h
diff --git a/drivers/freetype/src/pshinter/pshglob.c b/thirdparty/freetype/src/pshinter/pshglob.c
index 2ac5ef1558..2ac5ef1558 100644
--- a/drivers/freetype/src/pshinter/pshglob.c
+++ b/thirdparty/freetype/src/pshinter/pshglob.c
diff --git a/drivers/freetype/src/pshinter/pshglob.h b/thirdparty/freetype/src/pshinter/pshglob.h
index 45c957b6ef..45c957b6ef 100644
--- a/drivers/freetype/src/pshinter/pshglob.h
+++ b/thirdparty/freetype/src/pshinter/pshglob.h
diff --git a/drivers/freetype/src/pshinter/pshinter.c b/thirdparty/freetype/src/pshinter/pshinter.c
index 614e0bb3d8..614e0bb3d8 100644
--- a/drivers/freetype/src/pshinter/pshinter.c
+++ b/thirdparty/freetype/src/pshinter/pshinter.c
diff --git a/drivers/freetype/src/pshinter/pshmod.c b/thirdparty/freetype/src/pshinter/pshmod.c
index fa4ad1f564..fa4ad1f564 100644
--- a/drivers/freetype/src/pshinter/pshmod.c
+++ b/thirdparty/freetype/src/pshinter/pshmod.c
diff --git a/drivers/freetype/src/pshinter/pshmod.h b/thirdparty/freetype/src/pshinter/pshmod.h
index 39112a9561..39112a9561 100644
--- a/drivers/freetype/src/pshinter/pshmod.h
+++ b/thirdparty/freetype/src/pshinter/pshmod.h
diff --git a/drivers/freetype/src/pshinter/pshnterr.h b/thirdparty/freetype/src/pshinter/pshnterr.h
index 7a94588b87..7a94588b87 100644
--- a/drivers/freetype/src/pshinter/pshnterr.h
+++ b/thirdparty/freetype/src/pshinter/pshnterr.h
diff --git a/drivers/freetype/src/pshinter/pshpic.c b/thirdparty/freetype/src/pshinter/pshpic.c
index d0a3d8ebc9..d0a3d8ebc9 100644
--- a/drivers/freetype/src/pshinter/pshpic.c
+++ b/thirdparty/freetype/src/pshinter/pshpic.c
diff --git a/drivers/freetype/src/pshinter/pshpic.h b/thirdparty/freetype/src/pshinter/pshpic.h
index 75ee573544..75ee573544 100644
--- a/drivers/freetype/src/pshinter/pshpic.h
+++ b/thirdparty/freetype/src/pshinter/pshpic.h
diff --git a/drivers/freetype/src/pshinter/pshrec.c b/thirdparty/freetype/src/pshinter/pshrec.c
index d7cc4a0d21..d7cc4a0d21 100644
--- a/drivers/freetype/src/pshinter/pshrec.c
+++ b/thirdparty/freetype/src/pshinter/pshrec.c
diff --git a/drivers/freetype/src/pshinter/pshrec.h b/thirdparty/freetype/src/pshinter/pshrec.h
index 97e6f0ed51..97e6f0ed51 100644
--- a/drivers/freetype/src/pshinter/pshrec.h
+++ b/thirdparty/freetype/src/pshinter/pshrec.h
diff --git a/drivers/freetype/src/pshinter/rules.mk b/thirdparty/freetype/src/pshinter/rules.mk
index 67ecf7862f..67ecf7862f 100644
--- a/drivers/freetype/src/pshinter/rules.mk
+++ b/thirdparty/freetype/src/pshinter/rules.mk
diff --git a/drivers/freetype/src/psnames/module.mk b/thirdparty/freetype/src/psnames/module.mk
index ba29af813c..ba29af813c 100644
--- a/drivers/freetype/src/psnames/module.mk
+++ b/thirdparty/freetype/src/psnames/module.mk
diff --git a/drivers/freetype/src/psnames/psmodule.c b/thirdparty/freetype/src/psnames/psmodule.c
index 345402d7cc..345402d7cc 100644
--- a/drivers/freetype/src/psnames/psmodule.c
+++ b/thirdparty/freetype/src/psnames/psmodule.c
diff --git a/drivers/freetype/src/psnames/psmodule.h b/thirdparty/freetype/src/psnames/psmodule.h
index ee3c6cb631..ee3c6cb631 100644
--- a/drivers/freetype/src/psnames/psmodule.h
+++ b/thirdparty/freetype/src/psnames/psmodule.h
diff --git a/drivers/freetype/src/psnames/psnamerr.h b/thirdparty/freetype/src/psnames/psnamerr.h
index 3a9f65323b..3a9f65323b 100644
--- a/drivers/freetype/src/psnames/psnamerr.h
+++ b/thirdparty/freetype/src/psnames/psnamerr.h
diff --git a/drivers/freetype/src/psnames/psnames.c b/thirdparty/freetype/src/psnames/psnames.c
index e7b2c0b5ef..e7b2c0b5ef 100644
--- a/drivers/freetype/src/psnames/psnames.c
+++ b/thirdparty/freetype/src/psnames/psnames.c
diff --git a/drivers/freetype/src/psnames/pspic.c b/thirdparty/freetype/src/psnames/pspic.c
index a78ec5aa81..a78ec5aa81 100644
--- a/drivers/freetype/src/psnames/pspic.c
+++ b/thirdparty/freetype/src/psnames/pspic.c
diff --git a/drivers/freetype/src/psnames/pspic.h b/thirdparty/freetype/src/psnames/pspic.h
index 48348765cf..48348765cf 100644
--- a/drivers/freetype/src/psnames/pspic.h
+++ b/thirdparty/freetype/src/psnames/pspic.h
diff --git a/drivers/freetype/src/psnames/pstables.h b/thirdparty/freetype/src/psnames/pstables.h
index eb827fa5ea..eb827fa5ea 100644
--- a/drivers/freetype/src/psnames/pstables.h
+++ b/thirdparty/freetype/src/psnames/pstables.h
diff --git a/drivers/freetype/src/psnames/rules.mk b/thirdparty/freetype/src/psnames/rules.mk
index 9849f4053a..9849f4053a 100644
--- a/drivers/freetype/src/psnames/rules.mk
+++ b/thirdparty/freetype/src/psnames/rules.mk
diff --git a/drivers/freetype/src/raster/ftmisc.h b/thirdparty/freetype/src/raster/ftmisc.h
index 981ce32279..981ce32279 100644
--- a/drivers/freetype/src/raster/ftmisc.h
+++ b/thirdparty/freetype/src/raster/ftmisc.h
diff --git a/drivers/freetype/src/raster/ftraster.c b/thirdparty/freetype/src/raster/ftraster.c
index 0fa2f2687f..0fa2f2687f 100644
--- a/drivers/freetype/src/raster/ftraster.c
+++ b/thirdparty/freetype/src/raster/ftraster.c
diff --git a/drivers/freetype/src/raster/ftraster.h b/thirdparty/freetype/src/raster/ftraster.h
index 65cd5f9609..65cd5f9609 100644
--- a/drivers/freetype/src/raster/ftraster.h
+++ b/thirdparty/freetype/src/raster/ftraster.h
diff --git a/drivers/freetype/src/raster/ftrend1.c b/thirdparty/freetype/src/raster/ftrend1.c
index 494f112234..494f112234 100644
--- a/drivers/freetype/src/raster/ftrend1.c
+++ b/thirdparty/freetype/src/raster/ftrend1.c
diff --git a/drivers/freetype/src/raster/ftrend1.h b/thirdparty/freetype/src/raster/ftrend1.h
index a431f185d2..a431f185d2 100644
--- a/drivers/freetype/src/raster/ftrend1.h
+++ b/thirdparty/freetype/src/raster/ftrend1.h
diff --git a/drivers/freetype/src/raster/module.mk b/thirdparty/freetype/src/raster/module.mk
index f4a5f8e838..f4a5f8e838 100644
--- a/drivers/freetype/src/raster/module.mk
+++ b/thirdparty/freetype/src/raster/module.mk
diff --git a/drivers/freetype/src/raster/raster.c b/thirdparty/freetype/src/raster/raster.c
index 5b21dcbc6a..5b21dcbc6a 100644
--- a/drivers/freetype/src/raster/raster.c
+++ b/thirdparty/freetype/src/raster/raster.c
diff --git a/drivers/freetype/src/raster/rasterrs.h b/thirdparty/freetype/src/raster/rasterrs.h
index 44da7fca56..44da7fca56 100644
--- a/drivers/freetype/src/raster/rasterrs.h
+++ b/thirdparty/freetype/src/raster/rasterrs.h
diff --git a/drivers/freetype/src/raster/rastpic.c b/thirdparty/freetype/src/raster/rastpic.c
index dcfa92eef7..dcfa92eef7 100644
--- a/drivers/freetype/src/raster/rastpic.c
+++ b/thirdparty/freetype/src/raster/rastpic.c
diff --git a/drivers/freetype/src/raster/rastpic.h b/thirdparty/freetype/src/raster/rastpic.h
index 7815876383..7815876383 100644
--- a/drivers/freetype/src/raster/rastpic.h
+++ b/thirdparty/freetype/src/raster/rastpic.h
diff --git a/drivers/freetype/src/raster/rules.mk b/thirdparty/freetype/src/raster/rules.mk
index 929faa3a95..929faa3a95 100644
--- a/drivers/freetype/src/raster/rules.mk
+++ b/thirdparty/freetype/src/raster/rules.mk
diff --git a/drivers/freetype/src/sfnt/module.mk b/thirdparty/freetype/src/sfnt/module.mk
index ca19e096a3..ca19e096a3 100644
--- a/drivers/freetype/src/sfnt/module.mk
+++ b/thirdparty/freetype/src/sfnt/module.mk
diff --git a/drivers/freetype/src/sfnt/pngshim.c b/thirdparty/freetype/src/sfnt/pngshim.c
index 2815759ccb..2815759ccb 100644
--- a/drivers/freetype/src/sfnt/pngshim.c
+++ b/thirdparty/freetype/src/sfnt/pngshim.c
diff --git a/drivers/freetype/src/sfnt/pngshim.h b/thirdparty/freetype/src/sfnt/pngshim.h
index ff05871332..ff05871332 100644
--- a/drivers/freetype/src/sfnt/pngshim.h
+++ b/thirdparty/freetype/src/sfnt/pngshim.h
diff --git a/drivers/freetype/src/sfnt/rules.mk b/thirdparty/freetype/src/sfnt/rules.mk
index e9fc421567..e9fc421567 100644
--- a/drivers/freetype/src/sfnt/rules.mk
+++ b/thirdparty/freetype/src/sfnt/rules.mk
diff --git a/drivers/freetype/src/sfnt/sfdriver.c b/thirdparty/freetype/src/sfnt/sfdriver.c
index 47e8967752..47e8967752 100644
--- a/drivers/freetype/src/sfnt/sfdriver.c
+++ b/thirdparty/freetype/src/sfnt/sfdriver.c
diff --git a/drivers/freetype/src/sfnt/sfdriver.h b/thirdparty/freetype/src/sfnt/sfdriver.h
index 2694488e20..2694488e20 100644
--- a/drivers/freetype/src/sfnt/sfdriver.h
+++ b/thirdparty/freetype/src/sfnt/sfdriver.h
diff --git a/drivers/freetype/src/sfnt/sferrors.h b/thirdparty/freetype/src/sfnt/sferrors.h
index c2f9fdfead..c2f9fdfead 100644
--- a/drivers/freetype/src/sfnt/sferrors.h
+++ b/thirdparty/freetype/src/sfnt/sferrors.h
diff --git a/drivers/freetype/src/sfnt/sfnt.c b/thirdparty/freetype/src/sfnt/sfnt.c
index 952d6d425a..952d6d425a 100644
--- a/drivers/freetype/src/sfnt/sfnt.c
+++ b/thirdparty/freetype/src/sfnt/sfnt.c
diff --git a/drivers/freetype/src/sfnt/sfntpic.c b/thirdparty/freetype/src/sfnt/sfntpic.c
index 1f596c0936..1f596c0936 100644
--- a/drivers/freetype/src/sfnt/sfntpic.c
+++ b/thirdparty/freetype/src/sfnt/sfntpic.c
diff --git a/drivers/freetype/src/sfnt/sfntpic.h b/thirdparty/freetype/src/sfnt/sfntpic.h
index 5ce96d3938..5ce96d3938 100644
--- a/drivers/freetype/src/sfnt/sfntpic.h
+++ b/thirdparty/freetype/src/sfnt/sfntpic.h
diff --git a/drivers/freetype/src/sfnt/sfobjs.c b/thirdparty/freetype/src/sfnt/sfobjs.c
index 2e8c1ecde6..2e8c1ecde6 100644
--- a/drivers/freetype/src/sfnt/sfobjs.c
+++ b/thirdparty/freetype/src/sfnt/sfobjs.c
diff --git a/drivers/freetype/src/sfnt/sfobjs.h b/thirdparty/freetype/src/sfnt/sfobjs.h
index 60b5698edd..60b5698edd 100644
--- a/drivers/freetype/src/sfnt/sfobjs.h
+++ b/thirdparty/freetype/src/sfnt/sfobjs.h
diff --git a/drivers/freetype/src/sfnt/ttbdf.c b/thirdparty/freetype/src/sfnt/ttbdf.c
index f891691118..f891691118 100644
--- a/drivers/freetype/src/sfnt/ttbdf.c
+++ b/thirdparty/freetype/src/sfnt/ttbdf.c
diff --git a/drivers/freetype/src/sfnt/ttbdf.h b/thirdparty/freetype/src/sfnt/ttbdf.h
index ae521c60b6..ae521c60b6 100644
--- a/drivers/freetype/src/sfnt/ttbdf.h
+++ b/thirdparty/freetype/src/sfnt/ttbdf.h
diff --git a/drivers/freetype/src/sfnt/ttcmap.c b/thirdparty/freetype/src/sfnt/ttcmap.c
index 01255a887e..01255a887e 100644
--- a/drivers/freetype/src/sfnt/ttcmap.c
+++ b/thirdparty/freetype/src/sfnt/ttcmap.c
diff --git a/drivers/freetype/src/sfnt/ttcmap.h b/thirdparty/freetype/src/sfnt/ttcmap.h
index 2273cbd961..2273cbd961 100644
--- a/drivers/freetype/src/sfnt/ttcmap.h
+++ b/thirdparty/freetype/src/sfnt/ttcmap.h
diff --git a/drivers/freetype/src/sfnt/ttcmapc.h b/thirdparty/freetype/src/sfnt/ttcmapc.h
index 7c732fbd36..7c732fbd36 100644
--- a/drivers/freetype/src/sfnt/ttcmapc.h
+++ b/thirdparty/freetype/src/sfnt/ttcmapc.h
diff --git a/drivers/freetype/src/sfnt/ttkern.c b/thirdparty/freetype/src/sfnt/ttkern.c
index 6f9fa522d5..6f9fa522d5 100644
--- a/drivers/freetype/src/sfnt/ttkern.c
+++ b/thirdparty/freetype/src/sfnt/ttkern.c
diff --git a/drivers/freetype/src/sfnt/ttkern.h b/thirdparty/freetype/src/sfnt/ttkern.h
index 85dd5c31ae..85dd5c31ae 100644
--- a/drivers/freetype/src/sfnt/ttkern.h
+++ b/thirdparty/freetype/src/sfnt/ttkern.h
diff --git a/drivers/freetype/src/sfnt/ttload.c b/thirdparty/freetype/src/sfnt/ttload.c
index 2f5b2c3843..2f5b2c3843 100644
--- a/drivers/freetype/src/sfnt/ttload.c
+++ b/thirdparty/freetype/src/sfnt/ttload.c
diff --git a/drivers/freetype/src/sfnt/ttload.h b/thirdparty/freetype/src/sfnt/ttload.h
index bec42b94b4..bec42b94b4 100644
--- a/drivers/freetype/src/sfnt/ttload.h
+++ b/thirdparty/freetype/src/sfnt/ttload.h
diff --git a/drivers/freetype/src/sfnt/ttmtx.c b/thirdparty/freetype/src/sfnt/ttmtx.c
index 186f873dae..186f873dae 100644
--- a/drivers/freetype/src/sfnt/ttmtx.c
+++ b/thirdparty/freetype/src/sfnt/ttmtx.c
diff --git a/drivers/freetype/src/sfnt/ttmtx.h b/thirdparty/freetype/src/sfnt/ttmtx.h
index 78395def33..78395def33 100644
--- a/drivers/freetype/src/sfnt/ttmtx.h
+++ b/thirdparty/freetype/src/sfnt/ttmtx.h
diff --git a/drivers/freetype/src/sfnt/ttpost.c b/thirdparty/freetype/src/sfnt/ttpost.c
index 3277f1ec4f..3277f1ec4f 100644
--- a/drivers/freetype/src/sfnt/ttpost.c
+++ b/thirdparty/freetype/src/sfnt/ttpost.c
diff --git a/drivers/freetype/src/sfnt/ttpost.h b/thirdparty/freetype/src/sfnt/ttpost.h
index ede45fd84c..ede45fd84c 100644
--- a/drivers/freetype/src/sfnt/ttpost.h
+++ b/thirdparty/freetype/src/sfnt/ttpost.h
diff --git a/drivers/freetype/src/sfnt/ttsbit.c b/thirdparty/freetype/src/sfnt/ttsbit.c
index e24e7d6cdd..e24e7d6cdd 100644
--- a/drivers/freetype/src/sfnt/ttsbit.c
+++ b/thirdparty/freetype/src/sfnt/ttsbit.c
diff --git a/drivers/freetype/src/sfnt/ttsbit.h b/thirdparty/freetype/src/sfnt/ttsbit.h
index d8a8167083..d8a8167083 100644
--- a/drivers/freetype/src/sfnt/ttsbit.h
+++ b/thirdparty/freetype/src/sfnt/ttsbit.h
diff --git a/drivers/freetype/src/smooth/ftgrays.c b/thirdparty/freetype/src/smooth/ftgrays.c
index 0bf3ac6ffb..0bf3ac6ffb 100644
--- a/drivers/freetype/src/smooth/ftgrays.c
+++ b/thirdparty/freetype/src/smooth/ftgrays.c
diff --git a/drivers/freetype/src/smooth/ftgrays.h b/thirdparty/freetype/src/smooth/ftgrays.h
index 21c2badcaf..21c2badcaf 100644
--- a/drivers/freetype/src/smooth/ftgrays.h
+++ b/thirdparty/freetype/src/smooth/ftgrays.h
diff --git a/drivers/freetype/src/smooth/ftsmerrs.h b/thirdparty/freetype/src/smooth/ftsmerrs.h
index a759b91c17..a759b91c17 100644
--- a/drivers/freetype/src/smooth/ftsmerrs.h
+++ b/thirdparty/freetype/src/smooth/ftsmerrs.h
diff --git a/drivers/freetype/src/smooth/ftsmooth.c b/thirdparty/freetype/src/smooth/ftsmooth.c
index 79276765b1..79276765b1 100644
--- a/drivers/freetype/src/smooth/ftsmooth.c
+++ b/thirdparty/freetype/src/smooth/ftsmooth.c
diff --git a/drivers/freetype/src/smooth/ftsmooth.h b/thirdparty/freetype/src/smooth/ftsmooth.h
index c7c28c244c..c7c28c244c 100644
--- a/drivers/freetype/src/smooth/ftsmooth.h
+++ b/thirdparty/freetype/src/smooth/ftsmooth.h
diff --git a/drivers/freetype/src/smooth/ftspic.c b/thirdparty/freetype/src/smooth/ftspic.c
index 6c2b2329b3..6c2b2329b3 100644
--- a/drivers/freetype/src/smooth/ftspic.c
+++ b/thirdparty/freetype/src/smooth/ftspic.c
diff --git a/drivers/freetype/src/smooth/ftspic.h b/thirdparty/freetype/src/smooth/ftspic.h
index fe76152770..fe76152770 100644
--- a/drivers/freetype/src/smooth/ftspic.h
+++ b/thirdparty/freetype/src/smooth/ftspic.h
diff --git a/drivers/freetype/src/smooth/module.mk b/thirdparty/freetype/src/smooth/module.mk
index f3cb044039..f3cb044039 100644
--- a/drivers/freetype/src/smooth/module.mk
+++ b/thirdparty/freetype/src/smooth/module.mk
diff --git a/drivers/freetype/src/smooth/rules.mk b/thirdparty/freetype/src/smooth/rules.mk
index 5e94f73519..5e94f73519 100644
--- a/drivers/freetype/src/smooth/rules.mk
+++ b/thirdparty/freetype/src/smooth/rules.mk
diff --git a/drivers/freetype/src/smooth/smooth.c b/thirdparty/freetype/src/smooth/smooth.c
index 97ca3e5995..97ca3e5995 100644
--- a/drivers/freetype/src/smooth/smooth.c
+++ b/thirdparty/freetype/src/smooth/smooth.c
diff --git a/drivers/freetype/src/truetype/module.mk b/thirdparty/freetype/src/truetype/module.mk
index 80c9832b2c..80c9832b2c 100644
--- a/drivers/freetype/src/truetype/module.mk
+++ b/thirdparty/freetype/src/truetype/module.mk
diff --git a/drivers/freetype/src/truetype/rules.mk b/thirdparty/freetype/src/truetype/rules.mk
index 3bf7cf770d..3bf7cf770d 100644
--- a/drivers/freetype/src/truetype/rules.mk
+++ b/thirdparty/freetype/src/truetype/rules.mk
diff --git a/drivers/freetype/src/truetype/truetype.c b/thirdparty/freetype/src/truetype/truetype.c
index 23e2ea00a7..23e2ea00a7 100644
--- a/drivers/freetype/src/truetype/truetype.c
+++ b/thirdparty/freetype/src/truetype/truetype.c
diff --git a/drivers/freetype/src/truetype/ttdriver.c b/thirdparty/freetype/src/truetype/ttdriver.c
index c9d4081efe..c9d4081efe 100644
--- a/drivers/freetype/src/truetype/ttdriver.c
+++ b/thirdparty/freetype/src/truetype/ttdriver.c
diff --git a/drivers/freetype/src/truetype/ttdriver.h b/thirdparty/freetype/src/truetype/ttdriver.h
index 74392bbd02..74392bbd02 100644
--- a/drivers/freetype/src/truetype/ttdriver.h
+++ b/thirdparty/freetype/src/truetype/ttdriver.h
diff --git a/drivers/freetype/src/truetype/tterrors.h b/thirdparty/freetype/src/truetype/tterrors.h
index 895989f5fd..895989f5fd 100644
--- a/drivers/freetype/src/truetype/tterrors.h
+++ b/thirdparty/freetype/src/truetype/tterrors.h
diff --git a/drivers/freetype/src/truetype/ttgload.c b/thirdparty/freetype/src/truetype/ttgload.c
index 8be9b6ae65..8be9b6ae65 100644
--- a/drivers/freetype/src/truetype/ttgload.c
+++ b/thirdparty/freetype/src/truetype/ttgload.c
diff --git a/drivers/freetype/src/truetype/ttgload.h b/thirdparty/freetype/src/truetype/ttgload.h
index bfa29e4ff8..bfa29e4ff8 100644
--- a/drivers/freetype/src/truetype/ttgload.h
+++ b/thirdparty/freetype/src/truetype/ttgload.h
diff --git a/drivers/freetype/src/truetype/ttgxvar.c b/thirdparty/freetype/src/truetype/ttgxvar.c
index 9a02c5a8c1..9a02c5a8c1 100644
--- a/drivers/freetype/src/truetype/ttgxvar.c
+++ b/thirdparty/freetype/src/truetype/ttgxvar.c
diff --git a/drivers/freetype/src/truetype/ttgxvar.h b/thirdparty/freetype/src/truetype/ttgxvar.h
index aa8f6ea592..aa8f6ea592 100644
--- a/drivers/freetype/src/truetype/ttgxvar.h
+++ b/thirdparty/freetype/src/truetype/ttgxvar.h
diff --git a/drivers/freetype/src/truetype/ttinterp.c b/thirdparty/freetype/src/truetype/ttinterp.c
index 8fe83c5ea8..8fe83c5ea8 100644
--- a/drivers/freetype/src/truetype/ttinterp.c
+++ b/thirdparty/freetype/src/truetype/ttinterp.c
diff --git a/drivers/freetype/src/truetype/ttinterp.h b/thirdparty/freetype/src/truetype/ttinterp.h
index df7ce51f1c..df7ce51f1c 100644
--- a/drivers/freetype/src/truetype/ttinterp.h
+++ b/thirdparty/freetype/src/truetype/ttinterp.h
diff --git a/drivers/freetype/src/truetype/ttobjs.c b/thirdparty/freetype/src/truetype/ttobjs.c
index ed3be2dbee..ed3be2dbee 100644
--- a/drivers/freetype/src/truetype/ttobjs.c
+++ b/thirdparty/freetype/src/truetype/ttobjs.c
diff --git a/drivers/freetype/src/truetype/ttobjs.h b/thirdparty/freetype/src/truetype/ttobjs.h
index ed61a7d517..ed61a7d517 100644
--- a/drivers/freetype/src/truetype/ttobjs.h
+++ b/thirdparty/freetype/src/truetype/ttobjs.h
diff --git a/drivers/freetype/src/truetype/ttpic.c b/thirdparty/freetype/src/truetype/ttpic.c
index 54a5b8bed6..54a5b8bed6 100644
--- a/drivers/freetype/src/truetype/ttpic.c
+++ b/thirdparty/freetype/src/truetype/ttpic.c
diff --git a/drivers/freetype/src/truetype/ttpic.h b/thirdparty/freetype/src/truetype/ttpic.h
index f725865c5c..f725865c5c 100644
--- a/drivers/freetype/src/truetype/ttpic.h
+++ b/thirdparty/freetype/src/truetype/ttpic.h
diff --git a/drivers/freetype/src/truetype/ttpload.c b/thirdparty/freetype/src/truetype/ttpload.c
index ca158ac50b..ca158ac50b 100644
--- a/drivers/freetype/src/truetype/ttpload.c
+++ b/thirdparty/freetype/src/truetype/ttpload.c
diff --git a/drivers/freetype/src/truetype/ttpload.h b/thirdparty/freetype/src/truetype/ttpload.h
index aa2e38e6e7..aa2e38e6e7 100644
--- a/drivers/freetype/src/truetype/ttpload.h
+++ b/thirdparty/freetype/src/truetype/ttpload.h
diff --git a/drivers/freetype/src/truetype/ttsubpix.c b/thirdparty/freetype/src/truetype/ttsubpix.c
index 03950960a4..03950960a4 100644
--- a/drivers/freetype/src/truetype/ttsubpix.c
+++ b/thirdparty/freetype/src/truetype/ttsubpix.c
diff --git a/drivers/freetype/src/truetype/ttsubpix.h b/thirdparty/freetype/src/truetype/ttsubpix.h
index 86844da666..86844da666 100644
--- a/drivers/freetype/src/truetype/ttsubpix.h
+++ b/thirdparty/freetype/src/truetype/ttsubpix.h
diff --git a/drivers/freetype/src/type1/module.mk b/thirdparty/freetype/src/type1/module.mk
index d7ab520c74..d7ab520c74 100644
--- a/drivers/freetype/src/type1/module.mk
+++ b/thirdparty/freetype/src/type1/module.mk
diff --git a/drivers/freetype/src/type1/rules.mk b/thirdparty/freetype/src/type1/rules.mk
index bdec29479f..bdec29479f 100644
--- a/drivers/freetype/src/type1/rules.mk
+++ b/thirdparty/freetype/src/type1/rules.mk
diff --git a/drivers/freetype/src/type1/t1afm.c b/thirdparty/freetype/src/type1/t1afm.c
index bbd843c1c3..bbd843c1c3 100644
--- a/drivers/freetype/src/type1/t1afm.c
+++ b/thirdparty/freetype/src/type1/t1afm.c
diff --git a/drivers/freetype/src/type1/t1afm.h b/thirdparty/freetype/src/type1/t1afm.h
index 3a864f2379..3a864f2379 100644
--- a/drivers/freetype/src/type1/t1afm.h
+++ b/thirdparty/freetype/src/type1/t1afm.h
diff --git a/drivers/freetype/src/type1/t1driver.c b/thirdparty/freetype/src/type1/t1driver.c
index f1e60d4523..f1e60d4523 100644
--- a/drivers/freetype/src/type1/t1driver.c
+++ b/thirdparty/freetype/src/type1/t1driver.c
diff --git a/drivers/freetype/src/type1/t1driver.h b/thirdparty/freetype/src/type1/t1driver.h
index 78d8e38aa9..78d8e38aa9 100644
--- a/drivers/freetype/src/type1/t1driver.h
+++ b/thirdparty/freetype/src/type1/t1driver.h
diff --git a/drivers/freetype/src/type1/t1errors.h b/thirdparty/freetype/src/type1/t1errors.h
index 9ba470ed6c..9ba470ed6c 100644
--- a/drivers/freetype/src/type1/t1errors.h
+++ b/thirdparty/freetype/src/type1/t1errors.h
diff --git a/drivers/freetype/src/type1/t1gload.c b/thirdparty/freetype/src/type1/t1gload.c
index ea36f64142..ea36f64142 100644
--- a/drivers/freetype/src/type1/t1gload.c
+++ b/thirdparty/freetype/src/type1/t1gload.c
diff --git a/drivers/freetype/src/type1/t1gload.h b/thirdparty/freetype/src/type1/t1gload.h
index 975f227853..975f227853 100644
--- a/drivers/freetype/src/type1/t1gload.h
+++ b/thirdparty/freetype/src/type1/t1gload.h
diff --git a/drivers/freetype/src/type1/t1load.c b/thirdparty/freetype/src/type1/t1load.c
index c981adcf2c..c981adcf2c 100644
--- a/drivers/freetype/src/type1/t1load.c
+++ b/thirdparty/freetype/src/type1/t1load.c
diff --git a/drivers/freetype/src/type1/t1load.h b/thirdparty/freetype/src/type1/t1load.h
index b96fe5a746..b96fe5a746 100644
--- a/drivers/freetype/src/type1/t1load.h
+++ b/thirdparty/freetype/src/type1/t1load.h
diff --git a/drivers/freetype/src/type1/t1objs.c b/thirdparty/freetype/src/type1/t1objs.c
index a009117133..a009117133 100644
--- a/drivers/freetype/src/type1/t1objs.c
+++ b/thirdparty/freetype/src/type1/t1objs.c
diff --git a/drivers/freetype/src/type1/t1objs.h b/thirdparty/freetype/src/type1/t1objs.h
index 94fbdee9ae..94fbdee9ae 100644
--- a/drivers/freetype/src/type1/t1objs.h
+++ b/thirdparty/freetype/src/type1/t1objs.h
diff --git a/drivers/freetype/src/type1/t1parse.c b/thirdparty/freetype/src/type1/t1parse.c
index 563d9f37bb..563d9f37bb 100644
--- a/drivers/freetype/src/type1/t1parse.c
+++ b/thirdparty/freetype/src/type1/t1parse.c
diff --git a/drivers/freetype/src/type1/t1parse.h b/thirdparty/freetype/src/type1/t1parse.h
index affa818e63..affa818e63 100644
--- a/drivers/freetype/src/type1/t1parse.h
+++ b/thirdparty/freetype/src/type1/t1parse.h
diff --git a/drivers/freetype/src/type1/t1tokens.h b/thirdparty/freetype/src/type1/t1tokens.h
index a84f291a6b..a84f291a6b 100644
--- a/drivers/freetype/src/type1/t1tokens.h
+++ b/thirdparty/freetype/src/type1/t1tokens.h
diff --git a/drivers/freetype/src/type1/type1.c b/thirdparty/freetype/src/type1/type1.c
index bb8aca97f9..bb8aca97f9 100644
--- a/drivers/freetype/src/type1/type1.c
+++ b/thirdparty/freetype/src/type1/type1.c
diff --git a/drivers/freetype/src/type42/module.mk b/thirdparty/freetype/src/type42/module.mk
index a7e27b7236..a7e27b7236 100644
--- a/drivers/freetype/src/type42/module.mk
+++ b/thirdparty/freetype/src/type42/module.mk
diff --git a/drivers/freetype/src/type42/rules.mk b/thirdparty/freetype/src/type42/rules.mk
index 80710eff67..80710eff67 100644
--- a/drivers/freetype/src/type42/rules.mk
+++ b/thirdparty/freetype/src/type42/rules.mk
diff --git a/drivers/freetype/src/type42/t42drivr.c b/thirdparty/freetype/src/type42/t42drivr.c
index c63ed0c812..c63ed0c812 100644
--- a/drivers/freetype/src/type42/t42drivr.c
+++ b/thirdparty/freetype/src/type42/t42drivr.c
diff --git a/drivers/freetype/src/type42/t42drivr.h b/thirdparty/freetype/src/type42/t42drivr.h
index 6ddfb639d5..6ddfb639d5 100644
--- a/drivers/freetype/src/type42/t42drivr.h
+++ b/thirdparty/freetype/src/type42/t42drivr.h
diff --git a/drivers/freetype/src/type42/t42error.h b/thirdparty/freetype/src/type42/t42error.h
index e1097cc81e..e1097cc81e 100644
--- a/drivers/freetype/src/type42/t42error.h
+++ b/thirdparty/freetype/src/type42/t42error.h
diff --git a/drivers/freetype/src/type42/t42objs.c b/thirdparty/freetype/src/type42/t42objs.c
index 4672c6e164..4672c6e164 100644
--- a/drivers/freetype/src/type42/t42objs.c
+++ b/thirdparty/freetype/src/type42/t42objs.c
diff --git a/drivers/freetype/src/type42/t42objs.h b/thirdparty/freetype/src/type42/t42objs.h
index 87a40452f4..87a40452f4 100644
--- a/drivers/freetype/src/type42/t42objs.h
+++ b/thirdparty/freetype/src/type42/t42objs.h
diff --git a/drivers/freetype/src/type42/t42parse.c b/thirdparty/freetype/src/type42/t42parse.c
index f948916afa..f948916afa 100644
--- a/drivers/freetype/src/type42/t42parse.c
+++ b/thirdparty/freetype/src/type42/t42parse.c
diff --git a/drivers/freetype/src/type42/t42parse.h b/thirdparty/freetype/src/type42/t42parse.h
index ba9e857190..ba9e857190 100644
--- a/drivers/freetype/src/type42/t42parse.h
+++ b/thirdparty/freetype/src/type42/t42parse.h
diff --git a/drivers/freetype/src/type42/t42types.h b/thirdparty/freetype/src/type42/t42types.h
index 850a156e45..850a156e45 100644
--- a/drivers/freetype/src/type42/t42types.h
+++ b/thirdparty/freetype/src/type42/t42types.h
diff --git a/drivers/freetype/src/type42/type42.c b/thirdparty/freetype/src/type42/type42.c
index 0d17a9b1dc..0d17a9b1dc 100644
--- a/drivers/freetype/src/type42/type42.c
+++ b/thirdparty/freetype/src/type42/type42.c
diff --git a/drivers/freetype/src/winfonts/fnterrs.h b/thirdparty/freetype/src/winfonts/fnterrs.h
index 6835d3e64f..6835d3e64f 100644
--- a/drivers/freetype/src/winfonts/fnterrs.h
+++ b/thirdparty/freetype/src/winfonts/fnterrs.h
diff --git a/drivers/freetype/src/winfonts/module.mk b/thirdparty/freetype/src/winfonts/module.mk
index 83da5732f1..83da5732f1 100644
--- a/drivers/freetype/src/winfonts/module.mk
+++ b/thirdparty/freetype/src/winfonts/module.mk
diff --git a/drivers/freetype/src/winfonts/rules.mk b/thirdparty/freetype/src/winfonts/rules.mk
index 2fd7b822a2..2fd7b822a2 100644
--- a/drivers/freetype/src/winfonts/rules.mk
+++ b/thirdparty/freetype/src/winfonts/rules.mk
diff --git a/drivers/freetype/src/winfonts/winfnt.c b/thirdparty/freetype/src/winfonts/winfnt.c
index 1c74ccd5ab..1c74ccd5ab 100644
--- a/drivers/freetype/src/winfonts/winfnt.c
+++ b/thirdparty/freetype/src/winfonts/winfnt.c
diff --git a/drivers/freetype/src/winfonts/winfnt.h b/thirdparty/freetype/src/winfonts/winfnt.h
index 9a4f32d5b0..9a4f32d5b0 100644
--- a/drivers/freetype/src/winfonts/winfnt.h
+++ b/thirdparty/freetype/src/winfonts/winfnt.h
diff --git a/drivers/gl_context/GL/glew.h b/thirdparty/glew/GL/glew.h
index 702265c38b..702265c38b 100644
--- a/drivers/gl_context/GL/glew.h
+++ b/thirdparty/glew/GL/glew.h
diff --git a/drivers/gl_context/GL/glxew.h b/thirdparty/glew/GL/glxew.h
index d803d260b3..d803d260b3 100644
--- a/drivers/gl_context/GL/glxew.h
+++ b/thirdparty/glew/GL/glxew.h
diff --git a/drivers/gl_context/GL/wglew.h b/thirdparty/glew/GL/wglew.h
index 23e4d3fbab..23e4d3fbab 100644
--- a/drivers/gl_context/GL/wglew.h
+++ b/thirdparty/glew/GL/wglew.h
diff --git a/thirdparty/glew/LICENSE.txt b/thirdparty/glew/LICENSE.txt
new file mode 100644
index 0000000000..f7078042e9
--- /dev/null
+++ b/thirdparty/glew/LICENSE.txt
@@ -0,0 +1,73 @@
+The OpenGL Extension Wrangler Library
+Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
+Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
+Copyright (C) 2002, Lev Povalahev
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, 
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, 
+  this list of conditions and the following disclaimer in the documentation 
+  and/or other materials provided with the distribution.
+* The name of the author may be used to endorse or promote products 
+  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Mesa 3-D graphics library
+Version:  7.0
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Copyright (c) 2007 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
diff --git a/drivers/gl_context/glew.c b/thirdparty/glew/glew.c
index 0ed5520dae..0ed5520dae 100644
--- a/drivers/gl_context/glew.c
+++ b/thirdparty/glew/glew.c
diff --git a/drivers/jpegd/jpgd.cpp b/thirdparty/jpeg-compressor/jpgd.cpp
index fad9a37a9a..fad9a37a9a 100644
--- a/drivers/jpegd/jpgd.cpp
+++ b/thirdparty/jpeg-compressor/jpgd.cpp
diff --git a/drivers/jpegd/jpgd.h b/thirdparty/jpeg-compressor/jpgd.h
index 150b9a0b26..150b9a0b26 100644
--- a/drivers/jpegd/jpgd.h
+++ b/thirdparty/jpeg-compressor/jpgd.h
diff --git a/thirdparty/libmpcdec/COPYING b/thirdparty/libmpcdec/COPYING
new file mode 100644
index 0000000000..10190c014a
--- /dev/null
+++ b/thirdparty/libmpcdec/COPYING
@@ -0,0 +1,31 @@
+Copyright (c) 2005, The Musepack Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of the The Musepack Development Team nor the
+      names of its contributors may be used to endorse or promote
+      products derived from this software without specific prior
+      written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/drivers/mpc/decoder.h b/thirdparty/libmpcdec/decoder.h
index 3813fc02ea..3813fc02ea 100644
--- a/drivers/mpc/decoder.h
+++ b/thirdparty/libmpcdec/decoder.h
diff --git a/drivers/mpc/huffman.c b/thirdparty/libmpcdec/huffman.c
index 52cdfd92c4..52cdfd92c4 100644
--- a/drivers/mpc/huffman.c
+++ b/thirdparty/libmpcdec/huffman.c
diff --git a/drivers/mpc/huffman.h b/thirdparty/libmpcdec/huffman.h
index 5b12bff931..5b12bff931 100644
--- a/drivers/mpc/huffman.h
+++ b/thirdparty/libmpcdec/huffman.h
diff --git a/drivers/mpc/internal.h b/thirdparty/libmpcdec/internal.h
index 7810bcc25d..7810bcc25d 100644
--- a/drivers/mpc/internal.h
+++ b/thirdparty/libmpcdec/internal.h
diff --git a/drivers/mpc/datatypes.h b/thirdparty/libmpcdec/mpc/datatypes.h
index 608ecfa2f2..608ecfa2f2 100644
--- a/drivers/mpc/datatypes.h
+++ b/thirdparty/libmpcdec/mpc/datatypes.h
diff --git a/drivers/mpc/minimax.h b/thirdparty/libmpcdec/mpc/minimax.h
index 1192626567..1192626567 100644
--- a/drivers/mpc/minimax.h
+++ b/thirdparty/libmpcdec/mpc/minimax.h
diff --git a/drivers/mpc/mpc_types.h b/thirdparty/libmpcdec/mpc/mpc_types.h
index a827d15725..a827d15725 100644
--- a/drivers/mpc/mpc_types.h
+++ b/thirdparty/libmpcdec/mpc/mpc_types.h
diff --git a/drivers/mpc/mpcdec.h b/thirdparty/libmpcdec/mpc/mpcdec.h
index c72359516c..c72359516c 100644
--- a/drivers/mpc/mpcdec.h
+++ b/thirdparty/libmpcdec/mpc/mpcdec.h
diff --git a/drivers/mpc/mpcmath.h b/thirdparty/libmpcdec/mpc/mpcmath.h
index fa83cf8374..fa83cf8374 100644
--- a/drivers/mpc/mpcmath.h
+++ b/thirdparty/libmpcdec/mpc/mpcmath.h
diff --git a/drivers/mpc/reader.h b/thirdparty/libmpcdec/mpc/reader.h
index 1a93e06706..1a93e06706 100644
--- a/drivers/mpc/reader.h
+++ b/thirdparty/libmpcdec/mpc/reader.h
diff --git a/drivers/mpc/streaminfo.h b/thirdparty/libmpcdec/mpc/streaminfo.h
index a0a9470be1..a0a9470be1 100644
--- a/drivers/mpc/streaminfo.h
+++ b/thirdparty/libmpcdec/mpc/streaminfo.h
diff --git a/drivers/mpc/mpc_bits_reader.c b/thirdparty/libmpcdec/mpc_bits_reader.c
index 5281288d25..5281288d25 100644
--- a/drivers/mpc/mpc_bits_reader.c
+++ b/thirdparty/libmpcdec/mpc_bits_reader.c
diff --git a/drivers/mpc/mpc_bits_reader.h b/thirdparty/libmpcdec/mpc_bits_reader.h
index a7d8d66905..a7d8d66905 100644
--- a/drivers/mpc/mpc_bits_reader.h
+++ b/thirdparty/libmpcdec/mpc_bits_reader.h
diff --git a/drivers/mpc/mpc_decoder.c b/thirdparty/libmpcdec/mpc_decoder.c
index 45596c6015..45596c6015 100644
--- a/drivers/mpc/mpc_decoder.c
+++ b/thirdparty/libmpcdec/mpc_decoder.c
diff --git a/drivers/mpc/mpc_demux.c b/thirdparty/libmpcdec/mpc_demux.c
index 03bca9c36e..03bca9c36e 100644
--- a/drivers/mpc/mpc_demux.c
+++ b/thirdparty/libmpcdec/mpc_demux.c
diff --git a/drivers/mpc/mpc_reader.c b/thirdparty/libmpcdec/mpc_reader.c
index 550c5ecb54..550c5ecb54 100644
--- a/drivers/mpc/mpc_reader.c
+++ b/thirdparty/libmpcdec/mpc_reader.c
diff --git a/drivers/mpc/mpcdec_math.h b/thirdparty/libmpcdec/mpcdec_math.h
index 35a5ac5a57..35a5ac5a57 100644
--- a/drivers/mpc/mpcdec_math.h
+++ b/thirdparty/libmpcdec/mpcdec_math.h
diff --git a/drivers/mpc/requant.c b/thirdparty/libmpcdec/requant.c
index ebc89a10f0..ebc89a10f0 100644
--- a/drivers/mpc/requant.c
+++ b/thirdparty/libmpcdec/requant.c
diff --git a/drivers/mpc/requant.h b/thirdparty/libmpcdec/requant.h
index 014e2ebab7..014e2ebab7 100644
--- a/drivers/mpc/requant.h
+++ b/thirdparty/libmpcdec/requant.h
diff --git a/drivers/mpc/streaminfo.c b/thirdparty/libmpcdec/streaminfo.c
index d9b76bb5e6..d9b76bb5e6 100644
--- a/drivers/mpc/streaminfo.c
+++ b/thirdparty/libmpcdec/streaminfo.c
diff --git a/drivers/mpc/synth_filter.c b/thirdparty/libmpcdec/synth_filter.c
index 0d0c345340..0d0c345340 100644
--- a/drivers/mpc/synth_filter.c
+++ b/thirdparty/libmpcdec/synth_filter.c
diff --git a/drivers/ogg/COPYING b/thirdparty/libogg/COPYING
index 6111c6c5a6..6111c6c5a6 100644
--- a/drivers/ogg/COPYING
+++ b/thirdparty/libogg/COPYING
diff --git a/drivers/ogg/bitwise.c b/thirdparty/libogg/bitwise.c
index 145901d185..145901d185 100644
--- a/drivers/ogg/bitwise.c
+++ b/thirdparty/libogg/bitwise.c
diff --git a/drivers/ogg/framing.c b/thirdparty/libogg/framing.c
index 3a2f0a6058..3a2f0a6058 100644
--- a/drivers/ogg/framing.c
+++ b/thirdparty/libogg/framing.c
diff --git a/drivers/ogg/config_types.h b/thirdparty/libogg/ogg/config_types.h
index 5ea49b8abd..5ea49b8abd 100644
--- a/drivers/ogg/config_types.h
+++ b/thirdparty/libogg/ogg/config_types.h
diff --git a/drivers/ogg/ogg.h b/thirdparty/libogg/ogg/ogg.h
index cea4ebed75..cea4ebed75 100644
--- a/drivers/ogg/ogg.h
+++ b/thirdparty/libogg/ogg/ogg.h
diff --git a/drivers/ogg/os_types.h b/thirdparty/libogg/ogg/os_types.h
index 8bf82107e5..8bf82107e5 100644
--- a/drivers/ogg/os_types.h
+++ b/thirdparty/libogg/ogg/os_types.h
diff --git a/thirdparty/libpng/LICENSE b/thirdparty/libpng/LICENSE
new file mode 100644
index 0000000000..b7ad4b9eaf
--- /dev/null
+++ b/thirdparty/libpng/LICENSE
@@ -0,0 +1,130 @@
+
+This copy of the libpng notices is provided for your convenience.  In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.
+
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+
+If you modify libpng you may insert additional notices immediately following
+this sentence.
+
+This code is released under the libpng license.
+
+libpng versions 1.0.7, July 1, 2000 through 1.6.23, June 9, 2016 are
+Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+   Simon-Pierre Cadieux
+   Eric S. Raymond
+   Mans Rullgard
+   Cosmin Truta
+   Gilles Vollant
+   James Yu
+
+and with the following additions to the disclaimer:
+
+   There is no warranty against interference with your enjoyment of the
+   library or against infringement.  There is no warranty that our
+   efforts or the library will fulfill any of your particular purposes
+   or needs.  This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and effort is with
+   the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the list
+of Contributing Authors:
+
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+   John Bowler
+   Kevin Bracey
+   Sam Bushell
+   Magnus Holmgren
+   Greg Roelofs
+   Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+  1. The origin of this source code must not be misrepresented.
+
+  2. Altered versions must be plainly marked as such and must not
+     be misrepresented as being the original source.
+
+  3. This Copyright notice may not be removed or altered from any
+     source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products.  If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+
+TRADEMARK:
+
+The name "libpng" has not been registered by the Copyright owner
+as a trademark in any jurisdiction.  However, because libpng has
+been distributed and maintained world-wide, continually since 1995,
+the Copyright owner claims "common-law trademark protection" in any
+jurisdiction where common-law trademark is recognized.
+
+OSI CERTIFICATION:
+
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
+a certification mark of the Open Source Initiative. OSI has not addressed
+the additional disclaimers inserted at version 1.0.7.
+
+EXPORT CONTROL:
+
+The Copyright owner believes that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because
+it is open source, publicly available software, that does not contain
+any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
+734.7(b).
+
+Glenn Randers-Pehrson
+glennrp at users.sourceforge.net
+June 9, 2016
diff --git a/drivers/png/arm/arm_init.c b/thirdparty/libpng/arm/arm_init.c
index 52c3f31fed..52c3f31fed 100644
--- a/drivers/png/arm/arm_init.c
+++ b/thirdparty/libpng/arm/arm_init.c
diff --git a/drivers/png/arm/filter_neon.S b/thirdparty/libpng/arm/filter_neon.S
index 3b061d6bbf..3b061d6bbf 100644
--- a/drivers/png/arm/filter_neon.S
+++ b/thirdparty/libpng/arm/filter_neon.S
diff --git a/drivers/png/arm/filter_neon_intrinsics.c b/thirdparty/libpng/arm/filter_neon_intrinsics.c
index be5ccc7107..be5ccc7107 100644
--- a/drivers/png/arm/filter_neon_intrinsics.c
+++ b/thirdparty/libpng/arm/filter_neon_intrinsics.c
diff --git a/drivers/png/png.c b/thirdparty/libpng/png.c
index 1720ca0eae..1720ca0eae 100644
--- a/drivers/png/png.c
+++ b/thirdparty/libpng/png.c
diff --git a/drivers/png/png.h b/thirdparty/libpng/png.h
index 1efb0b02a9..1efb0b02a9 100644
--- a/drivers/png/png.h
+++ b/thirdparty/libpng/png.h
diff --git a/drivers/png/pngconf.h b/thirdparty/libpng/pngconf.h
index b0ccc8c25e..b0ccc8c25e 100644
--- a/drivers/png/pngconf.h
+++ b/thirdparty/libpng/pngconf.h
diff --git a/drivers/png/pngdebug.h b/thirdparty/libpng/pngdebug.h
index 15a7ed0c95..15a7ed0c95 100644
--- a/drivers/png/pngdebug.h
+++ b/thirdparty/libpng/pngdebug.h
diff --git a/drivers/png/pngerror.c b/thirdparty/libpng/pngerror.c
index 3fc8092fa6..3fc8092fa6 100644
--- a/drivers/png/pngerror.c
+++ b/thirdparty/libpng/pngerror.c
diff --git a/drivers/png/pngget.c b/thirdparty/libpng/pngget.c
index 14fc7be520..14fc7be520 100644
--- a/drivers/png/pngget.c
+++ b/thirdparty/libpng/pngget.c
diff --git a/drivers/png/pnginfo.h b/thirdparty/libpng/pnginfo.h
index 361ed8be70..361ed8be70 100644
--- a/drivers/png/pnginfo.h
+++ b/thirdparty/libpng/pnginfo.h
diff --git a/drivers/png/pnglibconf.h b/thirdparty/libpng/pnglibconf.h
index 3e70aa1170..3e70aa1170 100644
--- a/drivers/png/pnglibconf.h
+++ b/thirdparty/libpng/pnglibconf.h
diff --git a/drivers/png/pngmem.c b/thirdparty/libpng/pngmem.c
index 7bcfd00507..7bcfd00507 100644
--- a/drivers/png/pngmem.c
+++ b/thirdparty/libpng/pngmem.c
diff --git a/drivers/png/pngpread.c b/thirdparty/libpng/pngpread.c
index ca300e7f16..ca300e7f16 100644
--- a/drivers/png/pngpread.c
+++ b/thirdparty/libpng/pngpread.c
diff --git a/drivers/png/pngpriv.h b/thirdparty/libpng/pngpriv.h
index 9338df3144..9338df3144 100644
--- a/drivers/png/pngpriv.h
+++ b/thirdparty/libpng/pngpriv.h
diff --git a/drivers/png/pngread.c b/thirdparty/libpng/pngread.c
index 0ff6238023..0ff6238023 100644
--- a/drivers/png/pngread.c
+++ b/thirdparty/libpng/pngread.c
diff --git a/drivers/png/pngrio.c b/thirdparty/libpng/pngrio.c
index 5101d54a62..5101d54a62 100644
--- a/drivers/png/pngrio.c
+++ b/thirdparty/libpng/pngrio.c
diff --git a/drivers/png/pngrtran.c b/thirdparty/libpng/pngrtran.c
index 3138147aff..3138147aff 100644
--- a/drivers/png/pngrtran.c
+++ b/thirdparty/libpng/pngrtran.c
diff --git a/drivers/png/pngrutil.c b/thirdparty/libpng/pngrutil.c
index c9747fc27d..c9747fc27d 100644
--- a/drivers/png/pngrutil.c
+++ b/thirdparty/libpng/pngrutil.c
diff --git a/drivers/png/pngset.c b/thirdparty/libpng/pngset.c
index 43456b729d..43456b729d 100644
--- a/drivers/png/pngset.c
+++ b/thirdparty/libpng/pngset.c
diff --git a/drivers/png/pngstruct.h b/thirdparty/libpng/pngstruct.h
index c1f35edef5..c1f35edef5 100644
--- a/drivers/png/pngstruct.h
+++ b/thirdparty/libpng/pngstruct.h
diff --git a/drivers/png/pngtrans.c b/thirdparty/libpng/pngtrans.c
index 7f8cc455d3..7f8cc455d3 100644
--- a/drivers/png/pngtrans.c
+++ b/thirdparty/libpng/pngtrans.c
diff --git a/drivers/png/pngwio.c b/thirdparty/libpng/pngwio.c
index 586c03b721..586c03b721 100644
--- a/drivers/png/pngwio.c
+++ b/thirdparty/libpng/pngwio.c
diff --git a/drivers/png/pngwrite.c b/thirdparty/libpng/pngwrite.c
index 181a899438..181a899438 100644
--- a/drivers/png/pngwrite.c
+++ b/thirdparty/libpng/pngwrite.c
diff --git a/drivers/png/pngwtran.c b/thirdparty/libpng/pngwtran.c
index 038a2ef5dc..038a2ef5dc 100644
--- a/drivers/png/pngwtran.c
+++ b/thirdparty/libpng/pngwtran.c
diff --git a/drivers/png/pngwutil.c b/thirdparty/libpng/pngwutil.c
index b47f119d22..b47f119d22 100644
--- a/drivers/png/pngwutil.c
+++ b/thirdparty/libpng/pngwutil.c
diff --git a/drivers/theora/COPYING b/thirdparty/libtheora/COPYING
index c8ccce4ffb..c8ccce4ffb 100644
--- a/drivers/theora/COPYING
+++ b/thirdparty/libtheora/COPYING
diff --git a/drivers/theora/LICENSE b/thirdparty/libtheora/LICENSE
index 5e5ec08469..5e5ec08469 100644
--- a/drivers/theora/LICENSE
+++ b/thirdparty/libtheora/LICENSE
diff --git a/drivers/theora/analyze.c b/thirdparty/libtheora/analyze.c
index af01b60dff..af01b60dff 100644
--- a/drivers/theora/analyze.c
+++ b/thirdparty/libtheora/analyze.c
diff --git a/drivers/theora/apiwrapper.c b/thirdparty/libtheora/apiwrapper.c
index dc959b8d13..dc959b8d13 100644
--- a/drivers/theora/apiwrapper.c
+++ b/thirdparty/libtheora/apiwrapper.c
diff --git a/drivers/theora/apiwrapper.h b/thirdparty/libtheora/apiwrapper.h
index 93454d7bda..93454d7bda 100644
--- a/drivers/theora/apiwrapper.h
+++ b/thirdparty/libtheora/apiwrapper.h
diff --git a/drivers/theora/bitpack.c b/thirdparty/libtheora/bitpack.c
index 8195003bad..8195003bad 100644
--- a/drivers/theora/bitpack.c
+++ b/thirdparty/libtheora/bitpack.c
diff --git a/drivers/theora/bitpack.h b/thirdparty/libtheora/bitpack.h
index a020a292f5..a020a292f5 100644
--- a/drivers/theora/bitpack.h
+++ b/thirdparty/libtheora/bitpack.h
diff --git a/drivers/theora/cpu.c b/thirdparty/libtheora/cpu.c
index a863aad7f3..a863aad7f3 100644
--- a/drivers/theora/cpu.c
+++ b/thirdparty/libtheora/cpu.c
diff --git a/drivers/theora/cpu.h b/thirdparty/libtheora/cpu.h
index a43c957a39..a43c957a39 100644
--- a/drivers/theora/cpu.h
+++ b/thirdparty/libtheora/cpu.h
diff --git a/drivers/theora/dct.h b/thirdparty/libtheora/dct.h
index 24ba6f111a..24ba6f111a 100644
--- a/drivers/theora/dct.h
+++ b/thirdparty/libtheora/dct.h
diff --git a/drivers/theora/decapiwrapper.c b/thirdparty/libtheora/decapiwrapper.c
index 12ea475d17..12ea475d17 100644
--- a/drivers/theora/decapiwrapper.c
+++ b/thirdparty/libtheora/decapiwrapper.c
diff --git a/drivers/theora/decinfo.c b/thirdparty/libtheora/decinfo.c
index 845eb1361c..845eb1361c 100644
--- a/drivers/theora/decinfo.c
+++ b/thirdparty/libtheora/decinfo.c
diff --git a/drivers/theora/decint.h b/thirdparty/libtheora/decint.h
index 261b67631a..261b67631a 100644
--- a/drivers/theora/decint.h
+++ b/thirdparty/libtheora/decint.h
diff --git a/drivers/theora/decode.c b/thirdparty/libtheora/decode.c
index 7be66463d8..7be66463d8 100644
--- a/drivers/theora/decode.c
+++ b/thirdparty/libtheora/decode.c
diff --git a/drivers/theora/dequant.c b/thirdparty/libtheora/dequant.c
index e554872d4e..e554872d4e 100644
--- a/drivers/theora/dequant.c
+++ b/thirdparty/libtheora/dequant.c
diff --git a/drivers/theora/dequant.h b/thirdparty/libtheora/dequant.h
index ef25838e35..ef25838e35 100644
--- a/drivers/theora/dequant.h
+++ b/thirdparty/libtheora/dequant.h
diff --git a/drivers/theora/encapiwrapper.c b/thirdparty/libtheora/encapiwrapper.c
index 874f12442d..874f12442d 100644
--- a/drivers/theora/encapiwrapper.c
+++ b/thirdparty/libtheora/encapiwrapper.c
diff --git a/drivers/theora/encfrag.c b/thirdparty/libtheora/encfrag.c
index bb814c8e4a..bb814c8e4a 100644
--- a/drivers/theora/encfrag.c
+++ b/thirdparty/libtheora/encfrag.c
diff --git a/drivers/theora/encinfo.c b/thirdparty/libtheora/encinfo.c
index 83be1dae72..83be1dae72 100644
--- a/drivers/theora/encinfo.c
+++ b/thirdparty/libtheora/encinfo.c
diff --git a/drivers/theora/encint.h b/thirdparty/libtheora/encint.h
index 97897d5a04..97897d5a04 100644
--- a/drivers/theora/encint.h
+++ b/thirdparty/libtheora/encint.h
diff --git a/drivers/theora/encode.c b/thirdparty/libtheora/encode.c
index 0c5ea6a172..0c5ea6a172 100644
--- a/drivers/theora/encode.c
+++ b/thirdparty/libtheora/encode.c
diff --git a/drivers/theora/encoder_disabled.c b/thirdparty/libtheora/encoder_disabled.c
index 0cbf6645ac..0cbf6645ac 100644
--- a/drivers/theora/encoder_disabled.c
+++ b/thirdparty/libtheora/encoder_disabled.c
diff --git a/drivers/theora/enquant.c b/thirdparty/libtheora/enquant.c
index 3372fed221..3372fed221 100644
--- a/drivers/theora/enquant.c
+++ b/thirdparty/libtheora/enquant.c
diff --git a/drivers/theora/enquant.h b/thirdparty/libtheora/enquant.h
index d62df10d1a..d62df10d1a 100644
--- a/drivers/theora/enquant.h
+++ b/thirdparty/libtheora/enquant.h
diff --git a/drivers/theora/fdct.c b/thirdparty/libtheora/fdct.c
index dc3a66f245..dc3a66f245 100644
--- a/drivers/theora/fdct.c
+++ b/thirdparty/libtheora/fdct.c
diff --git a/drivers/theora/fragment.c b/thirdparty/libtheora/fragment.c
index 15372e9d9f..15372e9d9f 100644
--- a/drivers/theora/fragment.c
+++ b/thirdparty/libtheora/fragment.c
diff --git a/drivers/theora/huffdec.c b/thirdparty/libtheora/huffdec.c
index 8cf27f0341..8cf27f0341 100644
--- a/drivers/theora/huffdec.c
+++ b/thirdparty/libtheora/huffdec.c
diff --git a/drivers/theora/huffdec.h b/thirdparty/libtheora/huffdec.h
index d7ffa0e99b..d7ffa0e99b 100644
--- a/drivers/theora/huffdec.h
+++ b/thirdparty/libtheora/huffdec.h
diff --git a/drivers/theora/huffenc.c b/thirdparty/libtheora/huffenc.c
index bf624e0523..bf624e0523 100644
--- a/drivers/theora/huffenc.c
+++ b/thirdparty/libtheora/huffenc.c
diff --git a/drivers/theora/huffenc.h b/thirdparty/libtheora/huffenc.h
index c5a3956f1f..c5a3956f1f 100644
--- a/drivers/theora/huffenc.h
+++ b/thirdparty/libtheora/huffenc.h
diff --git a/drivers/theora/huffman.h b/thirdparty/libtheora/huffman.h
index 36cf7572e5..36cf7572e5 100644
--- a/drivers/theora/huffman.h
+++ b/thirdparty/libtheora/huffman.h
diff --git a/drivers/theora/idct.c b/thirdparty/libtheora/idct.c
index 0e68ac7658..0e68ac7658 100644
--- a/drivers/theora/idct.c
+++ b/thirdparty/libtheora/idct.c
diff --git a/drivers/theora/info.c b/thirdparty/libtheora/info.c
index 6b9762978b..6b9762978b 100644
--- a/drivers/theora/info.c
+++ b/thirdparty/libtheora/info.c
diff --git a/drivers/theora/internal.c b/thirdparty/libtheora/internal.c
index 0fe4f63e72..0fe4f63e72 100644
--- a/drivers/theora/internal.c
+++ b/thirdparty/libtheora/internal.c
diff --git a/drivers/theora/internal.h b/thirdparty/libtheora/internal.h
index d81263e13e..d81263e13e 100644
--- a/drivers/theora/internal.h
+++ b/thirdparty/libtheora/internal.h
diff --git a/drivers/theora/mathops.c b/thirdparty/libtheora/mathops.c
index d3fb909194..d3fb909194 100644
--- a/drivers/theora/mathops.c
+++ b/thirdparty/libtheora/mathops.c
diff --git a/drivers/theora/mathops.h b/thirdparty/libtheora/mathops.h
index efbc5377b0..efbc5377b0 100644
--- a/drivers/theora/mathops.h
+++ b/thirdparty/libtheora/mathops.h
diff --git a/drivers/theora/mcenc.c b/thirdparty/libtheora/mcenc.c
index 797e81f4f9..797e81f4f9 100644
--- a/drivers/theora/mcenc.c
+++ b/thirdparty/libtheora/mcenc.c
diff --git a/drivers/theora/modedec.h b/thirdparty/libtheora/modedec.h
index ea12c64afd..ea12c64afd 100644
--- a/drivers/theora/modedec.h
+++ b/thirdparty/libtheora/modedec.h
diff --git a/drivers/theora/ocintrin.h b/thirdparty/libtheora/ocintrin.h
index d49ebb2159..d49ebb2159 100644
--- a/drivers/theora/ocintrin.h
+++ b/thirdparty/libtheora/ocintrin.h
diff --git a/drivers/theora/quant.c b/thirdparty/libtheora/quant.c
index 8359f5abea..8359f5abea 100644
--- a/drivers/theora/quant.c
+++ b/thirdparty/libtheora/quant.c
diff --git a/drivers/theora/quant.h b/thirdparty/libtheora/quant.h
index 49ce13a65c..49ce13a65c 100644
--- a/drivers/theora/quant.h
+++ b/thirdparty/libtheora/quant.h
diff --git a/drivers/theora/rate.c b/thirdparty/libtheora/rate.c
index 4f43bb2e5f..4f43bb2e5f 100644
--- a/drivers/theora/rate.c
+++ b/thirdparty/libtheora/rate.c
diff --git a/drivers/theora/state.c b/thirdparty/libtheora/state.c
index 42ed33a9a3..42ed33a9a3 100644
--- a/drivers/theora/state.c
+++ b/thirdparty/libtheora/state.c
diff --git a/drivers/theora/codec.h b/thirdparty/libtheora/theora/codec.h
index 5c2669630c..5c2669630c 100644
--- a/drivers/theora/codec.h
+++ b/thirdparty/libtheora/theora/codec.h
diff --git a/drivers/theora/theora.h b/thirdparty/libtheora/theora/theora.h
index af6eb6f380..af6eb6f380 100644
--- a/drivers/theora/theora.h
+++ b/thirdparty/libtheora/theora/theora.h
diff --git a/drivers/theora/theoradec.h b/thirdparty/libtheora/theora/theoradec.h
index b20f0e3a64..b20f0e3a64 100644
--- a/drivers/theora/theoradec.h
+++ b/thirdparty/libtheora/theora/theoradec.h
diff --git a/drivers/theora/theoraenc.h b/thirdparty/libtheora/theora/theoraenc.h
index fdf2ab21e2..fdf2ab21e2 100644
--- a/drivers/theora/theoraenc.h
+++ b/thirdparty/libtheora/theora/theoraenc.h
diff --git a/drivers/theora/tokenize.c b/thirdparty/libtheora/tokenize.c
index 60574c3594..60574c3594 100644
--- a/drivers/theora/tokenize.c
+++ b/thirdparty/libtheora/tokenize.c
diff --git a/drivers/theora/x86/mmxencfrag.c b/thirdparty/libtheora/x86/mmxencfrag.c
index c79ff01fcc..c79ff01fcc 100644
--- a/drivers/theora/x86/mmxencfrag.c
+++ b/thirdparty/libtheora/x86/mmxencfrag.c
diff --git a/drivers/theora/x86/mmxfdct.c b/thirdparty/libtheora/x86/mmxfdct.c
index 211875255e..211875255e 100644
--- a/drivers/theora/x86/mmxfdct.c
+++ b/thirdparty/libtheora/x86/mmxfdct.c
diff --git a/drivers/theora/x86/mmxfrag.c b/thirdparty/libtheora/x86/mmxfrag.c
index 2c732939c3..2c732939c3 100644
--- a/drivers/theora/x86/mmxfrag.c
+++ b/thirdparty/libtheora/x86/mmxfrag.c
diff --git a/drivers/theora/x86/mmxfrag.h b/thirdparty/libtheora/x86/mmxfrag.h
index a398427629..a398427629 100644
--- a/drivers/theora/x86/mmxfrag.h
+++ b/thirdparty/libtheora/x86/mmxfrag.h
diff --git a/drivers/theora/x86/mmxidct.c b/thirdparty/libtheora/x86/mmxidct.c
index 76424e6364..76424e6364 100644
--- a/drivers/theora/x86/mmxidct.c
+++ b/thirdparty/libtheora/x86/mmxidct.c
diff --git a/drivers/theora/x86/mmxloop.h b/thirdparty/libtheora/x86/mmxloop.h
index 2e870c795d..2e870c795d 100644
--- a/drivers/theora/x86/mmxloop.h
+++ b/thirdparty/libtheora/x86/mmxloop.h
diff --git a/drivers/theora/x86/mmxstate.c b/thirdparty/libtheora/x86/mmxstate.c
index 808b0a789b..808b0a789b 100644
--- a/drivers/theora/x86/mmxstate.c
+++ b/thirdparty/libtheora/x86/mmxstate.c
diff --git a/drivers/theora/x86/sse2fdct.c b/thirdparty/libtheora/x86/sse2fdct.c
index 86c17d68b1..86c17d68b1 100644
--- a/drivers/theora/x86/sse2fdct.c
+++ b/thirdparty/libtheora/x86/sse2fdct.c
diff --git a/drivers/theora/x86/x86enc.c b/thirdparty/libtheora/x86/x86enc.c
index 43b7be3ea3..43b7be3ea3 100644
--- a/drivers/theora/x86/x86enc.c
+++ b/thirdparty/libtheora/x86/x86enc.c
diff --git a/drivers/theora/x86/x86enc.h b/thirdparty/libtheora/x86/x86enc.h
index 06c3908bcd..06c3908bcd 100644
--- a/drivers/theora/x86/x86enc.h
+++ b/thirdparty/libtheora/x86/x86enc.h
diff --git a/drivers/theora/x86/x86int.h b/thirdparty/libtheora/x86/x86int.h
index ede724f5aa..ede724f5aa 100644
--- a/drivers/theora/x86/x86int.h
+++ b/thirdparty/libtheora/x86/x86int.h
diff --git a/drivers/theora/x86/x86state.c b/thirdparty/libtheora/x86/x86state.c
index a786bec284..a786bec284 100644
--- a/drivers/theora/x86/x86state.c
+++ b/thirdparty/libtheora/x86/x86state.c
diff --git a/drivers/theora/x86_vc/mmxencfrag.c b/thirdparty/libtheora/x86_vc/mmxencfrag.c
index ac9dacf377..ac9dacf377 100644
--- a/drivers/theora/x86_vc/mmxencfrag.c
+++ b/thirdparty/libtheora/x86_vc/mmxencfrag.c
diff --git a/drivers/theora/x86_vc/mmxfdct.c b/thirdparty/libtheora/x86_vc/mmxfdct.c
index dcf17c9fa7..dcf17c9fa7 100644
--- a/drivers/theora/x86_vc/mmxfdct.c
+++ b/thirdparty/libtheora/x86_vc/mmxfdct.c
diff --git a/drivers/theora/x86_vc/mmxfrag.c b/thirdparty/libtheora/x86_vc/mmxfrag.c
index 4eb2084dc6..4eb2084dc6 100644
--- a/drivers/theora/x86_vc/mmxfrag.c
+++ b/thirdparty/libtheora/x86_vc/mmxfrag.c
diff --git a/drivers/theora/x86_vc/mmxfrag.h b/thirdparty/libtheora/x86_vc/mmxfrag.h
index 45ee93e777..45ee93e777 100644
--- a/drivers/theora/x86_vc/mmxfrag.h
+++ b/thirdparty/libtheora/x86_vc/mmxfrag.h
diff --git a/drivers/theora/x86_vc/mmxidct.c b/thirdparty/libtheora/x86_vc/mmxidct.c
index 8f5ff6803c..8f5ff6803c 100644
--- a/drivers/theora/x86_vc/mmxidct.c
+++ b/thirdparty/libtheora/x86_vc/mmxidct.c
diff --git a/drivers/theora/x86_vc/mmxloop.h b/thirdparty/libtheora/x86_vc/mmxloop.h
index 2561fca2ae..2561fca2ae 100644
--- a/drivers/theora/x86_vc/mmxloop.h
+++ b/thirdparty/libtheora/x86_vc/mmxloop.h
diff --git a/drivers/theora/x86_vc/mmxstate.c b/thirdparty/libtheora/x86_vc/mmxstate.c
index 73bd1981cf..73bd1981cf 100644
--- a/drivers/theora/x86_vc/mmxstate.c
+++ b/thirdparty/libtheora/x86_vc/mmxstate.c
diff --git a/drivers/theora/x86_vc/x86enc.c b/thirdparty/libtheora/x86_vc/x86enc.c
index e1960e1f0b..e1960e1f0b 100644
--- a/drivers/theora/x86_vc/x86enc.c
+++ b/thirdparty/libtheora/x86_vc/x86enc.c
diff --git a/drivers/theora/x86_vc/x86enc.h b/thirdparty/libtheora/x86_vc/x86enc.h
index 581484641f..581484641f 100644
--- a/drivers/theora/x86_vc/x86enc.h
+++ b/thirdparty/libtheora/x86_vc/x86enc.h
diff --git a/drivers/theora/x86_vc/x86int.h b/thirdparty/libtheora/x86_vc/x86int.h
index 4cca485311..4cca485311 100644
--- a/drivers/theora/x86_vc/x86int.h
+++ b/thirdparty/libtheora/x86_vc/x86int.h
diff --git a/drivers/theora/x86_vc/x86state.c b/thirdparty/libtheora/x86_vc/x86state.c
index a786bec284..a786bec284 100644
--- a/drivers/theora/x86_vc/x86state.c
+++ b/thirdparty/libtheora/x86_vc/x86state.c
diff --git a/drivers/vorbis/COPYING b/thirdparty/libvorbis/COPYING
index 8f1d18cc2b..8f1d18cc2b 100644
--- a/drivers/vorbis/COPYING
+++ b/thirdparty/libvorbis/COPYING
diff --git a/drivers/vorbis/analysis.c b/thirdparty/libvorbis/analysis.c
index 01aa6f30db..01aa6f30db 100644
--- a/drivers/vorbis/analysis.c
+++ b/thirdparty/libvorbis/analysis.c
diff --git a/drivers/vorbis/backends.h b/thirdparty/libvorbis/backends.h
index ff5bcc95fe..ff5bcc95fe 100644
--- a/drivers/vorbis/backends.h
+++ b/thirdparty/libvorbis/backends.h
diff --git a/drivers/vorbis/barkmel.c b/thirdparty/libvorbis/barkmel.c
index 37b6c4c7ba..37b6c4c7ba 100644
--- a/drivers/vorbis/barkmel.c
+++ b/thirdparty/libvorbis/barkmel.c
diff --git a/drivers/vorbis/bitrate.c b/thirdparty/libvorbis/bitrate.c
index 3a71b1dc23..3a71b1dc23 100644
--- a/drivers/vorbis/bitrate.c
+++ b/thirdparty/libvorbis/bitrate.c
diff --git a/drivers/vorbis/bitrate.h b/thirdparty/libvorbis/bitrate.h
index db48fcb645..db48fcb645 100644
--- a/drivers/vorbis/bitrate.h
+++ b/thirdparty/libvorbis/bitrate.h
diff --git a/drivers/vorbis/block.c b/thirdparty/libvorbis/block.c
index 345c042769..345c042769 100644
--- a/drivers/vorbis/block.c
+++ b/thirdparty/libvorbis/block.c
diff --git a/drivers/vorbis/books/coupled/res_books_51.h b/thirdparty/libvorbis/books/coupled/res_books_51.h
index 93910ff481..93910ff481 100644
--- a/drivers/vorbis/books/coupled/res_books_51.h
+++ b/thirdparty/libvorbis/books/coupled/res_books_51.h
diff --git a/drivers/vorbis/books/coupled/res_books_stereo.h b/thirdparty/libvorbis/books/coupled/res_books_stereo.h
index 9a9049f6ed..9a9049f6ed 100644
--- a/drivers/vorbis/books/coupled/res_books_stereo.h
+++ b/thirdparty/libvorbis/books/coupled/res_books_stereo.h
diff --git a/drivers/vorbis/books/floor/floor_books.h b/thirdparty/libvorbis/books/floor/floor_books.h
index e925313f7b..e925313f7b 100644
--- a/drivers/vorbis/books/floor/floor_books.h
+++ b/thirdparty/libvorbis/books/floor/floor_books.h
diff --git a/drivers/vorbis/books/uncoupled/res_books_uncoupled.h b/thirdparty/libvorbis/books/uncoupled/res_books_uncoupled.h
index 736353b675..736353b675 100644
--- a/drivers/vorbis/books/uncoupled/res_books_uncoupled.h
+++ b/thirdparty/libvorbis/books/uncoupled/res_books_uncoupled.h
diff --git a/drivers/vorbis/codebook.c b/thirdparty/libvorbis/codebook.c
index 72f8a17a35..72f8a17a35 100644
--- a/drivers/vorbis/codebook.c
+++ b/thirdparty/libvorbis/codebook.c
diff --git a/drivers/vorbis/codebook.h b/thirdparty/libvorbis/codebook.h
index 537d6c12d3..537d6c12d3 100644
--- a/drivers/vorbis/codebook.h
+++ b/thirdparty/libvorbis/codebook.h
diff --git a/drivers/vorbis/codec_internal.h b/thirdparty/libvorbis/codec_internal.h
index de1bccaedf..de1bccaedf 100644
--- a/drivers/vorbis/codec_internal.h
+++ b/thirdparty/libvorbis/codec_internal.h
diff --git a/drivers/vorbis/envelope.c b/thirdparty/libvorbis/envelope.c
index 010c66e2d6..010c66e2d6 100644
--- a/drivers/vorbis/envelope.c
+++ b/thirdparty/libvorbis/envelope.c
diff --git a/drivers/vorbis/envelope.h b/thirdparty/libvorbis/envelope.h
index fd15fb32a7..fd15fb32a7 100644
--- a/drivers/vorbis/envelope.h
+++ b/thirdparty/libvorbis/envelope.h
diff --git a/drivers/vorbis/floor0.c b/thirdparty/libvorbis/floor0.c
index 213cce4ec8..213cce4ec8 100644
--- a/drivers/vorbis/floor0.c
+++ b/thirdparty/libvorbis/floor0.c
diff --git a/drivers/vorbis/floor1.c b/thirdparty/libvorbis/floor1.c
index d8bd4645c1..d8bd4645c1 100644
--- a/drivers/vorbis/floor1.c
+++ b/thirdparty/libvorbis/floor1.c
diff --git a/drivers/vorbis/highlevel.h b/thirdparty/libvorbis/highlevel.h
index e38f370fd6..e38f370fd6 100644
--- a/drivers/vorbis/highlevel.h
+++ b/thirdparty/libvorbis/highlevel.h
diff --git a/drivers/vorbis/info.c b/thirdparty/libvorbis/info.c
index 8a2a001f99..8a2a001f99 100644
--- a/drivers/vorbis/info.c
+++ b/thirdparty/libvorbis/info.c
diff --git a/drivers/vorbis/lookup.c b/thirdparty/libvorbis/lookup.c
index 3321ed3dbc..3321ed3dbc 100644
--- a/drivers/vorbis/lookup.c
+++ b/thirdparty/libvorbis/lookup.c
diff --git a/drivers/vorbis/lookup.h b/thirdparty/libvorbis/lookup.h
index f8b5b82730..f8b5b82730 100644
--- a/drivers/vorbis/lookup.h
+++ b/thirdparty/libvorbis/lookup.h
diff --git a/drivers/vorbis/lookup_data.h b/thirdparty/libvorbis/lookup_data.h
index 2424a1b386..2424a1b386 100644
--- a/drivers/vorbis/lookup_data.h
+++ b/thirdparty/libvorbis/lookup_data.h
diff --git a/drivers/vorbis/lpc.c b/thirdparty/libvorbis/lpc.c
index f5199ec235..f5199ec235 100644
--- a/drivers/vorbis/lpc.c
+++ b/thirdparty/libvorbis/lpc.c
diff --git a/drivers/vorbis/lpc.h b/thirdparty/libvorbis/lpc.h
index 39d237601b..39d237601b 100644
--- a/drivers/vorbis/lpc.h
+++ b/thirdparty/libvorbis/lpc.h
diff --git a/drivers/vorbis/lsp.c b/thirdparty/libvorbis/lsp.c
index 6a619f7b0c..6a619f7b0c 100644
--- a/drivers/vorbis/lsp.c
+++ b/thirdparty/libvorbis/lsp.c
diff --git a/drivers/vorbis/lsp.h b/thirdparty/libvorbis/lsp.h
index bacfb0971f..bacfb0971f 100644
--- a/drivers/vorbis/lsp.h
+++ b/thirdparty/libvorbis/lsp.h
diff --git a/drivers/vorbis/mapping0.c b/thirdparty/libvorbis/mapping0.c
index 85c7d22d83..85c7d22d83 100644
--- a/drivers/vorbis/mapping0.c
+++ b/thirdparty/libvorbis/mapping0.c
diff --git a/drivers/vorbis/masking.h b/thirdparty/libvorbis/masking.h
index 3576ab7885..3576ab7885 100644
--- a/drivers/vorbis/masking.h
+++ b/thirdparty/libvorbis/masking.h
diff --git a/drivers/vorbis/mdct.c b/thirdparty/libvorbis/mdct.c
index 0816331805..0816331805 100644
--- a/drivers/vorbis/mdct.c
+++ b/thirdparty/libvorbis/mdct.c
diff --git a/drivers/vorbis/mdct.h b/thirdparty/libvorbis/mdct.h
index 3ed94333c5..3ed94333c5 100644
--- a/drivers/vorbis/mdct.h
+++ b/thirdparty/libvorbis/mdct.h
diff --git a/drivers/vorbis/misc.h b/thirdparty/libvorbis/misc.h
index 73b4519898..73b4519898 100644
--- a/drivers/vorbis/misc.h
+++ b/thirdparty/libvorbis/misc.h
diff --git a/drivers/vorbis/modes/floor_all.h b/thirdparty/libvorbis/modes/floor_all.h
index 4292be326e..4292be326e 100644
--- a/drivers/vorbis/modes/floor_all.h
+++ b/thirdparty/libvorbis/modes/floor_all.h
diff --git a/drivers/vorbis/modes/psych_11.h b/thirdparty/libvorbis/modes/psych_11.h
index 844a8ed3cd..844a8ed3cd 100644
--- a/drivers/vorbis/modes/psych_11.h
+++ b/thirdparty/libvorbis/modes/psych_11.h
diff --git a/drivers/vorbis/modes/psych_16.h b/thirdparty/libvorbis/modes/psych_16.h
index 1c10b3954e..1c10b3954e 100644
--- a/drivers/vorbis/modes/psych_16.h
+++ b/thirdparty/libvorbis/modes/psych_16.h
diff --git a/drivers/vorbis/modes/psych_44.h b/thirdparty/libvorbis/modes/psych_44.h
index f05c032653..f05c032653 100644
--- a/drivers/vorbis/modes/psych_44.h
+++ b/thirdparty/libvorbis/modes/psych_44.h
diff --git a/drivers/vorbis/modes/psych_8.h b/thirdparty/libvorbis/modes/psych_8.h
index 0e2dd57371..0e2dd57371 100644
--- a/drivers/vorbis/modes/psych_8.h
+++ b/thirdparty/libvorbis/modes/psych_8.h
diff --git a/drivers/vorbis/modes/residue_16.h b/thirdparty/libvorbis/modes/residue_16.h
index dcaca5451e..dcaca5451e 100644
--- a/drivers/vorbis/modes/residue_16.h
+++ b/thirdparty/libvorbis/modes/residue_16.h
diff --git a/drivers/vorbis/modes/residue_44.h b/thirdparty/libvorbis/modes/residue_44.h
index 236c18341b..236c18341b 100644
--- a/drivers/vorbis/modes/residue_44.h
+++ b/thirdparty/libvorbis/modes/residue_44.h
diff --git a/drivers/vorbis/modes/residue_44p51.h b/thirdparty/libvorbis/modes/residue_44p51.h
index a52cc5245e..a52cc5245e 100644
--- a/drivers/vorbis/modes/residue_44p51.h
+++ b/thirdparty/libvorbis/modes/residue_44p51.h
diff --git a/drivers/vorbis/modes/residue_44u.h b/thirdparty/libvorbis/modes/residue_44u.h
index 92c4a09ce3..92c4a09ce3 100644
--- a/drivers/vorbis/modes/residue_44u.h
+++ b/thirdparty/libvorbis/modes/residue_44u.h
diff --git a/drivers/vorbis/modes/residue_8.h b/thirdparty/libvorbis/modes/residue_8.h
index 94c6d84c44..94c6d84c44 100644
--- a/drivers/vorbis/modes/residue_8.h
+++ b/thirdparty/libvorbis/modes/residue_8.h
diff --git a/drivers/vorbis/modes/setup_11.h b/thirdparty/libvorbis/modes/setup_11.h
index 4c2d619ca2..4c2d619ca2 100644
--- a/drivers/vorbis/modes/setup_11.h
+++ b/thirdparty/libvorbis/modes/setup_11.h
diff --git a/drivers/vorbis/modes/setup_16.h b/thirdparty/libvorbis/modes/setup_16.h
index 336007f98e..336007f98e 100644
--- a/drivers/vorbis/modes/setup_16.h
+++ b/thirdparty/libvorbis/modes/setup_16.h
diff --git a/drivers/vorbis/modes/setup_22.h b/thirdparty/libvorbis/modes/setup_22.h
index 4fd5e57111..4fd5e57111 100644
--- a/drivers/vorbis/modes/setup_22.h
+++ b/thirdparty/libvorbis/modes/setup_22.h
diff --git a/drivers/vorbis/modes/setup_32.h b/thirdparty/libvorbis/modes/setup_32.h
index 2275ac9615..2275ac9615 100644
--- a/drivers/vorbis/modes/setup_32.h
+++ b/thirdparty/libvorbis/modes/setup_32.h
diff --git a/drivers/vorbis/modes/setup_44.h b/thirdparty/libvorbis/modes/setup_44.h
index 3b88a89ac5..3b88a89ac5 100644
--- a/drivers/vorbis/modes/setup_44.h
+++ b/thirdparty/libvorbis/modes/setup_44.h
diff --git a/drivers/vorbis/modes/setup_44p51.h b/thirdparty/libvorbis/modes/setup_44p51.h
index 67d9979608..67d9979608 100644
--- a/drivers/vorbis/modes/setup_44p51.h
+++ b/thirdparty/libvorbis/modes/setup_44p51.h
diff --git a/drivers/vorbis/modes/setup_44u.h b/thirdparty/libvorbis/modes/setup_44u.h
index 568b5f8959..568b5f8959 100644
--- a/drivers/vorbis/modes/setup_44u.h
+++ b/thirdparty/libvorbis/modes/setup_44u.h
diff --git a/drivers/vorbis/modes/setup_8.h b/thirdparty/libvorbis/modes/setup_8.h
index 14c48374fa..14c48374fa 100644
--- a/drivers/vorbis/modes/setup_8.h
+++ b/thirdparty/libvorbis/modes/setup_8.h
diff --git a/drivers/vorbis/modes/setup_X.h b/thirdparty/libvorbis/modes/setup_X.h
index a69f5d40a2..a69f5d40a2 100644
--- a/drivers/vorbis/modes/setup_X.h
+++ b/thirdparty/libvorbis/modes/setup_X.h
diff --git a/drivers/vorbis/os.h b/thirdparty/libvorbis/os.h
index 8bc3e5fe9c..8bc3e5fe9c 100644
--- a/drivers/vorbis/os.h
+++ b/thirdparty/libvorbis/os.h
diff --git a/drivers/vorbis/psy.c b/thirdparty/libvorbis/psy.c
index f7a44c6d00..f7a44c6d00 100644
--- a/drivers/vorbis/psy.c
+++ b/thirdparty/libvorbis/psy.c
diff --git a/drivers/vorbis/psy.h b/thirdparty/libvorbis/psy.h
index c1ea824401..c1ea824401 100644
--- a/drivers/vorbis/psy.h
+++ b/thirdparty/libvorbis/psy.h
diff --git a/drivers/vorbis/psytune.c b/thirdparty/libvorbis/psytune.c
index 64c13171f7..64c13171f7 100644
--- a/drivers/vorbis/psytune.c
+++ b/thirdparty/libvorbis/psytune.c
diff --git a/drivers/vorbis/registry.c b/thirdparty/libvorbis/registry.c
index 3961ed1403..3961ed1403 100644
--- a/drivers/vorbis/registry.c
+++ b/thirdparty/libvorbis/registry.c
diff --git a/drivers/vorbis/registry.h b/thirdparty/libvorbis/registry.h
index 3ae04776d8..3ae04776d8 100644
--- a/drivers/vorbis/registry.h
+++ b/thirdparty/libvorbis/registry.h
diff --git a/drivers/vorbis/res0.c b/thirdparty/libvorbis/res0.c
index ec11488c2f..ec11488c2f 100644
--- a/drivers/vorbis/res0.c
+++ b/thirdparty/libvorbis/res0.c
diff --git a/drivers/vorbis/scales.h b/thirdparty/libvorbis/scales.h
index 613f796e77..613f796e77 100644
--- a/drivers/vorbis/scales.h
+++ b/thirdparty/libvorbis/scales.h
diff --git a/drivers/vorbis/sharedbook.c b/thirdparty/libvorbis/sharedbook.c
index 6bfdf7311e..6bfdf7311e 100644
--- a/drivers/vorbis/sharedbook.c
+++ b/thirdparty/libvorbis/sharedbook.c
diff --git a/drivers/vorbis/smallft.c b/thirdparty/libvorbis/smallft.c
index ae2bc41b6b..ae2bc41b6b 100644
--- a/drivers/vorbis/smallft.c
+++ b/thirdparty/libvorbis/smallft.c
diff --git a/drivers/vorbis/smallft.h b/thirdparty/libvorbis/smallft.h
index 456497326c..456497326c 100644
--- a/drivers/vorbis/smallft.h
+++ b/thirdparty/libvorbis/smallft.h
diff --git a/drivers/vorbis/synthesis.c b/thirdparty/libvorbis/synthesis.c
index 932d271a63..932d271a63 100644
--- a/drivers/vorbis/synthesis.c
+++ b/thirdparty/libvorbis/synthesis.c
diff --git a/drivers/vorbis/tone.c b/thirdparty/libvorbis/tone.c
index 73afc67d4c..73afc67d4c 100644
--- a/drivers/vorbis/tone.c
+++ b/thirdparty/libvorbis/tone.c
diff --git a/drivers/vorbis/codec.h b/thirdparty/libvorbis/vorbis/codec.h
index 999aa33510..999aa33510 100644
--- a/drivers/vorbis/codec.h
+++ b/thirdparty/libvorbis/vorbis/codec.h
diff --git a/drivers/vorbis/vorbisenc.h b/thirdparty/libvorbis/vorbis/vorbisenc.h
index 02332b50ca..02332b50ca 100644
--- a/drivers/vorbis/vorbisenc.h
+++ b/thirdparty/libvorbis/vorbis/vorbisenc.h
diff --git a/drivers/vorbis/vorbisfile.h b/thirdparty/libvorbis/vorbis/vorbisfile.h
index 9271331e72..9271331e72 100644
--- a/drivers/vorbis/vorbisfile.h
+++ b/thirdparty/libvorbis/vorbis/vorbisfile.h
diff --git a/drivers/vorbis/vorbisenc.c b/thirdparty/libvorbis/vorbisenc.c
index b5d621e900..b5d621e900 100644
--- a/drivers/vorbis/vorbisenc.c
+++ b/thirdparty/libvorbis/vorbisenc.c
diff --git a/drivers/vorbis/vorbisfile.c b/thirdparty/libvorbis/vorbisfile.c
index fc0c86ff11..fc0c86ff11 100644
--- a/drivers/vorbis/vorbisfile.c
+++ b/thirdparty/libvorbis/vorbisfile.c
diff --git a/drivers/vorbis/window.c b/thirdparty/libvorbis/window.c
index 0305b79297..0305b79297 100644
--- a/drivers/vorbis/window.c
+++ b/thirdparty/libvorbis/window.c
diff --git a/drivers/vorbis/window.h b/thirdparty/libvorbis/window.h
index 51f97599f5..51f97599f5 100644
--- a/drivers/vorbis/window.h
+++ b/thirdparty/libvorbis/window.h
diff --git a/drivers/webp/AUTHORS b/thirdparty/libwebp/AUTHORS
index 70423cb4dd..70423cb4dd 100644
--- a/drivers/webp/AUTHORS
+++ b/thirdparty/libwebp/AUTHORS
diff --git a/drivers/webp/COPYING b/thirdparty/libwebp/COPYING
index 7a6f99547d..7a6f99547d 100644
--- a/drivers/webp/COPYING
+++ b/thirdparty/libwebp/COPYING
diff --git a/drivers/webp/PATENTS b/thirdparty/libwebp/PATENTS
index caedf607e9..caedf607e9 100644
--- a/drivers/webp/PATENTS
+++ b/thirdparty/libwebp/PATENTS
diff --git a/drivers/webp/dec/alpha.c b/thirdparty/libwebp/dec/alpha.c
index 19ce548e96..028eb3d50b 100644
--- a/drivers/webp/dec/alpha.c
+++ b/thirdparty/libwebp/dec/alpha.c
@@ -18,7 +18,7 @@
 #include "../dsp/dsp.h"
 #include "../utils/quant_levels_dec.h"
 #include "../utils/utils.h"
-#include "webp/format_constants.h"
+#include "../webp/format_constants.h"
 
 //------------------------------------------------------------------------------
 // ALPHDecoder object.
diff --git a/drivers/webp/dec/alphai.h b/thirdparty/libwebp/dec/alphai.h
index 69dd7c0f5d..69dd7c0f5d 100644
--- a/drivers/webp/dec/alphai.h
+++ b/thirdparty/libwebp/dec/alphai.h
diff --git a/drivers/webp/dec/buffer.c b/thirdparty/libwebp/dec/buffer.c
index 547e69b434..547e69b434 100644
--- a/drivers/webp/dec/buffer.c
+++ b/thirdparty/libwebp/dec/buffer.c
diff --git a/drivers/webp/dec/common.h b/thirdparty/libwebp/dec/common.h
index 6961e22470..6961e22470 100644
--- a/drivers/webp/dec/common.h
+++ b/thirdparty/libwebp/dec/common.h
diff --git a/drivers/webp/dec/decode_vp8.h b/thirdparty/libwebp/dec/decode_vp8.h
index 2bf1bdbbf5..b9337bbec0 100644
--- a/drivers/webp/dec/decode_vp8.h
+++ b/thirdparty/libwebp/dec/decode_vp8.h
@@ -14,7 +14,7 @@
 #ifndef WEBP_WEBP_DECODE_VP8_H_
 #define WEBP_WEBP_DECODE_VP8_H_
 
-#include "webp/decode.h"
+#include "../webp/decode.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/dec/frame.c b/thirdparty/libwebp/dec/frame.c
index 22d291d2cd..22d291d2cd 100644
--- a/drivers/webp/dec/frame.c
+++ b/thirdparty/libwebp/dec/frame.c
diff --git a/drivers/webp/dec/idec.c b/thirdparty/libwebp/dec/idec.c
index 8de131916e..8de131916e 100644
--- a/drivers/webp/dec/idec.c
+++ b/thirdparty/libwebp/dec/idec.c
diff --git a/drivers/webp/dec/io.c b/thirdparty/libwebp/dec/io.c
index 8d5c43f325..8d5c43f325 100644
--- a/drivers/webp/dec/io.c
+++ b/thirdparty/libwebp/dec/io.c
diff --git a/drivers/webp/dec/quant.c b/thirdparty/libwebp/dec/quant.c
index 5b648f942c..5b648f942c 100644
--- a/drivers/webp/dec/quant.c
+++ b/thirdparty/libwebp/dec/quant.c
diff --git a/drivers/webp/dec/tree.c b/thirdparty/libwebp/dec/tree.c
index c2007ea733..c2007ea733 100644
--- a/drivers/webp/dec/tree.c
+++ b/thirdparty/libwebp/dec/tree.c
diff --git a/drivers/webp/dec/vp8.c b/thirdparty/libwebp/dec/vp8.c
index 336680c38c..336680c38c 100644
--- a/drivers/webp/dec/vp8.c
+++ b/thirdparty/libwebp/dec/vp8.c
diff --git a/drivers/webp/dec/vp8i.h b/thirdparty/libwebp/dec/vp8i.h
index 00da02badc..00da02badc 100644
--- a/drivers/webp/dec/vp8i.h
+++ b/thirdparty/libwebp/dec/vp8i.h
diff --git a/drivers/webp/dec/vp8l.c b/thirdparty/libwebp/dec/vp8l.c
index cb2e3176b6..cb2e3176b6 100644
--- a/drivers/webp/dec/vp8l.c
+++ b/thirdparty/libwebp/dec/vp8l.c
diff --git a/drivers/webp/dec/vp8li.h b/thirdparty/libwebp/dec/vp8li.h
index 9313bdc0af..9313bdc0af 100644
--- a/drivers/webp/dec/vp8li.h
+++ b/thirdparty/libwebp/dec/vp8li.h
diff --git a/drivers/webp/dec/webp.c b/thirdparty/libwebp/dec/webp.c
index dd6c090f00..d0b912f02f 100644
--- a/drivers/webp/dec/webp.c
+++ b/thirdparty/libwebp/dec/webp.c
@@ -17,7 +17,7 @@
 #include "./vp8li.h"
 #include "./webpi.h"
 #include "../utils/utils.h"
-#include "webp/mux_types.h"  // ALPHA_FLAG
+#include "../webp/mux_types.h"  // ALPHA_FLAG
 
 //------------------------------------------------------------------------------
 // RIFF layout is:
diff --git a/drivers/webp/dec/webpi.h b/thirdparty/libwebp/dec/webpi.h
index 991b194c22..991b194c22 100644
--- a/drivers/webp/dec/webpi.h
+++ b/thirdparty/libwebp/dec/webpi.h
diff --git a/drivers/webp/demux/anim_decode.c b/thirdparty/libwebp/demux/anim_decode.c
index 39cf3de197..1989eb4ab4 100644
--- a/drivers/webp/demux/anim_decode.c
+++ b/thirdparty/libwebp/demux/anim_decode.c
@@ -11,15 +11,15 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
 #include <assert.h>
 #include <string.h>
 
 #include "../utils/utils.h"
-#include "webp/decode.h"
-#include "webp/demux.h"
+#include "../webp/decode.h"
+#include "../webp/demux.h"
 
 #define NUM_CHANNELS 4
 
diff --git a/drivers/webp/demux/demux.c b/thirdparty/libwebp/demux/demux.c
index df93c5b379..0d2989f6f4 100644
--- a/drivers/webp/demux/demux.c
+++ b/thirdparty/libwebp/demux/demux.c
@@ -11,7 +11,7 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
 #include <assert.h>
@@ -19,9 +19,9 @@
 #include <string.h>
 
 #include "../utils/utils.h"
-#include "webp/decode.h"     // WebPGetFeatures
-#include "webp/demux.h"
-#include "webp/format_constants.h"
+#include "../webp/decode.h"     // WebPGetFeatures
+#include "../webp/demux.h"
+#include "../webp/format_constants.h"
 
 #define DMUX_MAJ_VERSION 0
 #define DMUX_MIN_VERSION 3
diff --git a/drivers/webp/dsp/alpha_processing.c b/thirdparty/libwebp/dsp/alpha_processing.c
index 1716cace8d..1716cace8d 100644
--- a/drivers/webp/dsp/alpha_processing.c
+++ b/thirdparty/libwebp/dsp/alpha_processing.c
diff --git a/drivers/webp/dsp/alpha_processing_mips_dsp_r2.c b/thirdparty/libwebp/dsp/alpha_processing_mips_dsp_r2.c
index c631d78905..c631d78905 100644
--- a/drivers/webp/dsp/alpha_processing_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/alpha_processing_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/alpha_processing_sse2.c b/thirdparty/libwebp/dsp/alpha_processing_sse2.c
index 5acb481dcd..5acb481dcd 100644
--- a/drivers/webp/dsp/alpha_processing_sse2.c
+++ b/thirdparty/libwebp/dsp/alpha_processing_sse2.c
diff --git a/drivers/webp/dsp/alpha_processing_sse41.c b/thirdparty/libwebp/dsp/alpha_processing_sse41.c
index 986fde94ed..986fde94ed 100644
--- a/drivers/webp/dsp/alpha_processing_sse41.c
+++ b/thirdparty/libwebp/dsp/alpha_processing_sse41.c
diff --git a/drivers/webp/dsp/argb.c b/thirdparty/libwebp/dsp/argb.c
index cc1f9a96c3..cc1f9a96c3 100644
--- a/drivers/webp/dsp/argb.c
+++ b/thirdparty/libwebp/dsp/argb.c
diff --git a/drivers/webp/dsp/argb_mips_dsp_r2.c b/thirdparty/libwebp/dsp/argb_mips_dsp_r2.c
index af65acb8ff..af65acb8ff 100644
--- a/drivers/webp/dsp/argb_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/argb_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/argb_sse2.c b/thirdparty/libwebp/dsp/argb_sse2.c
index afcb1957e7..afcb1957e7 100644
--- a/drivers/webp/dsp/argb_sse2.c
+++ b/thirdparty/libwebp/dsp/argb_sse2.c
diff --git a/drivers/webp/dsp/common_sse2.h b/thirdparty/libwebp/dsp/common_sse2.h
index 7cea13fb3c..7cea13fb3c 100644
--- a/drivers/webp/dsp/common_sse2.h
+++ b/thirdparty/libwebp/dsp/common_sse2.h
diff --git a/drivers/webp/dsp/cost.c b/thirdparty/libwebp/dsp/cost.c
index fe72d26e79..fe72d26e79 100644
--- a/drivers/webp/dsp/cost.c
+++ b/thirdparty/libwebp/dsp/cost.c
diff --git a/drivers/webp/dsp/cost_mips32.c b/thirdparty/libwebp/dsp/cost_mips32.c
index d1e240e191..d1e240e191 100644
--- a/drivers/webp/dsp/cost_mips32.c
+++ b/thirdparty/libwebp/dsp/cost_mips32.c
diff --git a/drivers/webp/dsp/cost_mips_dsp_r2.c b/thirdparty/libwebp/dsp/cost_mips_dsp_r2.c
index ce64067756..ce64067756 100644
--- a/drivers/webp/dsp/cost_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/cost_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/cost_sse2.c b/thirdparty/libwebp/dsp/cost_sse2.c
index 0cb1c1fa04..0cb1c1fa04 100644
--- a/drivers/webp/dsp/cost_sse2.c
+++ b/thirdparty/libwebp/dsp/cost_sse2.c
diff --git a/drivers/webp/dsp/cpu.c b/thirdparty/libwebp/dsp/cpu.c
index cbb08db90a..cbb08db90a 100644
--- a/drivers/webp/dsp/cpu.c
+++ b/thirdparty/libwebp/dsp/cpu.c
diff --git a/drivers/webp/dsp/dec.c b/thirdparty/libwebp/dsp/dec.c
index e92d693362..e92d693362 100644
--- a/drivers/webp/dsp/dec.c
+++ b/thirdparty/libwebp/dsp/dec.c
diff --git a/drivers/webp/dsp/dec_clip_tables.c b/thirdparty/libwebp/dsp/dec_clip_tables.c
index 3b6dde86ba..3b6dde86ba 100644
--- a/drivers/webp/dsp/dec_clip_tables.c
+++ b/thirdparty/libwebp/dsp/dec_clip_tables.c
diff --git a/drivers/webp/dsp/dec_mips32.c b/thirdparty/libwebp/dsp/dec_mips32.c
index 4e9ef42605..4e9ef42605 100644
--- a/drivers/webp/dsp/dec_mips32.c
+++ b/thirdparty/libwebp/dsp/dec_mips32.c
diff --git a/drivers/webp/dsp/dec_mips_dsp_r2.c b/thirdparty/libwebp/dsp/dec_mips_dsp_r2.c
index db5c657228..db5c657228 100644
--- a/drivers/webp/dsp/dec_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/dec_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/dec_msa.c b/thirdparty/libwebp/dsp/dec_msa.c
index f76055cab0..f76055cab0 100644
--- a/drivers/webp/dsp/dec_msa.c
+++ b/thirdparty/libwebp/dsp/dec_msa.c
diff --git a/drivers/webp/dsp/dec_neon.c b/thirdparty/libwebp/dsp/dec_neon.c
index a63f43fe17..a63f43fe17 100644
--- a/drivers/webp/dsp/dec_neon.c
+++ b/thirdparty/libwebp/dsp/dec_neon.c
diff --git a/drivers/webp/dsp/dec_sse2.c b/thirdparty/libwebp/dsp/dec_sse2.c
index f0a8ddcaf3..f0a8ddcaf3 100644
--- a/drivers/webp/dsp/dec_sse2.c
+++ b/thirdparty/libwebp/dsp/dec_sse2.c
diff --git a/drivers/webp/dsp/dec_sse41.c b/thirdparty/libwebp/dsp/dec_sse41.c
index 8d6aed13e6..8d6aed13e6 100644
--- a/drivers/webp/dsp/dec_sse41.c
+++ b/thirdparty/libwebp/dsp/dec_sse41.c
diff --git a/drivers/webp/dsp/dsp.h b/thirdparty/libwebp/dsp/dsp.h
index 2469f7d3ac..1faac27b2b 100644
--- a/drivers/webp/dsp/dsp.h
+++ b/thirdparty/libwebp/dsp/dsp.h
@@ -15,10 +15,10 @@
 #define WEBP_DSP_DSP_H_
 
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/dsp/enc.c b/thirdparty/libwebp/dsp/enc.c
index f639f5570c..f639f5570c 100644
--- a/drivers/webp/dsp/enc.c
+++ b/thirdparty/libwebp/dsp/enc.c
diff --git a/drivers/webp/dsp/enc_avx2.c b/thirdparty/libwebp/dsp/enc_avx2.c
index 93efb30b10..93efb30b10 100644
--- a/drivers/webp/dsp/enc_avx2.c
+++ b/thirdparty/libwebp/dsp/enc_avx2.c
diff --git a/drivers/webp/dsp/enc_mips32.c b/thirdparty/libwebp/dsp/enc_mips32.c
index fd10143de9..fd10143de9 100644
--- a/drivers/webp/dsp/enc_mips32.c
+++ b/thirdparty/libwebp/dsp/enc_mips32.c
diff --git a/drivers/webp/dsp/enc_mips_dsp_r2.c b/thirdparty/libwebp/dsp/enc_mips_dsp_r2.c
index 7ab96f6800..7ab96f6800 100644
--- a/drivers/webp/dsp/enc_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/enc_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/enc_neon.c b/thirdparty/libwebp/dsp/enc_neon.c
index 46f6bf9a33..46f6bf9a33 100644
--- a/drivers/webp/dsp/enc_neon.c
+++ b/thirdparty/libwebp/dsp/enc_neon.c
diff --git a/drivers/webp/dsp/enc_sse2.c b/thirdparty/libwebp/dsp/enc_sse2.c
index 4a2e3ce14f..4a2e3ce14f 100644
--- a/drivers/webp/dsp/enc_sse2.c
+++ b/thirdparty/libwebp/dsp/enc_sse2.c
diff --git a/drivers/webp/dsp/enc_sse41.c b/thirdparty/libwebp/dsp/enc_sse41.c
index a1783901a6..a1783901a6 100644
--- a/drivers/webp/dsp/enc_sse41.c
+++ b/thirdparty/libwebp/dsp/enc_sse41.c
diff --git a/drivers/webp/dsp/filters.c b/thirdparty/libwebp/dsp/filters.c
index 9f04faf0cb..9f04faf0cb 100644
--- a/drivers/webp/dsp/filters.c
+++ b/thirdparty/libwebp/dsp/filters.c
diff --git a/drivers/webp/dsp/filters_mips_dsp_r2.c b/thirdparty/libwebp/dsp/filters_mips_dsp_r2.c
index 1d82e3c2e1..1d82e3c2e1 100644
--- a/drivers/webp/dsp/filters_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/filters_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/filters_sse2.c b/thirdparty/libwebp/dsp/filters_sse2.c
index 67f77999e6..67f77999e6 100644
--- a/drivers/webp/dsp/filters_sse2.c
+++ b/thirdparty/libwebp/dsp/filters_sse2.c
diff --git a/drivers/webp/dsp/lossless.c b/thirdparty/libwebp/dsp/lossless.c
index af913efccb..af913efccb 100644
--- a/drivers/webp/dsp/lossless.c
+++ b/thirdparty/libwebp/dsp/lossless.c
diff --git a/drivers/webp/dsp/lossless.h b/thirdparty/libwebp/dsp/lossless.h
index 7709b4fe85..9f0d7a25b7 100644
--- a/drivers/webp/dsp/lossless.h
+++ b/thirdparty/libwebp/dsp/lossless.h
@@ -15,8 +15,8 @@
 #ifndef WEBP_DSP_LOSSLESS_H_
 #define WEBP_DSP_LOSSLESS_H_
 
-#include "webp/types.h"
-#include "webp/decode.h"
+#include "../webp/types.h"
+#include "../webp/decode.h"
 
 #include "../enc/histogram.h"
 #include "../utils/utils.h"
diff --git a/drivers/webp/dsp/lossless_enc.c b/thirdparty/libwebp/dsp/lossless_enc.c
index 256f6f5f8b..256f6f5f8b 100644
--- a/drivers/webp/dsp/lossless_enc.c
+++ b/thirdparty/libwebp/dsp/lossless_enc.c
diff --git a/drivers/webp/dsp/lossless_enc_mips32.c b/thirdparty/libwebp/dsp/lossless_enc_mips32.c
index 49c666d4fd..49c666d4fd 100644
--- a/drivers/webp/dsp/lossless_enc_mips32.c
+++ b/thirdparty/libwebp/dsp/lossless_enc_mips32.c
diff --git a/drivers/webp/dsp/lossless_enc_mips_dsp_r2.c b/thirdparty/libwebp/dsp/lossless_enc_mips_dsp_r2.c
index 0abf3c4f36..0abf3c4f36 100644
--- a/drivers/webp/dsp/lossless_enc_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/lossless_enc_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/lossless_enc_neon.c b/thirdparty/libwebp/dsp/lossless_enc_neon.c
index 4c56f2594b..4c56f2594b 100644
--- a/drivers/webp/dsp/lossless_enc_neon.c
+++ b/thirdparty/libwebp/dsp/lossless_enc_neon.c
diff --git a/drivers/webp/dsp/lossless_enc_sse2.c b/thirdparty/libwebp/dsp/lossless_enc_sse2.c
index 7c894e7ca4..7c894e7ca4 100644
--- a/drivers/webp/dsp/lossless_enc_sse2.c
+++ b/thirdparty/libwebp/dsp/lossless_enc_sse2.c
diff --git a/drivers/webp/dsp/lossless_enc_sse41.c b/thirdparty/libwebp/dsp/lossless_enc_sse41.c
index 3e493198db..3e493198db 100644
--- a/drivers/webp/dsp/lossless_enc_sse41.c
+++ b/thirdparty/libwebp/dsp/lossless_enc_sse41.c
diff --git a/drivers/webp/dsp/lossless_mips_dsp_r2.c b/thirdparty/libwebp/dsp/lossless_mips_dsp_r2.c
index 90aed7f151..90aed7f151 100644
--- a/drivers/webp/dsp/lossless_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/lossless_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/lossless_neon.c b/thirdparty/libwebp/dsp/lossless_neon.c
index 6faccb8f97..6faccb8f97 100644
--- a/drivers/webp/dsp/lossless_neon.c
+++ b/thirdparty/libwebp/dsp/lossless_neon.c
diff --git a/drivers/webp/dsp/lossless_sse2.c b/thirdparty/libwebp/dsp/lossless_sse2.c
index 2d016c2911..2d016c2911 100644
--- a/drivers/webp/dsp/lossless_sse2.c
+++ b/thirdparty/libwebp/dsp/lossless_sse2.c
diff --git a/drivers/webp/dsp/mips_macro.h b/thirdparty/libwebp/dsp/mips_macro.h
index 44aba9b71d..44aba9b71d 100644
--- a/drivers/webp/dsp/mips_macro.h
+++ b/thirdparty/libwebp/dsp/mips_macro.h
diff --git a/drivers/webp/dsp/msa_macro.h b/thirdparty/libwebp/dsp/msa_macro.h
index 5c707f476a..5c707f476a 100644
--- a/drivers/webp/dsp/msa_macro.h
+++ b/thirdparty/libwebp/dsp/msa_macro.h
diff --git a/drivers/webp/dsp/neon.h b/thirdparty/libwebp/dsp/neon.h
index 0a06266848..0a06266848 100644
--- a/drivers/webp/dsp/neon.h
+++ b/thirdparty/libwebp/dsp/neon.h
diff --git a/drivers/webp/dsp/rescaler.c b/thirdparty/libwebp/dsp/rescaler.c
index bc743d5dc5..bc743d5dc5 100644
--- a/drivers/webp/dsp/rescaler.c
+++ b/thirdparty/libwebp/dsp/rescaler.c
diff --git a/drivers/webp/dsp/rescaler_mips32.c b/thirdparty/libwebp/dsp/rescaler_mips32.c
index ddaa391336..ddaa391336 100644
--- a/drivers/webp/dsp/rescaler_mips32.c
+++ b/thirdparty/libwebp/dsp/rescaler_mips32.c
diff --git a/drivers/webp/dsp/rescaler_mips_dsp_r2.c b/thirdparty/libwebp/dsp/rescaler_mips_dsp_r2.c
index b457d0a30a..b457d0a30a 100644
--- a/drivers/webp/dsp/rescaler_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/rescaler_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/rescaler_neon.c b/thirdparty/libwebp/dsp/rescaler_neon.c
index 16fd450ea3..16fd450ea3 100644
--- a/drivers/webp/dsp/rescaler_neon.c
+++ b/thirdparty/libwebp/dsp/rescaler_neon.c
diff --git a/drivers/webp/dsp/rescaler_sse2.c b/thirdparty/libwebp/dsp/rescaler_sse2.c
index 5b9702817c..5b9702817c 100644
--- a/drivers/webp/dsp/rescaler_sse2.c
+++ b/thirdparty/libwebp/dsp/rescaler_sse2.c
diff --git a/drivers/webp/dsp/upsampling.c b/thirdparty/libwebp/dsp/upsampling.c
index 651274fcee..651274fcee 100644
--- a/drivers/webp/dsp/upsampling.c
+++ b/thirdparty/libwebp/dsp/upsampling.c
diff --git a/drivers/webp/dsp/upsampling_mips_dsp_r2.c b/thirdparty/libwebp/dsp/upsampling_mips_dsp_r2.c
index ed2eb74825..ed2eb74825 100644
--- a/drivers/webp/dsp/upsampling_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/upsampling_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/upsampling_neon.c b/thirdparty/libwebp/dsp/upsampling_neon.c
index 2b0c99bddb..2b0c99bddb 100644
--- a/drivers/webp/dsp/upsampling_neon.c
+++ b/thirdparty/libwebp/dsp/upsampling_neon.c
diff --git a/drivers/webp/dsp/upsampling_sse2.c b/thirdparty/libwebp/dsp/upsampling_sse2.c
index b5b668900f..b5b668900f 100644
--- a/drivers/webp/dsp/upsampling_sse2.c
+++ b/thirdparty/libwebp/dsp/upsampling_sse2.c
diff --git a/drivers/webp/dsp/yuv.c b/thirdparty/libwebp/dsp/yuv.c
index f50a253168..f50a253168 100644
--- a/drivers/webp/dsp/yuv.c
+++ b/thirdparty/libwebp/dsp/yuv.c
diff --git a/drivers/webp/dsp/yuv.h b/thirdparty/libwebp/dsp/yuv.h
index 01c40fcb84..01c40fcb84 100644
--- a/drivers/webp/dsp/yuv.h
+++ b/thirdparty/libwebp/dsp/yuv.h
diff --git a/drivers/webp/dsp/yuv_mips32.c b/thirdparty/libwebp/dsp/yuv_mips32.c
index e61aac571f..e61aac571f 100644
--- a/drivers/webp/dsp/yuv_mips32.c
+++ b/thirdparty/libwebp/dsp/yuv_mips32.c
diff --git a/drivers/webp/dsp/yuv_mips_dsp_r2.c b/thirdparty/libwebp/dsp/yuv_mips_dsp_r2.c
index 1720d4190f..1720d4190f 100644
--- a/drivers/webp/dsp/yuv_mips_dsp_r2.c
+++ b/thirdparty/libwebp/dsp/yuv_mips_dsp_r2.c
diff --git a/drivers/webp/dsp/yuv_sse2.c b/thirdparty/libwebp/dsp/yuv_sse2.c
index e19bddff6c..e19bddff6c 100644
--- a/drivers/webp/dsp/yuv_sse2.c
+++ b/thirdparty/libwebp/dsp/yuv_sse2.c
diff --git a/drivers/webp/dsp/yuv_tables_sse2.h b/thirdparty/libwebp/dsp/yuv_tables_sse2.h
index 2b0f057518..2b0f057518 100644
--- a/drivers/webp/dsp/yuv_tables_sse2.h
+++ b/thirdparty/libwebp/dsp/yuv_tables_sse2.h
diff --git a/drivers/webp/enc/alpha.c b/thirdparty/libwebp/enc/alpha.c
index 464df4db09..03e3ad07f5 100644
--- a/drivers/webp/enc/alpha.c
+++ b/thirdparty/libwebp/enc/alpha.c
@@ -19,7 +19,7 @@
 #include "../utils/filters.h"
 #include "../utils/quant_levels.h"
 #include "../utils/utils.h"
-#include "webp/format_constants.h"
+#include "../webp/format_constants.h"
 
 // -----------------------------------------------------------------------------
 // Encodes the given alpha data via specified compression method 'method'.
diff --git a/drivers/webp/enc/analysis.c b/thirdparty/libwebp/enc/analysis.c
index b55128fd48..b55128fd48 100644
--- a/drivers/webp/enc/analysis.c
+++ b/thirdparty/libwebp/enc/analysis.c
diff --git a/drivers/webp/enc/backward_references.c b/thirdparty/libwebp/enc/backward_references.c
index 136a24a8c3..136a24a8c3 100644
--- a/drivers/webp/enc/backward_references.c
+++ b/thirdparty/libwebp/enc/backward_references.c
diff --git a/drivers/webp/enc/backward_references.h b/thirdparty/libwebp/enc/backward_references.h
index b72a01fb0e..0cadb11e11 100644
--- a/drivers/webp/enc/backward_references.h
+++ b/thirdparty/libwebp/enc/backward_references.h
@@ -15,8 +15,8 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include "webp/types.h"
-#include "webp/format_constants.h"
+#include "../webp/types.h"
+#include "../webp/format_constants.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/enc/config.c b/thirdparty/libwebp/enc/config.c
index 8fd2276cb5..f9f7961d58 100644
--- a/drivers/webp/enc/config.c
+++ b/thirdparty/libwebp/enc/config.c
@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "webp/encode.h"
+#include "../webp/encode.h"
 
 //------------------------------------------------------------------------------
 // WebPConfig
diff --git a/drivers/webp/enc/cost.c b/thirdparty/libwebp/enc/cost.c
index ae7fe01388..ae7fe01388 100644
--- a/drivers/webp/enc/cost.c
+++ b/thirdparty/libwebp/enc/cost.c
diff --git a/drivers/webp/enc/cost.h b/thirdparty/libwebp/enc/cost.h
index 20960d6d74..20960d6d74 100644
--- a/drivers/webp/enc/cost.h
+++ b/thirdparty/libwebp/enc/cost.h
diff --git a/drivers/webp/enc/delta_palettization.c b/thirdparty/libwebp/enc/delta_palettization.c
index 8bd3a3d233..062e588d79 100644
--- a/drivers/webp/enc/delta_palettization.c
+++ b/thirdparty/libwebp/enc/delta_palettization.c
@@ -13,7 +13,7 @@
 #include "./delta_palettization.h"
 
 #ifdef WEBP_EXPERIMENTAL_FEATURES
-#include "webp/types.h"
+#include "../webp/types.h"
 #include "../dsp/lossless.h"
 
 #define MK_COL(r, g, b) (((r) << 16) + ((g) << 8) + (b))
diff --git a/drivers/webp/enc/delta_palettization.h b/thirdparty/libwebp/enc/delta_palettization.h
index 54195d452c..e41c0c5ab5 100644
--- a/drivers/webp/enc/delta_palettization.h
+++ b/thirdparty/libwebp/enc/delta_palettization.h
@@ -13,7 +13,7 @@
 #ifndef WEBP_ENC_DELTA_PALETTIZATION_H_
 #define WEBP_ENC_DELTA_PALETTIZATION_H_
 
-#include "webp/encode.h"
+#include "../webp/encode.h"
 #include "../enc/vp8li.h"
 
 // Replaces enc->argb_[] input by a palettizable approximation of it,
diff --git a/drivers/webp/enc/filter.c b/thirdparty/libwebp/enc/filter.c
index e8ea8b4ff2..e8ea8b4ff2 100644
--- a/drivers/webp/enc/filter.c
+++ b/thirdparty/libwebp/enc/filter.c
diff --git a/drivers/webp/enc/frame.c b/thirdparty/libwebp/enc/frame.c
index 65a98ada4d..5b7a40b9ad 100644
--- a/drivers/webp/enc/frame.c
+++ b/thirdparty/libwebp/enc/frame.c
@@ -17,7 +17,7 @@
 #include "./cost.h"
 #include "./vp8enci.h"
 #include "../dsp/dsp.h"
-#include "webp/format_constants.h"  // RIFF constants
+#include "../webp/format_constants.h"  // RIFF constants
 
 #define SEGMENT_VISU 0
 #define DEBUG_SEARCH 0    // useful to track search convergence
diff --git a/drivers/webp/enc/histogram.c b/thirdparty/libwebp/enc/histogram.c
index 61544f4ccd..395372b245 100644
--- a/drivers/webp/enc/histogram.c
+++ b/thirdparty/libwebp/enc/histogram.c
@@ -10,7 +10,7 @@
 // Author: Jyrki Alakuijala (jyrki@google.com)
 //
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
 #include <math.h>
diff --git a/drivers/webp/enc/histogram.h b/thirdparty/libwebp/enc/histogram.h
index 59de42b33e..d303d1d58b 100644
--- a/drivers/webp/enc/histogram.h
+++ b/thirdparty/libwebp/enc/histogram.h
@@ -17,8 +17,8 @@
 #include <string.h>
 
 #include "./backward_references.h"
-#include "webp/format_constants.h"
-#include "webp/types.h"
+#include "../webp/format_constants.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/enc/iterator.c b/thirdparty/libwebp/enc/iterator.c
index 99d960a547..99d960a547 100644
--- a/drivers/webp/enc/iterator.c
+++ b/thirdparty/libwebp/enc/iterator.c
diff --git a/drivers/webp/enc/near_lossless.c b/thirdparty/libwebp/enc/near_lossless.c
index f4ab91f571..f4ab91f571 100644
--- a/drivers/webp/enc/near_lossless.c
+++ b/thirdparty/libwebp/enc/near_lossless.c
diff --git a/drivers/webp/enc/picture.c b/thirdparty/libwebp/enc/picture.c
index d9befbc47d..d9befbc47d 100644
--- a/drivers/webp/enc/picture.c
+++ b/thirdparty/libwebp/enc/picture.c
diff --git a/drivers/webp/enc/picture_csp.c b/thirdparty/libwebp/enc/picture_csp.c
index 607a6240b0..607a6240b0 100644
--- a/drivers/webp/enc/picture_csp.c
+++ b/thirdparty/libwebp/enc/picture_csp.c
diff --git a/drivers/webp/enc/picture_psnr.c b/thirdparty/libwebp/enc/picture_psnr.c
index 81ab1b5ca1..81ab1b5ca1 100644
--- a/drivers/webp/enc/picture_psnr.c
+++ b/thirdparty/libwebp/enc/picture_psnr.c
diff --git a/drivers/webp/enc/picture_rescale.c b/thirdparty/libwebp/enc/picture_rescale.c
index 9f19e8e80f..9f19e8e80f 100644
--- a/drivers/webp/enc/picture_rescale.c
+++ b/thirdparty/libwebp/enc/picture_rescale.c
diff --git a/drivers/webp/enc/picture_tools.c b/thirdparty/libwebp/enc/picture_tools.c
index bf97af8408..bf97af8408 100644
--- a/drivers/webp/enc/picture_tools.c
+++ b/thirdparty/libwebp/enc/picture_tools.c
diff --git a/drivers/webp/enc/quant.c b/thirdparty/libwebp/enc/quant.c
index 549ad26f93..549ad26f93 100644
--- a/drivers/webp/enc/quant.c
+++ b/thirdparty/libwebp/enc/quant.c
diff --git a/drivers/webp/enc/syntax.c b/thirdparty/libwebp/enc/syntax.c
index 2b65f15ca1..a0e79ef404 100644
--- a/drivers/webp/enc/syntax.c
+++ b/thirdparty/libwebp/enc/syntax.c
@@ -14,8 +14,8 @@
 #include <assert.h>
 
 #include "../utils/utils.h"
-#include "webp/format_constants.h"  // RIFF constants
-#include "webp/mux_types.h"         // ALPHA_FLAG
+#include "../webp/format_constants.h"  // RIFF constants
+#include "../webp/mux_types.h"         // ALPHA_FLAG
 #include "./vp8enci.h"
 
 //------------------------------------------------------------------------------
diff --git a/drivers/webp/enc/token.c b/thirdparty/libwebp/enc/token.c
index e73256b37e..e73256b37e 100644
--- a/drivers/webp/enc/token.c
+++ b/thirdparty/libwebp/enc/token.c
diff --git a/drivers/webp/enc/tree.c b/thirdparty/libwebp/enc/tree.c
index f141006d19..f141006d19 100644
--- a/drivers/webp/enc/tree.c
+++ b/thirdparty/libwebp/enc/tree.c
diff --git a/drivers/webp/enc/vp8enci.h b/thirdparty/libwebp/enc/vp8enci.h
index efd2f19a9b..c1fbd7644e 100644
--- a/drivers/webp/enc/vp8enci.h
+++ b/thirdparty/libwebp/enc/vp8enci.h
@@ -20,7 +20,7 @@
 #include "../utils/bit_writer.h"
 #include "../utils/thread.h"
 #include "../utils/utils.h"
-#include "webp/encode.h"
+#include "../webp/encode.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/enc/vp8l.c b/thirdparty/libwebp/enc/vp8l.c
index 1f2d41ea91..c16e2560ec 100644
--- a/drivers/webp/enc/vp8l.c
+++ b/thirdparty/libwebp/enc/vp8l.c
@@ -23,7 +23,7 @@
 #include "../utils/bit_writer.h"
 #include "../utils/huffman_encode.h"
 #include "../utils/utils.h"
-#include "webp/format_constants.h"
+#include "../webp/format_constants.h"
 
 #include "./delta_palettization.h"
 
diff --git a/drivers/webp/enc/vp8li.h b/thirdparty/libwebp/enc/vp8li.h
index 8e6b360d81..371e276ee0 100644
--- a/drivers/webp/enc/vp8li.h
+++ b/thirdparty/libwebp/enc/vp8li.h
@@ -17,8 +17,8 @@
 #include "./backward_references.h"
 #include "./histogram.h"
 #include "../utils/bit_writer.h"
-#include "webp/encode.h"
-#include "webp/format_constants.h"
+#include "../webp/encode.h"
+#include "../webp/format_constants.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/enc/webpenc.c b/thirdparty/libwebp/enc/webpenc.c
index a7d04ea2ce..a7d04ea2ce 100644
--- a/drivers/webp/enc/webpenc.c
+++ b/thirdparty/libwebp/enc/webpenc.c
diff --git a/drivers/webp/mux/anim_encode.c b/thirdparty/libwebp/mux/anim_encode.c
index 2226febf13..53e2906a82 100644
--- a/drivers/webp/mux/anim_encode.c
+++ b/thirdparty/libwebp/mux/anim_encode.c
@@ -17,10 +17,10 @@
 #include <stdlib.h>  // for abs()
 
 #include "../utils/utils.h"
-#include "webp/decode.h"
-#include "webp/encode.h"
-#include "webp/format_constants.h"
-#include "webp/mux.h"
+#include "../webp/decode.h"
+#include "../webp/encode.h"
+#include "../webp/format_constants.h"
+#include "../webp/mux.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
diff --git a/drivers/webp/mux/muxedit.c b/thirdparty/libwebp/mux/muxedit.c
index 9bbed42b1a..9bbed42b1a 100644
--- a/drivers/webp/mux/muxedit.c
+++ b/thirdparty/libwebp/mux/muxedit.c
diff --git a/drivers/webp/mux/muxi.h b/thirdparty/libwebp/mux/muxi.h
index 3f6428c4df..d4d5cbad91 100644
--- a/drivers/webp/mux/muxi.h
+++ b/thirdparty/libwebp/mux/muxi.h
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include "../dec/vp8i.h"
 #include "../dec/vp8li.h"
-#include "webp/mux.h"
+#include "../webp/mux.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/mux/muxinternal.c b/thirdparty/libwebp/mux/muxinternal.c
index 4babbe82fc..4babbe82fc 100644
--- a/drivers/webp/mux/muxinternal.c
+++ b/thirdparty/libwebp/mux/muxinternal.c
diff --git a/drivers/webp/mux/muxread.c b/thirdparty/libwebp/mux/muxread.c
index 8957a1e46e..8957a1e46e 100644
--- a/drivers/webp/mux/muxread.c
+++ b/thirdparty/libwebp/mux/muxread.c
diff --git a/drivers/webp/utils/bit_reader.c b/thirdparty/libwebp/utils/bit_reader.c
index 13c6cf316e..2eb46e0b4b 100644
--- a/drivers/webp/utils/bit_reader.c
+++ b/thirdparty/libwebp/utils/bit_reader.c
@@ -12,7 +12,7 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
 #include "./bit_reader_inl.h"
@@ -41,12 +41,14 @@ void VP8InitBitReader(VP8BitReader* const br,
   br->bits_    = -8;   // to load the very first 8bits
   br->eof_     = 0;
   VP8BitReaderSetBuffer(br, start, size);
+// -- GODOT -- begin
 #ifdef JAVASCRIPT_ENABLED // html5 required aligned reads
   while(((uintptr_t)br->buf_ & 1) != 0 && !br->eof_)
     VP8LoadFinalBytes(br);
 #else
   VP8LoadNewBytes(br);
 #endif
+// -- GODOT -- end
 }
 
 void VP8RemapBitReader(VP8BitReader* const br, ptrdiff_t offset) {
diff --git a/drivers/webp/utils/bit_reader.h b/thirdparty/libwebp/utils/bit_reader.h
index c2dcc711c0..ea5c584eb4 100644
--- a/drivers/webp/utils/bit_reader.h
+++ b/thirdparty/libwebp/utils/bit_reader.h
@@ -19,7 +19,7 @@
 #ifdef _MSC_VER
 #include <stdlib.h>  // _byteswap_ulong
 #endif
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,11 +37,11 @@ extern "C" {
 // BITS can be any multiple of 8 from 8 to 56 (inclusive).
 // Pick values that fit natural register size.
 
+// -- GODOT -- start
 #ifdef JAVASCRIPT_ENABLED
-
 #define BITS 16
-
 #else
+// -- GODOT -- end
 
 #if defined(__i386__) || defined(_M_IX86)      // x86 32bit
 #define BITS 24
@@ -57,7 +57,9 @@ extern "C" {
 #define BITS 24
 #endif
 
+// -- GODOT -- start
 #endif
+// -- GODOT -- end
 
 //------------------------------------------------------------------------------
 // Derived types and constants:
diff --git a/drivers/webp/utils/bit_reader_inl.h b/thirdparty/libwebp/utils/bit_reader_inl.h
index 21faf14d83..99ed3137d2 100644
--- a/drivers/webp/utils/bit_reader_inl.h
+++ b/thirdparty/libwebp/utils/bit_reader_inl.h
@@ -17,7 +17,7 @@
 #define WEBP_UTILS_BIT_READER_INL_H_
 
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
 #ifdef WEBP_FORCE_ALIGNED
diff --git a/drivers/webp/utils/bit_writer.c b/thirdparty/libwebp/utils/bit_writer.c
index 064428691b..064428691b 100644
--- a/drivers/webp/utils/bit_writer.c
+++ b/thirdparty/libwebp/utils/bit_writer.c
diff --git a/drivers/webp/utils/bit_writer.h b/thirdparty/libwebp/utils/bit_writer.h
index 867a5ee055..ef360d1dc6 100644
--- a/drivers/webp/utils/bit_writer.h
+++ b/thirdparty/libwebp/utils/bit_writer.h
@@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_BIT_WRITER_H_
 #define WEBP_UTILS_BIT_WRITER_H_
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/color_cache.c b/thirdparty/libwebp/utils/color_cache.c
index c34b2e7f1a..c34b2e7f1a 100644
--- a/drivers/webp/utils/color_cache.c
+++ b/thirdparty/libwebp/utils/color_cache.c
diff --git a/drivers/webp/utils/color_cache.h b/thirdparty/libwebp/utils/color_cache.h
index 34299e4c4e..a9a9f64270 100644
--- a/drivers/webp/utils/color_cache.h
+++ b/thirdparty/libwebp/utils/color_cache.h
@@ -15,7 +15,7 @@
 #ifndef WEBP_UTILS_COLOR_CACHE_H_
 #define WEBP_UTILS_COLOR_CACHE_H_
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/endian_inl.h b/thirdparty/libwebp/utils/endian_inl.h
index e11260ff7d..e11260ff7d 100644
--- a/drivers/webp/utils/endian_inl.h
+++ b/thirdparty/libwebp/utils/endian_inl.h
diff --git a/drivers/webp/utils/filters.c b/thirdparty/libwebp/utils/filters.c
index 15543b1271..15543b1271 100644
--- a/drivers/webp/utils/filters.c
+++ b/thirdparty/libwebp/utils/filters.c
diff --git a/drivers/webp/utils/filters.h b/thirdparty/libwebp/utils/filters.h
index 4aba3fd3b7..088b132fc5 100644
--- a/drivers/webp/utils/filters.h
+++ b/thirdparty/libwebp/utils/filters.h
@@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_FILTERS_H_
 #define WEBP_UTILS_FILTERS_H_
 
-#include "webp/types.h"
+#include "../webp/types.h"
 #include "../dsp/dsp.h"
 
 #ifdef __cplusplus
diff --git a/drivers/webp/utils/huffman.c b/thirdparty/libwebp/utils/huffman.c
index 7c9d83db9a..36e5502836 100644
--- a/drivers/webp/utils/huffman.c
+++ b/thirdparty/libwebp/utils/huffman.c
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "./huffman.h"
-#include "webp/format_constants.h"
 #include "./utils.h"
+#include "../webp/format_constants.h"
 
 // Huffman data read via DecodeImageStream is represented in two (red and green)
 // bytes.
diff --git a/drivers/webp/utils/huffman.h b/thirdparty/libwebp/utils/huffman.h
index a8cc0da1c3..c6dd6aaa45 100644
--- a/drivers/webp/utils/huffman.h
+++ b/thirdparty/libwebp/utils/huffman.h
@@ -15,8 +15,8 @@
 #define WEBP_UTILS_HUFFMAN_H_
 
 #include <assert.h>
-#include "webp/format_constants.h"
-#include "webp/types.h"
+#include "../webp/format_constants.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/huffman_encode.c b/thirdparty/libwebp/utils/huffman_encode.c
index 0be414a8f8..4e5ef6b447 100644
--- a/drivers/webp/utils/huffman_encode.c
+++ b/thirdparty/libwebp/utils/huffman_encode.c
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "./huffman_encode.h"
-#include "webp/format_constants.h"
 #include "./utils.h"
+#include "../webp/format_constants.h"
 
 // -----------------------------------------------------------------------------
 // Util function to optimize the symbol map for RLE coding
diff --git a/drivers/webp/utils/huffman_encode.h b/thirdparty/libwebp/utils/huffman_encode.h
index 93610066f3..a157165148 100644
--- a/drivers/webp/utils/huffman_encode.h
+++ b/thirdparty/libwebp/utils/huffman_encode.h
@@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_
 #define WEBP_UTILS_HUFFMAN_ENCODE_H_
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/quant_levels.c b/thirdparty/libwebp/utils/quant_levels.c
index d7c8aab922..d7c8aab922 100644
--- a/drivers/webp/utils/quant_levels.c
+++ b/thirdparty/libwebp/utils/quant_levels.c
diff --git a/drivers/webp/utils/quant_levels.h b/thirdparty/libwebp/utils/quant_levels.h
index 3916b977ab..1cb5a32cae 100644
--- a/drivers/webp/utils/quant_levels.h
+++ b/thirdparty/libwebp/utils/quant_levels.h
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/quant_levels_dec.c b/thirdparty/libwebp/utils/quant_levels_dec.c
index ee0a3fe127..ee0a3fe127 100644
--- a/drivers/webp/utils/quant_levels_dec.c
+++ b/thirdparty/libwebp/utils/quant_levels_dec.c
diff --git a/drivers/webp/utils/quant_levels_dec.h b/thirdparty/libwebp/utils/quant_levels_dec.h
index c99a475386..59a13495d3 100644
--- a/drivers/webp/utils/quant_levels_dec.h
+++ b/thirdparty/libwebp/utils/quant_levels_dec.h
@@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_QUANT_LEVELS_DEC_H_
 #define WEBP_UTILS_QUANT_LEVELS_DEC_H_
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/random.c b/thirdparty/libwebp/utils/random.c
index 24e96ad648..24e96ad648 100644
--- a/drivers/webp/utils/random.c
+++ b/thirdparty/libwebp/utils/random.c
diff --git a/drivers/webp/utils/random.h b/thirdparty/libwebp/utils/random.h
index 745f3e2e87..c392a615ca 100644
--- a/drivers/webp/utils/random.h
+++ b/thirdparty/libwebp/utils/random.h
@@ -15,7 +15,7 @@
 #define WEBP_UTILS_RANDOM_H_
 
 #include <assert.h>
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/rescaler.c b/thirdparty/libwebp/utils/rescaler.c
index 00c9300bfb..00c9300bfb 100644
--- a/drivers/webp/utils/rescaler.c
+++ b/thirdparty/libwebp/utils/rescaler.c
diff --git a/drivers/webp/utils/rescaler.h b/thirdparty/libwebp/utils/rescaler.h
index 868467b4d7..98b01a76d0 100644
--- a/drivers/webp/utils/rescaler.h
+++ b/thirdparty/libwebp/utils/rescaler.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #define WEBP_RESCALER_RFIX 32   // fixed-point precision for multiplies
 #define WEBP_RESCALER_ONE (1ull << WEBP_RESCALER_RFIX)
diff --git a/drivers/webp/utils/thread.c b/thirdparty/libwebp/utils/thread.c
index 93f7622797..93f7622797 100644
--- a/drivers/webp/utils/thread.c
+++ b/thirdparty/libwebp/utils/thread.c
diff --git a/drivers/webp/utils/thread.h b/thirdparty/libwebp/utils/thread.h
index 6008bb7c01..8408311855 100644
--- a/drivers/webp/utils/thread.h
+++ b/thirdparty/libwebp/utils/thread.h
@@ -15,10 +15,10 @@
 #define WEBP_UTILS_THREAD_H_
 
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/utils/utils.c b/thirdparty/libwebp/utils/utils.c
index b2193c4b47..2602ca3c9f 100644
--- a/drivers/webp/utils/utils.c
+++ b/thirdparty/libwebp/utils/utils.c
@@ -13,9 +13,9 @@
 
 #include <stdlib.h>
 #include <string.h>  // for memcpy()
-#include "webp/decode.h"
-#include "webp/encode.h"
-#include "webp/format_constants.h"  // for MAX_PALETTE_SIZE
+#include "../webp/decode.h"
+#include "../webp/encode.h"
+#include "../webp/format_constants.h"  // for MAX_PALETTE_SIZE
 #include "./utils.h"
 
 // If PRINT_MEM_INFO is defined, extra info (like total memory used, number of
diff --git a/drivers/webp/utils/utils.h b/thirdparty/libwebp/utils/utils.h
index cef496af78..e0a81126df 100644
--- a/drivers/webp/utils/utils.h
+++ b/thirdparty/libwebp/utils/utils.h
@@ -16,13 +16,13 @@
 #define WEBP_UTILS_UTILS_H_
 
 #ifdef HAVE_CONFIG_H
-#include "webp/config.h"
+#include "../webp/config.h"
 #endif
 
 #include <assert.h>
 
 #include "../dsp/dsp.h"
-#include "webp/types.h"
+#include "../webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/webp/config.h b/thirdparty/libwebp/webp/config.h
index 0ce1c7064d..0ce1c7064d 100644
--- a/drivers/webp/config.h
+++ b/thirdparty/libwebp/webp/config.h
diff --git a/drivers/webp/decode.h b/thirdparty/libwebp/webp/decode.h
index 7a3bed93a4..7a3bed93a4 100644
--- a/drivers/webp/decode.h
+++ b/thirdparty/libwebp/webp/decode.h
diff --git a/drivers/webp/demux.h b/thirdparty/libwebp/webp/demux.h
index 454f6914b2..454f6914b2 100644
--- a/drivers/webp/demux.h
+++ b/thirdparty/libwebp/webp/demux.h
diff --git a/drivers/webp/encode.h b/thirdparty/libwebp/webp/encode.h
index 9291b7195c..9291b7195c 100644
--- a/drivers/webp/encode.h
+++ b/thirdparty/libwebp/webp/encode.h
diff --git a/drivers/webp/format_constants.h b/thirdparty/libwebp/webp/format_constants.h
index b6e78a643e..b6e78a643e 100644
--- a/drivers/webp/format_constants.h
+++ b/thirdparty/libwebp/webp/format_constants.h
diff --git a/drivers/webp/mux.h b/thirdparty/libwebp/webp/mux.h
index b72658c741..b72658c741 100644
--- a/drivers/webp/mux.h
+++ b/thirdparty/libwebp/webp/mux.h
diff --git a/drivers/webp/mux_types.h b/thirdparty/libwebp/webp/mux_types.h
index c94043a3c0..c94043a3c0 100644
--- a/drivers/webp/mux_types.h
+++ b/thirdparty/libwebp/webp/mux_types.h
diff --git a/drivers/webp/types.h b/thirdparty/libwebp/webp/types.h
index 98fff35a11..98fff35a11 100644
--- a/drivers/webp/types.h
+++ b/thirdparty/libwebp/webp/types.h
diff --git a/thirdparty/openssl/LICENSE b/thirdparty/openssl/LICENSE
new file mode 100644
index 0000000000..fb03713dd1
--- /dev/null
+++ b/thirdparty/openssl/LICENSE
@@ -0,0 +1,127 @@
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact openssl-core@openssl.org.
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
diff --git a/drivers/builtin_openssl2/buildinf.h b/thirdparty/openssl/buildinf.h
index 2e287c42d8..2e287c42d8 100644
--- a/drivers/builtin_openssl2/buildinf.h
+++ b/thirdparty/openssl/buildinf.h
diff --git a/drivers/builtin_openssl2/crypto/LPdir_nyi.c b/thirdparty/openssl/crypto/LPdir_nyi.c
index 283d5b0636..283d5b0636 100644
--- a/drivers/builtin_openssl2/crypto/LPdir_nyi.c
+++ b/thirdparty/openssl/crypto/LPdir_nyi.c
diff --git a/drivers/builtin_openssl2/crypto/LPdir_unix.c b/thirdparty/openssl/crypto/LPdir_unix.c
index bead6abd71..bead6abd71 100644
--- a/drivers/builtin_openssl2/crypto/LPdir_unix.c
+++ b/thirdparty/openssl/crypto/LPdir_unix.c
diff --git a/drivers/builtin_openssl2/crypto/LPdir_vms.c b/thirdparty/openssl/crypto/LPdir_vms.c
index 88c7ddd85c..88c7ddd85c 100644
--- a/drivers/builtin_openssl2/crypto/LPdir_vms.c
+++ b/thirdparty/openssl/crypto/LPdir_vms.c
diff --git a/drivers/builtin_openssl2/crypto/LPdir_win.c b/thirdparty/openssl/crypto/LPdir_win.c
index 07e63fb424..07e63fb424 100644
--- a/drivers/builtin_openssl2/crypto/LPdir_win.c
+++ b/thirdparty/openssl/crypto/LPdir_win.c
diff --git a/drivers/builtin_openssl2/crypto/LPdir_win32.c b/thirdparty/openssl/crypto/LPdir_win32.c
index b1c983d87f..b1c983d87f 100644
--- a/drivers/builtin_openssl2/crypto/LPdir_win32.c
+++ b/thirdparty/openssl/crypto/LPdir_win32.c
diff --git a/drivers/builtin_openssl2/crypto/LPdir_wince.c b/thirdparty/openssl/crypto/LPdir_wince.c
index ae8a56f4be..ae8a56f4be 100644
--- a/drivers/builtin_openssl2/crypto/LPdir_wince.c
+++ b/thirdparty/openssl/crypto/LPdir_wince.c
diff --git a/drivers/builtin_openssl2/crypto/aes/README b/thirdparty/openssl/crypto/aes/README
index 0f9620a80e..0f9620a80e 100644
--- a/drivers/builtin_openssl2/crypto/aes/README
+++ b/thirdparty/openssl/crypto/aes/README
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_cbc.c b/thirdparty/openssl/crypto/aes/aes_cbc.c
index 805d0e260a..805d0e260a 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_cbc.c
+++ b/thirdparty/openssl/crypto/aes/aes_cbc.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_cfb.c b/thirdparty/openssl/crypto/aes/aes_cfb.c
index 1225000963..1225000963 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_cfb.c
+++ b/thirdparty/openssl/crypto/aes/aes_cfb.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_core.c b/thirdparty/openssl/crypto/aes/aes_core.c
index 7019b5d7aa..7019b5d7aa 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_core.c
+++ b/thirdparty/openssl/crypto/aes/aes_core.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_ctr.c b/thirdparty/openssl/crypto/aes/aes_ctr.c
index 9e760c4b12..9e760c4b12 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_ctr.c
+++ b/thirdparty/openssl/crypto/aes/aes_ctr.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_ecb.c b/thirdparty/openssl/crypto/aes/aes_ecb.c
index 52151a5c70..52151a5c70 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_ecb.c
+++ b/thirdparty/openssl/crypto/aes/aes_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_ige.c b/thirdparty/openssl/crypto/aes/aes_ige.c
index 8f2b770647..8f2b770647 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_ige.c
+++ b/thirdparty/openssl/crypto/aes/aes_ige.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_locl.h b/thirdparty/openssl/crypto/aes/aes_locl.h
index 7acd74ec16..7acd74ec16 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_locl.h
+++ b/thirdparty/openssl/crypto/aes/aes_locl.h
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_misc.c b/thirdparty/openssl/crypto/aes/aes_misc.c
index fafad4d6f5..fafad4d6f5 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_misc.c
+++ b/thirdparty/openssl/crypto/aes/aes_misc.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_ofb.c b/thirdparty/openssl/crypto/aes/aes_ofb.c
index 64a08caaec..64a08caaec 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_ofb.c
+++ b/thirdparty/openssl/crypto/aes/aes_ofb.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_wrap.c b/thirdparty/openssl/crypto/aes/aes_wrap.c
index b7b64d57a4..b7b64d57a4 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_wrap.c
+++ b/thirdparty/openssl/crypto/aes/aes_wrap.c
diff --git a/drivers/builtin_openssl2/crypto/aes/aes_x86core.c b/thirdparty/openssl/crypto/aes/aes_x86core.c
index b5dd697677..b5dd697677 100644
--- a/drivers/builtin_openssl2/crypto/aes/aes_x86core.c
+++ b/thirdparty/openssl/crypto/aes/aes_x86core.c
diff --git a/drivers/builtin_openssl2/crypto/arm_arch.h b/thirdparty/openssl/crypto/arm_arch.h
index 9d6e58880d..9d6e58880d 100644
--- a/drivers/builtin_openssl2/crypto/arm_arch.h
+++ b/thirdparty/openssl/crypto/arm_arch.h
diff --git a/drivers/builtin_openssl2/crypto/armcap.c b/thirdparty/openssl/crypto/armcap.c
index 356fa15287..356fa15287 100644
--- a/drivers/builtin_openssl2/crypto/armcap.c
+++ b/thirdparty/openssl/crypto/armcap.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_bitstr.c b/thirdparty/openssl/crypto/asn1/a_bitstr.c
index f906188b11..f906188b11 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_bitstr.c
+++ b/thirdparty/openssl/crypto/asn1/a_bitstr.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_bool.c b/thirdparty/openssl/crypto/asn1/a_bool.c
index 1b85bc9e61..1b85bc9e61 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_bool.c
+++ b/thirdparty/openssl/crypto/asn1/a_bool.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_bytes.c b/thirdparty/openssl/crypto/asn1/a_bytes.c
index 385b53986a..385b53986a 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_bytes.c
+++ b/thirdparty/openssl/crypto/asn1/a_bytes.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_d2i_fp.c b/thirdparty/openssl/crypto/asn1/a_d2i_fp.c
index 51b6f245ab..51b6f245ab 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_d2i_fp.c
+++ b/thirdparty/openssl/crypto/asn1/a_d2i_fp.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_digest.c b/thirdparty/openssl/crypto/asn1/a_digest.c
index 7cbc4751cd..7cbc4751cd 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_digest.c
+++ b/thirdparty/openssl/crypto/asn1/a_digest.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_dup.c b/thirdparty/openssl/crypto/asn1/a_dup.c
index 349ab56213..349ab56213 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_dup.c
+++ b/thirdparty/openssl/crypto/asn1/a_dup.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_enum.c b/thirdparty/openssl/crypto/asn1/a_enum.c
index c3498ac99c..c3498ac99c 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_enum.c
+++ b/thirdparty/openssl/crypto/asn1/a_enum.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_gentm.c b/thirdparty/openssl/crypto/asn1/a_gentm.c
index fa76dcac91..fa76dcac91 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_gentm.c
+++ b/thirdparty/openssl/crypto/asn1/a_gentm.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_i2d_fp.c b/thirdparty/openssl/crypto/asn1/a_i2d_fp.c
index 0f56cd4e07..0f56cd4e07 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_i2d_fp.c
+++ b/thirdparty/openssl/crypto/asn1/a_i2d_fp.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_int.c b/thirdparty/openssl/crypto/asn1/a_int.c
index 7e26704a54..7e26704a54 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_int.c
+++ b/thirdparty/openssl/crypto/asn1/a_int.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_mbstr.c b/thirdparty/openssl/crypto/asn1/a_mbstr.c
index 6935efe09f..6935efe09f 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_mbstr.c
+++ b/thirdparty/openssl/crypto/asn1/a_mbstr.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_object.c b/thirdparty/openssl/crypto/asn1/a_object.c
index 27f9c16914..27f9c16914 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_object.c
+++ b/thirdparty/openssl/crypto/asn1/a_object.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_octet.c b/thirdparty/openssl/crypto/asn1/a_octet.c
index 1a6e9ca9cc..1a6e9ca9cc 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_octet.c
+++ b/thirdparty/openssl/crypto/asn1/a_octet.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_print.c b/thirdparty/openssl/crypto/asn1/a_print.c
index d83e4ad82c..d83e4ad82c 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_print.c
+++ b/thirdparty/openssl/crypto/asn1/a_print.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_set.c b/thirdparty/openssl/crypto/asn1/a_set.c
index bf3f971889..bf3f971889 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_set.c
+++ b/thirdparty/openssl/crypto/asn1/a_set.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_sign.c b/thirdparty/openssl/crypto/asn1/a_sign.c
index 51c6a0c34d..51c6a0c34d 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_sign.c
+++ b/thirdparty/openssl/crypto/asn1/a_sign.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_strex.c b/thirdparty/openssl/crypto/asn1/a_strex.c
index 35fd44cd22..35fd44cd22 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_strex.c
+++ b/thirdparty/openssl/crypto/asn1/a_strex.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_strnid.c b/thirdparty/openssl/crypto/asn1/a_strnid.c
index 5224345368..5224345368 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_strnid.c
+++ b/thirdparty/openssl/crypto/asn1/a_strnid.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_time.c b/thirdparty/openssl/crypto/asn1/a_time.c
index fcb2d565cd..fcb2d565cd 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_time.c
+++ b/thirdparty/openssl/crypto/asn1/a_time.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_type.c b/thirdparty/openssl/crypto/asn1/a_type.c
index bb166e8568..bb166e8568 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_type.c
+++ b/thirdparty/openssl/crypto/asn1/a_type.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_utctm.c b/thirdparty/openssl/crypto/asn1/a_utctm.c
index 724a10be4e..724a10be4e 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_utctm.c
+++ b/thirdparty/openssl/crypto/asn1/a_utctm.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_utf8.c b/thirdparty/openssl/crypto/asn1/a_utf8.c
index 23dc2e828a..23dc2e828a 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_utf8.c
+++ b/thirdparty/openssl/crypto/asn1/a_utf8.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/a_verify.c b/thirdparty/openssl/crypto/asn1/a_verify.c
index 3ffd934cba..3ffd934cba 100644
--- a/drivers/builtin_openssl2/crypto/asn1/a_verify.c
+++ b/thirdparty/openssl/crypto/asn1/a_verify.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/ameth_lib.c b/thirdparty/openssl/crypto/asn1/ameth_lib.c
index 5389c04347..5389c04347 100644
--- a/drivers/builtin_openssl2/crypto/asn1/ameth_lib.c
+++ b/thirdparty/openssl/crypto/asn1/ameth_lib.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn1_err.c b/thirdparty/openssl/crypto/asn1/asn1_err.c
index fd4ac8d9db..fd4ac8d9db 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn1_err.c
+++ b/thirdparty/openssl/crypto/asn1/asn1_err.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn1_gen.c b/thirdparty/openssl/crypto/asn1/asn1_gen.c
index 65749239b1..65749239b1 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn1_gen.c
+++ b/thirdparty/openssl/crypto/asn1/asn1_gen.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn1_lib.c b/thirdparty/openssl/crypto/asn1/asn1_lib.c
index 874b1af8b0..874b1af8b0 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn1_lib.c
+++ b/thirdparty/openssl/crypto/asn1/asn1_lib.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn1_locl.h b/thirdparty/openssl/crypto/asn1/asn1_locl.h
index 4c004fab9a..4c004fab9a 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn1_locl.h
+++ b/thirdparty/openssl/crypto/asn1/asn1_locl.h
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn1_par.c b/thirdparty/openssl/crypto/asn1/asn1_par.c
index e85e3398b6..e85e3398b6 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn1_par.c
+++ b/thirdparty/openssl/crypto/asn1/asn1_par.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn_mime.c b/thirdparty/openssl/crypto/asn1/asn_mime.c
index 96110c540f..96110c540f 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn_mime.c
+++ b/thirdparty/openssl/crypto/asn1/asn_mime.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn_moid.c b/thirdparty/openssl/crypto/asn1/asn_moid.c
index fab2dd92e2..fab2dd92e2 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn_moid.c
+++ b/thirdparty/openssl/crypto/asn1/asn_moid.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/asn_pack.c b/thirdparty/openssl/crypto/asn1/asn_pack.c
index 366caf01f0..366caf01f0 100644
--- a/drivers/builtin_openssl2/crypto/asn1/asn_pack.c
+++ b/thirdparty/openssl/crypto/asn1/asn_pack.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/bio_asn1.c b/thirdparty/openssl/crypto/asn1/bio_asn1.c
index 60189b3b2c..60189b3b2c 100644
--- a/drivers/builtin_openssl2/crypto/asn1/bio_asn1.c
+++ b/thirdparty/openssl/crypto/asn1/bio_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/bio_ndef.c b/thirdparty/openssl/crypto/asn1/bio_ndef.c
index 31949b8794..31949b8794 100644
--- a/drivers/builtin_openssl2/crypto/asn1/bio_ndef.c
+++ b/thirdparty/openssl/crypto/asn1/bio_ndef.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/charmap.h b/thirdparty/openssl/crypto/asn1/charmap.h
index 3305ad146b..3305ad146b 100644
--- a/drivers/builtin_openssl2/crypto/asn1/charmap.h
+++ b/thirdparty/openssl/crypto/asn1/charmap.h
diff --git a/drivers/builtin_openssl2/crypto/asn1/d2i_pr.c b/thirdparty/openssl/crypto/asn1/d2i_pr.c
index d21829af19..d21829af19 100644
--- a/drivers/builtin_openssl2/crypto/asn1/d2i_pr.c
+++ b/thirdparty/openssl/crypto/asn1/d2i_pr.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/d2i_pu.c b/thirdparty/openssl/crypto/asn1/d2i_pu.c
index 33542dd122..33542dd122 100644
--- a/drivers/builtin_openssl2/crypto/asn1/d2i_pu.c
+++ b/thirdparty/openssl/crypto/asn1/d2i_pu.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/evp_asn1.c b/thirdparty/openssl/crypto/asn1/evp_asn1.c
index 5876afa5e4..5876afa5e4 100644
--- a/drivers/builtin_openssl2/crypto/asn1/evp_asn1.c
+++ b/thirdparty/openssl/crypto/asn1/evp_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/f_enum.c b/thirdparty/openssl/crypto/asn1/f_enum.c
index 591c3b5781..591c3b5781 100644
--- a/drivers/builtin_openssl2/crypto/asn1/f_enum.c
+++ b/thirdparty/openssl/crypto/asn1/f_enum.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/f_int.c b/thirdparty/openssl/crypto/asn1/f_int.c
index 4a81f81c88..4a81f81c88 100644
--- a/drivers/builtin_openssl2/crypto/asn1/f_int.c
+++ b/thirdparty/openssl/crypto/asn1/f_int.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/f_string.c b/thirdparty/openssl/crypto/asn1/f_string.c
index 6a6cf34714..6a6cf34714 100644
--- a/drivers/builtin_openssl2/crypto/asn1/f_string.c
+++ b/thirdparty/openssl/crypto/asn1/f_string.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/i2d_pr.c b/thirdparty/openssl/crypto/asn1/i2d_pr.c
index 4d338ac55a..4d338ac55a 100644
--- a/drivers/builtin_openssl2/crypto/asn1/i2d_pr.c
+++ b/thirdparty/openssl/crypto/asn1/i2d_pr.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/i2d_pu.c b/thirdparty/openssl/crypto/asn1/i2d_pu.c
index b8ed355411..b8ed355411 100644
--- a/drivers/builtin_openssl2/crypto/asn1/i2d_pu.c
+++ b/thirdparty/openssl/crypto/asn1/i2d_pu.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/n_pkey.c b/thirdparty/openssl/crypto/asn1/n_pkey.c
index d5a55146a4..d5a55146a4 100644
--- a/drivers/builtin_openssl2/crypto/asn1/n_pkey.c
+++ b/thirdparty/openssl/crypto/asn1/n_pkey.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/nsseq.c b/thirdparty/openssl/crypto/asn1/nsseq.c
index f2f7cba49e..f2f7cba49e 100644
--- a/drivers/builtin_openssl2/crypto/asn1/nsseq.c
+++ b/thirdparty/openssl/crypto/asn1/nsseq.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/p5_pbe.c b/thirdparty/openssl/crypto/asn1/p5_pbe.c
index bdbfdcd67c..bdbfdcd67c 100644
--- a/drivers/builtin_openssl2/crypto/asn1/p5_pbe.c
+++ b/thirdparty/openssl/crypto/asn1/p5_pbe.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/p5_pbev2.c b/thirdparty/openssl/crypto/asn1/p5_pbev2.c
index 73ba4a3d67..73ba4a3d67 100644
--- a/drivers/builtin_openssl2/crypto/asn1/p5_pbev2.c
+++ b/thirdparty/openssl/crypto/asn1/p5_pbev2.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/p8_pkey.c b/thirdparty/openssl/crypto/asn1/p8_pkey.c
index 0a425cd29d..0a425cd29d 100644
--- a/drivers/builtin_openssl2/crypto/asn1/p8_pkey.c
+++ b/thirdparty/openssl/crypto/asn1/p8_pkey.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/t_bitst.c b/thirdparty/openssl/crypto/asn1/t_bitst.c
index d5cf3c7732..d5cf3c7732 100644
--- a/drivers/builtin_openssl2/crypto/asn1/t_bitst.c
+++ b/thirdparty/openssl/crypto/asn1/t_bitst.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/t_crl.c b/thirdparty/openssl/crypto/asn1/t_crl.c
index 0dfaf0ba26..0dfaf0ba26 100644
--- a/drivers/builtin_openssl2/crypto/asn1/t_crl.c
+++ b/thirdparty/openssl/crypto/asn1/t_crl.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/t_pkey.c b/thirdparty/openssl/crypto/asn1/t_pkey.c
index 735c34264b..735c34264b 100644
--- a/drivers/builtin_openssl2/crypto/asn1/t_pkey.c
+++ b/thirdparty/openssl/crypto/asn1/t_pkey.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/t_req.c b/thirdparty/openssl/crypto/asn1/t_req.c
index 024553ab19..024553ab19 100644
--- a/drivers/builtin_openssl2/crypto/asn1/t_req.c
+++ b/thirdparty/openssl/crypto/asn1/t_req.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/t_spki.c b/thirdparty/openssl/crypto/asn1/t_spki.c
index 3bf48db509..3bf48db509 100644
--- a/drivers/builtin_openssl2/crypto/asn1/t_spki.c
+++ b/thirdparty/openssl/crypto/asn1/t_spki.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/t_x509.c b/thirdparty/openssl/crypto/asn1/t_x509.c
index 8888396f84..8888396f84 100644
--- a/drivers/builtin_openssl2/crypto/asn1/t_x509.c
+++ b/thirdparty/openssl/crypto/asn1/t_x509.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/t_x509a.c b/thirdparty/openssl/crypto/asn1/t_x509a.c
index f4b8f94cb3..f4b8f94cb3 100644
--- a/drivers/builtin_openssl2/crypto/asn1/t_x509a.c
+++ b/thirdparty/openssl/crypto/asn1/t_x509a.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/tasn_dec.c b/thirdparty/openssl/crypto/asn1/tasn_dec.c
index 6bdcd5c542..6bdcd5c542 100644
--- a/drivers/builtin_openssl2/crypto/asn1/tasn_dec.c
+++ b/thirdparty/openssl/crypto/asn1/tasn_dec.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/tasn_enc.c b/thirdparty/openssl/crypto/asn1/tasn_enc.c
index f7f83e56a9..f7f83e56a9 100644
--- a/drivers/builtin_openssl2/crypto/asn1/tasn_enc.c
+++ b/thirdparty/openssl/crypto/asn1/tasn_enc.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/tasn_fre.c b/thirdparty/openssl/crypto/asn1/tasn_fre.c
index aeea4eff7a..aeea4eff7a 100644
--- a/drivers/builtin_openssl2/crypto/asn1/tasn_fre.c
+++ b/thirdparty/openssl/crypto/asn1/tasn_fre.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/tasn_new.c b/thirdparty/openssl/crypto/asn1/tasn_new.c
index b0c73beeb5..b0c73beeb5 100644
--- a/drivers/builtin_openssl2/crypto/asn1/tasn_new.c
+++ b/thirdparty/openssl/crypto/asn1/tasn_new.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/tasn_prn.c b/thirdparty/openssl/crypto/asn1/tasn_prn.c
index 5e7d53e985..5e7d53e985 100644
--- a/drivers/builtin_openssl2/crypto/asn1/tasn_prn.c
+++ b/thirdparty/openssl/crypto/asn1/tasn_prn.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/tasn_typ.c b/thirdparty/openssl/crypto/asn1/tasn_typ.c
index 740e86d5fc..740e86d5fc 100644
--- a/drivers/builtin_openssl2/crypto/asn1/tasn_typ.c
+++ b/thirdparty/openssl/crypto/asn1/tasn_typ.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/tasn_utl.c b/thirdparty/openssl/crypto/asn1/tasn_utl.c
index 41726d8feb..41726d8feb 100644
--- a/drivers/builtin_openssl2/crypto/asn1/tasn_utl.c
+++ b/thirdparty/openssl/crypto/asn1/tasn_utl.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_algor.c b/thirdparty/openssl/crypto/asn1/x_algor.c
index fd7d16d404..fd7d16d404 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_algor.c
+++ b/thirdparty/openssl/crypto/asn1/x_algor.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_attrib.c b/thirdparty/openssl/crypto/asn1/x_attrib.c
index 93ef53bd5e..93ef53bd5e 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_attrib.c
+++ b/thirdparty/openssl/crypto/asn1/x_attrib.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_bignum.c b/thirdparty/openssl/crypto/asn1/x_bignum.c
index eaf046639d..eaf046639d 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_bignum.c
+++ b/thirdparty/openssl/crypto/asn1/x_bignum.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_crl.c b/thirdparty/openssl/crypto/asn1/x_crl.c
index 027950330d..027950330d 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_crl.c
+++ b/thirdparty/openssl/crypto/asn1/x_crl.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_exten.c b/thirdparty/openssl/crypto/asn1/x_exten.c
index 00a9580aa7..00a9580aa7 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_exten.c
+++ b/thirdparty/openssl/crypto/asn1/x_exten.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_info.c b/thirdparty/openssl/crypto/asn1/x_info.c
index 067fd72a6e..067fd72a6e 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_info.c
+++ b/thirdparty/openssl/crypto/asn1/x_info.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_long.c b/thirdparty/openssl/crypto/asn1/x_long.c
index 3aed44a3dd..3aed44a3dd 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_long.c
+++ b/thirdparty/openssl/crypto/asn1/x_long.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_name.c b/thirdparty/openssl/crypto/asn1/x_name.c
index a858c2993b..a858c2993b 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_name.c
+++ b/thirdparty/openssl/crypto/asn1/x_name.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_nx509.c b/thirdparty/openssl/crypto/asn1/x_nx509.c
index 5aa0ed58b4..5aa0ed58b4 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_nx509.c
+++ b/thirdparty/openssl/crypto/asn1/x_nx509.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_pkey.c b/thirdparty/openssl/crypto/asn1/x_pkey.c
index 2da23e4756..2da23e4756 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_pkey.c
+++ b/thirdparty/openssl/crypto/asn1/x_pkey.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_pubkey.c b/thirdparty/openssl/crypto/asn1/x_pubkey.c
index 6c57a7971c..6c57a7971c 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_pubkey.c
+++ b/thirdparty/openssl/crypto/asn1/x_pubkey.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_req.c b/thirdparty/openssl/crypto/asn1/x_req.c
index ae293aa0ca..ae293aa0ca 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_req.c
+++ b/thirdparty/openssl/crypto/asn1/x_req.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_sig.c b/thirdparty/openssl/crypto/asn1/x_sig.c
index dd33720c10..dd33720c10 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_sig.c
+++ b/thirdparty/openssl/crypto/asn1/x_sig.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_spki.c b/thirdparty/openssl/crypto/asn1/x_spki.c
index 1df6b87d2b..1df6b87d2b 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_spki.c
+++ b/thirdparty/openssl/crypto/asn1/x_spki.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_val.c b/thirdparty/openssl/crypto/asn1/x_val.c
index ee75a1e254..ee75a1e254 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_val.c
+++ b/thirdparty/openssl/crypto/asn1/x_val.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_x509.c b/thirdparty/openssl/crypto/asn1/x_x509.c
index e31e1e750d..e31e1e750d 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_x509.c
+++ b/thirdparty/openssl/crypto/asn1/x_x509.c
diff --git a/drivers/builtin_openssl2/crypto/asn1/x_x509a.c b/thirdparty/openssl/crypto/asn1/x_x509a.c
index ad93592a71..ad93592a71 100644
--- a/drivers/builtin_openssl2/crypto/asn1/x_x509a.c
+++ b/thirdparty/openssl/crypto/asn1/x_x509a.c
diff --git a/drivers/builtin_openssl2/crypto/bf/COPYRIGHT b/thirdparty/openssl/crypto/bf/COPYRIGHT
index 6857223506..6857223506 100644
--- a/drivers/builtin_openssl2/crypto/bf/COPYRIGHT
+++ b/thirdparty/openssl/crypto/bf/COPYRIGHT
diff --git a/drivers/builtin_openssl2/crypto/bf/INSTALL b/thirdparty/openssl/crypto/bf/INSTALL
index 3b25923532..3b25923532 100644
--- a/drivers/builtin_openssl2/crypto/bf/INSTALL
+++ b/thirdparty/openssl/crypto/bf/INSTALL
diff --git a/drivers/builtin_openssl2/crypto/bf/README b/thirdparty/openssl/crypto/bf/README
index f2712fd0e7..f2712fd0e7 100644
--- a/drivers/builtin_openssl2/crypto/bf/README
+++ b/thirdparty/openssl/crypto/bf/README
diff --git a/drivers/builtin_openssl2/crypto/bf/VERSION b/thirdparty/openssl/crypto/bf/VERSION
index be995855e4..be995855e4 100644
--- a/drivers/builtin_openssl2/crypto/bf/VERSION
+++ b/thirdparty/openssl/crypto/bf/VERSION
diff --git a/drivers/builtin_openssl2/crypto/bf/asm/readme b/thirdparty/openssl/crypto/bf/asm/readme
index 2385fa3812..2385fa3812 100644
--- a/drivers/builtin_openssl2/crypto/bf/asm/readme
+++ b/thirdparty/openssl/crypto/bf/asm/readme
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_cbc.c b/thirdparty/openssl/crypto/bf/bf_cbc.c
index de827a1a3c..de827a1a3c 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_cbc.c
+++ b/thirdparty/openssl/crypto/bf/bf_cbc.c
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_cfb64.c b/thirdparty/openssl/crypto/bf/bf_cfb64.c
index ddeab6eb77..ddeab6eb77 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_cfb64.c
+++ b/thirdparty/openssl/crypto/bf/bf_cfb64.c
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_ecb.c b/thirdparty/openssl/crypto/bf/bf_ecb.c
index 967a7f5507..967a7f5507 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_ecb.c
+++ b/thirdparty/openssl/crypto/bf/bf_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_enc.c b/thirdparty/openssl/crypto/bf/bf_enc.c
index b268795f5b..b268795f5b 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_enc.c
+++ b/thirdparty/openssl/crypto/bf/bf_enc.c
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_locl.h b/thirdparty/openssl/crypto/bf/bf_locl.h
index 9448aed424..9448aed424 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_locl.h
+++ b/thirdparty/openssl/crypto/bf/bf_locl.h
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_ofb64.c b/thirdparty/openssl/crypto/bf/bf_ofb64.c
index a8d190b5dd..a8d190b5dd 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_ofb64.c
+++ b/thirdparty/openssl/crypto/bf/bf_ofb64.c
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_opts.c b/thirdparty/openssl/crypto/bf/bf_opts.c
index f85495cf9d..f85495cf9d 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_opts.c
+++ b/thirdparty/openssl/crypto/bf/bf_opts.c
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_pi.h b/thirdparty/openssl/crypto/bf/bf_pi.h
index 46a26739be..46a26739be 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_pi.h
+++ b/thirdparty/openssl/crypto/bf/bf_pi.h
diff --git a/drivers/builtin_openssl2/crypto/bf/bf_skey.c b/thirdparty/openssl/crypto/bf/bf_skey.c
index 2cb3c66c8f..2cb3c66c8f 100644
--- a/drivers/builtin_openssl2/crypto/bf/bf_skey.c
+++ b/thirdparty/openssl/crypto/bf/bf_skey.c
diff --git a/drivers/builtin_openssl2/crypto/bf/bfs.cpp b/thirdparty/openssl/crypto/bf/bfs.cpp
index d74c457760..d74c457760 100644
--- a/drivers/builtin_openssl2/crypto/bf/bfs.cpp
+++ b/thirdparty/openssl/crypto/bf/bfs.cpp
diff --git a/drivers/builtin_openssl2/crypto/bf/bfspeed.c b/thirdparty/openssl/crypto/bf/bfspeed.c
index 305ad8bcbe..305ad8bcbe 100644
--- a/drivers/builtin_openssl2/crypto/bf/bfspeed.c
+++ b/thirdparty/openssl/crypto/bf/bfspeed.c
diff --git a/drivers/builtin_openssl2/crypto/bio/b_dump.c b/thirdparty/openssl/crypto/bio/b_dump.c
index ccf0e287c4..ccf0e287c4 100644
--- a/drivers/builtin_openssl2/crypto/bio/b_dump.c
+++ b/thirdparty/openssl/crypto/bio/b_dump.c
diff --git a/drivers/builtin_openssl2/crypto/bio/b_print.c b/thirdparty/openssl/crypto/bio/b_print.c
index 90248fa2aa..90248fa2aa 100644
--- a/drivers/builtin_openssl2/crypto/bio/b_print.c
+++ b/thirdparty/openssl/crypto/bio/b_print.c
diff --git a/drivers/builtin_openssl2/crypto/bio/b_sock.c b/thirdparty/openssl/crypto/bio/b_sock.c
index 5bad0a2bad..5bad0a2bad 100644
--- a/drivers/builtin_openssl2/crypto/bio/b_sock.c
+++ b/thirdparty/openssl/crypto/bio/b_sock.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bf_buff.c b/thirdparty/openssl/crypto/bio/bf_buff.c
index 478fa16a07..478fa16a07 100644
--- a/drivers/builtin_openssl2/crypto/bio/bf_buff.c
+++ b/thirdparty/openssl/crypto/bio/bf_buff.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bf_lbuf.c b/thirdparty/openssl/crypto/bio/bf_lbuf.c
index 46d0d5a1e6..46d0d5a1e6 100644
--- a/drivers/builtin_openssl2/crypto/bio/bf_lbuf.c
+++ b/thirdparty/openssl/crypto/bio/bf_lbuf.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bf_nbio.c b/thirdparty/openssl/crypto/bio/bf_nbio.c
index a04f32a008..a04f32a008 100644
--- a/drivers/builtin_openssl2/crypto/bio/bf_nbio.c
+++ b/thirdparty/openssl/crypto/bio/bf_nbio.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bf_null.c b/thirdparty/openssl/crypto/bio/bf_null.c
index e0c79e8291..e0c79e8291 100644
--- a/drivers/builtin_openssl2/crypto/bio/bf_null.c
+++ b/thirdparty/openssl/crypto/bio/bf_null.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bio_cb.c b/thirdparty/openssl/crypto/bio/bio_cb.c
index d3e860686c..d3e860686c 100644
--- a/drivers/builtin_openssl2/crypto/bio/bio_cb.c
+++ b/thirdparty/openssl/crypto/bio/bio_cb.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bio_err.c b/thirdparty/openssl/crypto/bio/bio_err.c
index d9007aa3d3..d9007aa3d3 100644
--- a/drivers/builtin_openssl2/crypto/bio/bio_err.c
+++ b/thirdparty/openssl/crypto/bio/bio_err.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bio_lcl.h b/thirdparty/openssl/crypto/bio/bio_lcl.h
index 741884da84..741884da84 100644
--- a/drivers/builtin_openssl2/crypto/bio/bio_lcl.h
+++ b/thirdparty/openssl/crypto/bio/bio_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/bio/bio_lib.c b/thirdparty/openssl/crypto/bio/bio_lib.c
index 07934f8a66..07934f8a66 100644
--- a/drivers/builtin_openssl2/crypto/bio/bio_lib.c
+++ b/thirdparty/openssl/crypto/bio/bio_lib.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_acpt.c b/thirdparty/openssl/crypto/bio/bss_acpt.c
index 4a5e39bd38..4a5e39bd38 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_acpt.c
+++ b/thirdparty/openssl/crypto/bio/bss_acpt.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_bio.c b/thirdparty/openssl/crypto/bio/bss_bio.c
index 4d8727f8f8..4d8727f8f8 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_bio.c
+++ b/thirdparty/openssl/crypto/bio/bss_bio.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_conn.c b/thirdparty/openssl/crypto/bio/bss_conn.c
index 7d15ad29dc..7d15ad29dc 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_conn.c
+++ b/thirdparty/openssl/crypto/bio/bss_conn.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_dgram.c b/thirdparty/openssl/crypto/bio/bss_dgram.c
index bdd7bf88ea..bdd7bf88ea 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_dgram.c
+++ b/thirdparty/openssl/crypto/bio/bss_dgram.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_fd.c b/thirdparty/openssl/crypto/bio/bss_fd.c
index 5f4e34481b..5f4e34481b 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_fd.c
+++ b/thirdparty/openssl/crypto/bio/bss_fd.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_file.c b/thirdparty/openssl/crypto/bio/bss_file.c
index bfba93e62b..bfba93e62b 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_file.c
+++ b/thirdparty/openssl/crypto/bio/bss_file.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_log.c b/thirdparty/openssl/crypto/bio/bss_log.c
index 1283a525b4..1283a525b4 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_log.c
+++ b/thirdparty/openssl/crypto/bio/bss_log.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_mem.c b/thirdparty/openssl/crypto/bio/bss_mem.c
index b0394a960d..b0394a960d 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_mem.c
+++ b/thirdparty/openssl/crypto/bio/bss_mem.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_null.c b/thirdparty/openssl/crypto/bio/bss_null.c
index 6a03fa2465..6a03fa2465 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_null.c
+++ b/thirdparty/openssl/crypto/bio/bss_null.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_rtcp.c b/thirdparty/openssl/crypto/bio/bss_rtcp.c
index 09f14f48dc..09f14f48dc 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_rtcp.c
+++ b/thirdparty/openssl/crypto/bio/bss_rtcp.c
diff --git a/drivers/builtin_openssl2/crypto/bio/bss_sock.c b/thirdparty/openssl/crypto/bio/bss_sock.c
index 6194d2c031..6194d2c031 100644
--- a/drivers/builtin_openssl2/crypto/bio/bss_sock.c
+++ b/thirdparty/openssl/crypto/bio/bss_sock.c
diff --git a/drivers/builtin_openssl2/crypto/bn/asm/README b/thirdparty/openssl/crypto/bn/asm/README
index b0f3a68a06..b0f3a68a06 100644
--- a/drivers/builtin_openssl2/crypto/bn/asm/README
+++ b/thirdparty/openssl/crypto/bn/asm/README
diff --git a/drivers/builtin_openssl2/crypto/bn/asm/vms.mar b/thirdparty/openssl/crypto/bn/asm/vms.mar
index aefab15cdb..aefab15cdb 100644
--- a/drivers/builtin_openssl2/crypto/bn/asm/vms.mar
+++ b/thirdparty/openssl/crypto/bn/asm/vms.mar
diff --git a/drivers/builtin_openssl2/crypto/bn/asm/x86/f b/thirdparty/openssl/crypto/bn/asm/x86/f
index 22e4112224..22e4112224 100644
--- a/drivers/builtin_openssl2/crypto/bn/asm/x86/f
+++ b/thirdparty/openssl/crypto/bn/asm/x86/f
diff --git a/drivers/builtin_openssl2/crypto/bn/asm/x86_64-gcc.c b/thirdparty/openssl/crypto/bn/asm/x86_64-gcc.c
index d77dc433d4..d77dc433d4 100644
--- a/drivers/builtin_openssl2/crypto/bn/asm/x86_64-gcc.c
+++ b/thirdparty/openssl/crypto/bn/asm/x86_64-gcc.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn.mul b/thirdparty/openssl/crypto/bn/bn.mul
index 9728870d38..9728870d38 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn.mul
+++ b/thirdparty/openssl/crypto/bn/bn.mul
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_add.c b/thirdparty/openssl/crypto/bn/bn_add.c
index 2f3d110449..2f3d110449 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_add.c
+++ b/thirdparty/openssl/crypto/bn/bn_add.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_asm.c b/thirdparty/openssl/crypto/bn/bn_asm.c
index 03a33cffe5..03a33cffe5 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_asm.c
+++ b/thirdparty/openssl/crypto/bn/bn_asm.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_blind.c b/thirdparty/openssl/crypto/bn/bn_blind.c
index d448daa3c7..d448daa3c7 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_blind.c
+++ b/thirdparty/openssl/crypto/bn/bn_blind.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_const.c b/thirdparty/openssl/crypto/bn/bn_const.c
index 12c3208c24..12c3208c24 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_const.c
+++ b/thirdparty/openssl/crypto/bn/bn_const.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_ctx.c b/thirdparty/openssl/crypto/bn/bn_ctx.c
index 526c6a046d..526c6a046d 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_ctx.c
+++ b/thirdparty/openssl/crypto/bn/bn_ctx.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_depr.c b/thirdparty/openssl/crypto/bn/bn_depr.c
index 34895f5982..34895f5982 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_depr.c
+++ b/thirdparty/openssl/crypto/bn/bn_depr.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_div.c b/thirdparty/openssl/crypto/bn/bn_div.c
index 72e6ce3f74..72e6ce3f74 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_div.c
+++ b/thirdparty/openssl/crypto/bn/bn_div.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_err.c b/thirdparty/openssl/crypto/bn/bn_err.c
index e7a703826e..e7a703826e 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_err.c
+++ b/thirdparty/openssl/crypto/bn/bn_err.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_exp.c b/thirdparty/openssl/crypto/bn/bn_exp.c
index 1670f01d1d..1670f01d1d 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_exp.c
+++ b/thirdparty/openssl/crypto/bn/bn_exp.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_exp2.c b/thirdparty/openssl/crypto/bn/bn_exp2.c
index 43fd2044c0..43fd2044c0 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_exp2.c
+++ b/thirdparty/openssl/crypto/bn/bn_exp2.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_gcd.c b/thirdparty/openssl/crypto/bn/bn_gcd.c
index ce59fe701f..ce59fe701f 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_gcd.c
+++ b/thirdparty/openssl/crypto/bn/bn_gcd.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_gf2m.c b/thirdparty/openssl/crypto/bn/bn_gf2m.c
index 2c61da1109..2c61da1109 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_gf2m.c
+++ b/thirdparty/openssl/crypto/bn/bn_gf2m.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_kron.c b/thirdparty/openssl/crypto/bn/bn_kron.c
index 88d731ac75..88d731ac75 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_kron.c
+++ b/thirdparty/openssl/crypto/bn/bn_kron.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_lcl.h b/thirdparty/openssl/crypto/bn/bn_lcl.h
index 00f4f09945..00f4f09945 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_lcl.h
+++ b/thirdparty/openssl/crypto/bn/bn_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_lib.c b/thirdparty/openssl/crypto/bn/bn_lib.c
index 80105fff41..80105fff41 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_lib.c
+++ b/thirdparty/openssl/crypto/bn/bn_lib.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_mod.c b/thirdparty/openssl/crypto/bn/bn_mod.c
index ffbce890cf..ffbce890cf 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_mod.c
+++ b/thirdparty/openssl/crypto/bn/bn_mod.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_mont.c b/thirdparty/openssl/crypto/bn/bn_mont.c
index be95bd55d0..be95bd55d0 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_mont.c
+++ b/thirdparty/openssl/crypto/bn/bn_mont.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_mpi.c b/thirdparty/openssl/crypto/bn/bn_mpi.c
index 3bd40bbd2b..3bd40bbd2b 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_mpi.c
+++ b/thirdparty/openssl/crypto/bn/bn_mpi.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_mul.c b/thirdparty/openssl/crypto/bn/bn_mul.c
index b174850b6b..b174850b6b 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_mul.c
+++ b/thirdparty/openssl/crypto/bn/bn_mul.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_nist.c b/thirdparty/openssl/crypto/bn/bn_nist.c
index 4a45404c6f..4a45404c6f 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_nist.c
+++ b/thirdparty/openssl/crypto/bn/bn_nist.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_prime.c b/thirdparty/openssl/crypto/bn/bn_prime.c
index 1d256874c9..1d256874c9 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_prime.c
+++ b/thirdparty/openssl/crypto/bn/bn_prime.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_prime.h b/thirdparty/openssl/crypto/bn/bn_prime.h
index 5cf0de169e..5cf0de169e 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_prime.h
+++ b/thirdparty/openssl/crypto/bn/bn_prime.h
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_print.c b/thirdparty/openssl/crypto/bn/bn_print.c
index bfa31efc56..bfa31efc56 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_print.c
+++ b/thirdparty/openssl/crypto/bn/bn_print.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_rand.c b/thirdparty/openssl/crypto/bn/bn_rand.c
index f9fb2e9e45..f9fb2e9e45 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_rand.c
+++ b/thirdparty/openssl/crypto/bn/bn_rand.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_recp.c b/thirdparty/openssl/crypto/bn/bn_recp.c
index f047040efe..f047040efe 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_recp.c
+++ b/thirdparty/openssl/crypto/bn/bn_recp.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_shift.c b/thirdparty/openssl/crypto/bn/bn_shift.c
index 9673d9a306..9673d9a306 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_shift.c
+++ b/thirdparty/openssl/crypto/bn/bn_shift.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_sqr.c b/thirdparty/openssl/crypto/bn/bn_sqr.c
index 3ca69879ee..3ca69879ee 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_sqr.c
+++ b/thirdparty/openssl/crypto/bn/bn_sqr.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_sqrt.c b/thirdparty/openssl/crypto/bn/bn_sqrt.c
index 232af99a21..232af99a21 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_sqrt.c
+++ b/thirdparty/openssl/crypto/bn/bn_sqrt.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_word.c b/thirdparty/openssl/crypto/bn/bn_word.c
index b031a60b5b..b031a60b5b 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_word.c
+++ b/thirdparty/openssl/crypto/bn/bn_word.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bn_x931p.c b/thirdparty/openssl/crypto/bn/bn_x931p.c
index efa48bdf87..efa48bdf87 100644
--- a/drivers/builtin_openssl2/crypto/bn/bn_x931p.c
+++ b/thirdparty/openssl/crypto/bn/bn_x931p.c
diff --git a/drivers/builtin_openssl2/crypto/bn/bnspeed.c b/thirdparty/openssl/crypto/bn/bnspeed.c
index e387fdfbc2..e387fdfbc2 100644
--- a/drivers/builtin_openssl2/crypto/bn/bnspeed.c
+++ b/thirdparty/openssl/crypto/bn/bnspeed.c
diff --git a/drivers/builtin_openssl2/crypto/bn/exp.c b/thirdparty/openssl/crypto/bn/exp.c
index fbce28c5be..fbce28c5be 100644
--- a/drivers/builtin_openssl2/crypto/bn/exp.c
+++ b/thirdparty/openssl/crypto/bn/exp.c
diff --git a/drivers/builtin_openssl2/crypto/bn/expspeed.c b/thirdparty/openssl/crypto/bn/expspeed.c
index 513a568a48..513a568a48 100644
--- a/drivers/builtin_openssl2/crypto/bn/expspeed.c
+++ b/thirdparty/openssl/crypto/bn/expspeed.c
diff --git a/drivers/builtin_openssl2/crypto/bn/rsaz_exp.c b/thirdparty/openssl/crypto/bn/rsaz_exp.c
index c54c6feb51..c54c6feb51 100644
--- a/drivers/builtin_openssl2/crypto/bn/rsaz_exp.c
+++ b/thirdparty/openssl/crypto/bn/rsaz_exp.c
diff --git a/drivers/builtin_openssl2/crypto/bn/rsaz_exp.h b/thirdparty/openssl/crypto/bn/rsaz_exp.h
index 229e181f67..229e181f67 100644
--- a/drivers/builtin_openssl2/crypto/bn/rsaz_exp.h
+++ b/thirdparty/openssl/crypto/bn/rsaz_exp.h
diff --git a/drivers/builtin_openssl2/crypto/bn/todo b/thirdparty/openssl/crypto/bn/todo
index e47e381aea..e47e381aea 100644
--- a/drivers/builtin_openssl2/crypto/bn/todo
+++ b/thirdparty/openssl/crypto/bn/todo
diff --git a/drivers/builtin_openssl2/crypto/bn/vms-helper.c b/thirdparty/openssl/crypto/bn/vms-helper.c
index f342e90cbf..f342e90cbf 100644
--- a/drivers/builtin_openssl2/crypto/bn/vms-helper.c
+++ b/thirdparty/openssl/crypto/bn/vms-helper.c
diff --git a/drivers/builtin_openssl2/crypto/buffer/buf_err.c b/thirdparty/openssl/crypto/buffer/buf_err.c
index 631eec38d7..631eec38d7 100644
--- a/drivers/builtin_openssl2/crypto/buffer/buf_err.c
+++ b/thirdparty/openssl/crypto/buffer/buf_err.c
diff --git a/drivers/builtin_openssl2/crypto/buffer/buf_str.c b/thirdparty/openssl/crypto/buffer/buf_str.c
index fa0d608e76..fa0d608e76 100644
--- a/drivers/builtin_openssl2/crypto/buffer/buf_str.c
+++ b/thirdparty/openssl/crypto/buffer/buf_str.c
diff --git a/drivers/builtin_openssl2/crypto/buffer/buffer.c b/thirdparty/openssl/crypto/buffer/buffer.c
index eff3e08157..eff3e08157 100644
--- a/drivers/builtin_openssl2/crypto/buffer/buffer.c
+++ b/thirdparty/openssl/crypto/buffer/buffer.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/camellia.c b/thirdparty/openssl/crypto/camellia/camellia.c
index 719fa61cf6..719fa61cf6 100644
--- a/drivers/builtin_openssl2/crypto/camellia/camellia.c
+++ b/thirdparty/openssl/crypto/camellia/camellia.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_cbc.c b/thirdparty/openssl/crypto/camellia/cmll_cbc.c
index 4017e00d92..4017e00d92 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_cbc.c
+++ b/thirdparty/openssl/crypto/camellia/cmll_cbc.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_cfb.c b/thirdparty/openssl/crypto/camellia/cmll_cfb.c
index 78f2ae4566..78f2ae4566 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_cfb.c
+++ b/thirdparty/openssl/crypto/camellia/cmll_cfb.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_ctr.c b/thirdparty/openssl/crypto/camellia/cmll_ctr.c
index 95e26621b7..95e26621b7 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_ctr.c
+++ b/thirdparty/openssl/crypto/camellia/cmll_ctr.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_ecb.c b/thirdparty/openssl/crypto/camellia/cmll_ecb.c
index b030791b27..b030791b27 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_ecb.c
+++ b/thirdparty/openssl/crypto/camellia/cmll_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_locl.h b/thirdparty/openssl/crypto/camellia/cmll_locl.h
index 2bd79b8c4e..2bd79b8c4e 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_locl.h
+++ b/thirdparty/openssl/crypto/camellia/cmll_locl.h
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_misc.c b/thirdparty/openssl/crypto/camellia/cmll_misc.c
index 694d2fac8f..694d2fac8f 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_misc.c
+++ b/thirdparty/openssl/crypto/camellia/cmll_misc.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_ofb.c b/thirdparty/openssl/crypto/camellia/cmll_ofb.c
index 85eb892156..85eb892156 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_ofb.c
+++ b/thirdparty/openssl/crypto/camellia/cmll_ofb.c
diff --git a/drivers/builtin_openssl2/crypto/camellia/cmll_utl.c b/thirdparty/openssl/crypto/camellia/cmll_utl.c
index d5eb6b4d68..d5eb6b4d68 100644
--- a/drivers/builtin_openssl2/crypto/camellia/cmll_utl.c
+++ b/thirdparty/openssl/crypto/camellia/cmll_utl.c
diff --git a/drivers/builtin_openssl2/crypto/cast/asm/readme b/thirdparty/openssl/crypto/cast/asm/readme
index fbcd76289e..fbcd76289e 100644
--- a/drivers/builtin_openssl2/crypto/cast/asm/readme
+++ b/thirdparty/openssl/crypto/cast/asm/readme
diff --git a/drivers/builtin_openssl2/crypto/cast/c_cfb64.c b/thirdparty/openssl/crypto/cast/c_cfb64.c
index f2f16e5d77..f2f16e5d77 100644
--- a/drivers/builtin_openssl2/crypto/cast/c_cfb64.c
+++ b/thirdparty/openssl/crypto/cast/c_cfb64.c
diff --git a/drivers/builtin_openssl2/crypto/cast/c_ecb.c b/thirdparty/openssl/crypto/cast/c_ecb.c
index 4793f28edf..4793f28edf 100644
--- a/drivers/builtin_openssl2/crypto/cast/c_ecb.c
+++ b/thirdparty/openssl/crypto/cast/c_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/cast/c_enc.c b/thirdparty/openssl/crypto/cast/c_enc.c
index 6e1d50f10d..6e1d50f10d 100644
--- a/drivers/builtin_openssl2/crypto/cast/c_enc.c
+++ b/thirdparty/openssl/crypto/cast/c_enc.c
diff --git a/drivers/builtin_openssl2/crypto/cast/c_ofb64.c b/thirdparty/openssl/crypto/cast/c_ofb64.c
index 4e0a7c2e6e..4e0a7c2e6e 100644
--- a/drivers/builtin_openssl2/crypto/cast/c_ofb64.c
+++ b/thirdparty/openssl/crypto/cast/c_ofb64.c
diff --git a/drivers/builtin_openssl2/crypto/cast/c_skey.c b/thirdparty/openssl/crypto/cast/c_skey.c
index bbb6d56099..bbb6d56099 100644
--- a/drivers/builtin_openssl2/crypto/cast/c_skey.c
+++ b/thirdparty/openssl/crypto/cast/c_skey.c
diff --git a/drivers/builtin_openssl2/crypto/cast/cast_lcl.h b/thirdparty/openssl/crypto/cast/cast_lcl.h
index b0f08294e3..b0f08294e3 100644
--- a/drivers/builtin_openssl2/crypto/cast/cast_lcl.h
+++ b/thirdparty/openssl/crypto/cast/cast_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/cast/cast_s.h b/thirdparty/openssl/crypto/cast/cast_s.h
index 380dc81aef..380dc81aef 100644
--- a/drivers/builtin_openssl2/crypto/cast/cast_s.h
+++ b/thirdparty/openssl/crypto/cast/cast_s.h
diff --git a/drivers/builtin_openssl2/crypto/cast/cast_spd.c b/thirdparty/openssl/crypto/cast/cast_spd.c
index 91d2ce23f7..91d2ce23f7 100644
--- a/drivers/builtin_openssl2/crypto/cast/cast_spd.c
+++ b/thirdparty/openssl/crypto/cast/cast_spd.c
diff --git a/drivers/builtin_openssl2/crypto/cast/castopts.c b/thirdparty/openssl/crypto/cast/castopts.c
index 42687f2884..42687f2884 100644
--- a/drivers/builtin_openssl2/crypto/cast/castopts.c
+++ b/thirdparty/openssl/crypto/cast/castopts.c
diff --git a/drivers/builtin_openssl2/crypto/cast/casts.cpp b/thirdparty/openssl/crypto/cast/casts.cpp
index 8d7bd468d2..8d7bd468d2 100644
--- a/drivers/builtin_openssl2/crypto/cast/casts.cpp
+++ b/thirdparty/openssl/crypto/cast/casts.cpp
diff --git a/drivers/builtin_openssl2/crypto/cmac/cm_ameth.c b/thirdparty/openssl/crypto/cmac/cm_ameth.c
index bf933e0866..bf933e0866 100644
--- a/drivers/builtin_openssl2/crypto/cmac/cm_ameth.c
+++ b/thirdparty/openssl/crypto/cmac/cm_ameth.c
diff --git a/drivers/builtin_openssl2/crypto/cmac/cm_pmeth.c b/thirdparty/openssl/crypto/cmac/cm_pmeth.c
index a2300df187..a2300df187 100644
--- a/drivers/builtin_openssl2/crypto/cmac/cm_pmeth.c
+++ b/thirdparty/openssl/crypto/cmac/cm_pmeth.c
diff --git a/drivers/builtin_openssl2/crypto/cmac/cmac.c b/thirdparty/openssl/crypto/cmac/cmac.c
index 2954b6eb7d..2954b6eb7d 100644
--- a/drivers/builtin_openssl2/crypto/cmac/cmac.c
+++ b/thirdparty/openssl/crypto/cmac/cmac.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_asn1.c b/thirdparty/openssl/crypto/cms/cms_asn1.c
index 81a3407f12..81a3407f12 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_asn1.c
+++ b/thirdparty/openssl/crypto/cms/cms_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_att.c b/thirdparty/openssl/crypto/cms/cms_att.c
index f79a49d518..f79a49d518 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_att.c
+++ b/thirdparty/openssl/crypto/cms/cms_att.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_cd.c b/thirdparty/openssl/crypto/cms/cms_cd.c
index aa3238f584..aa3238f584 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_cd.c
+++ b/thirdparty/openssl/crypto/cms/cms_cd.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_dd.c b/thirdparty/openssl/crypto/cms/cms_dd.c
index 23e9f2d3a4..23e9f2d3a4 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_dd.c
+++ b/thirdparty/openssl/crypto/cms/cms_dd.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_enc.c b/thirdparty/openssl/crypto/cms/cms_enc.c
index b14b4b68b5..b14b4b68b5 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_enc.c
+++ b/thirdparty/openssl/crypto/cms/cms_enc.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_env.c b/thirdparty/openssl/crypto/cms/cms_env.c
index 93c06cb00a..93c06cb00a 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_env.c
+++ b/thirdparty/openssl/crypto/cms/cms_env.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_err.c b/thirdparty/openssl/crypto/cms/cms_err.c
index 15572ea348..15572ea348 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_err.c
+++ b/thirdparty/openssl/crypto/cms/cms_err.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_ess.c b/thirdparty/openssl/crypto/cms/cms_ess.c
index 8631a2eb2b..8631a2eb2b 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_ess.c
+++ b/thirdparty/openssl/crypto/cms/cms_ess.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_io.c b/thirdparty/openssl/crypto/cms/cms_io.c
index ec51f8e680..ec51f8e680 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_io.c
+++ b/thirdparty/openssl/crypto/cms/cms_io.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_kari.c b/thirdparty/openssl/crypto/cms/cms_kari.c
index 2cfcdb29cd..2cfcdb29cd 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_kari.c
+++ b/thirdparty/openssl/crypto/cms/cms_kari.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_lcl.h b/thirdparty/openssl/crypto/cms/cms_lcl.h
index 20f2c25f5a..20f2c25f5a 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_lcl.h
+++ b/thirdparty/openssl/crypto/cms/cms_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_lib.c b/thirdparty/openssl/crypto/cms/cms_lib.c
index d6cb60d02d..d6cb60d02d 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_lib.c
+++ b/thirdparty/openssl/crypto/cms/cms_lib.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_pwri.c b/thirdparty/openssl/crypto/cms/cms_pwri.c
index b91c01691f..b91c01691f 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_pwri.c
+++ b/thirdparty/openssl/crypto/cms/cms_pwri.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_sd.c b/thirdparty/openssl/crypto/cms/cms_sd.c
index a41aca8e12..a41aca8e12 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_sd.c
+++ b/thirdparty/openssl/crypto/cms/cms_sd.c
diff --git a/drivers/builtin_openssl2/crypto/cms/cms_smime.c b/thirdparty/openssl/crypto/cms/cms_smime.c
index 07e3472e10..07e3472e10 100644
--- a/drivers/builtin_openssl2/crypto/cms/cms_smime.c
+++ b/thirdparty/openssl/crypto/cms/cms_smime.c
diff --git a/drivers/builtin_openssl2/crypto/comp/c_rle.c b/thirdparty/openssl/crypto/comp/c_rle.c
index e9aabbd166..e9aabbd166 100644
--- a/drivers/builtin_openssl2/crypto/comp/c_rle.c
+++ b/thirdparty/openssl/crypto/comp/c_rle.c
diff --git a/drivers/builtin_openssl2/crypto/comp/c_zlib.c b/thirdparty/openssl/crypto/comp/c_zlib.c
index 9c32614d3c..9c32614d3c 100644
--- a/drivers/builtin_openssl2/crypto/comp/c_zlib.c
+++ b/thirdparty/openssl/crypto/comp/c_zlib.c
diff --git a/drivers/builtin_openssl2/crypto/comp/comp_err.c b/thirdparty/openssl/crypto/comp/comp_err.c
index 8ca159b60e..8ca159b60e 100644
--- a/drivers/builtin_openssl2/crypto/comp/comp_err.c
+++ b/thirdparty/openssl/crypto/comp/comp_err.c
diff --git a/drivers/builtin_openssl2/crypto/comp/comp_lib.c b/thirdparty/openssl/crypto/comp/comp_lib.c
index bd4eb7a1ab..bd4eb7a1ab 100644
--- a/drivers/builtin_openssl2/crypto/comp/comp_lib.c
+++ b/thirdparty/openssl/crypto/comp/comp_lib.c
diff --git a/drivers/builtin_openssl2/crypto/conf/README b/thirdparty/openssl/crypto/conf/README
index 96e53b34ed..96e53b34ed 100644
--- a/drivers/builtin_openssl2/crypto/conf/README
+++ b/thirdparty/openssl/crypto/conf/README
diff --git a/drivers/builtin_openssl2/crypto/conf/cnf_save.c b/thirdparty/openssl/crypto/conf/cnf_save.c
index 71c4317428..71c4317428 100644
--- a/drivers/builtin_openssl2/crypto/conf/cnf_save.c
+++ b/thirdparty/openssl/crypto/conf/cnf_save.c
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_api.c b/thirdparty/openssl/crypto/conf/conf_api.c
index 4cf7553376..4cf7553376 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_api.c
+++ b/thirdparty/openssl/crypto/conf/conf_api.c
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_def.c b/thirdparty/openssl/crypto/conf/conf_def.c
index 68c77cec7d..68c77cec7d 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_def.c
+++ b/thirdparty/openssl/crypto/conf/conf_def.c
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_def.h b/thirdparty/openssl/crypto/conf/conf_def.h
index 7d897b89f1..7d897b89f1 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_def.h
+++ b/thirdparty/openssl/crypto/conf/conf_def.h
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_err.c b/thirdparty/openssl/crypto/conf/conf_err.c
index bb5e2fe252..bb5e2fe252 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_err.c
+++ b/thirdparty/openssl/crypto/conf/conf_err.c
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_lib.c b/thirdparty/openssl/crypto/conf/conf_lib.c
index 5281384807..5281384807 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_lib.c
+++ b/thirdparty/openssl/crypto/conf/conf_lib.c
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_mall.c b/thirdparty/openssl/crypto/conf/conf_mall.c
index b4dbd662d0..b4dbd662d0 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_mall.c
+++ b/thirdparty/openssl/crypto/conf/conf_mall.c
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_mod.c b/thirdparty/openssl/crypto/conf/conf_mod.c
index 9acfca4f71..9acfca4f71 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_mod.c
+++ b/thirdparty/openssl/crypto/conf/conf_mod.c
diff --git a/drivers/builtin_openssl2/crypto/conf/conf_sap.c b/thirdparty/openssl/crypto/conf/conf_sap.c
index c042cf222d..c042cf222d 100644
--- a/drivers/builtin_openssl2/crypto/conf/conf_sap.c
+++ b/thirdparty/openssl/crypto/conf/conf_sap.c
diff --git a/drivers/builtin_openssl2/crypto/conf/ssleay.cnf b/thirdparty/openssl/crypto/conf/ssleay.cnf
index ed33af601e..ed33af601e 100644
--- a/drivers/builtin_openssl2/crypto/conf/ssleay.cnf
+++ b/thirdparty/openssl/crypto/conf/ssleay.cnf
diff --git a/drivers/builtin_openssl2/crypto/constant_time_locl.h b/thirdparty/openssl/crypto/constant_time_locl.h
index c786aea949..c786aea949 100644
--- a/drivers/builtin_openssl2/crypto/constant_time_locl.h
+++ b/thirdparty/openssl/crypto/constant_time_locl.h
diff --git a/drivers/builtin_openssl2/crypto/cpt_err.c b/thirdparty/openssl/crypto/cpt_err.c
index a5138381a0..a5138381a0 100644
--- a/drivers/builtin_openssl2/crypto/cpt_err.c
+++ b/thirdparty/openssl/crypto/cpt_err.c
diff --git a/drivers/builtin_openssl2/crypto/cryptlib.c b/thirdparty/openssl/crypto/cryptlib.c
index 1925428f5e..1925428f5e 100644
--- a/drivers/builtin_openssl2/crypto/cryptlib.c
+++ b/thirdparty/openssl/crypto/cryptlib.c
diff --git a/drivers/builtin_openssl2/crypto/cryptlib.h b/thirdparty/openssl/crypto/cryptlib.h
index fba180a6b2..fba180a6b2 100644
--- a/drivers/builtin_openssl2/crypto/cryptlib.h
+++ b/thirdparty/openssl/crypto/cryptlib.h
diff --git a/drivers/builtin_openssl2/crypto/crypto-lib.com b/thirdparty/openssl/crypto/crypto-lib.com
index 1423cac288..1423cac288 100644
--- a/drivers/builtin_openssl2/crypto/crypto-lib.com
+++ b/thirdparty/openssl/crypto/crypto-lib.com
diff --git a/drivers/builtin_openssl2/crypto/cversion.c b/thirdparty/openssl/crypto/cversion.c
index bfff6995c1..bfff6995c1 100644
--- a/drivers/builtin_openssl2/crypto/cversion.c
+++ b/thirdparty/openssl/crypto/cversion.c
diff --git a/drivers/builtin_openssl2/crypto/des/COPYRIGHT b/thirdparty/openssl/crypto/des/COPYRIGHT
index 5469e1e469..5469e1e469 100644
--- a/drivers/builtin_openssl2/crypto/des/COPYRIGHT
+++ b/thirdparty/openssl/crypto/des/COPYRIGHT
diff --git a/drivers/builtin_openssl2/crypto/des/DES.pm b/thirdparty/openssl/crypto/des/DES.pm
index 6a175b6ca4..6a175b6ca4 100644
--- a/drivers/builtin_openssl2/crypto/des/DES.pm
+++ b/thirdparty/openssl/crypto/des/DES.pm
diff --git a/drivers/builtin_openssl2/crypto/des/DES.xs b/thirdparty/openssl/crypto/des/DES.xs
index b8050b9edf..b8050b9edf 100644
--- a/drivers/builtin_openssl2/crypto/des/DES.xs
+++ b/thirdparty/openssl/crypto/des/DES.xs
diff --git a/drivers/builtin_openssl2/crypto/des/FILES0 b/thirdparty/openssl/crypto/des/FILES0
index 4c7ea2de7a..4c7ea2de7a 100644
--- a/drivers/builtin_openssl2/crypto/des/FILES0
+++ b/thirdparty/openssl/crypto/des/FILES0
diff --git a/drivers/builtin_openssl2/crypto/des/INSTALL b/thirdparty/openssl/crypto/des/INSTALL
index 8aebdfe110..8aebdfe110 100644
--- a/drivers/builtin_openssl2/crypto/des/INSTALL
+++ b/thirdparty/openssl/crypto/des/INSTALL
diff --git a/drivers/builtin_openssl2/crypto/des/Imakefile b/thirdparty/openssl/crypto/des/Imakefile
index 1b9b5629e1..1b9b5629e1 100644
--- a/drivers/builtin_openssl2/crypto/des/Imakefile
+++ b/thirdparty/openssl/crypto/des/Imakefile
diff --git a/drivers/builtin_openssl2/crypto/des/KERBEROS b/thirdparty/openssl/crypto/des/KERBEROS
index f401b10014..f401b10014 100644
--- a/drivers/builtin_openssl2/crypto/des/KERBEROS
+++ b/thirdparty/openssl/crypto/des/KERBEROS
diff --git a/drivers/builtin_openssl2/crypto/des/README b/thirdparty/openssl/crypto/des/README
index 621a5ab467..621a5ab467 100644
--- a/drivers/builtin_openssl2/crypto/des/README
+++ b/thirdparty/openssl/crypto/des/README
diff --git a/drivers/builtin_openssl2/crypto/des/VERSION b/thirdparty/openssl/crypto/des/VERSION
index c7d01542bc..c7d01542bc 100644
--- a/drivers/builtin_openssl2/crypto/des/VERSION
+++ b/thirdparty/openssl/crypto/des/VERSION
diff --git a/drivers/builtin_openssl2/crypto/des/asm/des_enc.m4 b/thirdparty/openssl/crypto/des/asm/des_enc.m4
index dda08e126d..dda08e126d 100644
--- a/drivers/builtin_openssl2/crypto/des/asm/des_enc.m4
+++ b/thirdparty/openssl/crypto/des/asm/des_enc.m4
diff --git a/drivers/builtin_openssl2/crypto/des/asm/readme b/thirdparty/openssl/crypto/des/asm/readme
index 1beafe253b..1beafe253b 100644
--- a/drivers/builtin_openssl2/crypto/des/asm/readme
+++ b/thirdparty/openssl/crypto/des/asm/readme
diff --git a/drivers/builtin_openssl2/crypto/des/cbc3_enc.c b/thirdparty/openssl/crypto/des/cbc3_enc.c
index 249518a6a6..249518a6a6 100644
--- a/drivers/builtin_openssl2/crypto/des/cbc3_enc.c
+++ b/thirdparty/openssl/crypto/des/cbc3_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/cbc_cksm.c b/thirdparty/openssl/crypto/des/cbc_cksm.c
index f89b5b98e4..f89b5b98e4 100644
--- a/drivers/builtin_openssl2/crypto/des/cbc_cksm.c
+++ b/thirdparty/openssl/crypto/des/cbc_cksm.c
diff --git a/drivers/builtin_openssl2/crypto/des/cbc_enc.c b/thirdparty/openssl/crypto/des/cbc_enc.c
index 7ee359928c..7ee359928c 100644
--- a/drivers/builtin_openssl2/crypto/des/cbc_enc.c
+++ b/thirdparty/openssl/crypto/des/cbc_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/cfb64ede.c b/thirdparty/openssl/crypto/des/cfb64ede.c
index 5d709c12d3..5d709c12d3 100644
--- a/drivers/builtin_openssl2/crypto/des/cfb64ede.c
+++ b/thirdparty/openssl/crypto/des/cfb64ede.c
diff --git a/drivers/builtin_openssl2/crypto/des/cfb64enc.c b/thirdparty/openssl/crypto/des/cfb64enc.c
index 7346774eb2..7346774eb2 100644
--- a/drivers/builtin_openssl2/crypto/des/cfb64enc.c
+++ b/thirdparty/openssl/crypto/des/cfb64enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/cfb_enc.c b/thirdparty/openssl/crypto/des/cfb_enc.c
index bd0e299716..bd0e299716 100644
--- a/drivers/builtin_openssl2/crypto/des/cfb_enc.c
+++ b/thirdparty/openssl/crypto/des/cfb_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/des-lib.com b/thirdparty/openssl/crypto/des/des-lib.com
index 348f1c0470..348f1c0470 100644
--- a/drivers/builtin_openssl2/crypto/des/des-lib.com
+++ b/thirdparty/openssl/crypto/des/des-lib.com
diff --git a/drivers/builtin_openssl2/crypto/des/des.c b/thirdparty/openssl/crypto/des/des.c
index 586aed7237..586aed7237 100644
--- a/drivers/builtin_openssl2/crypto/des/des.c
+++ b/thirdparty/openssl/crypto/des/des.c
diff --git a/drivers/builtin_openssl2/crypto/des/des3s.cpp b/thirdparty/openssl/crypto/des/des3s.cpp
index 02d527c057..02d527c057 100644
--- a/drivers/builtin_openssl2/crypto/des/des3s.cpp
+++ b/thirdparty/openssl/crypto/des/des3s.cpp
diff --git a/drivers/builtin_openssl2/crypto/des/des_enc.c b/thirdparty/openssl/crypto/des/des_enc.c
index c0b062da3d..c0b062da3d 100644
--- a/drivers/builtin_openssl2/crypto/des/des_enc.c
+++ b/thirdparty/openssl/crypto/des/des_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/des_locl.h b/thirdparty/openssl/crypto/des/des_locl.h
index 23ea9d32a7..23ea9d32a7 100644
--- a/drivers/builtin_openssl2/crypto/des/des_locl.h
+++ b/thirdparty/openssl/crypto/des/des_locl.h
diff --git a/drivers/builtin_openssl2/crypto/des/des_old.c b/thirdparty/openssl/crypto/des/des_old.c
index c5c5a00f00..c5c5a00f00 100644
--- a/drivers/builtin_openssl2/crypto/des/des_old.c
+++ b/thirdparty/openssl/crypto/des/des_old.c
diff --git a/drivers/builtin_openssl2/crypto/des/des_old2.c b/thirdparty/openssl/crypto/des/des_old2.c
index 247ff8dcf8..247ff8dcf8 100644
--- a/drivers/builtin_openssl2/crypto/des/des_old2.c
+++ b/thirdparty/openssl/crypto/des/des_old2.c
diff --git a/drivers/builtin_openssl2/crypto/des/des_opts.c b/thirdparty/openssl/crypto/des/des_opts.c
index ec50e94f55..ec50e94f55 100644
--- a/drivers/builtin_openssl2/crypto/des/des_opts.c
+++ b/thirdparty/openssl/crypto/des/des_opts.c
diff --git a/drivers/builtin_openssl2/crypto/des/des_ver.h b/thirdparty/openssl/crypto/des/des_ver.h
index 276de2b616..276de2b616 100644
--- a/drivers/builtin_openssl2/crypto/des/des_ver.h
+++ b/thirdparty/openssl/crypto/des/des_ver.h
diff --git a/drivers/builtin_openssl2/crypto/des/dess.cpp b/thirdparty/openssl/crypto/des/dess.cpp
index 5549bab90a..5549bab90a 100644
--- a/drivers/builtin_openssl2/crypto/des/dess.cpp
+++ b/thirdparty/openssl/crypto/des/dess.cpp
diff --git a/drivers/builtin_openssl2/crypto/des/ecb3_enc.c b/thirdparty/openssl/crypto/des/ecb3_enc.c
index c49fbd41e6..c49fbd41e6 100644
--- a/drivers/builtin_openssl2/crypto/des/ecb3_enc.c
+++ b/thirdparty/openssl/crypto/des/ecb3_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/ecb_enc.c b/thirdparty/openssl/crypto/des/ecb_enc.c
index f97fd971dc..f97fd971dc 100644
--- a/drivers/builtin_openssl2/crypto/des/ecb_enc.c
+++ b/thirdparty/openssl/crypto/des/ecb_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/ede_cbcm_enc.c b/thirdparty/openssl/crypto/des/ede_cbcm_enc.c
index 86f27d077a..86f27d077a 100644
--- a/drivers/builtin_openssl2/crypto/des/ede_cbcm_enc.c
+++ b/thirdparty/openssl/crypto/des/ede_cbcm_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/enc_read.c b/thirdparty/openssl/crypto/des/enc_read.c
index fcb66541bd..fcb66541bd 100644
--- a/drivers/builtin_openssl2/crypto/des/enc_read.c
+++ b/thirdparty/openssl/crypto/des/enc_read.c
diff --git a/drivers/builtin_openssl2/crypto/des/enc_writ.c b/thirdparty/openssl/crypto/des/enc_writ.c
index bfaabde516..bfaabde516 100644
--- a/drivers/builtin_openssl2/crypto/des/enc_writ.c
+++ b/thirdparty/openssl/crypto/des/enc_writ.c
diff --git a/drivers/builtin_openssl2/crypto/des/fcrypt.c b/thirdparty/openssl/crypto/des/fcrypt.c
index 111f1e4617..111f1e4617 100644
--- a/drivers/builtin_openssl2/crypto/des/fcrypt.c
+++ b/thirdparty/openssl/crypto/des/fcrypt.c
diff --git a/drivers/builtin_openssl2/crypto/des/fcrypt_b.c b/thirdparty/openssl/crypto/des/fcrypt_b.c
index b9e87383d2..b9e87383d2 100644
--- a/drivers/builtin_openssl2/crypto/des/fcrypt_b.c
+++ b/thirdparty/openssl/crypto/des/fcrypt_b.c
diff --git a/drivers/builtin_openssl2/crypto/des/makefile.bc b/thirdparty/openssl/crypto/des/makefile.bc
index 1fe6d4915a..1fe6d4915a 100644
--- a/drivers/builtin_openssl2/crypto/des/makefile.bc
+++ b/thirdparty/openssl/crypto/des/makefile.bc
diff --git a/drivers/builtin_openssl2/crypto/des/ncbc_enc.c b/thirdparty/openssl/crypto/des/ncbc_enc.c
index ab267cbf38..ab267cbf38 100644
--- a/drivers/builtin_openssl2/crypto/des/ncbc_enc.c
+++ b/thirdparty/openssl/crypto/des/ncbc_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/ofb64ede.c b/thirdparty/openssl/crypto/des/ofb64ede.c
index 45c67505a6..45c67505a6 100644
--- a/drivers/builtin_openssl2/crypto/des/ofb64ede.c
+++ b/thirdparty/openssl/crypto/des/ofb64ede.c
diff --git a/drivers/builtin_openssl2/crypto/des/ofb64enc.c b/thirdparty/openssl/crypto/des/ofb64enc.c
index 8e72dece51..8e72dece51 100644
--- a/drivers/builtin_openssl2/crypto/des/ofb64enc.c
+++ b/thirdparty/openssl/crypto/des/ofb64enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/ofb_enc.c b/thirdparty/openssl/crypto/des/ofb_enc.c
index 02a787752e..02a787752e 100644
--- a/drivers/builtin_openssl2/crypto/des/ofb_enc.c
+++ b/thirdparty/openssl/crypto/des/ofb_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/options.txt b/thirdparty/openssl/crypto/des/options.txt
index 6e2b50f765..6e2b50f765 100644
--- a/drivers/builtin_openssl2/crypto/des/options.txt
+++ b/thirdparty/openssl/crypto/des/options.txt
diff --git a/drivers/builtin_openssl2/crypto/des/pcbc_enc.c b/thirdparty/openssl/crypto/des/pcbc_enc.c
index 144d5ed88f..144d5ed88f 100644
--- a/drivers/builtin_openssl2/crypto/des/pcbc_enc.c
+++ b/thirdparty/openssl/crypto/des/pcbc_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/qud_cksm.c b/thirdparty/openssl/crypto/des/qud_cksm.c
index 2a168a5769..2a168a5769 100644
--- a/drivers/builtin_openssl2/crypto/des/qud_cksm.c
+++ b/thirdparty/openssl/crypto/des/qud_cksm.c
diff --git a/drivers/builtin_openssl2/crypto/des/rand_key.c b/thirdparty/openssl/crypto/des/rand_key.c
index b75cc5f9b0..b75cc5f9b0 100644
--- a/drivers/builtin_openssl2/crypto/des/rand_key.c
+++ b/thirdparty/openssl/crypto/des/rand_key.c
diff --git a/drivers/builtin_openssl2/crypto/des/read2pwd.c b/thirdparty/openssl/crypto/des/read2pwd.c
index 01e275f331..01e275f331 100644
--- a/drivers/builtin_openssl2/crypto/des/read2pwd.c
+++ b/thirdparty/openssl/crypto/des/read2pwd.c
diff --git a/drivers/builtin_openssl2/crypto/des/read_pwd.c b/thirdparty/openssl/crypto/des/read_pwd.c
index 514a7063b4..514a7063b4 100644
--- a/drivers/builtin_openssl2/crypto/des/read_pwd.c
+++ b/thirdparty/openssl/crypto/des/read_pwd.c
diff --git a/drivers/builtin_openssl2/crypto/des/rpc_des.h b/thirdparty/openssl/crypto/des/rpc_des.h
index 4db9062d97..4db9062d97 100644
--- a/drivers/builtin_openssl2/crypto/des/rpc_des.h
+++ b/thirdparty/openssl/crypto/des/rpc_des.h
diff --git a/drivers/builtin_openssl2/crypto/des/rpc_enc.c b/thirdparty/openssl/crypto/des/rpc_enc.c
index f5a84c5b05..f5a84c5b05 100644
--- a/drivers/builtin_openssl2/crypto/des/rpc_enc.c
+++ b/thirdparty/openssl/crypto/des/rpc_enc.c
diff --git a/drivers/builtin_openssl2/crypto/des/rpw.c b/thirdparty/openssl/crypto/des/rpw.c
index ab65eacae3..ab65eacae3 100644
--- a/drivers/builtin_openssl2/crypto/des/rpw.c
+++ b/thirdparty/openssl/crypto/des/rpw.c
diff --git a/drivers/builtin_openssl2/crypto/des/set_key.c b/thirdparty/openssl/crypto/des/set_key.c
index 8fd8fe14bb..8fd8fe14bb 100644
--- a/drivers/builtin_openssl2/crypto/des/set_key.c
+++ b/thirdparty/openssl/crypto/des/set_key.c
diff --git a/drivers/builtin_openssl2/crypto/des/speed.c b/thirdparty/openssl/crypto/des/speed.c
index 9a3d929d29..9a3d929d29 100644
--- a/drivers/builtin_openssl2/crypto/des/speed.c
+++ b/thirdparty/openssl/crypto/des/speed.c
diff --git a/drivers/builtin_openssl2/crypto/des/spr.h b/thirdparty/openssl/crypto/des/spr.h
index e85d310052..e85d310052 100644
--- a/drivers/builtin_openssl2/crypto/des/spr.h
+++ b/thirdparty/openssl/crypto/des/spr.h
diff --git a/drivers/builtin_openssl2/crypto/des/str2key.c b/thirdparty/openssl/crypto/des/str2key.c
index 38a478cf43..38a478cf43 100644
--- a/drivers/builtin_openssl2/crypto/des/str2key.c
+++ b/thirdparty/openssl/crypto/des/str2key.c
diff --git a/drivers/builtin_openssl2/crypto/des/t/test b/thirdparty/openssl/crypto/des/t/test
index 97acd0552e..97acd0552e 100644
--- a/drivers/builtin_openssl2/crypto/des/t/test
+++ b/thirdparty/openssl/crypto/des/t/test
diff --git a/drivers/builtin_openssl2/crypto/des/times/486-50.sol b/thirdparty/openssl/crypto/des/times/486-50.sol
index 0de62d6db3..0de62d6db3 100644
--- a/drivers/builtin_openssl2/crypto/des/times/486-50.sol
+++ b/thirdparty/openssl/crypto/des/times/486-50.sol
diff --git a/drivers/builtin_openssl2/crypto/des/times/586-100.lnx b/thirdparty/openssl/crypto/des/times/586-100.lnx
index 4323914a11..4323914a11 100644
--- a/drivers/builtin_openssl2/crypto/des/times/586-100.lnx
+++ b/thirdparty/openssl/crypto/des/times/586-100.lnx
diff --git a/drivers/builtin_openssl2/crypto/des/times/686-200.fre b/thirdparty/openssl/crypto/des/times/686-200.fre
index 7d83f6adee..7d83f6adee 100644
--- a/drivers/builtin_openssl2/crypto/des/times/686-200.fre
+++ b/thirdparty/openssl/crypto/des/times/686-200.fre
diff --git a/drivers/builtin_openssl2/crypto/des/times/aix.cc b/thirdparty/openssl/crypto/des/times/aix.cc
index d96b74e2ce..d96b74e2ce 100644
--- a/drivers/builtin_openssl2/crypto/des/times/aix.cc
+++ b/thirdparty/openssl/crypto/des/times/aix.cc
diff --git a/drivers/builtin_openssl2/crypto/des/times/alpha.cc b/thirdparty/openssl/crypto/des/times/alpha.cc
index 95c17efae7..95c17efae7 100644
--- a/drivers/builtin_openssl2/crypto/des/times/alpha.cc
+++ b/thirdparty/openssl/crypto/des/times/alpha.cc
diff --git a/drivers/builtin_openssl2/crypto/des/times/hpux.cc b/thirdparty/openssl/crypto/des/times/hpux.cc
index 3de856ddac..3de856ddac 100644
--- a/drivers/builtin_openssl2/crypto/des/times/hpux.cc
+++ b/thirdparty/openssl/crypto/des/times/hpux.cc
diff --git a/drivers/builtin_openssl2/crypto/des/times/sparc.gcc b/thirdparty/openssl/crypto/des/times/sparc.gcc
index 8eaa042104..8eaa042104 100644
--- a/drivers/builtin_openssl2/crypto/des/times/sparc.gcc
+++ b/thirdparty/openssl/crypto/des/times/sparc.gcc
diff --git a/drivers/builtin_openssl2/crypto/des/times/usparc.cc b/thirdparty/openssl/crypto/des/times/usparc.cc
index 0864285ef6..0864285ef6 100644
--- a/drivers/builtin_openssl2/crypto/des/times/usparc.cc
+++ b/thirdparty/openssl/crypto/des/times/usparc.cc
diff --git a/drivers/builtin_openssl2/crypto/des/typemap b/thirdparty/openssl/crypto/des/typemap
index a524f53634..a524f53634 100644
--- a/drivers/builtin_openssl2/crypto/des/typemap
+++ b/thirdparty/openssl/crypto/des/typemap
diff --git a/drivers/builtin_openssl2/crypto/des/xcbc_enc.c b/thirdparty/openssl/crypto/des/xcbc_enc.c
index 6fe021be75..6fe021be75 100644
--- a/drivers/builtin_openssl2/crypto/des/xcbc_enc.c
+++ b/thirdparty/openssl/crypto/des/xcbc_enc.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh1024.pem b/thirdparty/openssl/crypto/dh/dh1024.pem
index 81d43f6a3e..81d43f6a3e 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh1024.pem
+++ b/thirdparty/openssl/crypto/dh/dh1024.pem
diff --git a/drivers/builtin_openssl2/crypto/dh/dh192.pem b/thirdparty/openssl/crypto/dh/dh192.pem
index 521c07271d..521c07271d 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh192.pem
+++ b/thirdparty/openssl/crypto/dh/dh192.pem
diff --git a/drivers/builtin_openssl2/crypto/dh/dh2048.pem b/thirdparty/openssl/crypto/dh/dh2048.pem
index 295460f508..295460f508 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh2048.pem
+++ b/thirdparty/openssl/crypto/dh/dh2048.pem
diff --git a/drivers/builtin_openssl2/crypto/dh/dh4096.pem b/thirdparty/openssl/crypto/dh/dh4096.pem
index 390943a21d..390943a21d 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh4096.pem
+++ b/thirdparty/openssl/crypto/dh/dh4096.pem
diff --git a/drivers/builtin_openssl2/crypto/dh/dh512.pem b/thirdparty/openssl/crypto/dh/dh512.pem
index 0a4d863ebe..0a4d863ebe 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh512.pem
+++ b/thirdparty/openssl/crypto/dh/dh512.pem
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_ameth.c b/thirdparty/openssl/crypto/dh/dh_ameth.c
index ac72468bd1..ac72468bd1 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_ameth.c
+++ b/thirdparty/openssl/crypto/dh/dh_ameth.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_asn1.c b/thirdparty/openssl/crypto/dh/dh_asn1.c
index f470214399..f470214399 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_asn1.c
+++ b/thirdparty/openssl/crypto/dh/dh_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_check.c b/thirdparty/openssl/crypto/dh/dh_check.c
index 0277041114..0277041114 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_check.c
+++ b/thirdparty/openssl/crypto/dh/dh_check.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_depr.c b/thirdparty/openssl/crypto/dh/dh_depr.c
index b622119930..b622119930 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_depr.c
+++ b/thirdparty/openssl/crypto/dh/dh_depr.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_err.c b/thirdparty/openssl/crypto/dh/dh_err.c
index b890cca817..b890cca817 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_err.c
+++ b/thirdparty/openssl/crypto/dh/dh_err.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_gen.c b/thirdparty/openssl/crypto/dh/dh_gen.c
index 5bedb665f2..5bedb665f2 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_gen.c
+++ b/thirdparty/openssl/crypto/dh/dh_gen.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_kdf.c b/thirdparty/openssl/crypto/dh/dh_kdf.c
index a882cb286e..a882cb286e 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_kdf.c
+++ b/thirdparty/openssl/crypto/dh/dh_kdf.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_key.c b/thirdparty/openssl/crypto/dh/dh_key.c
index 1d80fb2c5f..1d80fb2c5f 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_key.c
+++ b/thirdparty/openssl/crypto/dh/dh_key.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_lib.c b/thirdparty/openssl/crypto/dh/dh_lib.c
index bebc160ed6..bebc160ed6 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_lib.c
+++ b/thirdparty/openssl/crypto/dh/dh_lib.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_pmeth.c b/thirdparty/openssl/crypto/dh/dh_pmeth.c
index b58e3fa86f..b58e3fa86f 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_pmeth.c
+++ b/thirdparty/openssl/crypto/dh/dh_pmeth.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_prn.c b/thirdparty/openssl/crypto/dh/dh_prn.c
index 5d6c3a37e7..5d6c3a37e7 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_prn.c
+++ b/thirdparty/openssl/crypto/dh/dh_prn.c
diff --git a/drivers/builtin_openssl2/crypto/dh/dh_rfc5114.c b/thirdparty/openssl/crypto/dh/dh_rfc5114.c
index e96e2aa3fc..e96e2aa3fc 100644
--- a/drivers/builtin_openssl2/crypto/dh/dh_rfc5114.c
+++ b/thirdparty/openssl/crypto/dh/dh_rfc5114.c
diff --git a/drivers/builtin_openssl2/crypto/dh/example b/thirdparty/openssl/crypto/dh/example
index 16a33d2910..16a33d2910 100644
--- a/drivers/builtin_openssl2/crypto/dh/example
+++ b/thirdparty/openssl/crypto/dh/example
diff --git a/drivers/builtin_openssl2/crypto/dh/generate b/thirdparty/openssl/crypto/dh/generate
index 5d407231df..5d407231df 100644
--- a/drivers/builtin_openssl2/crypto/dh/generate
+++ b/thirdparty/openssl/crypto/dh/generate
diff --git a/drivers/builtin_openssl2/crypto/dh/p1024.c b/thirdparty/openssl/crypto/dh/p1024.c
index a4b014b6a3..a4b014b6a3 100644
--- a/drivers/builtin_openssl2/crypto/dh/p1024.c
+++ b/thirdparty/openssl/crypto/dh/p1024.c
diff --git a/drivers/builtin_openssl2/crypto/dh/p192.c b/thirdparty/openssl/crypto/dh/p192.c
index 9f49f76835..9f49f76835 100644
--- a/drivers/builtin_openssl2/crypto/dh/p192.c
+++ b/thirdparty/openssl/crypto/dh/p192.c
diff --git a/drivers/builtin_openssl2/crypto/dh/p512.c b/thirdparty/openssl/crypto/dh/p512.c
index 606fa4d6c3..606fa4d6c3 100644
--- a/drivers/builtin_openssl2/crypto/dh/p512.c
+++ b/thirdparty/openssl/crypto/dh/p512.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/README b/thirdparty/openssl/crypto/dsa/README
index 6a7e9c170a..6a7e9c170a 100644
--- a/drivers/builtin_openssl2/crypto/dsa/README
+++ b/thirdparty/openssl/crypto/dsa/README
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_ameth.c b/thirdparty/openssl/crypto/dsa/dsa_ameth.c
index cc83d6e6ad..cc83d6e6ad 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_ameth.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_ameth.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_asn1.c b/thirdparty/openssl/crypto/dsa/dsa_asn1.c
index 3283a2295b..3283a2295b 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_asn1.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_depr.c b/thirdparty/openssl/crypto/dsa/dsa_depr.c
index 54f88bc440..54f88bc440 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_depr.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_depr.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_err.c b/thirdparty/openssl/crypto/dsa/dsa_err.c
index f5ddc66b8a..f5ddc66b8a 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_err.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_err.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_gen.c b/thirdparty/openssl/crypto/dsa/dsa_gen.c
index 15f3bb4f3f..15f3bb4f3f 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_gen.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_gen.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_key.c b/thirdparty/openssl/crypto/dsa/dsa_key.c
index e8c8d2e6aa..e8c8d2e6aa 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_key.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_key.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_lib.c b/thirdparty/openssl/crypto/dsa/dsa_lib.c
index eb9d21d9ae..eb9d21d9ae 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_lib.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_lib.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_locl.h b/thirdparty/openssl/crypto/dsa/dsa_locl.h
index 9c23c3ef90..9c23c3ef90 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_locl.h
+++ b/thirdparty/openssl/crypto/dsa/dsa_locl.h
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_ossl.c b/thirdparty/openssl/crypto/dsa/dsa_ossl.c
index efc4f1b6ae..efc4f1b6ae 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_ossl.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_ossl.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_pmeth.c b/thirdparty/openssl/crypto/dsa/dsa_pmeth.c
index 42b8bb0862..42b8bb0862 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_pmeth.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_pmeth.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_prn.c b/thirdparty/openssl/crypto/dsa/dsa_prn.c
index ce690dfcf5..ce690dfcf5 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_prn.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_prn.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_sign.c b/thirdparty/openssl/crypto/dsa/dsa_sign.c
index c2b71d856f..c2b71d856f 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_sign.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_sign.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsa_vrf.c b/thirdparty/openssl/crypto/dsa/dsa_vrf.c
index 7dbd0ca279..7dbd0ca279 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsa_vrf.c
+++ b/thirdparty/openssl/crypto/dsa/dsa_vrf.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/dsagen.c b/thirdparty/openssl/crypto/dsa/dsagen.c
index e7d346b1ec..e7d346b1ec 100644
--- a/drivers/builtin_openssl2/crypto/dsa/dsagen.c
+++ b/thirdparty/openssl/crypto/dsa/dsagen.c
diff --git a/drivers/builtin_openssl2/crypto/dsa/fips186a.txt b/thirdparty/openssl/crypto/dsa/fips186a.txt
index 3a2e0a0d51..3a2e0a0d51 100644
--- a/drivers/builtin_openssl2/crypto/dsa/fips186a.txt
+++ b/thirdparty/openssl/crypto/dsa/fips186a.txt
diff --git a/drivers/builtin_openssl2/crypto/dso/README b/thirdparty/openssl/crypto/dso/README
index d0bc9a89fb..d0bc9a89fb 100644
--- a/drivers/builtin_openssl2/crypto/dso/README
+++ b/thirdparty/openssl/crypto/dso/README
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_beos.c b/thirdparty/openssl/crypto/dso/dso_beos.c
index 68ebcd8a24..68ebcd8a24 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_beos.c
+++ b/thirdparty/openssl/crypto/dso/dso_beos.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_dl.c b/thirdparty/openssl/crypto/dso/dso_dl.c
index ceedf66e88..ceedf66e88 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_dl.c
+++ b/thirdparty/openssl/crypto/dso/dso_dl.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_dlfcn.c b/thirdparty/openssl/crypto/dso/dso_dlfcn.c
index 78df723ffb..78df723ffb 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_dlfcn.c
+++ b/thirdparty/openssl/crypto/dso/dso_dlfcn.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_err.c b/thirdparty/openssl/crypto/dso/dso_err.c
index e143cc01f0..e143cc01f0 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_err.c
+++ b/thirdparty/openssl/crypto/dso/dso_err.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_lib.c b/thirdparty/openssl/crypto/dso/dso_lib.c
index 2beb7c1ba5..2beb7c1ba5 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_lib.c
+++ b/thirdparty/openssl/crypto/dso/dso_lib.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_null.c b/thirdparty/openssl/crypto/dso/dso_null.c
index 20122d1cab..20122d1cab 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_null.c
+++ b/thirdparty/openssl/crypto/dso/dso_null.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_openssl.c b/thirdparty/openssl/crypto/dso/dso_openssl.c
index 087e989e1c..087e989e1c 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_openssl.c
+++ b/thirdparty/openssl/crypto/dso/dso_openssl.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_vms.c b/thirdparty/openssl/crypto/dso/dso_vms.c
index 1efd84b945..1efd84b945 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_vms.c
+++ b/thirdparty/openssl/crypto/dso/dso_vms.c
diff --git a/drivers/builtin_openssl2/crypto/dso/dso_win32.c b/thirdparty/openssl/crypto/dso/dso_win32.c
index 706e754a3f..706e754a3f 100644
--- a/drivers/builtin_openssl2/crypto/dso/dso_win32.c
+++ b/thirdparty/openssl/crypto/dso/dso_win32.c
diff --git a/drivers/builtin_openssl2/crypto/ebcdic.c b/thirdparty/openssl/crypto/ebcdic.c
index fd6df92b46..fd6df92b46 100644
--- a/drivers/builtin_openssl2/crypto/ebcdic.c
+++ b/thirdparty/openssl/crypto/ebcdic.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec2_mult.c b/thirdparty/openssl/crypto/ec/ec2_mult.c
index 68cc8771d5..68cc8771d5 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec2_mult.c
+++ b/thirdparty/openssl/crypto/ec/ec2_mult.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec2_oct.c b/thirdparty/openssl/crypto/ec/ec2_oct.c
index 0d04cc6923..0d04cc6923 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec2_oct.c
+++ b/thirdparty/openssl/crypto/ec/ec2_oct.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec2_smpl.c b/thirdparty/openssl/crypto/ec/ec2_smpl.c
index 5b27b91fcc..5b27b91fcc 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec2_smpl.c
+++ b/thirdparty/openssl/crypto/ec/ec2_smpl.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_ameth.c b/thirdparty/openssl/crypto/ec/ec_ameth.c
index 83e208cfe4..83e208cfe4 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_ameth.c
+++ b/thirdparty/openssl/crypto/ec/ec_ameth.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_asn1.c b/thirdparty/openssl/crypto/ec/ec_asn1.c
index 33abf61f44..33abf61f44 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_asn1.c
+++ b/thirdparty/openssl/crypto/ec/ec_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_check.c b/thirdparty/openssl/crypto/ec/ec_check.c
index dd6f0ac409..dd6f0ac409 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_check.c
+++ b/thirdparty/openssl/crypto/ec/ec_check.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_curve.c b/thirdparty/openssl/crypto/ec/ec_curve.c
index 6dbe9d8258..6dbe9d8258 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_curve.c
+++ b/thirdparty/openssl/crypto/ec/ec_curve.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_cvt.c b/thirdparty/openssl/crypto/ec/ec_cvt.c
index 5a832ba1cf..5a832ba1cf 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_cvt.c
+++ b/thirdparty/openssl/crypto/ec/ec_cvt.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_err.c b/thirdparty/openssl/crypto/ec/ec_err.c
index 6fe5baafd4..6fe5baafd4 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_err.c
+++ b/thirdparty/openssl/crypto/ec/ec_err.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_key.c b/thirdparty/openssl/crypto/ec/ec_key.c
index bc94ab5661..bc94ab5661 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_key.c
+++ b/thirdparty/openssl/crypto/ec/ec_key.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_lcl.h b/thirdparty/openssl/crypto/ec/ec_lcl.h
index 969fd147ef..969fd147ef 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_lcl.h
+++ b/thirdparty/openssl/crypto/ec/ec_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_lib.c b/thirdparty/openssl/crypto/ec/ec_lib.c
index 3ffa112cc3..3ffa112cc3 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_lib.c
+++ b/thirdparty/openssl/crypto/ec/ec_lib.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_mult.c b/thirdparty/openssl/crypto/ec/ec_mult.c
index 23b8c3089b..23b8c3089b 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_mult.c
+++ b/thirdparty/openssl/crypto/ec/ec_mult.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_oct.c b/thirdparty/openssl/crypto/ec/ec_oct.c
index 040c414a33..040c414a33 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_oct.c
+++ b/thirdparty/openssl/crypto/ec/ec_oct.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_pmeth.c b/thirdparty/openssl/crypto/ec/ec_pmeth.c
index b76749010c..b76749010c 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_pmeth.c
+++ b/thirdparty/openssl/crypto/ec/ec_pmeth.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ec_print.c b/thirdparty/openssl/crypto/ec/ec_print.c
index 96b294d877..96b294d877 100644
--- a/drivers/builtin_openssl2/crypto/ec/ec_print.c
+++ b/thirdparty/openssl/crypto/ec/ec_print.c
diff --git a/drivers/builtin_openssl2/crypto/ec/eck_prn.c b/thirdparty/openssl/crypto/ec/eck_prn.c
index df9b37a750..df9b37a750 100644
--- a/drivers/builtin_openssl2/crypto/ec/eck_prn.c
+++ b/thirdparty/openssl/crypto/ec/eck_prn.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_mont.c b/thirdparty/openssl/crypto/ec/ecp_mont.c
index b2de7faea7..b2de7faea7 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_mont.c
+++ b/thirdparty/openssl/crypto/ec/ecp_mont.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_nist.c b/thirdparty/openssl/crypto/ec/ecp_nist.c
index 3944e24935..3944e24935 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_nist.c
+++ b/thirdparty/openssl/crypto/ec/ecp_nist.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_nistp224.c b/thirdparty/openssl/crypto/ec/ecp_nistp224.c
index d81cc9ce6b..d81cc9ce6b 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_nistp224.c
+++ b/thirdparty/openssl/crypto/ec/ecp_nistp224.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_nistp256.c b/thirdparty/openssl/crypto/ec/ecp_nistp256.c
index 78d191aac7..78d191aac7 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_nistp256.c
+++ b/thirdparty/openssl/crypto/ec/ecp_nistp256.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_nistp521.c b/thirdparty/openssl/crypto/ec/ecp_nistp521.c
index c53a61bbfb..c53a61bbfb 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_nistp521.c
+++ b/thirdparty/openssl/crypto/ec/ecp_nistp521.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_nistputil.c b/thirdparty/openssl/crypto/ec/ecp_nistputil.c
index 8ba2a25e93..8ba2a25e93 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_nistputil.c
+++ b/thirdparty/openssl/crypto/ec/ecp_nistputil.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_nistz256.c b/thirdparty/openssl/crypto/ec/ecp_nistz256.c
index ca44d0aaee..ca44d0aaee 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_nistz256.c
+++ b/thirdparty/openssl/crypto/ec/ecp_nistz256.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_nistz256_table.c b/thirdparty/openssl/crypto/ec/ecp_nistz256_table.c
index 2f0797db6b..2f0797db6b 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_nistz256_table.c
+++ b/thirdparty/openssl/crypto/ec/ecp_nistz256_table.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_oct.c b/thirdparty/openssl/crypto/ec/ecp_oct.c
index 1bc3f39ad1..1bc3f39ad1 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_oct.c
+++ b/thirdparty/openssl/crypto/ec/ecp_oct.c
diff --git a/drivers/builtin_openssl2/crypto/ec/ecp_smpl.c b/thirdparty/openssl/crypto/ec/ecp_smpl.c
index 2b848216d7..2b848216d7 100644
--- a/drivers/builtin_openssl2/crypto/ec/ecp_smpl.c
+++ b/thirdparty/openssl/crypto/ec/ecp_smpl.c
diff --git a/drivers/builtin_openssl2/crypto/ecdh/ech_err.c b/thirdparty/openssl/crypto/ecdh/ech_err.c
index af9f625b41..af9f625b41 100644
--- a/drivers/builtin_openssl2/crypto/ecdh/ech_err.c
+++ b/thirdparty/openssl/crypto/ecdh/ech_err.c
diff --git a/drivers/builtin_openssl2/crypto/ecdh/ech_kdf.c b/thirdparty/openssl/crypto/ecdh/ech_kdf.c
index ac722ac9ee..ac722ac9ee 100644
--- a/drivers/builtin_openssl2/crypto/ecdh/ech_kdf.c
+++ b/thirdparty/openssl/crypto/ecdh/ech_kdf.c
diff --git a/drivers/builtin_openssl2/crypto/ecdh/ech_key.c b/thirdparty/openssl/crypto/ecdh/ech_key.c
index 4f14498962..4f14498962 100644
--- a/drivers/builtin_openssl2/crypto/ecdh/ech_key.c
+++ b/thirdparty/openssl/crypto/ecdh/ech_key.c
diff --git a/drivers/builtin_openssl2/crypto/ecdh/ech_lib.c b/thirdparty/openssl/crypto/ecdh/ech_lib.c
index cbc21d1a27..cbc21d1a27 100644
--- a/drivers/builtin_openssl2/crypto/ecdh/ech_lib.c
+++ b/thirdparty/openssl/crypto/ecdh/ech_lib.c
diff --git a/drivers/builtin_openssl2/crypto/ecdh/ech_locl.h b/thirdparty/openssl/crypto/ecdh/ech_locl.h
index 4e66024c75..4e66024c75 100644
--- a/drivers/builtin_openssl2/crypto/ecdh/ech_locl.h
+++ b/thirdparty/openssl/crypto/ecdh/ech_locl.h
diff --git a/drivers/builtin_openssl2/crypto/ecdh/ech_ossl.c b/thirdparty/openssl/crypto/ecdh/ech_ossl.c
index df115cc262..df115cc262 100644
--- a/drivers/builtin_openssl2/crypto/ecdh/ech_ossl.c
+++ b/thirdparty/openssl/crypto/ecdh/ech_ossl.c
diff --git a/drivers/builtin_openssl2/crypto/ecdsa/ecs_asn1.c b/thirdparty/openssl/crypto/ecdsa/ecs_asn1.c
index 508b079f25..508b079f25 100644
--- a/drivers/builtin_openssl2/crypto/ecdsa/ecs_asn1.c
+++ b/thirdparty/openssl/crypto/ecdsa/ecs_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/ecdsa/ecs_err.c b/thirdparty/openssl/crypto/ecdsa/ecs_err.c
index f1fa7b55f9..f1fa7b55f9 100644
--- a/drivers/builtin_openssl2/crypto/ecdsa/ecs_err.c
+++ b/thirdparty/openssl/crypto/ecdsa/ecs_err.c
diff --git a/drivers/builtin_openssl2/crypto/ecdsa/ecs_lib.c b/thirdparty/openssl/crypto/ecdsa/ecs_lib.c
index 8dc1dda462..8dc1dda462 100644
--- a/drivers/builtin_openssl2/crypto/ecdsa/ecs_lib.c
+++ b/thirdparty/openssl/crypto/ecdsa/ecs_lib.c
diff --git a/drivers/builtin_openssl2/crypto/ecdsa/ecs_locl.h b/thirdparty/openssl/crypto/ecdsa/ecs_locl.h
index d3a5efc547..d3a5efc547 100644
--- a/drivers/builtin_openssl2/crypto/ecdsa/ecs_locl.h
+++ b/thirdparty/openssl/crypto/ecdsa/ecs_locl.h
diff --git a/drivers/builtin_openssl2/crypto/ecdsa/ecs_ossl.c b/thirdparty/openssl/crypto/ecdsa/ecs_ossl.c
index dd769609be..dd769609be 100644
--- a/drivers/builtin_openssl2/crypto/ecdsa/ecs_ossl.c
+++ b/thirdparty/openssl/crypto/ecdsa/ecs_ossl.c
diff --git a/drivers/builtin_openssl2/crypto/ecdsa/ecs_sign.c b/thirdparty/openssl/crypto/ecdsa/ecs_sign.c
index 28652d455d..28652d455d 100644
--- a/drivers/builtin_openssl2/crypto/ecdsa/ecs_sign.c
+++ b/thirdparty/openssl/crypto/ecdsa/ecs_sign.c
diff --git a/drivers/builtin_openssl2/crypto/ecdsa/ecs_vrf.c b/thirdparty/openssl/crypto/ecdsa/ecs_vrf.c
index e909aeb400..e909aeb400 100644
--- a/drivers/builtin_openssl2/crypto/ecdsa/ecs_vrf.c
+++ b/thirdparty/openssl/crypto/ecdsa/ecs_vrf.c
diff --git a/drivers/builtin_openssl2/crypto/engine/README b/thirdparty/openssl/crypto/engine/README
index 6b69b70f57..6b69b70f57 100644
--- a/drivers/builtin_openssl2/crypto/engine/README
+++ b/thirdparty/openssl/crypto/engine/README
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_all.c b/thirdparty/openssl/crypto/engine/eng_all.c
index 48ad0d26b4..48ad0d26b4 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_all.c
+++ b/thirdparty/openssl/crypto/engine/eng_all.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_cnf.c b/thirdparty/openssl/crypto/engine/eng_cnf.c
index f09bec4e9a..f09bec4e9a 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_cnf.c
+++ b/thirdparty/openssl/crypto/engine/eng_cnf.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_cryptodev.c b/thirdparty/openssl/crypto/engine/eng_cryptodev.c
index 8fb9c3373d..8fb9c3373d 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_cryptodev.c
+++ b/thirdparty/openssl/crypto/engine/eng_cryptodev.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_ctrl.c b/thirdparty/openssl/crypto/engine/eng_ctrl.c
index e6c0dfb011..e6c0dfb011 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_ctrl.c
+++ b/thirdparty/openssl/crypto/engine/eng_ctrl.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_dyn.c b/thirdparty/openssl/crypto/engine/eng_dyn.c
index 40f30e9d58..40f30e9d58 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_dyn.c
+++ b/thirdparty/openssl/crypto/engine/eng_dyn.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_err.c b/thirdparty/openssl/crypto/engine/eng_err.c
index bcc234852d..bcc234852d 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_err.c
+++ b/thirdparty/openssl/crypto/engine/eng_err.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_fat.c b/thirdparty/openssl/crypto/engine/eng_fat.c
index 4279dd94b1..4279dd94b1 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_fat.c
+++ b/thirdparty/openssl/crypto/engine/eng_fat.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_init.c b/thirdparty/openssl/crypto/engine/eng_init.c
index 4ea7fe633c..4ea7fe633c 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_init.c
+++ b/thirdparty/openssl/crypto/engine/eng_init.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_int.h b/thirdparty/openssl/crypto/engine/eng_int.h
index 46f163b1f5..46f163b1f5 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_int.h
+++ b/thirdparty/openssl/crypto/engine/eng_int.h
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_lib.c b/thirdparty/openssl/crypto/engine/eng_lib.c
index dc2abd28ec..dc2abd28ec 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_lib.c
+++ b/thirdparty/openssl/crypto/engine/eng_lib.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_list.c b/thirdparty/openssl/crypto/engine/eng_list.c
index 83c95d56f4..83c95d56f4 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_list.c
+++ b/thirdparty/openssl/crypto/engine/eng_list.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_openssl.c b/thirdparty/openssl/crypto/engine/eng_openssl.c
index 34b002950e..34b002950e 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_openssl.c
+++ b/thirdparty/openssl/crypto/engine/eng_openssl.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_pkey.c b/thirdparty/openssl/crypto/engine/eng_pkey.c
index 23580d9ec8..23580d9ec8 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_pkey.c
+++ b/thirdparty/openssl/crypto/engine/eng_pkey.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_rdrand.c b/thirdparty/openssl/crypto/engine/eng_rdrand.c
index 9316d6fe21..9316d6fe21 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_rdrand.c
+++ b/thirdparty/openssl/crypto/engine/eng_rdrand.c
diff --git a/drivers/builtin_openssl2/crypto/engine/eng_table.c b/thirdparty/openssl/crypto/engine/eng_table.c
index 27d31f70c8..27d31f70c8 100644
--- a/drivers/builtin_openssl2/crypto/engine/eng_table.c
+++ b/thirdparty/openssl/crypto/engine/eng_table.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_asnmth.c b/thirdparty/openssl/crypto/engine/tb_asnmth.c
index a1a9b88c43..a1a9b88c43 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_asnmth.c
+++ b/thirdparty/openssl/crypto/engine/tb_asnmth.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_cipher.c b/thirdparty/openssl/crypto/engine/tb_cipher.c
index fcfb2efd8f..fcfb2efd8f 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_cipher.c
+++ b/thirdparty/openssl/crypto/engine/tb_cipher.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_dh.c b/thirdparty/openssl/crypto/engine/tb_dh.c
index 8114afa63a..8114afa63a 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_dh.c
+++ b/thirdparty/openssl/crypto/engine/tb_dh.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_digest.c b/thirdparty/openssl/crypto/engine/tb_digest.c
index de1ad9c01b..de1ad9c01b 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_digest.c
+++ b/thirdparty/openssl/crypto/engine/tb_digest.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_dsa.c b/thirdparty/openssl/crypto/engine/tb_dsa.c
index c1f57f146c..c1f57f146c 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_dsa.c
+++ b/thirdparty/openssl/crypto/engine/tb_dsa.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_ecdh.c b/thirdparty/openssl/crypto/engine/tb_ecdh.c
index c51441be8a..c51441be8a 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_ecdh.c
+++ b/thirdparty/openssl/crypto/engine/tb_ecdh.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_ecdsa.c b/thirdparty/openssl/crypto/engine/tb_ecdsa.c
index a8b9be60d7..a8b9be60d7 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_ecdsa.c
+++ b/thirdparty/openssl/crypto/engine/tb_ecdsa.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_pkmeth.c b/thirdparty/openssl/crypto/engine/tb_pkmeth.c
index 29e65be1ad..29e65be1ad 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_pkmeth.c
+++ b/thirdparty/openssl/crypto/engine/tb_pkmeth.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_rand.c b/thirdparty/openssl/crypto/engine/tb_rand.c
index a522264d04..a522264d04 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_rand.c
+++ b/thirdparty/openssl/crypto/engine/tb_rand.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_rsa.c b/thirdparty/openssl/crypto/engine/tb_rsa.c
index 2790a82192..2790a82192 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_rsa.c
+++ b/thirdparty/openssl/crypto/engine/tb_rsa.c
diff --git a/drivers/builtin_openssl2/crypto/engine/tb_store.c b/thirdparty/openssl/crypto/engine/tb_store.c
index 1eab49d745..1eab49d745 100644
--- a/drivers/builtin_openssl2/crypto/engine/tb_store.c
+++ b/thirdparty/openssl/crypto/engine/tb_store.c
diff --git a/drivers/builtin_openssl2/crypto/err/err.c b/thirdparty/openssl/crypto/err/err.c
index e77d963b6b..e77d963b6b 100644
--- a/drivers/builtin_openssl2/crypto/err/err.c
+++ b/thirdparty/openssl/crypto/err/err.c
diff --git a/drivers/builtin_openssl2/crypto/err/err_all.c b/thirdparty/openssl/crypto/err/err_all.c
index d7575a7ef8..d7575a7ef8 100644
--- a/drivers/builtin_openssl2/crypto/err/err_all.c
+++ b/thirdparty/openssl/crypto/err/err_all.c
diff --git a/drivers/builtin_openssl2/crypto/err/err_prn.c b/thirdparty/openssl/crypto/err/err_prn.c
index 6e352effe3..6e352effe3 100644
--- a/drivers/builtin_openssl2/crypto/err/err_prn.c
+++ b/thirdparty/openssl/crypto/err/err_prn.c
diff --git a/drivers/builtin_openssl2/crypto/err/openssl.ec b/thirdparty/openssl/crypto/err/openssl.ec
index 139afe3234..139afe3234 100644
--- a/drivers/builtin_openssl2/crypto/err/openssl.ec
+++ b/thirdparty/openssl/crypto/err/openssl.ec
diff --git a/drivers/builtin_openssl2/crypto/evp/bio_b64.c b/thirdparty/openssl/crypto/evp/bio_b64.c
index 538b520264..538b520264 100644
--- a/drivers/builtin_openssl2/crypto/evp/bio_b64.c
+++ b/thirdparty/openssl/crypto/evp/bio_b64.c
diff --git a/drivers/builtin_openssl2/crypto/evp/bio_enc.c b/thirdparty/openssl/crypto/evp/bio_enc.c
index 363e0246ae..363e0246ae 100644
--- a/drivers/builtin_openssl2/crypto/evp/bio_enc.c
+++ b/thirdparty/openssl/crypto/evp/bio_enc.c
diff --git a/drivers/builtin_openssl2/crypto/evp/bio_md.c b/thirdparty/openssl/crypto/evp/bio_md.c
index f0b0c0c0a7..f0b0c0c0a7 100644
--- a/drivers/builtin_openssl2/crypto/evp/bio_md.c
+++ b/thirdparty/openssl/crypto/evp/bio_md.c
diff --git a/drivers/builtin_openssl2/crypto/evp/bio_ok.c b/thirdparty/openssl/crypto/evp/bio_ok.c
index 5c32e35e17..5c32e35e17 100644
--- a/drivers/builtin_openssl2/crypto/evp/bio_ok.c
+++ b/thirdparty/openssl/crypto/evp/bio_ok.c
diff --git a/drivers/builtin_openssl2/crypto/evp/c_all.c b/thirdparty/openssl/crypto/evp/c_all.c
index a3ed00d4c1..a3ed00d4c1 100644
--- a/drivers/builtin_openssl2/crypto/evp/c_all.c
+++ b/thirdparty/openssl/crypto/evp/c_all.c
diff --git a/drivers/builtin_openssl2/crypto/evp/c_allc.c b/thirdparty/openssl/crypto/evp/c_allc.c
index 280e58408f..280e58408f 100644
--- a/drivers/builtin_openssl2/crypto/evp/c_allc.c
+++ b/thirdparty/openssl/crypto/evp/c_allc.c
diff --git a/drivers/builtin_openssl2/crypto/evp/c_alld.c b/thirdparty/openssl/crypto/evp/c_alld.c
index fdbe3ee048..fdbe3ee048 100644
--- a/drivers/builtin_openssl2/crypto/evp/c_alld.c
+++ b/thirdparty/openssl/crypto/evp/c_alld.c
diff --git a/drivers/builtin_openssl2/crypto/evp/digest.c b/thirdparty/openssl/crypto/evp/digest.c
index 5b642b23fc..5b642b23fc 100644
--- a/drivers/builtin_openssl2/crypto/evp/digest.c
+++ b/thirdparty/openssl/crypto/evp/digest.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_aes.c b/thirdparty/openssl/crypto/evp/e_aes.c
index 1734a823c1..1734a823c1 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_aes.c
+++ b/thirdparty/openssl/crypto/evp/e_aes.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_aes_cbc_hmac_sha1.c b/thirdparty/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
index 6dfd590a4a..6dfd590a4a 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/thirdparty/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_aes_cbc_hmac_sha256.c b/thirdparty/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c
index 46c9d03389..46c9d03389 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/thirdparty/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_bf.c b/thirdparty/openssl/crypto/evp/e_bf.c
index d6a017826e..d6a017826e 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_bf.c
+++ b/thirdparty/openssl/crypto/evp/e_bf.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_camellia.c b/thirdparty/openssl/crypto/evp/e_camellia.c
index f273f9c947..f273f9c947 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_camellia.c
+++ b/thirdparty/openssl/crypto/evp/e_camellia.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_cast.c b/thirdparty/openssl/crypto/evp/e_cast.c
index 3f74548569..3f74548569 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_cast.c
+++ b/thirdparty/openssl/crypto/evp/e_cast.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_des.c b/thirdparty/openssl/crypto/evp/e_des.c
index 8ca65cd03a..8ca65cd03a 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_des.c
+++ b/thirdparty/openssl/crypto/evp/e_des.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_des3.c b/thirdparty/openssl/crypto/evp/e_des3.c
index 0e910d6d80..0e910d6d80 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_des3.c
+++ b/thirdparty/openssl/crypto/evp/e_des3.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_dsa.c b/thirdparty/openssl/crypto/evp/e_dsa.c
index 523993f4d9..523993f4d9 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_dsa.c
+++ b/thirdparty/openssl/crypto/evp/e_dsa.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_idea.c b/thirdparty/openssl/crypto/evp/e_idea.c
index cac72b33ba..cac72b33ba 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_idea.c
+++ b/thirdparty/openssl/crypto/evp/e_idea.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_null.c b/thirdparty/openssl/crypto/evp/e_null.c
index 599fcb808d..599fcb808d 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_null.c
+++ b/thirdparty/openssl/crypto/evp/e_null.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_old.c b/thirdparty/openssl/crypto/evp/e_old.c
index a23d143b7f..a23d143b7f 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_old.c
+++ b/thirdparty/openssl/crypto/evp/e_old.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_rc2.c b/thirdparty/openssl/crypto/evp/e_rc2.c
index 718cc8694f..718cc8694f 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_rc2.c
+++ b/thirdparty/openssl/crypto/evp/e_rc2.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_rc4.c b/thirdparty/openssl/crypto/evp/e_rc4.c
index 08e48f391d..08e48f391d 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_rc4.c
+++ b/thirdparty/openssl/crypto/evp/e_rc4.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_rc4_hmac_md5.c b/thirdparty/openssl/crypto/evp/e_rc4_hmac_md5.c
index 2da1117829..2da1117829 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_rc4_hmac_md5.c
+++ b/thirdparty/openssl/crypto/evp/e_rc4_hmac_md5.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_rc5.c b/thirdparty/openssl/crypto/evp/e_rc5.c
index f17e99d0c5..f17e99d0c5 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_rc5.c
+++ b/thirdparty/openssl/crypto/evp/e_rc5.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_seed.c b/thirdparty/openssl/crypto/evp/e_seed.c
index 7249d1b1ee..7249d1b1ee 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_seed.c
+++ b/thirdparty/openssl/crypto/evp/e_seed.c
diff --git a/drivers/builtin_openssl2/crypto/evp/e_xcbc_d.c b/thirdparty/openssl/crypto/evp/e_xcbc_d.c
index 3430df9e8e..3430df9e8e 100644
--- a/drivers/builtin_openssl2/crypto/evp/e_xcbc_d.c
+++ b/thirdparty/openssl/crypto/evp/e_xcbc_d.c
diff --git a/drivers/builtin_openssl2/crypto/evp/encode.c b/thirdparty/openssl/crypto/evp/encode.c
index c6c775e0a0..c6c775e0a0 100644
--- a/drivers/builtin_openssl2/crypto/evp/encode.c
+++ b/thirdparty/openssl/crypto/evp/encode.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_acnf.c b/thirdparty/openssl/crypto/evp/evp_acnf.c
index 9703116e02..9703116e02 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_acnf.c
+++ b/thirdparty/openssl/crypto/evp/evp_acnf.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_cnf.c b/thirdparty/openssl/crypto/evp/evp_cnf.c
index 6fd3a6da0b..6fd3a6da0b 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_cnf.c
+++ b/thirdparty/openssl/crypto/evp/evp_cnf.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_enc.c b/thirdparty/openssl/crypto/evp/evp_enc.c
index 7d7be245b0..7d7be245b0 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_enc.c
+++ b/thirdparty/openssl/crypto/evp/evp_enc.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_err.c b/thirdparty/openssl/crypto/evp/evp_err.c
index 15cf5532b3..15cf5532b3 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_err.c
+++ b/thirdparty/openssl/crypto/evp/evp_err.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_key.c b/thirdparty/openssl/crypto/evp/evp_key.c
index 5be9e336f9..5be9e336f9 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_key.c
+++ b/thirdparty/openssl/crypto/evp/evp_key.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_lib.c b/thirdparty/openssl/crypto/evp/evp_lib.c
index 7e0bab90d4..7e0bab90d4 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_lib.c
+++ b/thirdparty/openssl/crypto/evp/evp_lib.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_locl.h b/thirdparty/openssl/crypto/evp/evp_locl.h
index 2bb709a065..2bb709a065 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_locl.h
+++ b/thirdparty/openssl/crypto/evp/evp_locl.h
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_pbe.c b/thirdparty/openssl/crypto/evp/evp_pbe.c
index 7934c95fad..7934c95fad 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_pbe.c
+++ b/thirdparty/openssl/crypto/evp/evp_pbe.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evp_pkey.c b/thirdparty/openssl/crypto/evp/evp_pkey.c
index 6a456297bc..6a456297bc 100644
--- a/drivers/builtin_openssl2/crypto/evp/evp_pkey.c
+++ b/thirdparty/openssl/crypto/evp/evp_pkey.c
diff --git a/drivers/builtin_openssl2/crypto/evp/evptests.txt b/thirdparty/openssl/crypto/evp/evptests.txt
index 4e9958b3b5..4e9958b3b5 100644
--- a/drivers/builtin_openssl2/crypto/evp/evptests.txt
+++ b/thirdparty/openssl/crypto/evp/evptests.txt
diff --git a/drivers/builtin_openssl2/crypto/evp/m_dss.c b/thirdparty/openssl/crypto/evp/m_dss.c
index 147844862d..147844862d 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_dss.c
+++ b/thirdparty/openssl/crypto/evp/m_dss.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_dss1.c b/thirdparty/openssl/crypto/evp/m_dss1.c
index e36fabff70..e36fabff70 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_dss1.c
+++ b/thirdparty/openssl/crypto/evp/m_dss1.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_ecdsa.c b/thirdparty/openssl/crypto/evp/m_ecdsa.c
index 803d314955..803d314955 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_ecdsa.c
+++ b/thirdparty/openssl/crypto/evp/m_ecdsa.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_md2.c b/thirdparty/openssl/crypto/evp/m_md2.c
index 3c4cd7bf88..3c4cd7bf88 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_md2.c
+++ b/thirdparty/openssl/crypto/evp/m_md2.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_md4.c b/thirdparty/openssl/crypto/evp/m_md4.c
index 851de69f88..851de69f88 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_md4.c
+++ b/thirdparty/openssl/crypto/evp/m_md4.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_md5.c b/thirdparty/openssl/crypto/evp/m_md5.c
index e5d5f71b87..e5d5f71b87 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_md5.c
+++ b/thirdparty/openssl/crypto/evp/m_md5.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_mdc2.c b/thirdparty/openssl/crypto/evp/m_mdc2.c
index 94e12a6bd5..94e12a6bd5 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_mdc2.c
+++ b/thirdparty/openssl/crypto/evp/m_mdc2.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_null.c b/thirdparty/openssl/crypto/evp/m_null.c
index 017e1feb0b..017e1feb0b 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_null.c
+++ b/thirdparty/openssl/crypto/evp/m_null.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_ripemd.c b/thirdparty/openssl/crypto/evp/m_ripemd.c
index 81de0ef4e1..81de0ef4e1 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_ripemd.c
+++ b/thirdparty/openssl/crypto/evp/m_ripemd.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_sha.c b/thirdparty/openssl/crypto/evp/m_sha.c
index e1e22e0c19..e1e22e0c19 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_sha.c
+++ b/thirdparty/openssl/crypto/evp/m_sha.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_sha1.c b/thirdparty/openssl/crypto/evp/m_sha1.c
index a74e6b7794..a74e6b7794 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_sha1.c
+++ b/thirdparty/openssl/crypto/evp/m_sha1.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_sigver.c b/thirdparty/openssl/crypto/evp/m_sigver.c
index 4492d207f2..4492d207f2 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_sigver.c
+++ b/thirdparty/openssl/crypto/evp/m_sigver.c
diff --git a/drivers/builtin_openssl2/crypto/evp/m_wp.c b/thirdparty/openssl/crypto/evp/m_wp.c
index a890939ec4..a890939ec4 100644
--- a/drivers/builtin_openssl2/crypto/evp/m_wp.c
+++ b/thirdparty/openssl/crypto/evp/m_wp.c
diff --git a/drivers/builtin_openssl2/crypto/evp/names.c b/thirdparty/openssl/crypto/evp/names.c
index ff115a31c8..ff115a31c8 100644
--- a/drivers/builtin_openssl2/crypto/evp/names.c
+++ b/thirdparty/openssl/crypto/evp/names.c
diff --git a/drivers/builtin_openssl2/crypto/evp/openbsd_hw.c b/thirdparty/openssl/crypto/evp/openbsd_hw.c
index 75d12e2330..75d12e2330 100644
--- a/drivers/builtin_openssl2/crypto/evp/openbsd_hw.c
+++ b/thirdparty/openssl/crypto/evp/openbsd_hw.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p5_crpt.c b/thirdparty/openssl/crypto/evp/p5_crpt.c
index d06ab90a3e..d06ab90a3e 100644
--- a/drivers/builtin_openssl2/crypto/evp/p5_crpt.c
+++ b/thirdparty/openssl/crypto/evp/p5_crpt.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p5_crpt2.c b/thirdparty/openssl/crypto/evp/p5_crpt2.c
index f2ae1e5790..f2ae1e5790 100644
--- a/drivers/builtin_openssl2/crypto/evp/p5_crpt2.c
+++ b/thirdparty/openssl/crypto/evp/p5_crpt2.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p_dec.c b/thirdparty/openssl/crypto/evp/p_dec.c
index 225b8b45ed..225b8b45ed 100644
--- a/drivers/builtin_openssl2/crypto/evp/p_dec.c
+++ b/thirdparty/openssl/crypto/evp/p_dec.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p_enc.c b/thirdparty/openssl/crypto/evp/p_enc.c
index f565f33fbf..f565f33fbf 100644
--- a/drivers/builtin_openssl2/crypto/evp/p_enc.c
+++ b/thirdparty/openssl/crypto/evp/p_enc.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p_lib.c b/thirdparty/openssl/crypto/evp/p_lib.c
index c0171244d5..c0171244d5 100644
--- a/drivers/builtin_openssl2/crypto/evp/p_lib.c
+++ b/thirdparty/openssl/crypto/evp/p_lib.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p_open.c b/thirdparty/openssl/crypto/evp/p_open.c
index 229eb6417a..229eb6417a 100644
--- a/drivers/builtin_openssl2/crypto/evp/p_open.c
+++ b/thirdparty/openssl/crypto/evp/p_open.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p_seal.c b/thirdparty/openssl/crypto/evp/p_seal.c
index ba9dfff215..ba9dfff215 100644
--- a/drivers/builtin_openssl2/crypto/evp/p_seal.c
+++ b/thirdparty/openssl/crypto/evp/p_seal.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p_sign.c b/thirdparty/openssl/crypto/evp/p_sign.c
index 1b9ba060d4..1b9ba060d4 100644
--- a/drivers/builtin_openssl2/crypto/evp/p_sign.c
+++ b/thirdparty/openssl/crypto/evp/p_sign.c
diff --git a/drivers/builtin_openssl2/crypto/evp/p_verify.c b/thirdparty/openssl/crypto/evp/p_verify.c
index 65e1e21692..65e1e21692 100644
--- a/drivers/builtin_openssl2/crypto/evp/p_verify.c
+++ b/thirdparty/openssl/crypto/evp/p_verify.c
diff --git a/drivers/builtin_openssl2/crypto/evp/pmeth_fn.c b/thirdparty/openssl/crypto/evp/pmeth_fn.c
index a8b7f2f6d5..a8b7f2f6d5 100644
--- a/drivers/builtin_openssl2/crypto/evp/pmeth_fn.c
+++ b/thirdparty/openssl/crypto/evp/pmeth_fn.c
diff --git a/drivers/builtin_openssl2/crypto/evp/pmeth_gn.c b/thirdparty/openssl/crypto/evp/pmeth_gn.c
index 6435f1b632..6435f1b632 100644
--- a/drivers/builtin_openssl2/crypto/evp/pmeth_gn.c
+++ b/thirdparty/openssl/crypto/evp/pmeth_gn.c
diff --git a/drivers/builtin_openssl2/crypto/evp/pmeth_lib.c b/thirdparty/openssl/crypto/evp/pmeth_lib.c
index 9f81d10021..9f81d10021 100644
--- a/drivers/builtin_openssl2/crypto/evp/pmeth_lib.c
+++ b/thirdparty/openssl/crypto/evp/pmeth_lib.c
diff --git a/drivers/builtin_openssl2/crypto/ex_data.c b/thirdparty/openssl/crypto/ex_data.c
index f96a51781a..f96a51781a 100644
--- a/drivers/builtin_openssl2/crypto/ex_data.c
+++ b/thirdparty/openssl/crypto/ex_data.c
diff --git a/drivers/builtin_openssl2/crypto/fips_err.h b/thirdparty/openssl/crypto/fips_err.h
index 0308b63bbc..0308b63bbc 100644
--- a/drivers/builtin_openssl2/crypto/fips_err.h
+++ b/thirdparty/openssl/crypto/fips_err.h
diff --git a/drivers/builtin_openssl2/crypto/fips_ers.c b/thirdparty/openssl/crypto/fips_ers.c
index 1788ed2884..1788ed2884 100644
--- a/drivers/builtin_openssl2/crypto/fips_ers.c
+++ b/thirdparty/openssl/crypto/fips_ers.c
diff --git a/drivers/builtin_openssl2/crypto/hmac/hm_ameth.c b/thirdparty/openssl/crypto/hmac/hm_ameth.c
index 944c6c857b..944c6c857b 100644
--- a/drivers/builtin_openssl2/crypto/hmac/hm_ameth.c
+++ b/thirdparty/openssl/crypto/hmac/hm_ameth.c
diff --git a/drivers/builtin_openssl2/crypto/hmac/hm_pmeth.c b/thirdparty/openssl/crypto/hmac/hm_pmeth.c
index 0ffff79cc4..0ffff79cc4 100644
--- a/drivers/builtin_openssl2/crypto/hmac/hm_pmeth.c
+++ b/thirdparty/openssl/crypto/hmac/hm_pmeth.c
diff --git a/drivers/builtin_openssl2/crypto/hmac/hmac.c b/thirdparty/openssl/crypto/hmac/hmac.c
index 51a0a3efcd..51a0a3efcd 100644
--- a/drivers/builtin_openssl2/crypto/hmac/hmac.c
+++ b/thirdparty/openssl/crypto/hmac/hmac.c
diff --git a/drivers/builtin_openssl2/crypto/idea/i_cbc.c b/thirdparty/openssl/crypto/idea/i_cbc.c
index 950df98c95..950df98c95 100644
--- a/drivers/builtin_openssl2/crypto/idea/i_cbc.c
+++ b/thirdparty/openssl/crypto/idea/i_cbc.c
diff --git a/drivers/builtin_openssl2/crypto/idea/i_cfb64.c b/thirdparty/openssl/crypto/idea/i_cfb64.c
index a1547ed5d7..a1547ed5d7 100644
--- a/drivers/builtin_openssl2/crypto/idea/i_cfb64.c
+++ b/thirdparty/openssl/crypto/idea/i_cfb64.c
diff --git a/drivers/builtin_openssl2/crypto/idea/i_ecb.c b/thirdparty/openssl/crypto/idea/i_ecb.c
index a6b879a927..a6b879a927 100644
--- a/drivers/builtin_openssl2/crypto/idea/i_ecb.c
+++ b/thirdparty/openssl/crypto/idea/i_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/idea/i_ofb64.c b/thirdparty/openssl/crypto/idea/i_ofb64.c
index aa5948801b..aa5948801b 100644
--- a/drivers/builtin_openssl2/crypto/idea/i_ofb64.c
+++ b/thirdparty/openssl/crypto/idea/i_ofb64.c
diff --git a/drivers/builtin_openssl2/crypto/idea/i_skey.c b/thirdparty/openssl/crypto/idea/i_skey.c
index 5365151335..5365151335 100644
--- a/drivers/builtin_openssl2/crypto/idea/i_skey.c
+++ b/thirdparty/openssl/crypto/idea/i_skey.c
diff --git a/drivers/builtin_openssl2/crypto/idea/idea_lcl.h b/thirdparty/openssl/crypto/idea/idea_lcl.h
index e40695384d..e40695384d 100644
--- a/drivers/builtin_openssl2/crypto/idea/idea_lcl.h
+++ b/thirdparty/openssl/crypto/idea/idea_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/idea/idea_spd.c b/thirdparty/openssl/crypto/idea/idea_spd.c
index 59acc407d7..59acc407d7 100644
--- a/drivers/builtin_openssl2/crypto/idea/idea_spd.c
+++ b/thirdparty/openssl/crypto/idea/idea_spd.c
diff --git a/drivers/builtin_openssl2/crypto/idea/version b/thirdparty/openssl/crypto/idea/version
index 3f22293795..3f22293795 100644
--- a/drivers/builtin_openssl2/crypto/idea/version
+++ b/thirdparty/openssl/crypto/idea/version
diff --git a/drivers/builtin_openssl2/crypto/install-crypto.com b/thirdparty/openssl/crypto/install-crypto.com
index af1d75b526..af1d75b526 100755
--- a/drivers/builtin_openssl2/crypto/install-crypto.com
+++ b/thirdparty/openssl/crypto/install-crypto.com
diff --git a/drivers/builtin_openssl2/crypto/jpake/jpake.c b/thirdparty/openssl/crypto/jpake/jpake.c
index ebc0975575..ebc0975575 100644
--- a/drivers/builtin_openssl2/crypto/jpake/jpake.c
+++ b/thirdparty/openssl/crypto/jpake/jpake.c
diff --git a/drivers/builtin_openssl2/crypto/jpake/jpake.h b/thirdparty/openssl/crypto/jpake/jpake.h
index 371eed679c..371eed679c 100644
--- a/drivers/builtin_openssl2/crypto/jpake/jpake.h
+++ b/thirdparty/openssl/crypto/jpake/jpake.h
diff --git a/drivers/builtin_openssl2/crypto/jpake/jpake_err.c b/thirdparty/openssl/crypto/jpake/jpake_err.c
index be236d9ea8..be236d9ea8 100644
--- a/drivers/builtin_openssl2/crypto/jpake/jpake_err.c
+++ b/thirdparty/openssl/crypto/jpake/jpake_err.c
diff --git a/drivers/builtin_openssl2/crypto/krb5/krb5_asn.c b/thirdparty/openssl/crypto/krb5/krb5_asn.c
index d9851e9737..d9851e9737 100644
--- a/drivers/builtin_openssl2/crypto/krb5/krb5_asn.c
+++ b/thirdparty/openssl/crypto/krb5/krb5_asn.c
diff --git a/drivers/builtin_openssl2/crypto/lhash/lh_stats.c b/thirdparty/openssl/crypto/lhash/lh_stats.c
index 0bfec2322e..0bfec2322e 100644
--- a/drivers/builtin_openssl2/crypto/lhash/lh_stats.c
+++ b/thirdparty/openssl/crypto/lhash/lh_stats.c
diff --git a/drivers/builtin_openssl2/crypto/lhash/lhash.c b/thirdparty/openssl/crypto/lhash/lhash.c
index 53c5c138bb..53c5c138bb 100644
--- a/drivers/builtin_openssl2/crypto/lhash/lhash.c
+++ b/thirdparty/openssl/crypto/lhash/lhash.c
diff --git a/drivers/builtin_openssl2/crypto/md2/md2.c b/thirdparty/openssl/crypto/md2/md2.c
index 584e34a648..584e34a648 100644
--- a/drivers/builtin_openssl2/crypto/md2/md2.c
+++ b/thirdparty/openssl/crypto/md2/md2.c
diff --git a/drivers/builtin_openssl2/crypto/md2/md2.h b/thirdparty/openssl/crypto/md2/md2.h
index b568d3f987..b568d3f987 100644
--- a/drivers/builtin_openssl2/crypto/md2/md2.h
+++ b/thirdparty/openssl/crypto/md2/md2.h
diff --git a/drivers/builtin_openssl2/crypto/md2/md2_dgst.c b/thirdparty/openssl/crypto/md2/md2_dgst.c
index 9cd79f8d70..9cd79f8d70 100644
--- a/drivers/builtin_openssl2/crypto/md2/md2_dgst.c
+++ b/thirdparty/openssl/crypto/md2/md2_dgst.c
diff --git a/drivers/builtin_openssl2/crypto/md2/md2_one.c b/thirdparty/openssl/crypto/md2/md2_one.c
index cd2631b261..cd2631b261 100644
--- a/drivers/builtin_openssl2/crypto/md2/md2_one.c
+++ b/thirdparty/openssl/crypto/md2/md2_one.c
diff --git a/drivers/builtin_openssl2/crypto/md32_common.h b/thirdparty/openssl/crypto/md32_common.h
index 96828d2693..96828d2693 100644
--- a/drivers/builtin_openssl2/crypto/md32_common.h
+++ b/thirdparty/openssl/crypto/md32_common.h
diff --git a/drivers/builtin_openssl2/crypto/md4/md4.c b/thirdparty/openssl/crypto/md4/md4.c
index c9fab6669a..c9fab6669a 100644
--- a/drivers/builtin_openssl2/crypto/md4/md4.c
+++ b/thirdparty/openssl/crypto/md4/md4.c
diff --git a/drivers/builtin_openssl2/crypto/md4/md4_dgst.c b/thirdparty/openssl/crypto/md4/md4_dgst.c
index 614fca0056..614fca0056 100644
--- a/drivers/builtin_openssl2/crypto/md4/md4_dgst.c
+++ b/thirdparty/openssl/crypto/md4/md4_dgst.c
diff --git a/drivers/builtin_openssl2/crypto/md4/md4_locl.h b/thirdparty/openssl/crypto/md4/md4_locl.h
index dc86a86c56..dc86a86c56 100644
--- a/drivers/builtin_openssl2/crypto/md4/md4_locl.h
+++ b/thirdparty/openssl/crypto/md4/md4_locl.h
diff --git a/drivers/builtin_openssl2/crypto/md4/md4_one.c b/thirdparty/openssl/crypto/md4/md4_one.c
index 32ebd5facf..32ebd5facf 100644
--- a/drivers/builtin_openssl2/crypto/md4/md4_one.c
+++ b/thirdparty/openssl/crypto/md4/md4_one.c
diff --git a/drivers/builtin_openssl2/crypto/md4/md4s.cpp b/thirdparty/openssl/crypto/md4/md4s.cpp
index c0ec97fc9f..c0ec97fc9f 100644
--- a/drivers/builtin_openssl2/crypto/md4/md4s.cpp
+++ b/thirdparty/openssl/crypto/md4/md4s.cpp
diff --git a/drivers/builtin_openssl2/crypto/md5/md5.c b/thirdparty/openssl/crypto/md5/md5.c
index f0282c507e..f0282c507e 100644
--- a/drivers/builtin_openssl2/crypto/md5/md5.c
+++ b/thirdparty/openssl/crypto/md5/md5.c
diff --git a/drivers/builtin_openssl2/crypto/md5/md5_dgst.c b/thirdparty/openssl/crypto/md5/md5_dgst.c
index 2b51946708..2b51946708 100644
--- a/drivers/builtin_openssl2/crypto/md5/md5_dgst.c
+++ b/thirdparty/openssl/crypto/md5/md5_dgst.c
diff --git a/drivers/builtin_openssl2/crypto/md5/md5_locl.h b/thirdparty/openssl/crypto/md5/md5_locl.h
index 82e69218da..82e69218da 100644
--- a/drivers/builtin_openssl2/crypto/md5/md5_locl.h
+++ b/thirdparty/openssl/crypto/md5/md5_locl.h
diff --git a/drivers/builtin_openssl2/crypto/md5/md5_one.c b/thirdparty/openssl/crypto/md5/md5_one.c
index 4ac882e739..4ac882e739 100644
--- a/drivers/builtin_openssl2/crypto/md5/md5_one.c
+++ b/thirdparty/openssl/crypto/md5/md5_one.c
diff --git a/drivers/builtin_openssl2/crypto/md5/md5s.cpp b/thirdparty/openssl/crypto/md5/md5s.cpp
index dd343fd4e6..dd343fd4e6 100644
--- a/drivers/builtin_openssl2/crypto/md5/md5s.cpp
+++ b/thirdparty/openssl/crypto/md5/md5s.cpp
diff --git a/drivers/builtin_openssl2/crypto/mdc2/mdc2_one.c b/thirdparty/openssl/crypto/mdc2/mdc2_one.c
index 790775c6fe..790775c6fe 100644
--- a/drivers/builtin_openssl2/crypto/mdc2/mdc2_one.c
+++ b/thirdparty/openssl/crypto/mdc2/mdc2_one.c
diff --git a/drivers/builtin_openssl2/crypto/mdc2/mdc2dgst.c b/thirdparty/openssl/crypto/mdc2/mdc2dgst.c
index 6615cf84d7..6615cf84d7 100644
--- a/drivers/builtin_openssl2/crypto/mdc2/mdc2dgst.c
+++ b/thirdparty/openssl/crypto/mdc2/mdc2dgst.c
diff --git a/drivers/builtin_openssl2/crypto/mem.c b/thirdparty/openssl/crypto/mem.c
index fdad49b76e..fdad49b76e 100644
--- a/drivers/builtin_openssl2/crypto/mem.c
+++ b/thirdparty/openssl/crypto/mem.c
diff --git a/drivers/builtin_openssl2/crypto/mem_clr.c b/thirdparty/openssl/crypto/mem_clr.c
index ab85344eef..ab85344eef 100644
--- a/drivers/builtin_openssl2/crypto/mem_clr.c
+++ b/thirdparty/openssl/crypto/mem_clr.c
diff --git a/drivers/builtin_openssl2/crypto/mem_dbg.c b/thirdparty/openssl/crypto/mem_dbg.c
index 8525ded78c..8525ded78c 100644
--- a/drivers/builtin_openssl2/crypto/mem_dbg.c
+++ b/thirdparty/openssl/crypto/mem_dbg.c
diff --git a/drivers/builtin_openssl2/crypto/modes/cbc128.c b/thirdparty/openssl/crypto/modes/cbc128.c
index c13caea535..c13caea535 100644
--- a/drivers/builtin_openssl2/crypto/modes/cbc128.c
+++ b/thirdparty/openssl/crypto/modes/cbc128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/ccm128.c b/thirdparty/openssl/crypto/modes/ccm128.c
index c1ded0f914..c1ded0f914 100644
--- a/drivers/builtin_openssl2/crypto/modes/ccm128.c
+++ b/thirdparty/openssl/crypto/modes/ccm128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/cfb128.c b/thirdparty/openssl/crypto/modes/cfb128.c
index d4ecbd08ee..d4ecbd08ee 100644
--- a/drivers/builtin_openssl2/crypto/modes/cfb128.c
+++ b/thirdparty/openssl/crypto/modes/cfb128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/ctr128.c b/thirdparty/openssl/crypto/modes/ctr128.c
index bcafd6b6bf..bcafd6b6bf 100644
--- a/drivers/builtin_openssl2/crypto/modes/ctr128.c
+++ b/thirdparty/openssl/crypto/modes/ctr128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/cts128.c b/thirdparty/openssl/crypto/modes/cts128.c
index 137be595a1..137be595a1 100644
--- a/drivers/builtin_openssl2/crypto/modes/cts128.c
+++ b/thirdparty/openssl/crypto/modes/cts128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/gcm128.c b/thirdparty/openssl/crypto/modes/gcm128.c
index e299131c13..e299131c13 100644
--- a/drivers/builtin_openssl2/crypto/modes/gcm128.c
+++ b/thirdparty/openssl/crypto/modes/gcm128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/modes_lcl.h b/thirdparty/openssl/crypto/modes/modes_lcl.h
index fe14ec7002..fe14ec7002 100644
--- a/drivers/builtin_openssl2/crypto/modes/modes_lcl.h
+++ b/thirdparty/openssl/crypto/modes/modes_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/modes/ofb128.c b/thirdparty/openssl/crypto/modes/ofb128.c
index 4dbaccd7a6..4dbaccd7a6 100644
--- a/drivers/builtin_openssl2/crypto/modes/ofb128.c
+++ b/thirdparty/openssl/crypto/modes/ofb128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/wrap128.c b/thirdparty/openssl/crypto/modes/wrap128.c
index 384978371a..384978371a 100644
--- a/drivers/builtin_openssl2/crypto/modes/wrap128.c
+++ b/thirdparty/openssl/crypto/modes/wrap128.c
diff --git a/drivers/builtin_openssl2/crypto/modes/xts128.c b/thirdparty/openssl/crypto/modes/xts128.c
index 8f2af588b2..8f2af588b2 100644
--- a/drivers/builtin_openssl2/crypto/modes/xts128.c
+++ b/thirdparty/openssl/crypto/modes/xts128.c
diff --git a/drivers/builtin_openssl2/crypto/o_dir.c b/thirdparty/openssl/crypto/o_dir.c
index f9dbed8711..f9dbed8711 100644
--- a/drivers/builtin_openssl2/crypto/o_dir.c
+++ b/thirdparty/openssl/crypto/o_dir.c
diff --git a/drivers/builtin_openssl2/crypto/o_dir.h b/thirdparty/openssl/crypto/o_dir.h
index bf45a14d02..bf45a14d02 100644
--- a/drivers/builtin_openssl2/crypto/o_dir.h
+++ b/thirdparty/openssl/crypto/o_dir.h
diff --git a/drivers/builtin_openssl2/crypto/o_fips.c b/thirdparty/openssl/crypto/o_fips.c
index f56d5bb79d..f56d5bb79d 100644
--- a/drivers/builtin_openssl2/crypto/o_fips.c
+++ b/thirdparty/openssl/crypto/o_fips.c
diff --git a/drivers/builtin_openssl2/crypto/o_init.c b/thirdparty/openssl/crypto/o_init.c
index 2088388128..2088388128 100644
--- a/drivers/builtin_openssl2/crypto/o_init.c
+++ b/thirdparty/openssl/crypto/o_init.c
diff --git a/drivers/builtin_openssl2/crypto/o_str.c b/thirdparty/openssl/crypto/o_str.c
index c10842300d..c10842300d 100644
--- a/drivers/builtin_openssl2/crypto/o_str.c
+++ b/thirdparty/openssl/crypto/o_str.c
diff --git a/drivers/builtin_openssl2/crypto/o_str.h b/thirdparty/openssl/crypto/o_str.h
index fa512eb397..fa512eb397 100644
--- a/drivers/builtin_openssl2/crypto/o_str.h
+++ b/thirdparty/openssl/crypto/o_str.h
diff --git a/drivers/builtin_openssl2/crypto/o_time.c b/thirdparty/openssl/crypto/o_time.c
index 635dae184d..635dae184d 100644
--- a/drivers/builtin_openssl2/crypto/o_time.c
+++ b/thirdparty/openssl/crypto/o_time.c
diff --git a/drivers/builtin_openssl2/crypto/o_time.h b/thirdparty/openssl/crypto/o_time.h
index f192c6dccf..f192c6dccf 100644
--- a/drivers/builtin_openssl2/crypto/o_time.h
+++ b/thirdparty/openssl/crypto/o_time.h
diff --git a/drivers/builtin_openssl2/crypto/objects/o_names.c b/thirdparty/openssl/crypto/objects/o_names.c
index 24859926ac..24859926ac 100644
--- a/drivers/builtin_openssl2/crypto/objects/o_names.c
+++ b/thirdparty/openssl/crypto/objects/o_names.c
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_dat.c b/thirdparty/openssl/crypto/objects/obj_dat.c
index aca382a6e9..aca382a6e9 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_dat.c
+++ b/thirdparty/openssl/crypto/objects/obj_dat.c
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_dat.h b/thirdparty/openssl/crypto/objects/obj_dat.h
index b7e3cf280e..b7e3cf280e 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_dat.h
+++ b/thirdparty/openssl/crypto/objects/obj_dat.h
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_err.c b/thirdparty/openssl/crypto/objects/obj_err.c
index 238aaa59f9..238aaa59f9 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_err.c
+++ b/thirdparty/openssl/crypto/objects/obj_err.c
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_lib.c b/thirdparty/openssl/crypto/objects/obj_lib.c
index 8851baffb2..8851baffb2 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_lib.c
+++ b/thirdparty/openssl/crypto/objects/obj_lib.c
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_mac.num b/thirdparty/openssl/crypto/objects/obj_mac.num
index 8e5ea83363..8e5ea83363 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_mac.num
+++ b/thirdparty/openssl/crypto/objects/obj_mac.num
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_xref.c b/thirdparty/openssl/crypto/objects/obj_xref.c
index 97b305d213..97b305d213 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_xref.c
+++ b/thirdparty/openssl/crypto/objects/obj_xref.c
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_xref.h b/thirdparty/openssl/crypto/objects/obj_xref.h
index e453e99f83..e453e99f83 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_xref.h
+++ b/thirdparty/openssl/crypto/objects/obj_xref.h
diff --git a/drivers/builtin_openssl2/crypto/objects/obj_xref.txt b/thirdparty/openssl/crypto/objects/obj_xref.txt
index 19c94226b2..19c94226b2 100644
--- a/drivers/builtin_openssl2/crypto/objects/obj_xref.txt
+++ b/thirdparty/openssl/crypto/objects/obj_xref.txt
diff --git a/drivers/builtin_openssl2/crypto/objects/objects.README b/thirdparty/openssl/crypto/objects/objects.README
index cb1d216ce8..cb1d216ce8 100644
--- a/drivers/builtin_openssl2/crypto/objects/objects.README
+++ b/thirdparty/openssl/crypto/objects/objects.README
diff --git a/drivers/builtin_openssl2/crypto/objects/objects.txt b/thirdparty/openssl/crypto/objects/objects.txt
index b57aabb226..b57aabb226 100644
--- a/drivers/builtin_openssl2/crypto/objects/objects.txt
+++ b/thirdparty/openssl/crypto/objects/objects.txt
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_asn.c b/thirdparty/openssl/crypto/ocsp/ocsp_asn.c
index e2e52e77af..e2e52e77af 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_asn.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_asn.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_cl.c b/thirdparty/openssl/crypto/ocsp/ocsp_cl.c
index b3612c8dfc..b3612c8dfc 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_cl.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_cl.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_err.c b/thirdparty/openssl/crypto/ocsp/ocsp_err.c
index 722043c0f2..722043c0f2 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_err.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_err.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_ext.c b/thirdparty/openssl/crypto/ocsp/ocsp_ext.c
index c19648c732..c19648c732 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_ext.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_ext.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_ht.c b/thirdparty/openssl/crypto/ocsp/ocsp_ht.c
index 88b26b38e8..88b26b38e8 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_ht.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_ht.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_lib.c b/thirdparty/openssl/crypto/ocsp/ocsp_lib.c
index cabf53933a..cabf53933a 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_lib.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_lib.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_prn.c b/thirdparty/openssl/crypto/ocsp/ocsp_prn.c
index 47d5f83ef9..47d5f83ef9 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_prn.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_prn.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_srv.c b/thirdparty/openssl/crypto/ocsp/ocsp_srv.c
index 2ec2c63618..2ec2c63618 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_srv.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_srv.c
diff --git a/drivers/builtin_openssl2/crypto/ocsp/ocsp_vfy.c b/thirdparty/openssl/crypto/ocsp/ocsp_vfy.c
index d4a257c33b..d4a257c33b 100644
--- a/drivers/builtin_openssl2/crypto/ocsp/ocsp_vfy.c
+++ b/thirdparty/openssl/crypto/ocsp/ocsp_vfy.c
diff --git a/drivers/builtin_openssl2/crypto/opensslconf.h.in b/thirdparty/openssl/crypto/opensslconf.h.in
index 7a1c85d6ec..7a1c85d6ec 100644
--- a/drivers/builtin_openssl2/crypto/opensslconf.h.in
+++ b/thirdparty/openssl/crypto/opensslconf.h.in
diff --git a/drivers/builtin_openssl2/crypto/pem/message b/thirdparty/openssl/crypto/pem/message
index e8bf9d7592..e8bf9d7592 100644
--- a/drivers/builtin_openssl2/crypto/pem/message
+++ b/thirdparty/openssl/crypto/pem/message
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_all.c b/thirdparty/openssl/crypto/pem/pem_all.c
index 0e5be63ef0..0e5be63ef0 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_all.c
+++ b/thirdparty/openssl/crypto/pem/pem_all.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_err.c b/thirdparty/openssl/crypto/pem/pem_err.c
index e1f4fdb432..e1f4fdb432 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_err.c
+++ b/thirdparty/openssl/crypto/pem/pem_err.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_info.c b/thirdparty/openssl/crypto/pem/pem_info.c
index 4d736a1d07..4d736a1d07 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_info.c
+++ b/thirdparty/openssl/crypto/pem/pem_info.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_lib.c b/thirdparty/openssl/crypto/pem/pem_lib.c
index fe881d6641..fe881d6641 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_lib.c
+++ b/thirdparty/openssl/crypto/pem/pem_lib.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_oth.c b/thirdparty/openssl/crypto/pem/pem_oth.c
index 1dd3bd7a1b..1dd3bd7a1b 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_oth.c
+++ b/thirdparty/openssl/crypto/pem/pem_oth.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_pk8.c b/thirdparty/openssl/crypto/pem/pem_pk8.c
index 5747c7366e..5747c7366e 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_pk8.c
+++ b/thirdparty/openssl/crypto/pem/pem_pk8.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_pkey.c b/thirdparty/openssl/crypto/pem/pem_pkey.c
index 04d6319a22..04d6319a22 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_pkey.c
+++ b/thirdparty/openssl/crypto/pem/pem_pkey.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_seal.c b/thirdparty/openssl/crypto/pem/pem_seal.c
index a5c1812575..a5c1812575 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_seal.c
+++ b/thirdparty/openssl/crypto/pem/pem_seal.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_sign.c b/thirdparty/openssl/crypto/pem/pem_sign.c
index b5e5c29b0e..b5e5c29b0e 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_sign.c
+++ b/thirdparty/openssl/crypto/pem/pem_sign.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_x509.c b/thirdparty/openssl/crypto/pem/pem_x509.c
index 3c20ff28ad..3c20ff28ad 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_x509.c
+++ b/thirdparty/openssl/crypto/pem/pem_x509.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_xaux.c b/thirdparty/openssl/crypto/pem/pem_xaux.c
index c523430189..c523430189 100644
--- a/drivers/builtin_openssl2/crypto/pem/pem_xaux.c
+++ b/thirdparty/openssl/crypto/pem/pem_xaux.c
diff --git a/drivers/builtin_openssl2/crypto/pem/pkcs7.lis b/thirdparty/openssl/crypto/pem/pkcs7.lis
index be90c5d87f..be90c5d87f 100644
--- a/drivers/builtin_openssl2/crypto/pem/pkcs7.lis
+++ b/thirdparty/openssl/crypto/pem/pkcs7.lis
diff --git a/drivers/builtin_openssl2/crypto/pem/pvkfmt.c b/thirdparty/openssl/crypto/pem/pvkfmt.c
index 61864468f6..61864468f6 100644
--- a/drivers/builtin_openssl2/crypto/pem/pvkfmt.c
+++ b/thirdparty/openssl/crypto/pem/pvkfmt.c
diff --git a/drivers/builtin_openssl2/crypto/perlasm/readme b/thirdparty/openssl/crypto/perlasm/readme
index f02bbee75a..f02bbee75a 100644
--- a/drivers/builtin_openssl2/crypto/perlasm/readme
+++ b/thirdparty/openssl/crypto/perlasm/readme
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_add.c b/thirdparty/openssl/crypto/pkcs12/p12_add.c
index d9f03a39fd..d9f03a39fd 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_add.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_add.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_asn.c b/thirdparty/openssl/crypto/pkcs12/p12_asn.c
index 370ddbd6e7..370ddbd6e7 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_asn.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_asn.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_attr.c b/thirdparty/openssl/crypto/pkcs12/p12_attr.c
index fff3ba1ece..fff3ba1ece 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_attr.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_attr.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_crpt.c b/thirdparty/openssl/crypto/pkcs12/p12_crpt.c
index 9c2dcab024..9c2dcab024 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_crpt.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_crpt.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_crt.c b/thirdparty/openssl/crypto/pkcs12/p12_crt.c
index 7d2aeefac3..7d2aeefac3 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_crt.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_crt.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_decr.c b/thirdparty/openssl/crypto/pkcs12/p12_decr.c
index b40ea10ccb..b40ea10ccb 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_decr.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_decr.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_init.c b/thirdparty/openssl/crypto/pkcs12/p12_init.c
index 0322df944a..0322df944a 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_init.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_init.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_key.c b/thirdparty/openssl/crypto/pkcs12/p12_key.c
index 99b8260c96..99b8260c96 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_key.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_key.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_kiss.c b/thirdparty/openssl/crypto/pkcs12/p12_kiss.c
index 9aa3c90c4e..9aa3c90c4e 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_kiss.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_kiss.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_mutl.c b/thirdparty/openssl/crypto/pkcs12/p12_mutl.c
index a9277827ff..a9277827ff 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_mutl.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_mutl.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_npas.c b/thirdparty/openssl/crypto/pkcs12/p12_npas.c
index a89b61abab..a89b61abab 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_npas.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_npas.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_p8d.c b/thirdparty/openssl/crypto/pkcs12/p12_p8d.c
index 3cc7a9f40e..3cc7a9f40e 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_p8d.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_p8d.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_p8e.c b/thirdparty/openssl/crypto/pkcs12/p12_p8e.c
index 861a087f80..861a087f80 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_p8e.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_p8e.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/p12_utl.c b/thirdparty/openssl/crypto/pkcs12/p12_utl.c
index a0b992eab6..a0b992eab6 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/p12_utl.c
+++ b/thirdparty/openssl/crypto/pkcs12/p12_utl.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs12/pk12err.c b/thirdparty/openssl/crypto/pkcs12/pk12err.c
index e58710b253..e58710b253 100644
--- a/drivers/builtin_openssl2/crypto/pkcs12/pk12err.c
+++ b/thirdparty/openssl/crypto/pkcs12/pk12err.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/bio_pk7.c b/thirdparty/openssl/crypto/pkcs7/bio_pk7.c
index fae1c564c4..fae1c564c4 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/bio_pk7.c
+++ b/thirdparty/openssl/crypto/pkcs7/bio_pk7.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_asn1.c b/thirdparty/openssl/crypto/pkcs7/pk7_asn1.c
index 9c0a43981e..9c0a43981e 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_asn1.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_attr.c b/thirdparty/openssl/crypto/pkcs7/pk7_attr.c
index 88922efe27..88922efe27 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_attr.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_attr.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_dgst.c b/thirdparty/openssl/crypto/pkcs7/pk7_dgst.c
index 6b57f97aba..6b57f97aba 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_dgst.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_dgst.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_doit.c b/thirdparty/openssl/crypto/pkcs7/pk7_doit.c
index 946aaa6543..946aaa6543 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_doit.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_doit.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_enc.c b/thirdparty/openssl/crypto/pkcs7/pk7_enc.c
index 6983e014cd..6983e014cd 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_enc.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_enc.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_lib.c b/thirdparty/openssl/crypto/pkcs7/pk7_lib.c
index 0c5fcaa6aa..0c5fcaa6aa 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_lib.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_lib.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_mime.c b/thirdparty/openssl/crypto/pkcs7/pk7_mime.c
index 62fb2997ee..62fb2997ee 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_mime.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_mime.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pk7_smime.c b/thirdparty/openssl/crypto/pkcs7/pk7_smime.c
index dc9b484078..dc9b484078 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pk7_smime.c
+++ b/thirdparty/openssl/crypto/pkcs7/pk7_smime.c
diff --git a/drivers/builtin_openssl2/crypto/pkcs7/pkcs7err.c b/thirdparty/openssl/crypto/pkcs7/pkcs7err.c
index 323513fe8e..323513fe8e 100644
--- a/drivers/builtin_openssl2/crypto/pkcs7/pkcs7err.c
+++ b/thirdparty/openssl/crypto/pkcs7/pkcs7err.c
diff --git a/drivers/builtin_openssl2/crypto/ppc_arch.h b/thirdparty/openssl/crypto/ppc_arch.h
index b50ec996a5..b50ec996a5 100644
--- a/drivers/builtin_openssl2/crypto/ppc_arch.h
+++ b/thirdparty/openssl/crypto/ppc_arch.h
diff --git a/drivers/builtin_openssl2/crypto/ppccap.c b/thirdparty/openssl/crypto/ppccap.c
index 74af4732b5..74af4732b5 100644
--- a/drivers/builtin_openssl2/crypto/ppccap.c
+++ b/thirdparty/openssl/crypto/ppccap.c
diff --git a/drivers/builtin_openssl2/crypto/pqueue/pqueue.c b/thirdparty/openssl/crypto/pqueue/pqueue.c
index 75f9734931..75f9734931 100644
--- a/drivers/builtin_openssl2/crypto/pqueue/pqueue.c
+++ b/thirdparty/openssl/crypto/pqueue/pqueue.c
diff --git a/drivers/builtin_openssl2/crypto/rand/md_rand.c b/thirdparty/openssl/crypto/rand/md_rand.c
index 5c13d57765..5c13d57765 100644
--- a/drivers/builtin_openssl2/crypto/rand/md_rand.c
+++ b/thirdparty/openssl/crypto/rand/md_rand.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_egd.c b/thirdparty/openssl/crypto/rand/rand_egd.c
index 737aebfa22..737aebfa22 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_egd.c
+++ b/thirdparty/openssl/crypto/rand/rand_egd.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_err.c b/thirdparty/openssl/crypto/rand/rand_err.c
index 55d86ea8a3..55d86ea8a3 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_err.c
+++ b/thirdparty/openssl/crypto/rand/rand_err.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_lcl.h b/thirdparty/openssl/crypto/rand/rand_lcl.h
index f9fda3eb89..f9fda3eb89 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_lcl.h
+++ b/thirdparty/openssl/crypto/rand/rand_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_lib.c b/thirdparty/openssl/crypto/rand/rand_lib.c
index 88a78d3506..88a78d3506 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_lib.c
+++ b/thirdparty/openssl/crypto/rand/rand_lib.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_nw.c b/thirdparty/openssl/crypto/rand/rand_nw.c
index 55ffe9ad51..55ffe9ad51 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_nw.c
+++ b/thirdparty/openssl/crypto/rand/rand_nw.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_os2.c b/thirdparty/openssl/crypto/rand/rand_os2.c
index 706ab1e817..706ab1e817 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_os2.c
+++ b/thirdparty/openssl/crypto/rand/rand_os2.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_unix.c b/thirdparty/openssl/crypto/rand/rand_unix.c
index 266111edda..266111edda 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_unix.c
+++ b/thirdparty/openssl/crypto/rand/rand_unix.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_vms.c b/thirdparty/openssl/crypto/rand/rand_vms.c
index 0e10c363e2..0e10c363e2 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_vms.c
+++ b/thirdparty/openssl/crypto/rand/rand_vms.c
diff --git a/drivers/builtin_openssl2/crypto/rand/rand_win.c b/thirdparty/openssl/crypto/rand/rand_win.c
index 70fd52a7aa..70fd52a7aa 100644
--- a/drivers/builtin_openssl2/crypto/rand/rand_win.c
+++ b/thirdparty/openssl/crypto/rand/rand_win.c
diff --git a/drivers/builtin_openssl2/crypto/rand/randfile.c b/thirdparty/openssl/crypto/rand/randfile.c
index 9537c56a78..9537c56a78 100644
--- a/drivers/builtin_openssl2/crypto/rand/randfile.c
+++ b/thirdparty/openssl/crypto/rand/randfile.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/rc2_cbc.c b/thirdparty/openssl/crypto/rc2/rc2_cbc.c
index 5eaf01d2e0..5eaf01d2e0 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rc2_cbc.c
+++ b/thirdparty/openssl/crypto/rc2/rc2_cbc.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/rc2_ecb.c b/thirdparty/openssl/crypto/rc2/rc2_ecb.c
index 48442a3f39..48442a3f39 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rc2_ecb.c
+++ b/thirdparty/openssl/crypto/rc2/rc2_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/rc2_locl.h b/thirdparty/openssl/crypto/rc2/rc2_locl.h
index e72a20c0ca..e72a20c0ca 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rc2_locl.h
+++ b/thirdparty/openssl/crypto/rc2/rc2_locl.h
diff --git a/drivers/builtin_openssl2/crypto/rc2/rc2_skey.c b/thirdparty/openssl/crypto/rc2/rc2_skey.c
index bcec0a85d2..bcec0a85d2 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rc2_skey.c
+++ b/thirdparty/openssl/crypto/rc2/rc2_skey.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/rc2cfb64.c b/thirdparty/openssl/crypto/rc2/rc2cfb64.c
index 8b5929fde3..8b5929fde3 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rc2cfb64.c
+++ b/thirdparty/openssl/crypto/rc2/rc2cfb64.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/rc2ofb64.c b/thirdparty/openssl/crypto/rc2/rc2ofb64.c
index b9f4d8c35b..b9f4d8c35b 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rc2ofb64.c
+++ b/thirdparty/openssl/crypto/rc2/rc2ofb64.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/rc2speed.c b/thirdparty/openssl/crypto/rc2/rc2speed.c
index 3e45eb0841..3e45eb0841 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rc2speed.c
+++ b/thirdparty/openssl/crypto/rc2/rc2speed.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/rrc2.doc b/thirdparty/openssl/crypto/rc2/rrc2.doc
index f93ee003d2..f93ee003d2 100644
--- a/drivers/builtin_openssl2/crypto/rc2/rrc2.doc
+++ b/thirdparty/openssl/crypto/rc2/rrc2.doc
diff --git a/drivers/builtin_openssl2/crypto/rc2/tab.c b/thirdparty/openssl/crypto/rc2/tab.c
index 0534e37506..0534e37506 100644
--- a/drivers/builtin_openssl2/crypto/rc2/tab.c
+++ b/thirdparty/openssl/crypto/rc2/tab.c
diff --git a/drivers/builtin_openssl2/crypto/rc2/version b/thirdparty/openssl/crypto/rc2/version
index 6f89d595f1..6f89d595f1 100644
--- a/drivers/builtin_openssl2/crypto/rc2/version
+++ b/thirdparty/openssl/crypto/rc2/version
diff --git a/drivers/builtin_openssl2/crypto/rc4/rc4.c b/thirdparty/openssl/crypto/rc4/rc4.c
index 99082e8919..99082e8919 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rc4.c
+++ b/thirdparty/openssl/crypto/rc4/rc4.c
diff --git a/drivers/builtin_openssl2/crypto/rc4/rc4_enc.c b/thirdparty/openssl/crypto/rc4/rc4_enc.c
index 0f0a2487a7..0f0a2487a7 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rc4_enc.c
+++ b/thirdparty/openssl/crypto/rc4/rc4_enc.c
diff --git a/drivers/builtin_openssl2/crypto/rc4/rc4_locl.h b/thirdparty/openssl/crypto/rc4/rc4_locl.h
index faf8742f01..faf8742f01 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rc4_locl.h
+++ b/thirdparty/openssl/crypto/rc4/rc4_locl.h
diff --git a/drivers/builtin_openssl2/crypto/rc4/rc4_skey.c b/thirdparty/openssl/crypto/rc4/rc4_skey.c
index 06890d16ae..06890d16ae 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rc4_skey.c
+++ b/thirdparty/openssl/crypto/rc4/rc4_skey.c
diff --git a/drivers/builtin_openssl2/crypto/rc4/rc4_utl.c b/thirdparty/openssl/crypto/rc4/rc4_utl.c
index cbd4a24e4b..cbd4a24e4b 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rc4_utl.c
+++ b/thirdparty/openssl/crypto/rc4/rc4_utl.c
diff --git a/drivers/builtin_openssl2/crypto/rc4/rc4s.cpp b/thirdparty/openssl/crypto/rc4/rc4s.cpp
index 3814fde997..3814fde997 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rc4s.cpp
+++ b/thirdparty/openssl/crypto/rc4/rc4s.cpp
diff --git a/drivers/builtin_openssl2/crypto/rc4/rc4speed.c b/thirdparty/openssl/crypto/rc4/rc4speed.c
index 3f13a2b2bc..3f13a2b2bc 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rc4speed.c
+++ b/thirdparty/openssl/crypto/rc4/rc4speed.c
diff --git a/drivers/builtin_openssl2/crypto/rc4/rrc4.doc b/thirdparty/openssl/crypto/rc4/rrc4.doc
index 2f9a953c12..2f9a953c12 100644
--- a/drivers/builtin_openssl2/crypto/rc4/rrc4.doc
+++ b/thirdparty/openssl/crypto/rc4/rrc4.doc
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5.h b/thirdparty/openssl/crypto/rc5/rc5.h
index fba613713d..fba613713d 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5.h
+++ b/thirdparty/openssl/crypto/rc5/rc5.h
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5_ecb.c b/thirdparty/openssl/crypto/rc5/rc5_ecb.c
index e657a93b9a..e657a93b9a 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5_ecb.c
+++ b/thirdparty/openssl/crypto/rc5/rc5_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5_enc.c b/thirdparty/openssl/crypto/rc5/rc5_enc.c
index 06b89d83a1..06b89d83a1 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5_enc.c
+++ b/thirdparty/openssl/crypto/rc5/rc5_enc.c
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5_locl.h b/thirdparty/openssl/crypto/rc5/rc5_locl.h
index ee757e6477..ee757e6477 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5_locl.h
+++ b/thirdparty/openssl/crypto/rc5/rc5_locl.h
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5_skey.c b/thirdparty/openssl/crypto/rc5/rc5_skey.c
index 5dd4a52743..5dd4a52743 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5_skey.c
+++ b/thirdparty/openssl/crypto/rc5/rc5_skey.c
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5cfb64.c b/thirdparty/openssl/crypto/rc5/rc5cfb64.c
index a3813e030b..a3813e030b 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5cfb64.c
+++ b/thirdparty/openssl/crypto/rc5/rc5cfb64.c
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5ofb64.c b/thirdparty/openssl/crypto/rc5/rc5ofb64.c
index d3c63067b7..d3c63067b7 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5ofb64.c
+++ b/thirdparty/openssl/crypto/rc5/rc5ofb64.c
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5s.cpp b/thirdparty/openssl/crypto/rc5/rc5s.cpp
index 1c5518bc80..1c5518bc80 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5s.cpp
+++ b/thirdparty/openssl/crypto/rc5/rc5s.cpp
diff --git a/drivers/builtin_openssl2/crypto/rc5/rc5speed.c b/thirdparty/openssl/crypto/rc5/rc5speed.c
index 3f595704a9..3f595704a9 100644
--- a/drivers/builtin_openssl2/crypto/rc5/rc5speed.c
+++ b/thirdparty/openssl/crypto/rc5/rc5speed.c
diff --git a/drivers/builtin_openssl2/crypto/ripemd/README b/thirdparty/openssl/crypto/ripemd/README
index f1ffc8b134..f1ffc8b134 100644
--- a/drivers/builtin_openssl2/crypto/ripemd/README
+++ b/thirdparty/openssl/crypto/ripemd/README
diff --git a/drivers/builtin_openssl2/crypto/ripemd/asm/rips.cpp b/thirdparty/openssl/crypto/ripemd/asm/rips.cpp
index f7a13677a9..f7a13677a9 100644
--- a/drivers/builtin_openssl2/crypto/ripemd/asm/rips.cpp
+++ b/thirdparty/openssl/crypto/ripemd/asm/rips.cpp
diff --git a/drivers/builtin_openssl2/crypto/ripemd/rmd160.c b/thirdparty/openssl/crypto/ripemd/rmd160.c
index a4f8007040..a4f8007040 100644
--- a/drivers/builtin_openssl2/crypto/ripemd/rmd160.c
+++ b/thirdparty/openssl/crypto/ripemd/rmd160.c
diff --git a/drivers/builtin_openssl2/crypto/ripemd/rmd_dgst.c b/thirdparty/openssl/crypto/ripemd/rmd_dgst.c
index 4ddd939fcf..4ddd939fcf 100644
--- a/drivers/builtin_openssl2/crypto/ripemd/rmd_dgst.c
+++ b/thirdparty/openssl/crypto/ripemd/rmd_dgst.c
diff --git a/drivers/builtin_openssl2/crypto/ripemd/rmd_locl.h b/thirdparty/openssl/crypto/ripemd/rmd_locl.h
index 26e0256333..26e0256333 100644
--- a/drivers/builtin_openssl2/crypto/ripemd/rmd_locl.h
+++ b/thirdparty/openssl/crypto/ripemd/rmd_locl.h
diff --git a/drivers/builtin_openssl2/crypto/ripemd/rmd_one.c b/thirdparty/openssl/crypto/ripemd/rmd_one.c
index 666e01a41b..666e01a41b 100644
--- a/drivers/builtin_openssl2/crypto/ripemd/rmd_one.c
+++ b/thirdparty/openssl/crypto/ripemd/rmd_one.c
diff --git a/drivers/builtin_openssl2/crypto/ripemd/rmdconst.h b/thirdparty/openssl/crypto/ripemd/rmdconst.h
index 8fe33de14e..8fe33de14e 100644
--- a/drivers/builtin_openssl2/crypto/ripemd/rmdconst.h
+++ b/thirdparty/openssl/crypto/ripemd/rmdconst.h
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_ameth.c b/thirdparty/openssl/crypto/rsa/rsa_ameth.c
index 4e0621827c..4e0621827c 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_ameth.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_ameth.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_asn1.c b/thirdparty/openssl/crypto/rsa/rsa_asn1.c
index aff8b583fa..aff8b583fa 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_asn1.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_chk.c b/thirdparty/openssl/crypto/rsa/rsa_chk.c
index 607faa0017..607faa0017 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_chk.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_chk.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_crpt.c b/thirdparty/openssl/crypto/rsa/rsa_crpt.c
index 5c416b53fa..5c416b53fa 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_crpt.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_crpt.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_depr.c b/thirdparty/openssl/crypto/rsa/rsa_depr.c
index 32f0c8887f..32f0c8887f 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_depr.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_depr.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_eay.c b/thirdparty/openssl/crypto/rsa/rsa_eay.c
index b147fff8bd..b147fff8bd 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_eay.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_eay.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_err.c b/thirdparty/openssl/crypto/rsa/rsa_err.c
index 0bab05efcf..0bab05efcf 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_err.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_err.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_gen.c b/thirdparty/openssl/crypto/rsa/rsa_gen.c
index 7f7dca39fd..7f7dca39fd 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_gen.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_gen.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_lib.c b/thirdparty/openssl/crypto/rsa/rsa_lib.c
index a6805debc8..a6805debc8 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_lib.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_lib.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_locl.h b/thirdparty/openssl/crypto/rsa/rsa_locl.h
index 3e88187d9b..3e88187d9b 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_locl.h
+++ b/thirdparty/openssl/crypto/rsa/rsa_locl.h
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_none.c b/thirdparty/openssl/crypto/rsa/rsa_none.c
index 982b31f28c..982b31f28c 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_none.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_none.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_null.c b/thirdparty/openssl/crypto/rsa/rsa_null.c
index 241b431ad5..241b431ad5 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_null.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_null.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_oaep.c b/thirdparty/openssl/crypto/rsa/rsa_oaep.c
index 9c2a943cf7..9c2a943cf7 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_oaep.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_oaep.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_pk1.c b/thirdparty/openssl/crypto/rsa/rsa_pk1.c
index efa1fd3e99..efa1fd3e99 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_pk1.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_pk1.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_pmeth.c b/thirdparty/openssl/crypto/rsa/rsa_pmeth.c
index 203635595f..203635595f 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_pmeth.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_pmeth.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_prn.c b/thirdparty/openssl/crypto/rsa/rsa_prn.c
index 076f871b31..076f871b31 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_prn.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_prn.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_pss.c b/thirdparty/openssl/crypto/rsa/rsa_pss.c
index 41bc0844e4..41bc0844e4 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_pss.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_pss.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_saos.c b/thirdparty/openssl/crypto/rsa/rsa_saos.c
index e400236057..e400236057 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_saos.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_saos.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_sign.c b/thirdparty/openssl/crypto/rsa/rsa_sign.c
index 82ca8324df..82ca8324df 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_sign.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_sign.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_ssl.c b/thirdparty/openssl/crypto/rsa/rsa_ssl.c
index 746e01f64a..746e01f64a 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_ssl.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_ssl.c
diff --git a/drivers/builtin_openssl2/crypto/rsa/rsa_x931.c b/thirdparty/openssl/crypto/rsa/rsa_x931.c
index 725ead049c..725ead049c 100644
--- a/drivers/builtin_openssl2/crypto/rsa/rsa_x931.c
+++ b/thirdparty/openssl/crypto/rsa/rsa_x931.c
diff --git a/drivers/builtin_openssl2/crypto/s390xcap.c b/thirdparty/openssl/crypto/s390xcap.c
index 47d6b6ff51..47d6b6ff51 100644
--- a/drivers/builtin_openssl2/crypto/s390xcap.c
+++ b/thirdparty/openssl/crypto/s390xcap.c
diff --git a/drivers/builtin_openssl2/crypto/seed/seed.c b/thirdparty/openssl/crypto/seed/seed.c
index a90587227e..a90587227e 100644
--- a/drivers/builtin_openssl2/crypto/seed/seed.c
+++ b/thirdparty/openssl/crypto/seed/seed.c
diff --git a/drivers/builtin_openssl2/crypto/seed/seed_cbc.c b/thirdparty/openssl/crypto/seed/seed_cbc.c
index ee1115b4c1..ee1115b4c1 100644
--- a/drivers/builtin_openssl2/crypto/seed/seed_cbc.c
+++ b/thirdparty/openssl/crypto/seed/seed_cbc.c
diff --git a/drivers/builtin_openssl2/crypto/seed/seed_cfb.c b/thirdparty/openssl/crypto/seed/seed_cfb.c
index b6a5648b35..b6a5648b35 100644
--- a/drivers/builtin_openssl2/crypto/seed/seed_cfb.c
+++ b/thirdparty/openssl/crypto/seed/seed_cfb.c
diff --git a/drivers/builtin_openssl2/crypto/seed/seed_ecb.c b/thirdparty/openssl/crypto/seed/seed_ecb.c
index 9363d55080..9363d55080 100644
--- a/drivers/builtin_openssl2/crypto/seed/seed_ecb.c
+++ b/thirdparty/openssl/crypto/seed/seed_ecb.c
diff --git a/drivers/builtin_openssl2/crypto/seed/seed_locl.h b/thirdparty/openssl/crypto/seed/seed_locl.h
index 96ec43022d..96ec43022d 100644
--- a/drivers/builtin_openssl2/crypto/seed/seed_locl.h
+++ b/thirdparty/openssl/crypto/seed/seed_locl.h
diff --git a/drivers/builtin_openssl2/crypto/seed/seed_ofb.c b/thirdparty/openssl/crypto/seed/seed_ofb.c
index 48b71224c5..48b71224c5 100644
--- a/drivers/builtin_openssl2/crypto/seed/seed_ofb.c
+++ b/thirdparty/openssl/crypto/seed/seed_ofb.c
diff --git a/drivers/builtin_openssl2/crypto/sha/asm/README b/thirdparty/openssl/crypto/sha/asm/README
index b7e755765f..b7e755765f 100644
--- a/drivers/builtin_openssl2/crypto/sha/asm/README
+++ b/thirdparty/openssl/crypto/sha/asm/README
diff --git a/drivers/builtin_openssl2/crypto/sha/sha.c b/thirdparty/openssl/crypto/sha/sha.c
index cfc12f3edc..cfc12f3edc 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha.c
+++ b/thirdparty/openssl/crypto/sha/sha.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha1.c b/thirdparty/openssl/crypto/sha/sha1.c
index 8dd19431b4..8dd19431b4 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha1.c
+++ b/thirdparty/openssl/crypto/sha/sha1.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha1_one.c b/thirdparty/openssl/crypto/sha/sha1_one.c
index a6dd760a1e..a6dd760a1e 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha1_one.c
+++ b/thirdparty/openssl/crypto/sha/sha1_one.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha1dgst.c b/thirdparty/openssl/crypto/sha/sha1dgst.c
index a67f1fe364..a67f1fe364 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha1dgst.c
+++ b/thirdparty/openssl/crypto/sha/sha1dgst.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha256.c b/thirdparty/openssl/crypto/sha/sha256.c
index 72a1159369..72a1159369 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha256.c
+++ b/thirdparty/openssl/crypto/sha/sha256.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha256t.c b/thirdparty/openssl/crypto/sha/sha256t.c
index 35dbbc2a96..35dbbc2a96 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha256t.c
+++ b/thirdparty/openssl/crypto/sha/sha256t.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha512.c b/thirdparty/openssl/crypto/sha/sha512.c
index 3bf66ae198..3bf66ae198 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha512.c
+++ b/thirdparty/openssl/crypto/sha/sha512.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha512t.c b/thirdparty/openssl/crypto/sha/sha512t.c
index 178882fc76..178882fc76 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha512t.c
+++ b/thirdparty/openssl/crypto/sha/sha512t.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha_dgst.c b/thirdparty/openssl/crypto/sha/sha_dgst.c
index f77cf5e38d..f77cf5e38d 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha_dgst.c
+++ b/thirdparty/openssl/crypto/sha/sha_dgst.c
diff --git a/drivers/builtin_openssl2/crypto/sha/sha_locl.h b/thirdparty/openssl/crypto/sha/sha_locl.h
index 03bd411ede..03bd411ede 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha_locl.h
+++ b/thirdparty/openssl/crypto/sha/sha_locl.h
diff --git a/drivers/builtin_openssl2/crypto/sha/sha_one.c b/thirdparty/openssl/crypto/sha/sha_one.c
index 0930b98a66..0930b98a66 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha_one.c
+++ b/thirdparty/openssl/crypto/sha/sha_one.c
diff --git a/drivers/builtin_openssl2/crypto/sparc_arch.h b/thirdparty/openssl/crypto/sparc_arch.h
index e30d322a4a..e30d322a4a 100644
--- a/drivers/builtin_openssl2/crypto/sparc_arch.h
+++ b/thirdparty/openssl/crypto/sparc_arch.h
diff --git a/drivers/builtin_openssl2/crypto/sparcv9cap.c b/thirdparty/openssl/crypto/sparcv9cap.c
index a36e461792..a36e461792 100644
--- a/drivers/builtin_openssl2/crypto/sparcv9cap.c
+++ b/thirdparty/openssl/crypto/sparcv9cap.c
diff --git a/drivers/builtin_openssl2/crypto/srp/srp_grps.h b/thirdparty/openssl/crypto/srp/srp_grps.h
index 31312de15c..31312de15c 100644
--- a/drivers/builtin_openssl2/crypto/srp/srp_grps.h
+++ b/thirdparty/openssl/crypto/srp/srp_grps.h
diff --git a/drivers/builtin_openssl2/crypto/srp/srp_lcl.h b/thirdparty/openssl/crypto/srp/srp_lcl.h
index 9a7fce1b4c..9a7fce1b4c 100644
--- a/drivers/builtin_openssl2/crypto/srp/srp_lcl.h
+++ b/thirdparty/openssl/crypto/srp/srp_lcl.h
diff --git a/drivers/builtin_openssl2/crypto/srp/srp_lib.c b/thirdparty/openssl/crypto/srp/srp_lib.c
index e9a2e058f6..e9a2e058f6 100644
--- a/drivers/builtin_openssl2/crypto/srp/srp_lib.c
+++ b/thirdparty/openssl/crypto/srp/srp_lib.c
diff --git a/drivers/builtin_openssl2/crypto/srp/srp_vfy.c b/thirdparty/openssl/crypto/srp/srp_vfy.c
index 26ad3e07b4..26ad3e07b4 100644
--- a/drivers/builtin_openssl2/crypto/srp/srp_vfy.c
+++ b/thirdparty/openssl/crypto/srp/srp_vfy.c
diff --git a/drivers/builtin_openssl2/crypto/stack/stack.c b/thirdparty/openssl/crypto/stack/stack.c
index fa50083e22..fa50083e22 100644
--- a/drivers/builtin_openssl2/crypto/stack/stack.c
+++ b/thirdparty/openssl/crypto/stack/stack.c
diff --git a/drivers/builtin_openssl2/crypto/store/README b/thirdparty/openssl/crypto/store/README
index 966168f6a5..966168f6a5 100644
--- a/drivers/builtin_openssl2/crypto/store/README
+++ b/thirdparty/openssl/crypto/store/README
diff --git a/drivers/builtin_openssl2/crypto/store/store.h b/thirdparty/openssl/crypto/store/store.h
index ce3709d9f0..ce3709d9f0 100644
--- a/drivers/builtin_openssl2/crypto/store/store.h
+++ b/thirdparty/openssl/crypto/store/store.h
diff --git a/drivers/builtin_openssl2/crypto/store/str_err.c b/thirdparty/openssl/crypto/store/str_err.c
index 9858e606ea..9858e606ea 100644
--- a/drivers/builtin_openssl2/crypto/store/str_err.c
+++ b/thirdparty/openssl/crypto/store/str_err.c
diff --git a/drivers/builtin_openssl2/crypto/store/str_lib.c b/thirdparty/openssl/crypto/store/str_lib.c
index e3d5da9388..e3d5da9388 100644
--- a/drivers/builtin_openssl2/crypto/store/str_lib.c
+++ b/thirdparty/openssl/crypto/store/str_lib.c
diff --git a/drivers/builtin_openssl2/crypto/store/str_locl.h b/thirdparty/openssl/crypto/store/str_locl.h
index c0b40f0db6..c0b40f0db6 100644
--- a/drivers/builtin_openssl2/crypto/store/str_locl.h
+++ b/thirdparty/openssl/crypto/store/str_locl.h
diff --git a/drivers/builtin_openssl2/crypto/store/str_mem.c b/thirdparty/openssl/crypto/store/str_mem.c
index 6eee5bba29..6eee5bba29 100644
--- a/drivers/builtin_openssl2/crypto/store/str_mem.c
+++ b/thirdparty/openssl/crypto/store/str_mem.c
diff --git a/drivers/builtin_openssl2/crypto/store/str_meth.c b/thirdparty/openssl/crypto/store/str_meth.c
index c83fbc565a..c83fbc565a 100644
--- a/drivers/builtin_openssl2/crypto/store/str_meth.c
+++ b/thirdparty/openssl/crypto/store/str_meth.c
diff --git a/drivers/builtin_openssl2/crypto/threads/README b/thirdparty/openssl/crypto/threads/README
index df6b26e146..df6b26e146 100644
--- a/drivers/builtin_openssl2/crypto/threads/README
+++ b/thirdparty/openssl/crypto/threads/README
diff --git a/drivers/builtin_openssl2/crypto/threads/netware.bat b/thirdparty/openssl/crypto/threads/netware.bat
index 0b3eca3caf..0b3eca3caf 100644
--- a/drivers/builtin_openssl2/crypto/threads/netware.bat
+++ b/thirdparty/openssl/crypto/threads/netware.bat
diff --git a/drivers/builtin_openssl2/crypto/threads/profile.sh b/thirdparty/openssl/crypto/threads/profile.sh
index 6e3e342fc0..6e3e342fc0 100644
--- a/drivers/builtin_openssl2/crypto/threads/profile.sh
+++ b/thirdparty/openssl/crypto/threads/profile.sh
diff --git a/drivers/builtin_openssl2/crypto/threads/ptest.bat b/thirdparty/openssl/crypto/threads/ptest.bat
index 4071b5ffea..4071b5ffea 100755
--- a/drivers/builtin_openssl2/crypto/threads/ptest.bat
+++ b/thirdparty/openssl/crypto/threads/ptest.bat
diff --git a/drivers/builtin_openssl2/crypto/threads/pthread.sh b/thirdparty/openssl/crypto/threads/pthread.sh
index f1c49821d2..f1c49821d2 100644
--- a/drivers/builtin_openssl2/crypto/threads/pthread.sh
+++ b/thirdparty/openssl/crypto/threads/pthread.sh
diff --git a/drivers/builtin_openssl2/crypto/threads/pthread2.sh b/thirdparty/openssl/crypto/threads/pthread2.sh
index ec945c451b..ec945c451b 100755
--- a/drivers/builtin_openssl2/crypto/threads/pthread2.sh
+++ b/thirdparty/openssl/crypto/threads/pthread2.sh
diff --git a/drivers/builtin_openssl2/crypto/threads/pthreads-vms.com b/thirdparty/openssl/crypto/threads/pthreads-vms.com
index 1cf92bdf57..1cf92bdf57 100644
--- a/drivers/builtin_openssl2/crypto/threads/pthreads-vms.com
+++ b/thirdparty/openssl/crypto/threads/pthreads-vms.com
diff --git a/drivers/builtin_openssl2/crypto/threads/purify.sh b/thirdparty/openssl/crypto/threads/purify.sh
index 6d44fe26b7..6d44fe26b7 100644
--- a/drivers/builtin_openssl2/crypto/threads/purify.sh
+++ b/thirdparty/openssl/crypto/threads/purify.sh
diff --git a/drivers/builtin_openssl2/crypto/threads/solaris.sh b/thirdparty/openssl/crypto/threads/solaris.sh
index bc93094a27..bc93094a27 100644
--- a/drivers/builtin_openssl2/crypto/threads/solaris.sh
+++ b/thirdparty/openssl/crypto/threads/solaris.sh
diff --git a/drivers/builtin_openssl2/crypto/threads/th-lock.c b/thirdparty/openssl/crypto/threads/th-lock.c
index cc8cf2581d..cc8cf2581d 100644
--- a/drivers/builtin_openssl2/crypto/threads/th-lock.c
+++ b/thirdparty/openssl/crypto/threads/th-lock.c
diff --git a/drivers/builtin_openssl2/crypto/threads/win32.bat b/thirdparty/openssl/crypto/threads/win32.bat
index ee6da80a07..ee6da80a07 100755
--- a/drivers/builtin_openssl2/crypto/threads/win32.bat
+++ b/thirdparty/openssl/crypto/threads/win32.bat
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_asn1.c b/thirdparty/openssl/crypto/ts/ts_asn1.c
index 657dc4ca4d..657dc4ca4d 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_asn1.c
+++ b/thirdparty/openssl/crypto/ts/ts_asn1.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_conf.c b/thirdparty/openssl/crypto/ts/ts_conf.c
index 4716b2336d..4716b2336d 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_conf.c
+++ b/thirdparty/openssl/crypto/ts/ts_conf.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_err.c b/thirdparty/openssl/crypto/ts/ts_err.c
index ff1abf4533..ff1abf4533 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_err.c
+++ b/thirdparty/openssl/crypto/ts/ts_err.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_lib.c b/thirdparty/openssl/crypto/ts/ts_lib.c
index c51538a17f..c51538a17f 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_lib.c
+++ b/thirdparty/openssl/crypto/ts/ts_lib.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_req_print.c b/thirdparty/openssl/crypto/ts/ts_req_print.c
index 31940eef50..31940eef50 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_req_print.c
+++ b/thirdparty/openssl/crypto/ts/ts_req_print.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_req_utils.c b/thirdparty/openssl/crypto/ts/ts_req_utils.c
index 362e5e589a..362e5e589a 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_req_utils.c
+++ b/thirdparty/openssl/crypto/ts/ts_req_utils.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_rsp_print.c b/thirdparty/openssl/crypto/ts/ts_rsp_print.c
index e706a5687a..e706a5687a 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_rsp_print.c
+++ b/thirdparty/openssl/crypto/ts/ts_rsp_print.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_rsp_sign.c b/thirdparty/openssl/crypto/ts/ts_rsp_sign.c
index db6ce3241f..db6ce3241f 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_rsp_sign.c
+++ b/thirdparty/openssl/crypto/ts/ts_rsp_sign.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_rsp_utils.c b/thirdparty/openssl/crypto/ts/ts_rsp_utils.c
index f6f63329a0..f6f63329a0 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_rsp_utils.c
+++ b/thirdparty/openssl/crypto/ts/ts_rsp_utils.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_rsp_verify.c b/thirdparty/openssl/crypto/ts/ts_rsp_verify.c
index 29aa5a497e..29aa5a497e 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_rsp_verify.c
+++ b/thirdparty/openssl/crypto/ts/ts_rsp_verify.c
diff --git a/drivers/builtin_openssl2/crypto/ts/ts_verify_ctx.c b/thirdparty/openssl/crypto/ts/ts_verify_ctx.c
index 3e6fcb57be..3e6fcb57be 100644
--- a/drivers/builtin_openssl2/crypto/ts/ts_verify_ctx.c
+++ b/thirdparty/openssl/crypto/ts/ts_verify_ctx.c
diff --git a/drivers/builtin_openssl2/crypto/txt_db/txt_db.c b/thirdparty/openssl/crypto/txt_db/txt_db.c
index f9b42ac6e5..f9b42ac6e5 100644
--- a/drivers/builtin_openssl2/crypto/txt_db/txt_db.c
+++ b/thirdparty/openssl/crypto/txt_db/txt_db.c
diff --git a/drivers/builtin_openssl2/crypto/ui/ui_compat.c b/thirdparty/openssl/crypto/ui/ui_compat.c
index e79d54eea6..e79d54eea6 100644
--- a/drivers/builtin_openssl2/crypto/ui/ui_compat.c
+++ b/thirdparty/openssl/crypto/ui/ui_compat.c
diff --git a/drivers/builtin_openssl2/crypto/ui/ui_err.c b/thirdparty/openssl/crypto/ui/ui_err.c
index 8097da836a..8097da836a 100644
--- a/drivers/builtin_openssl2/crypto/ui/ui_err.c
+++ b/thirdparty/openssl/crypto/ui/ui_err.c
diff --git a/drivers/builtin_openssl2/crypto/ui/ui_lib.c b/thirdparty/openssl/crypto/ui/ui_lib.c
index 2f580352ce..2f580352ce 100644
--- a/drivers/builtin_openssl2/crypto/ui/ui_lib.c
+++ b/thirdparty/openssl/crypto/ui/ui_lib.c
diff --git a/drivers/builtin_openssl2/crypto/ui/ui_locl.h b/thirdparty/openssl/crypto/ui/ui_locl.h
index bebc13abfc..bebc13abfc 100644
--- a/drivers/builtin_openssl2/crypto/ui/ui_locl.h
+++ b/thirdparty/openssl/crypto/ui/ui_locl.h
diff --git a/drivers/builtin_openssl2/crypto/ui/ui_openssl.c b/thirdparty/openssl/crypto/ui/ui_openssl.c
index 9ab259b8f6..9ab259b8f6 100644
--- a/drivers/builtin_openssl2/crypto/ui/ui_openssl.c
+++ b/thirdparty/openssl/crypto/ui/ui_openssl.c
diff --git a/drivers/builtin_openssl2/crypto/ui/ui_util.c b/thirdparty/openssl/crypto/ui/ui_util.c
index 0f290115d0..0f290115d0 100644
--- a/drivers/builtin_openssl2/crypto/ui/ui_util.c
+++ b/thirdparty/openssl/crypto/ui/ui_util.c
diff --git a/drivers/builtin_openssl2/crypto/uid.c b/thirdparty/openssl/crypto/uid.c
index 90694c6725..90694c6725 100644
--- a/drivers/builtin_openssl2/crypto/uid.c
+++ b/thirdparty/openssl/crypto/uid.c
diff --git a/drivers/builtin_openssl2/crypto/vms_rms.h b/thirdparty/openssl/crypto/vms_rms.h
index 09c280e87b..09c280e87b 100644
--- a/drivers/builtin_openssl2/crypto/vms_rms.h
+++ b/thirdparty/openssl/crypto/vms_rms.h
diff --git a/drivers/builtin_openssl2/crypto/whrlpool/wp_block.c b/thirdparty/openssl/crypto/whrlpool/wp_block.c
index 920430bd6c..920430bd6c 100644
--- a/drivers/builtin_openssl2/crypto/whrlpool/wp_block.c
+++ b/thirdparty/openssl/crypto/whrlpool/wp_block.c
diff --git a/drivers/builtin_openssl2/crypto/whrlpool/wp_dgst.c b/thirdparty/openssl/crypto/whrlpool/wp_dgst.c
index e33bb4f833..e33bb4f833 100644
--- a/drivers/builtin_openssl2/crypto/whrlpool/wp_dgst.c
+++ b/thirdparty/openssl/crypto/whrlpool/wp_dgst.c
diff --git a/drivers/builtin_openssl2/crypto/whrlpool/wp_locl.h b/thirdparty/openssl/crypto/whrlpool/wp_locl.h
index 6e7b549e1e..6e7b549e1e 100644
--- a/drivers/builtin_openssl2/crypto/whrlpool/wp_locl.h
+++ b/thirdparty/openssl/crypto/whrlpool/wp_locl.h
diff --git a/drivers/builtin_openssl2/crypto/x509/by_dir.c b/thirdparty/openssl/crypto/x509/by_dir.c
index 9ee8f8d859..9ee8f8d859 100644
--- a/drivers/builtin_openssl2/crypto/x509/by_dir.c
+++ b/thirdparty/openssl/crypto/x509/by_dir.c
diff --git a/drivers/builtin_openssl2/crypto/x509/by_file.c b/thirdparty/openssl/crypto/x509/by_file.c
index 43a073003d..43a073003d 100644
--- a/drivers/builtin_openssl2/crypto/x509/by_file.c
+++ b/thirdparty/openssl/crypto/x509/by_file.c
diff --git a/drivers/builtin_openssl2/crypto/x509/vpm_int.h b/thirdparty/openssl/crypto/x509/vpm_int.h
index 9c55defc51..9c55defc51 100644
--- a/drivers/builtin_openssl2/crypto/x509/vpm_int.h
+++ b/thirdparty/openssl/crypto/x509/vpm_int.h
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_att.c b/thirdparty/openssl/crypto/x509/x509_att.c
index bd59281f9d..bd59281f9d 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_att.c
+++ b/thirdparty/openssl/crypto/x509/x509_att.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_cmp.c b/thirdparty/openssl/crypto/x509/x509_cmp.c
index 49c71b9128..49c71b9128 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_cmp.c
+++ b/thirdparty/openssl/crypto/x509/x509_cmp.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_d2.c b/thirdparty/openssl/crypto/x509/x509_d2.c
index 50ca2a6d18..50ca2a6d18 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_d2.c
+++ b/thirdparty/openssl/crypto/x509/x509_d2.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_def.c b/thirdparty/openssl/crypto/x509/x509_def.c
index 25c5537556..25c5537556 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_def.c
+++ b/thirdparty/openssl/crypto/x509/x509_def.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_err.c b/thirdparty/openssl/crypto/x509/x509_err.c
index 1e779fefd9..1e779fefd9 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_err.c
+++ b/thirdparty/openssl/crypto/x509/x509_err.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_ext.c b/thirdparty/openssl/crypto/x509/x509_ext.c
index fb4e311d71..fb4e311d71 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_ext.c
+++ b/thirdparty/openssl/crypto/x509/x509_ext.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_lu.c b/thirdparty/openssl/crypto/x509/x509_lu.c
index 50120a4d70..50120a4d70 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_lu.c
+++ b/thirdparty/openssl/crypto/x509/x509_lu.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_obj.c b/thirdparty/openssl/crypto/x509/x509_obj.c
index 3de3ac7204..3de3ac7204 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_obj.c
+++ b/thirdparty/openssl/crypto/x509/x509_obj.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_r2x.c b/thirdparty/openssl/crypto/x509/x509_r2x.c
index 0ff439c99f..0ff439c99f 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_r2x.c
+++ b/thirdparty/openssl/crypto/x509/x509_r2x.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_req.c b/thirdparty/openssl/crypto/x509/x509_req.c
index 01795f4b3f..01795f4b3f 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_req.c
+++ b/thirdparty/openssl/crypto/x509/x509_req.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_set.c b/thirdparty/openssl/crypto/x509/x509_set.c
index 5b802bd6c7..5b802bd6c7 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_set.c
+++ b/thirdparty/openssl/crypto/x509/x509_set.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_trs.c b/thirdparty/openssl/crypto/x509/x509_trs.c
index 11e0763403..11e0763403 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_trs.c
+++ b/thirdparty/openssl/crypto/x509/x509_trs.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_txt.c b/thirdparty/openssl/crypto/x509/x509_txt.c
index 3d46d3ff83..3d46d3ff83 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_txt.c
+++ b/thirdparty/openssl/crypto/x509/x509_txt.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_v3.c b/thirdparty/openssl/crypto/x509/x509_v3.c
index 4a03445a64..4a03445a64 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_v3.c
+++ b/thirdparty/openssl/crypto/x509/x509_v3.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_vfy.c b/thirdparty/openssl/crypto/x509/x509_vfy.c
index 4d34dbac93..4d34dbac93 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_vfy.c
+++ b/thirdparty/openssl/crypto/x509/x509_vfy.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509_vpm.c b/thirdparty/openssl/crypto/x509/x509_vpm.c
index 1ac15a881a..1ac15a881a 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509_vpm.c
+++ b/thirdparty/openssl/crypto/x509/x509_vpm.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509cset.c b/thirdparty/openssl/crypto/x509/x509cset.c
index 24ca35b58b..24ca35b58b 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509cset.c
+++ b/thirdparty/openssl/crypto/x509/x509cset.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509name.c b/thirdparty/openssl/crypto/x509/x509name.c
index 6ea601f962..6ea601f962 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509name.c
+++ b/thirdparty/openssl/crypto/x509/x509name.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509rset.c b/thirdparty/openssl/crypto/x509/x509rset.c
index 80e273e642..80e273e642 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509rset.c
+++ b/thirdparty/openssl/crypto/x509/x509rset.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509spki.c b/thirdparty/openssl/crypto/x509/x509spki.c
index 2df84ead9e..2df84ead9e 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509spki.c
+++ b/thirdparty/openssl/crypto/x509/x509spki.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x509type.c b/thirdparty/openssl/crypto/x509/x509type.c
index 9219f753bf..9219f753bf 100644
--- a/drivers/builtin_openssl2/crypto/x509/x509type.c
+++ b/thirdparty/openssl/crypto/x509/x509type.c
diff --git a/drivers/builtin_openssl2/crypto/x509/x_all.c b/thirdparty/openssl/crypto/x509/x_all.c
index 0f26c546d8..0f26c546d8 100644
--- a/drivers/builtin_openssl2/crypto/x509/x_all.c
+++ b/thirdparty/openssl/crypto/x509/x_all.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/ext_dat.h b/thirdparty/openssl/crypto/x509v3/ext_dat.h
index c3a6fce752..c3a6fce752 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/ext_dat.h
+++ b/thirdparty/openssl/crypto/x509v3/ext_dat.h
diff --git a/drivers/builtin_openssl2/crypto/x509v3/pcy_cache.c b/thirdparty/openssl/crypto/x509v3/pcy_cache.c
index c8f41f24bc..c8f41f24bc 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/pcy_cache.c
+++ b/thirdparty/openssl/crypto/x509v3/pcy_cache.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/pcy_data.c b/thirdparty/openssl/crypto/x509v3/pcy_data.c
index 90e9970e46..90e9970e46 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/pcy_data.c
+++ b/thirdparty/openssl/crypto/x509v3/pcy_data.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/pcy_int.h b/thirdparty/openssl/crypto/x509v3/pcy_int.h
index b5075f9edb..b5075f9edb 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/pcy_int.h
+++ b/thirdparty/openssl/crypto/x509v3/pcy_int.h
diff --git a/drivers/builtin_openssl2/crypto/x509v3/pcy_lib.c b/thirdparty/openssl/crypto/x509v3/pcy_lib.c
index dbb29835fa..dbb29835fa 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/pcy_lib.c
+++ b/thirdparty/openssl/crypto/x509v3/pcy_lib.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/pcy_map.c b/thirdparty/openssl/crypto/x509v3/pcy_map.c
index b99eb91cf7..b99eb91cf7 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/pcy_map.c
+++ b/thirdparty/openssl/crypto/x509v3/pcy_map.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/pcy_node.c b/thirdparty/openssl/crypto/x509v3/pcy_node.c
index d6c917650a..d6c917650a 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/pcy_node.c
+++ b/thirdparty/openssl/crypto/x509v3/pcy_node.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/pcy_tree.c b/thirdparty/openssl/crypto/x509v3/pcy_tree.c
index 09b8691c86..09b8691c86 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/pcy_tree.c
+++ b/thirdparty/openssl/crypto/x509v3/pcy_tree.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_addr.c b/thirdparty/openssl/crypto/x509v3/v3_addr.c
index 94cfed0509..94cfed0509 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_addr.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_addr.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_akey.c b/thirdparty/openssl/crypto/x509v3/v3_akey.c
index e920270e16..e920270e16 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_akey.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_akey.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_akeya.c b/thirdparty/openssl/crypto/x509v3/v3_akeya.c
index 2cc85b7623..2cc85b7623 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_akeya.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_akeya.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_alt.c b/thirdparty/openssl/crypto/x509v3/v3_alt.c
index 22ec202846..22ec202846 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_alt.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_alt.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_asid.c b/thirdparty/openssl/crypto/x509v3/v3_asid.c
index 2a32c9d0c9..2a32c9d0c9 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_asid.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_asid.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_bcons.c b/thirdparty/openssl/crypto/x509v3/v3_bcons.c
index dc00b9cb05..dc00b9cb05 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_bcons.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_bcons.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_bitst.c b/thirdparty/openssl/crypto/x509v3/v3_bitst.c
index b7bb3b556f..b7bb3b556f 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_bitst.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_bitst.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_conf.c b/thirdparty/openssl/crypto/x509v3/v3_conf.c
index eeff8bd185..eeff8bd185 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_conf.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_conf.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_cpols.c b/thirdparty/openssl/crypto/x509v3/v3_cpols.c
index d97f6226b9..d97f6226b9 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_cpols.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_cpols.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_crld.c b/thirdparty/openssl/crypto/x509v3/v3_crld.c
index d3e1d1b057..d3e1d1b057 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_crld.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_crld.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_enum.c b/thirdparty/openssl/crypto/x509v3/v3_enum.c
index 7678664fc3..7678664fc3 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_enum.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_enum.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_extku.c b/thirdparty/openssl/crypto/x509v3/v3_extku.c
index 6092c2e4bd..6092c2e4bd 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_extku.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_extku.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_genn.c b/thirdparty/openssl/crypto/x509v3/v3_genn.c
index 7f40bfabe0..7f40bfabe0 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_genn.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_genn.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_ia5.c b/thirdparty/openssl/crypto/x509v3/v3_ia5.c
index c170a55ff4..c170a55ff4 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_ia5.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_ia5.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_info.c b/thirdparty/openssl/crypto/x509v3/v3_info.c
index e052a34b94..e052a34b94 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_info.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_info.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_int.c b/thirdparty/openssl/crypto/x509v3/v3_int.c
index 8bfdb37e7a..8bfdb37e7a 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_int.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_int.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_lib.c b/thirdparty/openssl/crypto/x509v3/v3_lib.c
index 8350429aaf..8350429aaf 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_lib.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_lib.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_ncons.c b/thirdparty/openssl/crypto/x509v3/v3_ncons.c
index 2855269668..2855269668 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_ncons.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_ncons.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_ocsp.c b/thirdparty/openssl/crypto/x509v3/v3_ocsp.c
index b151eaccba..b151eaccba 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_ocsp.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_ocsp.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_pci.c b/thirdparty/openssl/crypto/x509v3/v3_pci.c
index 34cad53cb5..34cad53cb5 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_pci.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_pci.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_pcia.c b/thirdparty/openssl/crypto/x509v3/v3_pcia.c
index e53c82e8dc..e53c82e8dc 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_pcia.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_pcia.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_pcons.c b/thirdparty/openssl/crypto/x509v3/v3_pcons.c
index cfccb97de6..cfccb97de6 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_pcons.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_pcons.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_pku.c b/thirdparty/openssl/crypto/x509v3/v3_pku.c
index dd01c44169..dd01c44169 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_pku.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_pku.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_pmaps.c b/thirdparty/openssl/crypto/x509v3/v3_pmaps.c
index a168343b82..a168343b82 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_pmaps.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_pmaps.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_prn.c b/thirdparty/openssl/crypto/x509v3/v3_prn.c
index acc9c6d991..acc9c6d991 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_prn.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_prn.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_purp.c b/thirdparty/openssl/crypto/x509v3/v3_purp.c
index 845be673b7..845be673b7 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_purp.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_purp.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_scts.c b/thirdparty/openssl/crypto/x509v3/v3_scts.c
index 0b7c68180e..0b7c68180e 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_scts.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_scts.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_skey.c b/thirdparty/openssl/crypto/x509v3/v3_skey.c
index 1cede04727..1cede04727 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_skey.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_skey.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_sxnet.c b/thirdparty/openssl/crypto/x509v3/v3_sxnet.c
index a4e6a93e0b..a4e6a93e0b 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_sxnet.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_sxnet.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3_utl.c b/thirdparty/openssl/crypto/x509v3/v3_utl.c
index 43b9cb9c58..43b9cb9c58 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3_utl.c
+++ b/thirdparty/openssl/crypto/x509v3/v3_utl.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3conf.c b/thirdparty/openssl/crypto/x509v3/v3conf.c
index 41aa266948..41aa266948 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3conf.c
+++ b/thirdparty/openssl/crypto/x509v3/v3conf.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3err.c b/thirdparty/openssl/crypto/x509v3/v3err.c
index bcc1be722e..bcc1be722e 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3err.c
+++ b/thirdparty/openssl/crypto/x509v3/v3err.c
diff --git a/drivers/builtin_openssl2/crypto/x509v3/v3prin.c b/thirdparty/openssl/crypto/x509v3/v3prin.c
index cbc357079d..cbc357079d 100644
--- a/drivers/builtin_openssl2/crypto/x509v3/v3prin.c
+++ b/thirdparty/openssl/crypto/x509v3/v3prin.c
diff --git a/drivers/builtin_openssl2/e_os.h b/thirdparty/openssl/e_os.h
index 1fa36c1719..1fa36c1719 100644
--- a/drivers/builtin_openssl2/e_os.h
+++ b/thirdparty/openssl/e_os.h
diff --git a/drivers/builtin_openssl2/openssl/aes.h b/thirdparty/openssl/openssl/aes.h
index faa66c4914..faa66c4914 100644
--- a/drivers/builtin_openssl2/openssl/aes.h
+++ b/thirdparty/openssl/openssl/aes.h
diff --git a/drivers/builtin_openssl2/openssl/asn1.h b/thirdparty/openssl/openssl/asn1.h
index 68e791fcdb..68e791fcdb 100644
--- a/drivers/builtin_openssl2/openssl/asn1.h
+++ b/thirdparty/openssl/openssl/asn1.h
diff --git a/drivers/builtin_openssl2/openssl/asn1_mac.h b/thirdparty/openssl/openssl/asn1_mac.h
index abc6dc35ca..abc6dc35ca 100644
--- a/drivers/builtin_openssl2/openssl/asn1_mac.h
+++ b/thirdparty/openssl/openssl/asn1_mac.h
diff --git a/drivers/builtin_openssl2/openssl/asn1t.h b/thirdparty/openssl/openssl/asn1t.h
index 99bc0eecf3..99bc0eecf3 100644
--- a/drivers/builtin_openssl2/openssl/asn1t.h
+++ b/thirdparty/openssl/openssl/asn1t.h
diff --git a/drivers/builtin_openssl2/openssl/bio.h b/thirdparty/openssl/openssl/bio.h
index 6790aed28e..6790aed28e 100644
--- a/drivers/builtin_openssl2/openssl/bio.h
+++ b/thirdparty/openssl/openssl/bio.h
diff --git a/drivers/builtin_openssl2/openssl/blowfish.h b/thirdparty/openssl/openssl/blowfish.h
index 832930272c..832930272c 100644
--- a/drivers/builtin_openssl2/openssl/blowfish.h
+++ b/thirdparty/openssl/openssl/blowfish.h
diff --git a/drivers/builtin_openssl2/openssl/bn.h b/thirdparty/openssl/openssl/bn.h
index 86264ae631..86264ae631 100644
--- a/drivers/builtin_openssl2/openssl/bn.h
+++ b/thirdparty/openssl/openssl/bn.h
diff --git a/drivers/builtin_openssl2/openssl/buffer.h b/thirdparty/openssl/openssl/buffer.h
index efd240a5f9..efd240a5f9 100644
--- a/drivers/builtin_openssl2/openssl/buffer.h
+++ b/thirdparty/openssl/openssl/buffer.h
diff --git a/drivers/builtin_openssl2/openssl/camellia.h b/thirdparty/openssl/openssl/camellia.h
index 45e8d25b1d..45e8d25b1d 100644
--- a/drivers/builtin_openssl2/openssl/camellia.h
+++ b/thirdparty/openssl/openssl/camellia.h
diff --git a/drivers/builtin_openssl2/openssl/cast.h b/thirdparty/openssl/openssl/cast.h
index 0003ec9c7c..0003ec9c7c 100644
--- a/drivers/builtin_openssl2/openssl/cast.h
+++ b/thirdparty/openssl/openssl/cast.h
diff --git a/drivers/builtin_openssl2/openssl/cmac.h b/thirdparty/openssl/openssl/cmac.h
index 175be8348a..175be8348a 100644
--- a/drivers/builtin_openssl2/openssl/cmac.h
+++ b/thirdparty/openssl/openssl/cmac.h
diff --git a/drivers/builtin_openssl2/openssl/cms.h b/thirdparty/openssl/openssl/cms.h
index e6c7f964bf..e6c7f964bf 100644
--- a/drivers/builtin_openssl2/openssl/cms.h
+++ b/thirdparty/openssl/openssl/cms.h
diff --git a/drivers/builtin_openssl2/openssl/comp.h b/thirdparty/openssl/openssl/comp.h
index 60a073404e..60a073404e 100644
--- a/drivers/builtin_openssl2/openssl/comp.h
+++ b/thirdparty/openssl/openssl/comp.h
diff --git a/drivers/builtin_openssl2/openssl/conf.h b/thirdparty/openssl/openssl/conf.h
index 8d926d5d82..8d926d5d82 100644
--- a/drivers/builtin_openssl2/openssl/conf.h
+++ b/thirdparty/openssl/openssl/conf.h
diff --git a/drivers/builtin_openssl2/openssl/conf_api.h b/thirdparty/openssl/openssl/conf_api.h
index e478f7df4b..e478f7df4b 100644
--- a/drivers/builtin_openssl2/openssl/conf_api.h
+++ b/thirdparty/openssl/openssl/conf_api.h
diff --git a/drivers/builtin_openssl2/openssl/crypto.h b/thirdparty/openssl/openssl/crypto.h
index 6c644ce12a..6c644ce12a 100644
--- a/drivers/builtin_openssl2/openssl/crypto.h
+++ b/thirdparty/openssl/openssl/crypto.h
diff --git a/drivers/builtin_openssl2/openssl/des.h b/thirdparty/openssl/openssl/des.h
index 1b40144e1b..1b40144e1b 100644
--- a/drivers/builtin_openssl2/openssl/des.h
+++ b/thirdparty/openssl/openssl/des.h
diff --git a/drivers/builtin_openssl2/openssl/des_old.h b/thirdparty/openssl/openssl/des_old.h
index ee7607a241..ee7607a241 100644
--- a/drivers/builtin_openssl2/openssl/des_old.h
+++ b/thirdparty/openssl/openssl/des_old.h
diff --git a/drivers/builtin_openssl2/openssl/dh.h b/thirdparty/openssl/openssl/dh.h
index a5bd9016aa..a5bd9016aa 100644
--- a/drivers/builtin_openssl2/openssl/dh.h
+++ b/thirdparty/openssl/openssl/dh.h
diff --git a/drivers/builtin_openssl2/openssl/dsa.h b/thirdparty/openssl/openssl/dsa.h
index 545358fd02..545358fd02 100644
--- a/drivers/builtin_openssl2/openssl/dsa.h
+++ b/thirdparty/openssl/openssl/dsa.h
diff --git a/drivers/builtin_openssl2/openssl/dso.h b/thirdparty/openssl/openssl/dso.h
index c9013f5cea..c9013f5cea 100644
--- a/drivers/builtin_openssl2/openssl/dso.h
+++ b/thirdparty/openssl/openssl/dso.h
diff --git a/drivers/builtin_openssl2/openssl/dtls1.h b/thirdparty/openssl/openssl/dtls1.h
index a58aca248d..a58aca248d 100644
--- a/drivers/builtin_openssl2/openssl/dtls1.h
+++ b/thirdparty/openssl/openssl/dtls1.h
diff --git a/drivers/builtin_openssl2/openssl/e_os2.h b/thirdparty/openssl/openssl/e_os2.h
index 7be9989ac3..7be9989ac3 100644
--- a/drivers/builtin_openssl2/openssl/e_os2.h
+++ b/thirdparty/openssl/openssl/e_os2.h
diff --git a/drivers/builtin_openssl2/openssl/ebcdic.h b/thirdparty/openssl/openssl/ebcdic.h
index 4cbdfeb7ae..4cbdfeb7ae 100644
--- a/drivers/builtin_openssl2/openssl/ebcdic.h
+++ b/thirdparty/openssl/openssl/ebcdic.h
diff --git a/drivers/builtin_openssl2/openssl/ec.h b/thirdparty/openssl/openssl/ec.h
index 81e6faf6c5..81e6faf6c5 100644
--- a/drivers/builtin_openssl2/openssl/ec.h
+++ b/thirdparty/openssl/openssl/ec.h
diff --git a/drivers/builtin_openssl2/openssl/ecdh.h b/thirdparty/openssl/openssl/ecdh.h
index 25348b30fe..25348b30fe 100644
--- a/drivers/builtin_openssl2/openssl/ecdh.h
+++ b/thirdparty/openssl/openssl/ecdh.h
diff --git a/drivers/builtin_openssl2/openssl/ecdsa.h b/thirdparty/openssl/openssl/ecdsa.h
index a6f0930f82..a6f0930f82 100644
--- a/drivers/builtin_openssl2/openssl/ecdsa.h
+++ b/thirdparty/openssl/openssl/ecdsa.h
diff --git a/drivers/builtin_openssl2/openssl/engine.h b/thirdparty/openssl/openssl/engine.h
index bd7b591447..bd7b591447 100644
--- a/drivers/builtin_openssl2/openssl/engine.h
+++ b/thirdparty/openssl/openssl/engine.h
diff --git a/drivers/builtin_openssl2/openssl/err.h b/thirdparty/openssl/openssl/err.h
index 585aa8ba3d..585aa8ba3d 100644
--- a/drivers/builtin_openssl2/openssl/err.h
+++ b/thirdparty/openssl/openssl/err.h
diff --git a/drivers/builtin_openssl2/openssl/evp.h b/thirdparty/openssl/openssl/evp.h
index 39ab7937d2..39ab7937d2 100644
--- a/drivers/builtin_openssl2/openssl/evp.h
+++ b/thirdparty/openssl/openssl/evp.h
diff --git a/drivers/builtin_openssl2/openssl/hmac.h b/thirdparty/openssl/openssl/hmac.h
index b8b55cda7d..b8b55cda7d 100644
--- a/drivers/builtin_openssl2/openssl/hmac.h
+++ b/thirdparty/openssl/openssl/hmac.h
diff --git a/drivers/builtin_openssl2/openssl/idea.h b/thirdparty/openssl/openssl/idea.h
index 6075984039..6075984039 100644
--- a/drivers/builtin_openssl2/openssl/idea.h
+++ b/thirdparty/openssl/openssl/idea.h
diff --git a/drivers/builtin_openssl2/openssl/krb5_asn.h b/thirdparty/openssl/openssl/krb5_asn.h
index 9cf5a26dd8..9cf5a26dd8 100644
--- a/drivers/builtin_openssl2/openssl/krb5_asn.h
+++ b/thirdparty/openssl/openssl/krb5_asn.h
diff --git a/drivers/builtin_openssl2/openssl/kssl.h b/thirdparty/openssl/openssl/kssl.h
index ae8a51f472..ae8a51f472 100644
--- a/drivers/builtin_openssl2/openssl/kssl.h
+++ b/thirdparty/openssl/openssl/kssl.h
diff --git a/drivers/builtin_openssl2/openssl/lhash.h b/thirdparty/openssl/openssl/lhash.h
index b6c328bffb..b6c328bffb 100644
--- a/drivers/builtin_openssl2/openssl/lhash.h
+++ b/thirdparty/openssl/openssl/lhash.h
diff --git a/drivers/builtin_openssl2/openssl/md4.h b/thirdparty/openssl/openssl/md4.h
index 11fd71295b..11fd71295b 100644
--- a/drivers/builtin_openssl2/openssl/md4.h
+++ b/thirdparty/openssl/openssl/md4.h
diff --git a/drivers/builtin_openssl2/openssl/md5.h b/thirdparty/openssl/openssl/md5.h
index 300d3f3463..300d3f3463 100644
--- a/drivers/builtin_openssl2/openssl/md5.h
+++ b/thirdparty/openssl/openssl/md5.h
diff --git a/drivers/builtin_openssl2/openssl/mdc2.h b/thirdparty/openssl/openssl/mdc2.h
index 7efe53bc29..7efe53bc29 100644
--- a/drivers/builtin_openssl2/openssl/mdc2.h
+++ b/thirdparty/openssl/openssl/mdc2.h
diff --git a/drivers/builtin_openssl2/openssl/modes.h b/thirdparty/openssl/openssl/modes.h
index fd488499a0..fd488499a0 100644
--- a/drivers/builtin_openssl2/openssl/modes.h
+++ b/thirdparty/openssl/openssl/modes.h
diff --git a/drivers/builtin_openssl2/openssl/obj_mac.h b/thirdparty/openssl/openssl/obj_mac.h
index 779c309b86..779c309b86 100644
--- a/drivers/builtin_openssl2/openssl/obj_mac.h
+++ b/thirdparty/openssl/openssl/obj_mac.h
diff --git a/drivers/builtin_openssl2/openssl/objects.h b/thirdparty/openssl/openssl/objects.h
index b8dafa89ce..b8dafa89ce 100644
--- a/drivers/builtin_openssl2/openssl/objects.h
+++ b/thirdparty/openssl/openssl/objects.h
diff --git a/drivers/builtin_openssl2/openssl/ocsp.h b/thirdparty/openssl/openssl/ocsp.h
index ca2ee76dce..ca2ee76dce 100644
--- a/drivers/builtin_openssl2/openssl/ocsp.h
+++ b/thirdparty/openssl/openssl/ocsp.h
diff --git a/drivers/builtin_openssl2/openssl/opensslconf.h b/thirdparty/openssl/openssl/opensslconf.h
index c86bb60b94..c86bb60b94 100644
--- a/drivers/builtin_openssl2/openssl/opensslconf.h
+++ b/thirdparty/openssl/openssl/opensslconf.h
diff --git a/drivers/builtin_openssl2/openssl/opensslv.h b/thirdparty/openssl/openssl/opensslv.h
index 13fe440231..13fe440231 100644
--- a/drivers/builtin_openssl2/openssl/opensslv.h
+++ b/thirdparty/openssl/openssl/opensslv.h
diff --git a/drivers/builtin_openssl2/openssl/ossl_typ.h b/thirdparty/openssl/openssl/ossl_typ.h
index 9144ea2cf6..9144ea2cf6 100644
--- a/drivers/builtin_openssl2/openssl/ossl_typ.h
+++ b/thirdparty/openssl/openssl/ossl_typ.h
diff --git a/drivers/builtin_openssl2/openssl/pem.h b/thirdparty/openssl/openssl/pem.h
index d3b23fc997..d3b23fc997 100644
--- a/drivers/builtin_openssl2/openssl/pem.h
+++ b/thirdparty/openssl/openssl/pem.h
diff --git a/drivers/builtin_openssl2/openssl/pem2.h b/thirdparty/openssl/openssl/pem2.h
index 84897d5ec3..84897d5ec3 100644
--- a/drivers/builtin_openssl2/openssl/pem2.h
+++ b/thirdparty/openssl/openssl/pem2.h
diff --git a/drivers/builtin_openssl2/openssl/pkcs12.h b/thirdparty/openssl/openssl/pkcs12.h
index a39adf5eb5..a39adf5eb5 100644
--- a/drivers/builtin_openssl2/openssl/pkcs12.h
+++ b/thirdparty/openssl/openssl/pkcs12.h
diff --git a/drivers/builtin_openssl2/openssl/pkcs7.h b/thirdparty/openssl/openssl/pkcs7.h
index b51b3863eb..b51b3863eb 100644
--- a/drivers/builtin_openssl2/openssl/pkcs7.h
+++ b/thirdparty/openssl/openssl/pkcs7.h
diff --git a/drivers/builtin_openssl2/openssl/pqueue.h b/thirdparty/openssl/openssl/pqueue.h
index d40d9c7d85..d40d9c7d85 100644
--- a/drivers/builtin_openssl2/openssl/pqueue.h
+++ b/thirdparty/openssl/openssl/pqueue.h
diff --git a/drivers/builtin_openssl2/openssl/rand.h b/thirdparty/openssl/openssl/rand.h
index 66068834eb..66068834eb 100644
--- a/drivers/builtin_openssl2/openssl/rand.h
+++ b/thirdparty/openssl/openssl/rand.h
diff --git a/drivers/builtin_openssl2/openssl/rc2.h b/thirdparty/openssl/openssl/rc2.h
index 29d02d7322..29d02d7322 100644
--- a/drivers/builtin_openssl2/openssl/rc2.h
+++ b/thirdparty/openssl/openssl/rc2.h
diff --git a/drivers/builtin_openssl2/openssl/rc4.h b/thirdparty/openssl/openssl/rc4.h
index 39162b1648..39162b1648 100644
--- a/drivers/builtin_openssl2/openssl/rc4.h
+++ b/thirdparty/openssl/openssl/rc4.h
diff --git a/drivers/builtin_openssl2/openssl/ripemd.h b/thirdparty/openssl/openssl/ripemd.h
index b88ef25e72..b88ef25e72 100644
--- a/drivers/builtin_openssl2/openssl/ripemd.h
+++ b/thirdparty/openssl/openssl/ripemd.h
diff --git a/drivers/builtin_openssl2/openssl/rsa.h b/thirdparty/openssl/openssl/rsa.h
index d2ee37406e..d2ee37406e 100644
--- a/drivers/builtin_openssl2/openssl/rsa.h
+++ b/thirdparty/openssl/openssl/rsa.h
diff --git a/drivers/builtin_openssl2/openssl/safestack.h b/thirdparty/openssl/openssl/safestack.h
index 1d4f87eab3..1d4f87eab3 100644
--- a/drivers/builtin_openssl2/openssl/safestack.h
+++ b/thirdparty/openssl/openssl/safestack.h
diff --git a/drivers/builtin_openssl2/openssl/seed.h b/thirdparty/openssl/openssl/seed.h
index 8cbf0d9281..8cbf0d9281 100644
--- a/drivers/builtin_openssl2/openssl/seed.h
+++ b/thirdparty/openssl/openssl/seed.h
diff --git a/drivers/builtin_openssl2/openssl/sha.h b/thirdparty/openssl/openssl/sha.h
index e5169e4fee..e5169e4fee 100644
--- a/drivers/builtin_openssl2/openssl/sha.h
+++ b/thirdparty/openssl/openssl/sha.h
diff --git a/drivers/builtin_openssl2/openssl/srp.h b/thirdparty/openssl/openssl/srp.h
index 028892a1ff..028892a1ff 100644
--- a/drivers/builtin_openssl2/openssl/srp.h
+++ b/thirdparty/openssl/openssl/srp.h
diff --git a/drivers/builtin_openssl2/openssl/srtp.h b/thirdparty/openssl/openssl/srtp.h
index 2279c32b89..2279c32b89 100644
--- a/drivers/builtin_openssl2/openssl/srtp.h
+++ b/thirdparty/openssl/openssl/srtp.h
diff --git a/drivers/builtin_openssl2/openssl/ssl.h b/thirdparty/openssl/openssl/ssl.h
index 5ef56faa50..5ef56faa50 100644
--- a/drivers/builtin_openssl2/openssl/ssl.h
+++ b/thirdparty/openssl/openssl/ssl.h
diff --git a/drivers/builtin_openssl2/openssl/ssl2.h b/thirdparty/openssl/openssl/ssl2.h
index 03c7dd8cac..03c7dd8cac 100644
--- a/drivers/builtin_openssl2/openssl/ssl2.h
+++ b/thirdparty/openssl/openssl/ssl2.h
diff --git a/drivers/builtin_openssl2/openssl/ssl23.h b/thirdparty/openssl/openssl/ssl23.h
index 9de4685af9..9de4685af9 100644
--- a/drivers/builtin_openssl2/openssl/ssl23.h
+++ b/thirdparty/openssl/openssl/ssl23.h
diff --git a/drivers/builtin_openssl2/openssl/ssl3.h b/thirdparty/openssl/openssl/ssl3.h
index e681d50a9e..e681d50a9e 100644
--- a/drivers/builtin_openssl2/openssl/ssl3.h
+++ b/thirdparty/openssl/openssl/ssl3.h
diff --git a/drivers/builtin_openssl2/openssl/stack.h b/thirdparty/openssl/openssl/stack.h
index eb07216659..eb07216659 100644
--- a/drivers/builtin_openssl2/openssl/stack.h
+++ b/thirdparty/openssl/openssl/stack.h
diff --git a/drivers/builtin_openssl2/openssl/symhacks.h b/thirdparty/openssl/openssl/symhacks.h
index 239fa4fb1b..239fa4fb1b 100644
--- a/drivers/builtin_openssl2/openssl/symhacks.h
+++ b/thirdparty/openssl/openssl/symhacks.h
diff --git a/drivers/builtin_openssl2/openssl/tls1.h b/thirdparty/openssl/openssl/tls1.h
index 7e237d0631..7e237d0631 100644
--- a/drivers/builtin_openssl2/openssl/tls1.h
+++ b/thirdparty/openssl/openssl/tls1.h
diff --git a/drivers/builtin_openssl2/openssl/ts.h b/thirdparty/openssl/openssl/ts.h
index 16eccbb38d..16eccbb38d 100644
--- a/drivers/builtin_openssl2/openssl/ts.h
+++ b/thirdparty/openssl/openssl/ts.h
diff --git a/drivers/builtin_openssl2/openssl/txt_db.h b/thirdparty/openssl/openssl/txt_db.h
index 98e23a2003..98e23a2003 100644
--- a/drivers/builtin_openssl2/openssl/txt_db.h
+++ b/thirdparty/openssl/openssl/txt_db.h
diff --git a/drivers/builtin_openssl2/openssl/ui.h b/thirdparty/openssl/openssl/ui.h
index 0dc16330b8..0dc16330b8 100644
--- a/drivers/builtin_openssl2/openssl/ui.h
+++ b/thirdparty/openssl/openssl/ui.h
diff --git a/drivers/builtin_openssl2/openssl/ui_compat.h b/thirdparty/openssl/openssl/ui_compat.h
index bf541542c0..bf541542c0 100644
--- a/drivers/builtin_openssl2/openssl/ui_compat.h
+++ b/thirdparty/openssl/openssl/ui_compat.h
diff --git a/drivers/builtin_openssl2/openssl/whrlpool.h b/thirdparty/openssl/openssl/whrlpool.h
index 73c749da81..73c749da81 100644
--- a/drivers/builtin_openssl2/openssl/whrlpool.h
+++ b/thirdparty/openssl/openssl/whrlpool.h
diff --git a/drivers/builtin_openssl2/openssl/x509.h b/thirdparty/openssl/openssl/x509.h
index fc613ce635..fc613ce635 100644
--- a/drivers/builtin_openssl2/openssl/x509.h
+++ b/thirdparty/openssl/openssl/x509.h
diff --git a/drivers/builtin_openssl2/openssl/x509_vfy.h b/thirdparty/openssl/openssl/x509_vfy.h
index 2663e1c0a3..2663e1c0a3 100644
--- a/drivers/builtin_openssl2/openssl/x509_vfy.h
+++ b/thirdparty/openssl/openssl/x509_vfy.h
diff --git a/drivers/builtin_openssl2/openssl/x509v3.h b/thirdparty/openssl/openssl/x509v3.h
index f5c61560aa..f5c61560aa 100644
--- a/drivers/builtin_openssl2/openssl/x509v3.h
+++ b/thirdparty/openssl/openssl/x509v3.h
diff --git a/drivers/builtin_openssl2/ssl/bio_ssl.c b/thirdparty/openssl/ssl/bio_ssl.c
index d2d4d2ea2d..d2d4d2ea2d 100644
--- a/drivers/builtin_openssl2/ssl/bio_ssl.c
+++ b/thirdparty/openssl/ssl/bio_ssl.c
diff --git a/drivers/builtin_openssl2/ssl/d1_both.c b/thirdparty/openssl/ssl/d1_both.c
index 5d26c94926..5d26c94926 100644
--- a/drivers/builtin_openssl2/ssl/d1_both.c
+++ b/thirdparty/openssl/ssl/d1_both.c
diff --git a/drivers/builtin_openssl2/ssl/d1_clnt.c b/thirdparty/openssl/ssl/d1_clnt.c
index 3ddfa7bca4..3ddfa7bca4 100644
--- a/drivers/builtin_openssl2/ssl/d1_clnt.c
+++ b/thirdparty/openssl/ssl/d1_clnt.c
diff --git a/drivers/builtin_openssl2/ssl/d1_lib.c b/thirdparty/openssl/ssl/d1_lib.c
index ee78921ba8..ee78921ba8 100644
--- a/drivers/builtin_openssl2/ssl/d1_lib.c
+++ b/thirdparty/openssl/ssl/d1_lib.c
diff --git a/drivers/builtin_openssl2/ssl/d1_meth.c b/thirdparty/openssl/ssl/d1_meth.c
index 899010e985..899010e985 100644
--- a/drivers/builtin_openssl2/ssl/d1_meth.c
+++ b/thirdparty/openssl/ssl/d1_meth.c
diff --git a/drivers/builtin_openssl2/ssl/d1_pkt.c b/thirdparty/openssl/ssl/d1_pkt.c
index fe30ec7d00..fe30ec7d00 100644
--- a/drivers/builtin_openssl2/ssl/d1_pkt.c
+++ b/thirdparty/openssl/ssl/d1_pkt.c
diff --git a/drivers/builtin_openssl2/ssl/d1_srtp.c b/thirdparty/openssl/ssl/d1_srtp.c
index 64d0634a38..64d0634a38 100644
--- a/drivers/builtin_openssl2/ssl/d1_srtp.c
+++ b/thirdparty/openssl/ssl/d1_srtp.c
diff --git a/drivers/builtin_openssl2/ssl/d1_srvr.c b/thirdparty/openssl/ssl/d1_srvr.c
index e677d880f0..e677d880f0 100644
--- a/drivers/builtin_openssl2/ssl/d1_srvr.c
+++ b/thirdparty/openssl/ssl/d1_srvr.c
diff --git a/drivers/builtin_openssl2/ssl/install-ssl.com b/thirdparty/openssl/ssl/install-ssl.com
index afe6967f85..afe6967f85 100755
--- a/drivers/builtin_openssl2/ssl/install-ssl.com
+++ b/thirdparty/openssl/ssl/install-ssl.com
diff --git a/drivers/builtin_openssl2/ssl/kssl.c b/thirdparty/openssl/ssl/kssl.c
index f2839bdcd7..f2839bdcd7 100644
--- a/drivers/builtin_openssl2/ssl/kssl.c
+++ b/thirdparty/openssl/ssl/kssl.c
diff --git a/drivers/builtin_openssl2/ssl/kssl_lcl.h b/thirdparty/openssl/ssl/kssl_lcl.h
index 8e6a6d69e9..8e6a6d69e9 100644
--- a/drivers/builtin_openssl2/ssl/kssl_lcl.h
+++ b/thirdparty/openssl/ssl/kssl_lcl.h
diff --git a/drivers/builtin_openssl2/ssl/s23_clnt.c b/thirdparty/openssl/ssl/s23_clnt.c
index f782010c47..f782010c47 100644
--- a/drivers/builtin_openssl2/ssl/s23_clnt.c
+++ b/thirdparty/openssl/ssl/s23_clnt.c
diff --git a/drivers/builtin_openssl2/ssl/s23_lib.c b/thirdparty/openssl/ssl/s23_lib.c
index 9056d39e83..9056d39e83 100644
--- a/drivers/builtin_openssl2/ssl/s23_lib.c
+++ b/thirdparty/openssl/ssl/s23_lib.c
diff --git a/drivers/builtin_openssl2/ssl/s23_meth.c b/thirdparty/openssl/ssl/s23_meth.c
index eb76098792..eb76098792 100644
--- a/drivers/builtin_openssl2/ssl/s23_meth.c
+++ b/thirdparty/openssl/ssl/s23_meth.c
diff --git a/drivers/builtin_openssl2/ssl/s23_pkt.c b/thirdparty/openssl/ssl/s23_pkt.c
index efc8647841..efc8647841 100644
--- a/drivers/builtin_openssl2/ssl/s23_pkt.c
+++ b/thirdparty/openssl/ssl/s23_pkt.c
diff --git a/drivers/builtin_openssl2/ssl/s23_srvr.c b/thirdparty/openssl/ssl/s23_srvr.c
index 470bd3d94f..470bd3d94f 100644
--- a/drivers/builtin_openssl2/ssl/s23_srvr.c
+++ b/thirdparty/openssl/ssl/s23_srvr.c
diff --git a/drivers/builtin_openssl2/ssl/s2_clnt.c b/thirdparty/openssl/ssl/s2_clnt.c
index 69da6b1421..69da6b1421 100644
--- a/drivers/builtin_openssl2/ssl/s2_clnt.c
+++ b/thirdparty/openssl/ssl/s2_clnt.c
diff --git a/drivers/builtin_openssl2/ssl/s2_enc.c b/thirdparty/openssl/ssl/s2_enc.c
index 23eef72aa4..23eef72aa4 100644
--- a/drivers/builtin_openssl2/ssl/s2_enc.c
+++ b/thirdparty/openssl/ssl/s2_enc.c
diff --git a/drivers/builtin_openssl2/ssl/s2_lib.c b/thirdparty/openssl/ssl/s2_lib.c
index 88e67f083a..88e67f083a 100644
--- a/drivers/builtin_openssl2/ssl/s2_lib.c
+++ b/thirdparty/openssl/ssl/s2_lib.c
diff --git a/drivers/builtin_openssl2/ssl/s2_meth.c b/thirdparty/openssl/ssl/s2_meth.c
index 73885b7ecf..73885b7ecf 100644
--- a/drivers/builtin_openssl2/ssl/s2_meth.c
+++ b/thirdparty/openssl/ssl/s2_meth.c
diff --git a/drivers/builtin_openssl2/ssl/s2_pkt.c b/thirdparty/openssl/ssl/s2_pkt.c
index 7a61888134..7a61888134 100644
--- a/drivers/builtin_openssl2/ssl/s2_pkt.c
+++ b/thirdparty/openssl/ssl/s2_pkt.c
diff --git a/drivers/builtin_openssl2/ssl/s2_srvr.c b/thirdparty/openssl/ssl/s2_srvr.c
index 07e9df8282..07e9df8282 100644
--- a/drivers/builtin_openssl2/ssl/s2_srvr.c
+++ b/thirdparty/openssl/ssl/s2_srvr.c
diff --git a/drivers/builtin_openssl2/ssl/s3_both.c b/thirdparty/openssl/ssl/s3_both.c
index 09d0661e81..09d0661e81 100644
--- a/drivers/builtin_openssl2/ssl/s3_both.c
+++ b/thirdparty/openssl/ssl/s3_both.c
diff --git a/drivers/builtin_openssl2/ssl/s3_cbc.c b/thirdparty/openssl/ssl/s3_cbc.c
index 557622f513..557622f513 100644
--- a/drivers/builtin_openssl2/ssl/s3_cbc.c
+++ b/thirdparty/openssl/ssl/s3_cbc.c
diff --git a/drivers/builtin_openssl2/ssl/s3_clnt.c b/thirdparty/openssl/ssl/s3_clnt.c
index 19dc8648b9..19dc8648b9 100644
--- a/drivers/builtin_openssl2/ssl/s3_clnt.c
+++ b/thirdparty/openssl/ssl/s3_clnt.c
diff --git a/drivers/builtin_openssl2/ssl/s3_enc.c b/thirdparty/openssl/ssl/s3_enc.c
index 47a0ec9fe0..47a0ec9fe0 100644
--- a/drivers/builtin_openssl2/ssl/s3_enc.c
+++ b/thirdparty/openssl/ssl/s3_enc.c
diff --git a/drivers/builtin_openssl2/ssl/s3_lib.c b/thirdparty/openssl/ssl/s3_lib.c
index 872e636af9..872e636af9 100644
--- a/drivers/builtin_openssl2/ssl/s3_lib.c
+++ b/thirdparty/openssl/ssl/s3_lib.c
diff --git a/drivers/builtin_openssl2/ssl/s3_meth.c b/thirdparty/openssl/ssl/s3_meth.c
index e5a52993fc..e5a52993fc 100644
--- a/drivers/builtin_openssl2/ssl/s3_meth.c
+++ b/thirdparty/openssl/ssl/s3_meth.c
diff --git a/drivers/builtin_openssl2/ssl/s3_pkt.c b/thirdparty/openssl/ssl/s3_pkt.c
index 379890237e..379890237e 100644
--- a/drivers/builtin_openssl2/ssl/s3_pkt.c
+++ b/thirdparty/openssl/ssl/s3_pkt.c
diff --git a/drivers/builtin_openssl2/ssl/s3_srvr.c b/thirdparty/openssl/ssl/s3_srvr.c
index ab28702ee9..ab28702ee9 100644
--- a/drivers/builtin_openssl2/ssl/s3_srvr.c
+++ b/thirdparty/openssl/ssl/s3_srvr.c
diff --git a/drivers/builtin_openssl2/ssl/ssl-lib.com b/thirdparty/openssl/ssl/ssl-lib.com
index 43fea17541..43fea17541 100644
--- a/drivers/builtin_openssl2/ssl/ssl-lib.com
+++ b/thirdparty/openssl/ssl/ssl-lib.com
diff --git a/drivers/builtin_openssl2/ssl/ssl_algs.c b/thirdparty/openssl/ssl/ssl_algs.c
index e6f515ff62..e6f515ff62 100644
--- a/drivers/builtin_openssl2/ssl/ssl_algs.c
+++ b/thirdparty/openssl/ssl/ssl_algs.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_asn1.c b/thirdparty/openssl/ssl/ssl_asn1.c
index 35cc27c5e9..35cc27c5e9 100644
--- a/drivers/builtin_openssl2/ssl/ssl_asn1.c
+++ b/thirdparty/openssl/ssl/ssl_asn1.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_cert.c b/thirdparty/openssl/ssl/ssl_cert.c
index f48ebaecc0..f48ebaecc0 100644
--- a/drivers/builtin_openssl2/ssl/ssl_cert.c
+++ b/thirdparty/openssl/ssl/ssl_cert.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_ciph.c b/thirdparty/openssl/ssl/ssl_ciph.c
index 302464e643..302464e643 100644
--- a/drivers/builtin_openssl2/ssl/ssl_ciph.c
+++ b/thirdparty/openssl/ssl/ssl_ciph.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_conf.c b/thirdparty/openssl/ssl/ssl_conf.c
index 8d3709d2b6..8d3709d2b6 100644
--- a/drivers/builtin_openssl2/ssl/ssl_conf.c
+++ b/thirdparty/openssl/ssl/ssl_conf.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_err.c b/thirdparty/openssl/ssl/ssl_err.c
index 704088dc46..704088dc46 100644
--- a/drivers/builtin_openssl2/ssl/ssl_err.c
+++ b/thirdparty/openssl/ssl/ssl_err.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_err2.c b/thirdparty/openssl/ssl/ssl_err2.c
index 14e48221f4..14e48221f4 100644
--- a/drivers/builtin_openssl2/ssl/ssl_err2.c
+++ b/thirdparty/openssl/ssl/ssl_err2.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_lib.c b/thirdparty/openssl/ssl/ssl_lib.c
index fd94325bb3..fd94325bb3 100644
--- a/drivers/builtin_openssl2/ssl/ssl_lib.c
+++ b/thirdparty/openssl/ssl/ssl_lib.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_locl.h b/thirdparty/openssl/ssl/ssl_locl.h
index 747e718a52..747e718a52 100644
--- a/drivers/builtin_openssl2/ssl/ssl_locl.h
+++ b/thirdparty/openssl/ssl/ssl_locl.h
diff --git a/drivers/builtin_openssl2/ssl/ssl_rsa.c b/thirdparty/openssl/ssl/ssl_rsa.c
index 82022470bf..82022470bf 100644
--- a/drivers/builtin_openssl2/ssl/ssl_rsa.c
+++ b/thirdparty/openssl/ssl/ssl_rsa.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_sess.c b/thirdparty/openssl/ssl/ssl_sess.c
index b182998343..b182998343 100644
--- a/drivers/builtin_openssl2/ssl/ssl_sess.c
+++ b/thirdparty/openssl/ssl/ssl_sess.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_stat.c b/thirdparty/openssl/ssl/ssl_stat.c
index 1b9069f978..1b9069f978 100644
--- a/drivers/builtin_openssl2/ssl/ssl_stat.c
+++ b/thirdparty/openssl/ssl/ssl_stat.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_task.c b/thirdparty/openssl/ssl/ssl_task.c
index fb770753e2..fb770753e2 100644
--- a/drivers/builtin_openssl2/ssl/ssl_task.c
+++ b/thirdparty/openssl/ssl/ssl_task.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_txt.c b/thirdparty/openssl/ssl/ssl_txt.c
index 45308d8b65..45308d8b65 100644
--- a/drivers/builtin_openssl2/ssl/ssl_txt.c
+++ b/thirdparty/openssl/ssl/ssl_txt.c
diff --git a/drivers/builtin_openssl2/ssl/ssl_utst.c b/thirdparty/openssl/ssl/ssl_utst.c
index 53bdde330d..53bdde330d 100644
--- a/drivers/builtin_openssl2/ssl/ssl_utst.c
+++ b/thirdparty/openssl/ssl/ssl_utst.c
diff --git a/drivers/builtin_openssl2/ssl/t1_clnt.c b/thirdparty/openssl/ssl/t1_clnt.c
index 746b4e6b7a..746b4e6b7a 100644
--- a/drivers/builtin_openssl2/ssl/t1_clnt.c
+++ b/thirdparty/openssl/ssl/t1_clnt.c
diff --git a/drivers/builtin_openssl2/ssl/t1_enc.c b/thirdparty/openssl/ssl/t1_enc.c
index 514fcb3e4e..514fcb3e4e 100644
--- a/drivers/builtin_openssl2/ssl/t1_enc.c
+++ b/thirdparty/openssl/ssl/t1_enc.c
diff --git a/drivers/builtin_openssl2/ssl/t1_ext.c b/thirdparty/openssl/ssl/t1_ext.c
index 724ddf76ac..724ddf76ac 100644
--- a/drivers/builtin_openssl2/ssl/t1_ext.c
+++ b/thirdparty/openssl/ssl/t1_ext.c
diff --git a/drivers/builtin_openssl2/ssl/t1_lib.c b/thirdparty/openssl/ssl/t1_lib.c
index dd5bd0050d..dd5bd0050d 100644
--- a/drivers/builtin_openssl2/ssl/t1_lib.c
+++ b/thirdparty/openssl/ssl/t1_lib.c
diff --git a/drivers/builtin_openssl2/ssl/t1_meth.c b/thirdparty/openssl/ssl/t1_meth.c
index 335d57b530..335d57b530 100644
--- a/drivers/builtin_openssl2/ssl/t1_meth.c
+++ b/thirdparty/openssl/ssl/t1_meth.c
diff --git a/drivers/builtin_openssl2/ssl/t1_reneg.c b/thirdparty/openssl/ssl/t1_reneg.c
index b9a35c7fc2..b9a35c7fc2 100644
--- a/drivers/builtin_openssl2/ssl/t1_reneg.c
+++ b/thirdparty/openssl/ssl/t1_reneg.c
diff --git a/drivers/builtin_openssl2/ssl/t1_srvr.c b/thirdparty/openssl/ssl/t1_srvr.c
index 8c6b3dff2f..8c6b3dff2f 100644
--- a/drivers/builtin_openssl2/ssl/t1_srvr.c
+++ b/thirdparty/openssl/ssl/t1_srvr.c
diff --git a/drivers/builtin_openssl2/ssl/t1_trce.c b/thirdparty/openssl/ssl/t1_trce.c
index c5e21df77a..c5e21df77a 100644
--- a/drivers/builtin_openssl2/ssl/t1_trce.c
+++ b/thirdparty/openssl/ssl/t1_trce.c
diff --git a/drivers/builtin_openssl2/ssl/tls_srp.c b/thirdparty/openssl/ssl/tls_srp.c
index bb719ba4cf..bb719ba4cf 100644
--- a/drivers/builtin_openssl2/ssl/tls_srp.c
+++ b/thirdparty/openssl/ssl/tls_srp.c
diff --git a/drivers/builtin_openssl2/winrt.cpp b/thirdparty/openssl/winrt.cpp
index c3a6f8bfcc..c3a6f8bfcc 100644
--- a/drivers/builtin_openssl2/winrt.cpp
+++ b/thirdparty/openssl/winrt.cpp
diff --git a/drivers/builtin_openssl2/winrt_fix.patch b/thirdparty/openssl/winrt_fix.patch
index caf180a75b..caf180a75b 100644
--- a/drivers/builtin_openssl2/winrt_fix.patch
+++ b/thirdparty/openssl/winrt_fix.patch
diff --git a/drivers/opus/COPYING b/thirdparty/opus/COPYING
index 7b53d665df..7b53d665df 100644
--- a/drivers/opus/COPYING
+++ b/thirdparty/opus/COPYING
diff --git a/drivers/opus/analysis.c b/thirdparty/opus/analysis.c
index 6a0cd30113..360ebcc8dd 100644
--- a/drivers/opus/analysis.c
+++ b/thirdparty/opus/analysis.c
@@ -24,17 +24,20 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/kiss_fft.h"
-#include "opus/celt/celt.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/quant_bands.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "kiss_fft.h"
+#include "celt.h"
+#include "modes.h"
+#include "arch.h"
+#include "quant_bands.h"
 #include <stdio.h>
-#include "opus/analysis.h"
-#include "opus/mlp.h"
-#include "opus/celt/stack_alloc.h"
+#include "analysis.h"
+#include "mlp.h"
+#include "stack_alloc.h"
 
 #ifndef M_PI
 #define M_PI 3.141592653
@@ -273,7 +276,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     downmix(x, &tonal->inmem[240], remaining, offset+ANALYSIS_BUF_SIZE-tonal->mem_fill, c1, c2, C);
     tonal->mem_fill = 240 + remaining;
     opus_fft(kfft, in, out, tonal->arch);
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
     /* If there's any NaN on the input, the entire output will be NaN, so we only need to check one value. */
     if (celt_isnan(out[0].r))
     {
@@ -345,7 +348,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
        {
           float binE = out[i].r*(float)out[i].r + out[N-i].r*(float)out[N-i].r
                      + out[i].i*(float)out[i].i + out[N-i].i*(float)out[N-i].i;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
           /* FIXME: It's probably best to change the BFCC filter initial state instead */
           binE *= 5.55e-17f;
 #endif
@@ -353,7 +356,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
           tE += binE*tonality[i];
           nE += binE*2.f*(.5f-noisiness[i]);
        }
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
        /* Check for extreme band energies that could cause NaNs later. */
        if (!(E<1e9f) || celt_isnan(E))
        {
@@ -411,7 +414,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     bandwidth = 0;
     maxE = 0;
     noise_floor = 5.7e-4f/(1<<(IMAX(0,lsb_depth-8)));
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
     noise_floor *= 1<<(15+SIG_SHIFT);
 #endif
     noise_floor *= noise_floor;
diff --git a/drivers/opus/analysis.h b/thirdparty/opus/analysis.h
index 9d81164e25..9eae56a525 100644
--- a/drivers/opus/analysis.h
+++ b/thirdparty/opus/analysis.h
@@ -28,8 +28,8 @@
 #ifndef ANALYSIS_H
 #define ANALYSIS_H
 
-#include "opus/celt/celt.h"
-#include "opus/opus_private.h"
+#include "celt.h"
+#include "opus_private.h"
 
 #define NB_FRAMES 8
 #define NB_TBANDS 18
diff --git a/drivers/opus/celt/_kiss_fft_guts.h b/thirdparty/opus/celt/_kiss_fft_guts.h
index a41f9a1a05..5e3d58fd66 100644
--- a/drivers/opus/celt/_kiss_fft_guts.h
+++ b/thirdparty/opus/celt/_kiss_fft_guts.h
@@ -33,7 +33,7 @@
    defines kiss_fft_scalar as either short or a float type
    and defines
    typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
-#include "opus/celt/kiss_fft.h"
+#include "kiss_fft.h"
 
 /*
   Explanation of macros dealing with complex math:
@@ -44,8 +44,8 @@
    C_SUBFROM( res , a)  : res -= a
    C_ADDTO( res , a)    : res += a
  * */
-#ifdef OPUS_FIXED_POINT
-#include "opus/celt/arch.h"
+#ifdef FIXED_POINT
+#include "arch.h"
 
 
 #define SAMP_MAX 2147483647
@@ -91,14 +91,14 @@
     }while(0)
 
 #if defined(OPUS_ARM_INLINE_ASM)
-#include "opus/celt/arm/kiss_fft_armv4.h"
+#include "arm/kiss_fft_armv4.h"
 #endif
 
 #if defined(OPUS_ARM_INLINE_EDSP)
-#include "opus/celt/arm/kiss_fft_armv5e.h"
+#include "arm/kiss_fft_armv5e.h"
 #endif
 #if defined(MIPSr1_ASM)
-#include "opus/celt/mips/kiss_fft_mipsr1.h"
+#include "mips/kiss_fft_mipsr1.h"
 #endif
 
 #else  /* not FIXED_POINT*/
@@ -151,7 +151,7 @@
     }while(0)
 #endif /* C_ADD defined */
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 /*#  define KISS_FFT_COS(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * cos (phase))))
 #  define KISS_FFT_SIN(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * sin (phase))))*/
 #  define KISS_FFT_COS(phase)  floor(.5+TWID_MAX*cos (phase))
diff --git a/drivers/opus/celt/arch.h b/thirdparty/opus/celt/arch.h
index 7fb036e9fe..9f74ddd267 100644
--- a/drivers/opus/celt/arch.h
+++ b/thirdparty/opus/celt/arch.h
@@ -34,8 +34,8 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#include "opus_types.h"
+#include "opus_defines.h"
 
 # if !defined(__GNUC_PREREQ)
 #  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
@@ -80,7 +80,7 @@ static OPUS_INLINE void _celt_fatal(const char *str, const char *file, int line)
 
 #define PRINT_MIPS(file)
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 typedef opus_int16 opus_val16;
 typedef opus_int32 opus_val32;
@@ -113,15 +113,15 @@ static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
 }
 
 #ifdef FIXED_DEBUG
-#include "opus/celt/fixed_debug.h"
+#include "fixed_debug.h"
 #else
 
-#include "opus/celt/fixed_generic.h"
+#include "fixed_generic.h"
 
 #ifdef OPUS_ARM_INLINE_EDSP
-#include "opus/celt/arm/fixed_armv5e.h"
+#include "arm/fixed_armv5e.h"
 #elif defined (OPUS_ARM_INLINE_ASM)
-#include "opus/celt/arm/fixed_armv4.h"
+#include "arm/fixed_armv4.h"
 #elif defined (BFIN_ASM)
 #include "fixed_bfin.h"
 #elif defined (TI_C5X_ASM)
@@ -231,7 +231,7 @@ static OPUS_INLINE int celt_isnan(float x)
 #endif /* !FIXED_POINT */
 
 #ifndef GLOBAL_STACK_SIZE
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 #define GLOBAL_STACK_SIZE 100000
 #else
 #define GLOBAL_STACK_SIZE 100000
diff --git a/drivers/opus/celt/arm/arm2gnu.pl b/thirdparty/opus/celt/arm/arm2gnu.pl
index 6c922ac819..6c922ac819 100755
--- a/drivers/opus/celt/arm/arm2gnu.pl
+++ b/thirdparty/opus/celt/arm/arm2gnu.pl
diff --git a/drivers/opus/celt/arm/arm_celt_map.c b/thirdparty/opus/celt/arm/arm_celt_map.c
index 92c83c1763..ee6c244786 100644
--- a/drivers/opus/celt/arm/arm_celt_map.c
+++ b/thirdparty/opus/celt/arm/arm_celt_map.c
@@ -24,11 +24,14 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/pitch.h"
-#include "opus/celt/kiss_fft.h"
-#include "opus/celt/mdct.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pitch.h"
+#include "kiss_fft.h"
+#include "mdct.h"
 
 #if defined(OPUS_HAVE_RTCD)
 
diff --git a/drivers/opus/celt/arm/armcpu.c b/thirdparty/opus/celt/arm/armcpu.c
index ac8ad2ec14..5e5d10c344 100644
--- a/drivers/opus/celt/arm/armcpu.c
+++ b/thirdparty/opus/celt/arm/armcpu.c
@@ -26,14 +26,17 @@
 */
 
 /* Original code from libtheora modified to suit to Opus */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #ifdef OPUS_HAVE_RTCD
 
-#include "opus/celt/arm/armcpu.h"
-#include "opus/celt/cpu_support.h"
-#include "opus/celt/os_support.h"
-#include "opus/opus_types.h"
+#include "armcpu.h"
+#include "cpu_support.h"
+#include "os_support.h"
+#include "opus_types.h"
 
 #define OPUS_CPU_ARM_V4    (1)
 #define OPUS_CPU_ARM_EDSP  (1<<1)
diff --git a/drivers/opus/celt/arm/armcpu.h b/thirdparty/opus/celt/arm/armcpu.h
index ac5744606e..ac5744606e 100644
--- a/drivers/opus/celt/arm/armcpu.h
+++ b/thirdparty/opus/celt/arm/armcpu.h
diff --git a/drivers/opus/celt/arm/armopts.s.in b/thirdparty/opus/celt/arm/armopts.s.in
index 3d8aaf2754..3d8aaf2754 100644
--- a/drivers/opus/celt/arm/armopts.s.in
+++ b/thirdparty/opus/celt/arm/armopts.s.in
diff --git a/drivers/opus/celt/arm/celt_ne10_fft.c b/thirdparty/opus/celt/arm/celt_ne10_fft.c
index e57d23ee1d..42d96a7117 100644
--- a/drivers/opus/celt/arm/celt_ne10_fft.c
+++ b/thirdparty/opus/celt/arm/celt_ne10_fft.c
@@ -31,14 +31,16 @@
 */
 
 #ifndef SKIP_CONFIG_H
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #endif
 
 #include <NE10_init.h>
 #include <NE10_dsp.h>
-#include "opus/celt/os_support.h"
-#include "opus/celt/kiss_fft.h"
-#include "opus/celt/stack_alloc.h"
+#include "os_support.h"
+#include "kiss_fft.h"
+#include "stack_alloc.h"
 
 #if !defined(FIXED_POINT)
 # define NE10_FFT_ALLOC_C2C_TYPE_NEON ne10_fft_alloc_c2c_float32_neon
diff --git a/drivers/opus/celt/arm/celt_ne10_mdct.c b/thirdparty/opus/celt/arm/celt_ne10_mdct.c
index eb407b674f..293c3efd7a 100644
--- a/drivers/opus/celt/arm/celt_ne10_mdct.c
+++ b/thirdparty/opus/celt/arm/celt_ne10_mdct.c
@@ -31,13 +31,15 @@
 */
 
 #ifndef SKIP_CONFIG_H
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #endif
 
-#include "opus/celt/kiss_fft.h"
-#include "opus/celt/_kiss_fft_guts.h"
-#include "opus/celt/mdct.h"
-#include "opus/celt/stack_alloc.h"
+#include "kiss_fft.h"
+#include "_kiss_fft_guts.h"
+#include "mdct.h"
+#include "stack_alloc.h"
 
 void clt_mdct_forward_neon(const mdct_lookup *l,
                            kiss_fft_scalar *in,
diff --git a/drivers/opus/celt/arm/celt_neon_intr.c b/thirdparty/opus/celt/arm/celt_neon_intr.c
index 82b6958644..47dce15ba5 100644
--- a/drivers/opus/celt/arm/celt_neon_intr.c
+++ b/thirdparty/opus/celt/arm/celt_neon_intr.c
@@ -29,10 +29,13 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <arm_neon.h>
-#include "opus/celt/pitch.h"
+#include "../pitch.h"
 
 #if !defined(FIXED_POINT)
 /*
diff --git a/drivers/opus/celt/arm/celt_pitch_xcorr_arm-gnu.S b/thirdparty/opus/celt/arm/celt_pitch_xcorr_arm-gnu.S
index 5b2ee55a10..5b2ee55a10 100644
--- a/drivers/opus/celt/arm/celt_pitch_xcorr_arm-gnu.S
+++ b/thirdparty/opus/celt/arm/celt_pitch_xcorr_arm-gnu.S
diff --git a/drivers/opus/celt/arm/celt_pitch_xcorr_arm.s b/thirdparty/opus/celt/arm/celt_pitch_xcorr_arm.s
index f96e0a88bb..f96e0a88bb 100644
--- a/drivers/opus/celt/arm/celt_pitch_xcorr_arm.s
+++ b/thirdparty/opus/celt/arm/celt_pitch_xcorr_arm.s
diff --git a/drivers/opus/celt/arm/fft_arm.h b/thirdparty/opus/celt/arm/fft_arm.h
index c99458b4af..0cb55d8e22 100644
--- a/drivers/opus/celt/arm/fft_arm.h
+++ b/thirdparty/opus/celt/arm/fft_arm.h
@@ -34,8 +34,8 @@
 #if !defined(FFT_ARM_H)
 #define FFT_ARM_H
 
-#include "opus/opus_config.h"
-#include "opus/celt/kiss_fft.h"
+#include "config.h"
+#include "kiss_fft.h"
 
 #if defined(HAVE_ARM_NE10)
 
diff --git a/thirdparty/opus/celt/arm/fixed_arm64.h b/thirdparty/opus/celt/arm/fixed_arm64.h
new file mode 100644
index 0000000000..c6fbd3db2c
--- /dev/null
+++ b/thirdparty/opus/celt/arm/fixed_arm64.h
@@ -0,0 +1,35 @@
+/* Copyright (C) 2015 Vidyo */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef FIXED_ARM64_H
+#define FIXED_ARM64_H
+
+#include <arm_neon.h>
+
+#undef SIG2WORD16
+#define SIG2WORD16(x) (vqmovns_s32(PSHR32((x), SIG_SHIFT)))
+
+#endif
diff --git a/drivers/opus/celt/arm/fixed_armv4.h b/thirdparty/opus/celt/arm/fixed_armv4.h
index efb3b1896a..efb3b1896a 100644
--- a/drivers/opus/celt/arm/fixed_armv4.h
+++ b/thirdparty/opus/celt/arm/fixed_armv4.h
diff --git a/drivers/opus/celt/arm/fixed_armv5e.h b/thirdparty/opus/celt/arm/fixed_armv5e.h
index 2db23262e8..36a6321101 100644
--- a/drivers/opus/celt/arm/fixed_armv5e.h
+++ b/thirdparty/opus/celt/arm/fixed_armv5e.h
@@ -30,7 +30,7 @@
 #ifndef FIXED_ARMv5E_H
 #define FIXED_ARMv5E_H
 
-#include "opus/celt/arm/fixed_armv4.h"
+#include "fixed_armv4.h"
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q16
diff --git a/drivers/opus/celt/arm/kiss_fft_armv4.h b/thirdparty/opus/celt/arm/kiss_fft_armv4.h
index 0f5617324d..e4faad6f2b 100644
--- a/drivers/opus/celt/arm/kiss_fft_armv4.h
+++ b/thirdparty/opus/celt/arm/kiss_fft_armv4.h
@@ -30,7 +30,7 @@
 #error "This file should only be included from _kiss_fft_guts.h"
 #endif
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 #undef C_MUL
 #define C_MUL(m,a,b) \
diff --git a/drivers/opus/celt/arm/kiss_fft_armv5e.h b/thirdparty/opus/celt/arm/kiss_fft_armv5e.h
index 0ab75fbc58..9eca183d77 100644
--- a/drivers/opus/celt/arm/kiss_fft_armv5e.h
+++ b/thirdparty/opus/celt/arm/kiss_fft_armv5e.h
@@ -30,7 +30,7 @@
 #error "This file should only be included from _kiss_fft_guts.h"
 #endif
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 #if defined(__thumb__)||defined(__thumb2__)
 #define LDRD_CONS "Q"
diff --git a/drivers/opus/celt/arm/mdct_arm.h b/thirdparty/opus/celt/arm/mdct_arm.h
index faf3c8acab..49cbb44576 100644
--- a/drivers/opus/celt/arm/mdct_arm.h
+++ b/thirdparty/opus/celt/arm/mdct_arm.h
@@ -33,8 +33,8 @@
 #if !defined(MDCT_ARM_H)
 #define MDCT_ARM_H
 
-#include "opus/opus_config.h"
-#include "opus/celt/mdct.h"
+#include "config.h"
+#include "mdct.h"
 
 #if defined(HAVE_ARM_NE10)
 /** Compute a forward MDCT and scale by 4/N, trashes the input array */
diff --git a/drivers/opus/celt/arm/pitch_arm.h b/thirdparty/opus/celt/arm/pitch_arm.h
index 996fbc7fd9..8626ed75b9 100644
--- a/drivers/opus/celt/arm/pitch_arm.h
+++ b/thirdparty/opus/celt/arm/pitch_arm.h
@@ -28,7 +28,7 @@
 #if !defined(PITCH_ARM_H)
 # define PITCH_ARM_H
 
-# include "opus/celt/arm/armcpu.h"
+# include "armcpu.h"
 
 # if defined(FIXED_POINT)
 
diff --git a/drivers/opus/celt/bands.c b/thirdparty/opus/celt/bands.c
index bdd87dd327..25f229e267 100644
--- a/drivers/opus/celt/bands.c
+++ b/thirdparty/opus/celt/bands.c
@@ -26,19 +26,22 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <math.h>
-#include "opus/celt/bands.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/vq.h"
-#include "opus/celt/cwrs.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/rate.h"
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/pitch.h"
+#include "bands.h"
+#include "modes.h"
+#include "vq.h"
+#include "cwrs.h"
+#include "stack_alloc.h"
+#include "os_support.h"
+#include "mathops.h"
+#include "rate.h"
+#include "quant_bands.h"
+#include "pitch.h"
 
 int hysteresis_decision(opus_val16 val, const opus_val16 *thresholds, const opus_val16 *hysteresis, int N, int prev)
 {
@@ -87,7 +90,7 @@ static int bitexact_log2tan(int isin,int icos)
          -FRAC_MUL16(icos, FRAC_MUL16(icos, -2597) + 7932);
 }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 /* Compute the amplitude (sqrt energy) in each of the bands */
 void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM)
 {
@@ -216,13 +219,13 @@ void denormalise_bands(const CELTMode *m, const celt_norm * OPUS_RESTRICT X,
       int j, band_end;
       opus_val16 g;
       opus_val16 lg;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       int shift;
 #endif
       j=M*eBands[i];
       band_end = M*eBands[i+1];
       lg = ADD16(bandLogE[i], SHL16((opus_val16)eMeans[i],6));
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
       g = celt_exp2(lg);
 #else
       /* Handle the integer part of the log energy */
@@ -271,7 +274,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
       int N0;
       opus_val16 thresh, sqrt_1;
       int depth;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       int shift;
       opus_val32 thresh32;
 #endif
@@ -281,7 +284,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
       celt_assert(pulses[i]>=0);
       depth = celt_udiv(1+pulses[i], (m->eBands[i+1]-m->eBands[i]))>>LM;
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       thresh32 = SHR32(celt_exp2(-SHL16(depth, 10-BITRES)),1);
       thresh = MULT16_32_Q15(QCONST16(0.5f, 15), MIN32(32767,thresh32));
       {
@@ -314,7 +317,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
          Ediff = EXTEND32(logE[c*m->nbEBands+i])-EXTEND32(MIN16(prev1,prev2));
          Ediff = MAX32(0, Ediff);
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          if (Ediff < 16384)
          {
             opus_val32 r32 = SHR32(celt_exp2(-EXTRACT16(Ediff)),1);
@@ -364,7 +367,7 @@ static void intensity_stereo(const CELTMode *m, celt_norm * OPUS_RESTRICT X, con
    opus_val16 a1, a2;
    opus_val16 left, right;
    opus_val16 norm;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    int shift = celt_zlog2(MAX32(bandE[i], bandE[i+m->nbEBands]))-13;
 #endif
    left = VSHR32(bandE[i],shift);
@@ -401,7 +404,7 @@ static void stereo_merge(celt_norm * OPUS_RESTRICT X, celt_norm * OPUS_RESTRICT
    opus_val32 xp=0, side=0;
    opus_val32 El, Er;
    opus_val16 mid2;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    int kl, kr;
 #endif
    opus_val32 t, lgain, rgain;
@@ -420,7 +423,7 @@ static void stereo_merge(celt_norm * OPUS_RESTRICT X, celt_norm * OPUS_RESTRICT
       return;
    }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    kl = celt_ilog2(El)>>1;
    kr = celt_ilog2(Er)>>1;
 #endif
@@ -429,7 +432,7 @@ static void stereo_merge(celt_norm * OPUS_RESTRICT X, celt_norm * OPUS_RESTRICT
    t = VSHR32(Er, (kr-7)<<1);
    rgain = celt_rsqrt_norm(t);
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    if (kl < 7)
       kl = 7;
    if (kr < 7)
@@ -939,7 +942,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
       delta = sctx.delta;
       itheta = sctx.itheta;
       qalloc = sctx.qalloc;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       mid = imid;
       side = iside;
 #else
@@ -1237,7 +1240,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
    delta = sctx.delta;
    itheta = sctx.itheta;
    qalloc = sctx.qalloc;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    mid = imid;
    side = iside;
 #else
diff --git a/drivers/opus/celt/bands.h b/thirdparty/opus/celt/bands.h
index eb7ea4cc24..e8bef4bad0 100644
--- a/drivers/opus/celt/bands.h
+++ b/thirdparty/opus/celt/bands.h
@@ -30,11 +30,11 @@
 #ifndef BANDS_H
 #define BANDS_H
 
-#include "opus/celt/arch.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
-#include "opus/celt/rate.h"
+#include "arch.h"
+#include "modes.h"
+#include "entenc.h"
+#include "entdec.h"
+#include "rate.h"
 
 /** Compute the amplitude (sqrt energy) in each of the bands
  * @param m Mode data
diff --git a/drivers/opus/celt/celt.c b/thirdparty/opus/celt/celt.c
index 4a16651441..b121c51a1f 100644
--- a/drivers/opus/celt/celt.c
+++ b/thirdparty/opus/celt/celt.c
@@ -26,33 +26,36 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #define CELT_C
 
-#include "opus/celt/os_support.h"
-#include "opus/celt/mdct.h"
+#include "os_support.h"
+#include "mdct.h"
 #include <math.h>
-#include "opus/celt/celt.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/bands.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/entcode.h"
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/rate.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/float_cast.h"
+#include "celt.h"
+#include "pitch.h"
+#include "bands.h"
+#include "modes.h"
+#include "entcode.h"
+#include "quant_bands.h"
+#include "rate.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "float_cast.h"
 #include <stdarg.h>
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/vq.h"
+#include "celt_lpc.h"
+#include "vq.h"
 
 #ifndef PACKAGE_VERSION
 #define PACKAGE_VERSION "unknown"
 #endif
 
 #if defined(MIPSr1_ASM)
-#include "opus/celt/mips/celt_mipsr1.h"
+#include "mips/celt_mipsr1.h"
 #endif
 
 
@@ -286,7 +289,7 @@ const char *opus_get_version_string(void)
     /* Applications may rely on the presence of this substring in the version
        string to determine if they have a fixed-point or floating-point build
        at runtime. */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
           "-fixed"
 #endif
 #ifdef FUZZING
diff --git a/drivers/opus/celt/celt.h b/thirdparty/opus/celt/celt.h
index 72814dc0de..a423b95046 100644
--- a/drivers/opus/celt/celt.h
+++ b/thirdparty/opus/celt/celt.h
@@ -35,12 +35,12 @@
 #ifndef CELT_H
 #define CELT_H
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
-#include "opus/opus_custom.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
-#include "opus/celt/arch.h"
+#include "opus_types.h"
+#include "opus_defines.h"
+#include "opus_custom.h"
+#include "entenc.h"
+#include "entdec.h"
+#include "arch.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/opus/celt/celt_decoder.c b/thirdparty/opus/celt/celt_decoder.c
index 88072ed110..b688f2a4e3 100644
--- a/drivers/opus/celt/celt_decoder.c
+++ b/thirdparty/opus/celt/celt_decoder.c
@@ -26,27 +26,30 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #define CELT_DECODER_C
 
-#include "opus/celt/cpu_support.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/mdct.h"
+#include "cpu_support.h"
+#include "os_support.h"
+#include "mdct.h"
 #include <math.h>
-#include "opus/celt/celt.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/bands.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/entcode.h"
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/rate.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/float_cast.h"
+#include "celt.h"
+#include "pitch.h"
+#include "bands.h"
+#include "modes.h"
+#include "entcode.h"
+#include "quant_bands.h"
+#include "rate.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "float_cast.h"
 #include <stdarg.h>
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/vq.h"
+#include "celt_lpc.h"
+#include "vq.h"
 
 #if defined(SMALL_FOOTPRINT) && defined(FIXED_POINT)
 #define NORM_ALIASING_HACK
@@ -188,7 +191,7 @@ void deemphasis(celt_sig *in[], opus_val16 *pcm, int N, int C, int downsample, c
    opus_val16 coef0;
    VARDECL(celt_sig, scratch);
    SAVE_STACK;
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
    (void)accum;
    celt_assert(accum==0);
 #endif
@@ -230,7 +233,7 @@ void deemphasis(celt_sig *in[], opus_val16 *pcm, int N, int C, int downsample, c
          apply_downsampling=1;
       } else {
          /* Shortcut for the standard (non-custom modes) case */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          if (accum)
          {
             for (j=0;j<N;j++)
@@ -255,7 +258,7 @@ void deemphasis(celt_sig *in[], opus_val16 *pcm, int N, int C, int downsample, c
       if (apply_downsampling)
       {
          /* Perform down-sampling */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          if (accum)
          {
             for (j=0;j<Nd;j++)
@@ -543,7 +546,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM)
             _celt_autocorr(exc, ac, window, overlap,
                    LPC_ORDER, MAX_PERIOD, st->arch);
             /* Add a noise floor of -40 dB. */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             ac[0] += SHR32(ac[0],13);
 #else
             ac[0] *= 1.0001f;
@@ -552,7 +555,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM)
             for (i=1;i<=LPC_ORDER;i++)
             {
                /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
                ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
 #else
                ac[i] -= ac[i]*(0.008f*0.008f)*i*i;
@@ -583,7 +586,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM)
          {
             opus_val32 E1=1, E2=1;
             int decay_length;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             int shift = IMAX(0,2*celt_zlog2(celt_maxabs16(&exc[MAX_PERIOD-exc_length], exc_length))-20);
 #endif
             decay_length = exc_length>>1;
@@ -655,7 +658,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM)
                S2 += SHR32(MULT16_16(tmp, tmp), 8);
             }
             /* This checks for an "explosion" in the synthesis. */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             if (!(S1 > SHR32(S2,2)))
 #else
             /* The float test is written this way to catch NaNs in the output
@@ -1071,7 +1074,7 @@ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *dat
 
 #ifdef CUSTOM_MODES
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 int opus_custom_decode(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_int16 * OPUS_RESTRICT pcm, int frame_size)
 {
    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
diff --git a/drivers/opus/celt/celt_encoder.c b/thirdparty/opus/celt/celt_encoder.c
index 9099bcd278..41fbfd49c8 100644
--- a/drivers/opus/celt/celt_encoder.c
+++ b/thirdparty/opus/celt/celt_encoder.c
@@ -26,27 +26,30 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #define CELT_ENCODER_C
 
-#include "opus/celt/cpu_support.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/mdct.h"
+#include "cpu_support.h"
+#include "os_support.h"
+#include "mdct.h"
 #include <math.h>
-#include "opus/celt/celt.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/bands.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/entcode.h"
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/rate.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/float_cast.h"
+#include "celt.h"
+#include "pitch.h"
+#include "bands.h"
+#include "modes.h"
+#include "entcode.h"
+#include "quant_bands.h"
+#include "rate.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "float_cast.h"
 #include <stdarg.h>
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/vq.h"
+#include "celt_lpc.h"
+#include "vq.h"
 
 
 /** Encoder state
@@ -259,7 +262,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
          opus_val32 x,y;
          x = SHR32(in[i+c*len],SIG_SHIFT);
          y = ADD32(mem0, x);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          mem0 = mem1 + y - SHL32(x,1);
          mem1 = x - SHR32(y,1);
 #else
@@ -273,7 +276,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
       /* First few samples are bad because we don't propagate the memory */
       OPUS_CLEAR(tmp, 12);
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       /* Normalize tmp to max range */
       {
          int shift=0;
@@ -294,7 +297,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
       {
          opus_val16 x2 = PSHR32(MULT16_16(tmp[2*i],tmp[2*i]) + MULT16_16(tmp[2*i+1],tmp[2*i+1]),16);
          mean += x2;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          /* FIXME: Use PSHR16() instead */
          tmp[i] = mem0 + PSHR32(x2-mem0,4);
 #else
@@ -308,7 +311,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
       /* Backward pass to compute the pre-echo threshold */
       for (i=len2-1;i>=0;i--)
       {
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          /* FIXME: Use PSHR16() instead */
          tmp[i] = mem0 + PSHR32(tmp[i]-mem0,3);
 #else
@@ -325,7 +328,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
 
       /* As a compromise with the old transient detector, frame energy is the
          geometric mean of the energy and half the max */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       /* Costs two sqrt() to avoid overflows */
       mean = MULT16_16(celt_sqrt(mean), celt_sqrt(MULT16_16(maxE,len2>>1)));
 #else
@@ -339,7 +342,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
       for (i=12;i<len2-5;i+=4)
       {
          int id;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          id = MAX32(0,MIN32(127,MULT16_32_Q15(tmp[i]+EPSILON,norm))); /* Do not round to nearest */
 #else
          id = (int)MAX32(0,MIN32(127,floor(64*norm*(tmp[i]+EPSILON)))); /* Do not round to nearest */
@@ -490,7 +493,7 @@ void celt_preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_RES
    for (i=0;i<Nu;i++)
       inp[i*upsample] = SCALEIN(pcmp[CC*i]);
 
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
    if (clip)
    {
       /* Clip input to avoid encoding non-portable files */
@@ -787,7 +790,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
       logXC = celt_log2(QCONST32(1.001f, 20)-MULT16_16(sum, sum));
       /* mid-side savings estimations based on min correlation */
       logXC2 = MAX16(HALF16(logXC), celt_log2(QCONST32(1.001f, 20)-MULT16_16(minXC, minXC)));
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       /* Compensate for Q20 vs Q14 input and convert output to Q8 */
       logXC = PSHR32(logXC-QCONST16(6.f, DB_SHIFT),DB_SHIFT-8);
       logXC2 = PSHR32(logXC2-QCONST16(6.f, DB_SHIFT),DB_SHIFT-8);
@@ -819,7 +822,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
    (void)analysis;
 #endif
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    trim_index = PSHR32(trim, 8);
 #else
    trim_index = (int)floor(.5f+trim);
@@ -1145,7 +1148,7 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
       if (ABS16(gain1-st->prefilter_gain)<QCONST16(.1f,15))
          gain1=st->prefilter_gain;
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       qg = ((gain1+1536)>>10)/3-1;
 #else
       qg = (int)floor(.5f+gain1*32/3)-1;
@@ -1279,7 +1282,7 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
    if ((!has_surround_mask||lfe) && (constrained_vbr || bitrate<64000))
    {
       opus_val16 rate_factor;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       rate_factor = MAX16(0,(bitrate-32000));
 #else
       rate_factor = MAX16(0,(1.f/32768)*(bitrate-32000));
@@ -1509,7 +1512,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
    sample_max=MAX32(st->overlap_max, celt_maxabs16(pcm, C*(N-overlap)/st->upsample));
    st->overlap_max=celt_maxabs16(pcm+C*(N-overlap)/st->upsample, C*overlap/st->upsample);
    sample_max=MAX32(sample_max, st->overlap_max);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    silence = (sample_max==0);
 #else
    silence = (sample_max <= (opus_val16)1/(1<<st->lsb_depth));
@@ -1539,7 +1542,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
    }
    c=0; do {
       int need_clip=0;
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
       need_clip = st->clip && sample_max>65536.f;
 #endif
       celt_preemphasis(pcm+c, in+c*(N+overlap)+overlap, N, CC, st->upsample,
@@ -2156,7 +2159,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
 
 #ifdef CUSTOM_MODES
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 int opus_custom_encode(CELTEncoder * OPUS_RESTRICT st, const opus_int16 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
diff --git a/drivers/opus/celt/celt_lpc.c b/thirdparty/opus/celt/celt_lpc.c
index 5b8c01021f..f02145af0d 100644
--- a/drivers/opus/celt/celt_lpc.c
+++ b/thirdparty/opus/celt/celt_lpc.c
@@ -24,12 +24,15 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/pitch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "celt_lpc.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "pitch.h"
 
 void _celt_lpc(
       opus_val16       *_lpc, /* out: [0...p-1] LPC coefficients      */
@@ -40,7 +43,7 @@ int          p
    int i, j;
    opus_val32 r;
    opus_val32 error = ac[0];
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    opus_val32 lpc[LPC_ORDER];
 #else
    float *lpc = _lpc;
@@ -70,7 +73,7 @@ int          p
 
          error = error - MULT32_32_Q31(MULT32_32_Q31(r,r),error);
          /* Bail out once we get 30 dB gain */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          if (error<SHR32(ac[0],10))
             break;
 #else
@@ -79,7 +82,7 @@ int          p
 #endif
       }
    }
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    for (i=0;i<p;i++)
       _lpc[i] = ROUND16(lpc[i],16);
 #endif
@@ -257,7 +260,7 @@ int _celt_autocorr(
       xptr = xx;
    }
    shift=0;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    {
       opus_val32 ac0;
       ac0 = 1+(n<<7);
@@ -286,7 +289,7 @@ int _celt_autocorr(
          d = MAC16_16(d, xptr[i], xptr[i-k]);
       ac[k] += d;
    }
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    shift = 2*shift;
    if (shift<=0)
       ac[0] += SHL32((opus_int32)1, -shift);
diff --git a/drivers/opus/celt/celt_lpc.h b/thirdparty/opus/celt/celt_lpc.h
index dc0352d468..323459eb1a 100644
--- a/drivers/opus/celt/celt_lpc.h
+++ b/thirdparty/opus/celt/celt_lpc.h
@@ -28,11 +28,11 @@
 #ifndef PLC_H
 #define PLC_H
 
-#include "opus/celt/arch.h"
-#include "opus/celt/cpu_support.h"
+#include "arch.h"
+#include "cpu_support.h"
 
 #if defined(OPUS_X86_MAY_HAVE_SSE4_1)
-#include "opus/celt/x86/celt_lpc_sse.h"
+#include "x86/celt_lpc_sse.h"
 #endif
 
 #define LPC_ORDER 24
diff --git a/drivers/opus/celt/cpu_support.h b/thirdparty/opus/celt/cpu_support.h
index 2507e1861e..68fc60678f 100644
--- a/drivers/opus/celt/cpu_support.h
+++ b/thirdparty/opus/celt/cpu_support.h
@@ -28,12 +28,12 @@
 #ifndef CPU_SUPPORT_H
 #define CPU_SUPPORT_H
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#include "opus_types.h"
+#include "opus_defines.h"
 
 #if defined(OPUS_HAVE_RTCD) && \
   (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))
-#include "opus/celt/arm/armcpu.h"
+#include "arm/armcpu.h"
 
 /* We currently support 4 ARM variants:
  * arch[0] -> ARMv4
@@ -48,7 +48,7 @@
   (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \
   (defined(OPUS_X86_MAY_HAVE_AVX) && !defined(OPUS_X86_PRESUME_AVX))
 
-#include "opus/celt/x86/x86cpu.h"
+#include "x86/x86cpu.h"
 /* We currently support 5 x86 variants:
  * arch[0] -> non-sse
  * arch[1] -> sse
diff --git a/drivers/opus/celt/cwrs.c b/thirdparty/opus/celt/cwrs.c
index 983d4580a9..2fa9f89cd6 100644
--- a/drivers/opus/celt/cwrs.c
+++ b/thirdparty/opus/celt/cwrs.c
@@ -26,12 +26,15 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/os_support.h"
-#include "opus/celt/cwrs.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/arch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "os_support.h"
+#include "cwrs.h"
+#include "mathops.h"
+#include "arch.h"
 
 #ifdef CUSTOM_MODES
 
diff --git a/drivers/opus/celt/cwrs.h b/thirdparty/opus/celt/cwrs.h
index f0ea844e5e..7cd4717459 100644
--- a/drivers/opus/celt/cwrs.h
+++ b/thirdparty/opus/celt/cwrs.h
@@ -30,10 +30,10 @@
 #ifndef CWRS_H
 #define CWRS_H
 
-#include "opus/celt/arch.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
+#include "arch.h"
+#include "stack_alloc.h"
+#include "entenc.h"
+#include "entdec.h"
 
 #ifdef CUSTOM_MODES
 int log2_frac(opus_uint32 val, int frac);
diff --git a/drivers/opus/celt/ecintrin.h b/thirdparty/opus/celt/ecintrin.h
index 6ed8fb280e..2263cff6bd 100644
--- a/drivers/opus/celt/ecintrin.h
+++ b/thirdparty/opus/celt/ecintrin.h
@@ -26,10 +26,10 @@
 */
 
 /*Some common macros for potential platform-specific optimization.*/
-#include "opus/opus_types.h"
+#include "opus_types.h"
 #include <math.h>
 #include <limits.h>
-#include "opus/celt/arch.h"
+#include "arch.h"
 #if !defined(_ecintrin_H)
 # define _ecintrin_H (1)
 
diff --git a/drivers/opus/celt/entcode.c b/thirdparty/opus/celt/entcode.c
index d1c6b25c7f..70f32016ec 100644
--- a/drivers/opus/celt/entcode.c
+++ b/thirdparty/opus/celt/entcode.c
@@ -24,10 +24,13 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/entcode.h"
-#include "opus/celt/arch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "entcode.h"
+#include "arch.h"
 
 #if !defined(EC_CLZ)
 /*This is a fallback for systems where we don't know how to access
diff --git a/drivers/opus/celt/entcode.h b/thirdparty/opus/celt/entcode.h
index 4d736d4dca..13d6c84ef0 100644
--- a/drivers/opus/celt/entcode.h
+++ b/thirdparty/opus/celt/entcode.h
@@ -25,14 +25,14 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#include "opus_types.h"
+#include "opus_defines.h"
 
 #if !defined(_entcode_H)
 # define _entcode_H (1)
 # include <limits.h>
 # include <stddef.h>
-# include "opus/celt/ecintrin.h"
+# include "ecintrin.h"
 
 extern const opus_uint32 SMALL_DIV_TABLE[129];
 
diff --git a/drivers/opus/celt/entdec.c b/thirdparty/opus/celt/entdec.c
index fdc49c92c1..0b3433ed8b 100644
--- a/drivers/opus/celt/entdec.c
+++ b/thirdparty/opus/celt/entdec.c
@@ -24,13 +24,16 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stddef.h>
-#include "opus/celt/os_support.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/entdec.h"
-#include "opus/celt/mfrngcod.h"
+#include "os_support.h"
+#include "arch.h"
+#include "entdec.h"
+#include "mfrngcod.h"
 
 /*A range decoder.
   This is an entropy decoder based upon \cite{Mar79}, which is itself a
diff --git a/drivers/opus/celt/entdec.h b/thirdparty/opus/celt/entdec.h
index fda60ab326..d8ab318730 100644
--- a/drivers/opus/celt/entdec.h
+++ b/thirdparty/opus/celt/entdec.h
@@ -28,7 +28,7 @@
 #if !defined(_entdec_H)
 # define _entdec_H (1)
 # include <limits.h>
-# include "opus/celt/entcode.h"
+# include "entcode.h"
 
 /*Initializes the decoder.
   _buf: The input buffer to use.
diff --git a/drivers/opus/celt/entenc.c b/thirdparty/opus/celt/entenc.c
index da7f2c8e62..f1750d25b8 100644
--- a/drivers/opus/celt/entenc.c
+++ b/thirdparty/opus/celt/entenc.c
@@ -24,11 +24,14 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/mfrngcod.h"
+
+#if defined(HAVE_CONFIG_H)
+# include "config.h"
+#endif
+#include "os_support.h"
+#include "arch.h"
+#include "entenc.h"
+#include "mfrngcod.h"
 
 /*A range encoder.
   See entdec.c and the references for implementation details \cite{Mar79,MNW98}.
diff --git a/drivers/opus/celt/entenc.h b/thirdparty/opus/celt/entenc.h
index 3f4a3acc93..796bc4d572 100644
--- a/drivers/opus/celt/entenc.h
+++ b/thirdparty/opus/celt/entenc.h
@@ -28,7 +28,7 @@
 #if !defined(_entenc_H)
 # define _entenc_H (1)
 # include <stddef.h>
-# include "opus/celt/entcode.h"
+# include "entcode.h"
 
 /*Initializes the encoder.
   _buf:  The buffer to store output bytes in.
diff --git a/drivers/opus/celt/fixed_debug.h b/thirdparty/opus/celt/fixed_debug.h
index 3b8d5ef7a9..d28227f5dc 100644
--- a/drivers/opus/celt/fixed_debug.h
+++ b/thirdparty/opus/celt/fixed_debug.h
@@ -33,7 +33,7 @@
 #define FIXED_DEBUG_H
 
 #include <stdio.h>
-#include "opus/opus_defines.h"
+#include "opus_defines.h"
 
 #ifdef CELT_C
 OPUS_EXPORT opus_int64 celt_mips=0;
diff --git a/drivers/opus/celt/fixed_generic.h b/thirdparty/opus/celt/fixed_generic.h
index 71ab048e4a..ac67d37ce8 100644
--- a/drivers/opus/celt/fixed_generic.h
+++ b/thirdparty/opus/celt/fixed_generic.h
@@ -136,7 +136,7 @@
 #define DIV32(a,b) (((opus_val32)(a))/((opus_val32)(b)))
 
 #if defined(MIPSr1_ASM)
-#include "opus/celt/mips/fixed_generic_mipsr1.h"
+#include "mips/fixed_generic_mipsr1.h"
 #endif
 
 static OPUS_INLINE opus_val16 SIG2WORD16_generic(celt_sig x)
diff --git a/drivers/opus/celt/float_cast.h b/thirdparty/opus/celt/float_cast.h
index 36a1bfe671..ed5a39b543 100644
--- a/drivers/opus/celt/float_cast.h
+++ b/thirdparty/opus/celt/float_cast.h
@@ -30,7 +30,7 @@
 #define FLOAT_CAST_H
 
 
-#include "opus/celt/arch.h"
+#include "arch.h"
 
 /*============================================================================
 **      On Intel Pentium processors (especially PIII and probably P4), converting
diff --git a/drivers/opus/celt/kiss_fft.c b/thirdparty/opus/celt/kiss_fft.c
index cf8d049fa1..4ed37d2bb7 100644
--- a/drivers/opus/celt/kiss_fft.c
+++ b/thirdparty/opus/celt/kiss_fft.c
@@ -30,14 +30,16 @@
    heavily modified to better suit Opus */
 
 #ifndef SKIP_CONFIG_H
-#include "opus/opus_config.h"
+#  ifdef HAVE_CONFIG_H
+#    include "config.h"
+#  endif
 #endif
 
-#include "opus/celt/_kiss_fft_guts.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/stack_alloc.h"
+#include "_kiss_fft_guts.h"
+#include "arch.h"
+#include "os_support.h"
+#include "mathops.h"
+#include "stack_alloc.h"
 
 /* The guts header contains all the multiplication and addition macros that are defined for
    complex numbers.  It also delares the kf_ internal functions.
@@ -188,7 +190,7 @@ static void kf_bfly3(
    kiss_twiddle_cpx epi3;
 
    kiss_fft_cpx * Fout_beg = Fout;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    epi3.r = -16384;
    epi3.i = -28378;
 #else
@@ -246,7 +248,7 @@ static void kf_bfly5(
    kiss_twiddle_cpx ya,yb;
    kiss_fft_cpx * Fout_beg = Fout;
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    ya.r = 10126;
    ya.i = -31164;
    yb.r = -26510;
@@ -407,7 +409,7 @@ int kf_factor(int n,opus_int16 * facbuf)
 static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
 {
    int i;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    for (i=0;i<nfft;++i) {
       opus_val32 phase = -i;
       kf_cexp2(twiddles+i, DIV32(SHL32(phase,17),nfft));
@@ -450,7 +452,7 @@ kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
         kiss_twiddle_cpx *twiddles;
 
         st->nfft=nfft;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
         st->scale_shift = celt_ilog2(st->nfft);
         if (st->nfft == 1<<st->scale_shift)
            st->scale = Q15ONE;
@@ -568,7 +570,7 @@ void opus_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *f
 {
    int i;
    opus_val16 scale;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    /* Allows us to scale with MULT16_32_Q16(), which is faster than
       MULT16_32_Q15() on ARM. */
    int scale_shift = st->scale_shift-1;
diff --git a/drivers/opus/celt/kiss_fft.h b/thirdparty/opus/celt/kiss_fft.h
index 6229044c43..bffa2bfad6 100644
--- a/drivers/opus/celt/kiss_fft.h
+++ b/thirdparty/opus/celt/kiss_fft.h
@@ -31,8 +31,8 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "opus/celt/arch.h"
-#include "opus/celt/cpu_support.h"
+#include "arch.h"
+#include "cpu_support.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,8 +46,8 @@ extern "C" {
 #define KISS_FFT_MALLOC opus_alloc
 #endif
 
-#ifdef OPUS_FIXED_POINT
-#include "opus/celt/arch.h"
+#ifdef FIXED_POINT
+#include "arch.h"
 
 #  define kiss_fft_scalar opus_int32
 #  define kiss_twiddle_scalar opus_int16
@@ -86,7 +86,7 @@ typedef struct arch_fft_state{
 typedef struct kiss_fft_state{
     int nfft;
     opus_val16 scale;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
     int scale_shift;
 #endif
     int shift;
@@ -97,7 +97,7 @@ typedef struct kiss_fft_state{
 } kiss_fft_state;
 
 #if defined(HAVE_ARM_NE10)
-#include "opus/celt/arm/fft_arm.h"
+#include "arm/fft_arm.h"
 #endif
 
 /*typedef struct kiss_fft_state* kiss_fft_cfg;*/
diff --git a/drivers/opus/celt/laplace.c b/thirdparty/opus/celt/laplace.c
index 5bc956af45..a7bca874b6 100644
--- a/drivers/opus/celt/laplace.c
+++ b/thirdparty/opus/celt/laplace.c
@@ -25,10 +25,13 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/laplace.h"
-#include "opus/celt/mathops.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "laplace.h"
+#include "mathops.h"
 
 /* The minimum probability of an energy delta (out of 32768). */
 #define LAPLACE_LOG_MINP (0)
diff --git a/drivers/opus/celt/laplace.h b/thirdparty/opus/celt/laplace.h
index 9efcc73aa2..46c14b5da5 100644
--- a/drivers/opus/celt/laplace.h
+++ b/thirdparty/opus/celt/laplace.h
@@ -26,8 +26,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
+#include "entenc.h"
+#include "entdec.h"
 
 /** Encode a value that is assumed to be the realisation of a
     Laplace-distributed random process
diff --git a/drivers/opus/celt/mathops.c b/thirdparty/opus/celt/mathops.c
index 3f7c1a8bdd..3f8c5dcc0e 100644
--- a/drivers/opus/celt/mathops.c
+++ b/thirdparty/opus/celt/mathops.c
@@ -30,9 +30,12 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/mathops.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mathops.h"
 
 /*Compute floor(sqrt(_val)) with exact arithmetic.
   This has been tested on all possible 32-bit inputs.*/
@@ -61,7 +64,7 @@ unsigned isqrt32(opus_uint32 _val){
   return g;
 }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 opus_val32 frac_div32(opus_val32 a, opus_val32 b)
 {
diff --git a/drivers/opus/celt/mathops.h b/thirdparty/opus/celt/mathops.h
index a008d71e18..a0525a9610 100644
--- a/drivers/opus/celt/mathops.h
+++ b/thirdparty/opus/celt/mathops.h
@@ -34,9 +34,9 @@
 #ifndef MATHOPS_H
 #define MATHOPS_H
 
-#include "opus/celt/arch.h"
-#include "opus/celt/entcode.h"
-#include "opus/celt/os_support.h"
+#include "arch.h"
+#include "entcode.h"
+#include "os_support.h"
 
 /* Multiplies two 16-bit fractional values. Bit-exactness of this macro is important */
 #define FRAC_MUL16(a,b) ((16384+((opus_int32)(opus_int16)(a)*(opus_int16)(b)))>>15)
@@ -59,7 +59,7 @@ static OPUS_INLINE opus_val32 celt_maxabs16(const opus_val16 *x, int len)
 #endif
 
 #ifndef OVERRIDE_CELT_MAXABS32
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 static OPUS_INLINE opus_val32 celt_maxabs32(const opus_val32 *x, int len)
 {
    int i;
@@ -78,7 +78,7 @@ static OPUS_INLINE opus_val32 celt_maxabs32(const opus_val32 *x, int len)
 #endif
 
 
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
 
 #define PI 3.141592653f
 #define celt_sqrt(x) ((float)sqrt(x))
@@ -139,9 +139,9 @@ static OPUS_INLINE float celt_exp2(float x)
 
 #endif
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
-#include "opus/celt/os_support.h"
+#include "os_support.h"
 
 #ifndef OVERRIDE_CELT_ILOG2
 /** Integer log in base2. Undefined for zero and negative numbers */
diff --git a/drivers/opus/celt/mdct.c b/thirdparty/opus/celt/mdct.c
index 641a20e49a..5315ad11a3 100644
--- a/drivers/opus/celt/mdct.c
+++ b/thirdparty/opus/celt/mdct.c
@@ -40,19 +40,21 @@
 */
 
 #ifndef SKIP_CONFIG_H
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #endif
 
-#include "opus/celt/mdct.h"
-#include "opus/celt/kiss_fft.h"
-#include "opus/celt/_kiss_fft_guts.h"
+#include "mdct.h"
+#include "kiss_fft.h"
+#include "_kiss_fft_guts.h"
 #include <math.h>
-#include "opus/celt/os_support.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/stack_alloc.h"
+#include "os_support.h"
+#include "mathops.h"
+#include "stack_alloc.h"
 
 #if defined(MIPSr1_ASM)
-#include "opus/celt/mips/mdct_mipsr1.h"
+#include "mips/mdct_mipsr1.h"
 #endif
 
 
@@ -124,7 +126,7 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
    const kiss_fft_state *st = l->kfft[shift];
    const kiss_twiddle_scalar *trig;
    opus_val16 scale;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    /* Allows us to scale with MULT16_32_Q16(), which is faster than
       MULT16_32_Q15() on ARM. */
    int scale_shift = st->scale_shift-1;
diff --git a/drivers/opus/celt/mdct.h b/thirdparty/opus/celt/mdct.h
index 2ec98a92e5..160ae4e0f3 100644
--- a/drivers/opus/celt/mdct.h
+++ b/thirdparty/opus/celt/mdct.h
@@ -42,9 +42,9 @@
 #ifndef MDCT_H
 #define MDCT_H
 
-#include "opus/opus_defines.h"
-#include "opus/celt/kiss_fft.h"
-#include "opus/celt/arch.h"
+#include "opus_defines.h"
+#include "kiss_fft.h"
+#include "arch.h"
 
 typedef struct {
    int n;
@@ -54,7 +54,7 @@ typedef struct {
 } mdct_lookup;
 
 #if defined(HAVE_ARM_NE10)
-#include "opus/celt/arm/mdct_arm.h"
+#include "arm/mdct_arm.h"
 #endif
 
 
diff --git a/drivers/opus/celt/mfrngcod.h b/thirdparty/opus/celt/mfrngcod.h
index c24d98cde2..809152a59a 100644
--- a/drivers/opus/celt/mfrngcod.h
+++ b/thirdparty/opus/celt/mfrngcod.h
@@ -27,7 +27,7 @@
 
 #if !defined(_mfrngcode_H)
 # define _mfrngcode_H (1)
-# include "opus/celt/entcode.h"
+# include "entcode.h"
 
 /*Constants used by the entropy encoder/decoder.*/
 
diff --git a/drivers/opus/celt/mips/celt_mipsr1.h b/thirdparty/opus/celt/mips/celt_mipsr1.h
index 906848f1ec..e85661a661 100644
--- a/drivers/opus/celt/mips/celt_mipsr1.h
+++ b/thirdparty/opus/celt/mips/celt_mipsr1.h
@@ -29,26 +29,29 @@
 
 #ifndef __CELT_MIPSR1_H__
 #define __CELT_MIPSR1_H__
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #define CELT_C
 
-#include "opus/celt/os_support.h"
-#include "opus/celt/mdct.h"
+#include "os_support.h"
+#include "mdct.h"
 #include <math.h>
-#include "opus/celt/celt.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/bands.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/entcode.h"
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/rate.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/float_cast.h"
+#include "celt.h"
+#include "pitch.h"
+#include "bands.h"
+#include "modes.h"
+#include "entcode.h"
+#include "quant_bands.h"
+#include "rate.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "float_cast.h"
 #include <stdarg.h>
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/vq.h"
+#include "celt_lpc.h"
+#include "vq.h"
 
 #define OVERRIDE_comb_filter
 void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
diff --git a/drivers/opus/celt/mips/fixed_generic_mipsr1.h b/thirdparty/opus/celt/mips/fixed_generic_mipsr1.h
index 4a05efbf85..4a05efbf85 100644
--- a/drivers/opus/celt/mips/fixed_generic_mipsr1.h
+++ b/thirdparty/opus/celt/mips/fixed_generic_mipsr1.h
diff --git a/drivers/opus/celt/mips/kiss_fft_mipsr1.h b/thirdparty/opus/celt/mips/kiss_fft_mipsr1.h
index 09dc9af464..400ca4de9c 100644
--- a/drivers/opus/celt/mips/kiss_fft_mipsr1.h
+++ b/thirdparty/opus/celt/mips/kiss_fft_mipsr1.h
@@ -30,7 +30,7 @@
 #error "This file should only be included from _kiss_fft_guts.h"
 #endif
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 #define S_MUL_ADD(a, b, c, d) (S_MUL(a,b)+S_MUL(c,d))
 #define S_MUL_SUB(a, b, c, d) (S_MUL(a,b)-S_MUL(c,d))
@@ -102,7 +102,7 @@ static void kf_bfly5(
    kiss_twiddle_cpx ya,yb;
    kiss_fft_cpx * Fout_beg = Fout;
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    ya.r = 10126;
    ya.i = -31164;
    yb.r = -26510;
diff --git a/drivers/opus/celt/mips/mdct_mipsr1.h b/thirdparty/opus/celt/mips/mdct_mipsr1.h
index 0bb8b5a056..2934dab776 100644
--- a/drivers/opus/celt/mips/mdct_mipsr1.h
+++ b/thirdparty/opus/celt/mips/mdct_mipsr1.h
@@ -42,16 +42,18 @@
 #define __MDCT_MIPSR1_H__
 
 #ifndef SKIP_CONFIG_H
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #endif
 
-#include "opus/celt/mdct.h"
-#include "opus/celt/kiss_fft.h"
-#include "opus/celt/_kiss_fft_guts.h"
+#include "mdct.h"
+#include "kiss_fft.h"
+#include "_kiss_fft_guts.h"
 #include <math.h>
-#include "opus/celt/os_support.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/stack_alloc.h"
+#include "os_support.h"
+#include "mathops.h"
+#include "stack_alloc.h"
 
 /* Forward MDCT trashes the input array */
 #define OVERRIDE_clt_mdct_forward
@@ -65,7 +67,7 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
    const kiss_fft_state *st = l->kfft[shift];
    const kiss_twiddle_scalar *trig;
    opus_val16 scale;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    /* Allows us to scale with MULT16_32_Q16(), which is faster than
       MULT16_32_Q15() on ARM. */
    int scale_shift = st->scale_shift-1;
diff --git a/drivers/opus/celt/mips/pitch_mipsr1.h b/thirdparty/opus/celt/mips/pitch_mipsr1.h
index a9500aff58..a9500aff58 100644
--- a/drivers/opus/celt/mips/pitch_mipsr1.h
+++ b/thirdparty/opus/celt/mips/pitch_mipsr1.h
diff --git a/drivers/opus/celt/mips/vq_mipsr1.h b/thirdparty/opus/celt/mips/vq_mipsr1.h
index c68159972f..54cef86133 100644
--- a/drivers/opus/celt/mips/vq_mipsr1.h
+++ b/thirdparty/opus/celt/mips/vq_mipsr1.h
@@ -28,10 +28,13 @@
 
 #ifndef __VQ_MIPSR1_H__
 #define __VQ_MIPSR1_H__
-#include "opus/opus_config.h"
 
-#include "opus/celt/mathops.h"
-#include "opus/celt/arch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mathops.h"
+#include "arch.h"
 
 static unsigned extract_collapse_mask(int *iy, int N, int B);
 static void normalise_residual(int * OPUS_RESTRICT iy, celt_norm * OPUS_RESTRICT X, int N, opus_val32 Ryy, opus_val16 gain);
@@ -73,7 +76,7 @@ static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_
 void renormalise_vector_mips(celt_norm *X, int N, opus_val16 gain, int arch)
 {
    int i;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    int k;
 #endif
    opus_val32 E = EPSILON;
@@ -104,7 +107,7 @@ void renormalise_vector_mips(celt_norm *X, int N, opus_val16 gain, int arch)
    }
 
    asm volatile("MFLO %0, $ac1" : "=r" (E));
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    k = celt_ilog2(E)>>1;
 #endif
    t = VSHR32(E, 2*(k-7));
diff --git a/drivers/opus/celt/modes.c b/thirdparty/opus/celt/modes.c
index d628f1468b..911686e905 100644
--- a/drivers/opus/celt/modes.c
+++ b/thirdparty/opus/celt/modes.c
@@ -26,15 +26,18 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/celt.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/rate.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/cpu_support.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "celt.h"
+#include "modes.h"
+#include "rate.h"
+#include "os_support.h"
+#include "stack_alloc.h"
+#include "quant_bands.h"
+#include "cpu_support.h"
 
 static const opus_int16 eband5ms[] = {
 /*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 */
@@ -60,10 +63,10 @@ static const unsigned char band_allocation[] = {
 };
 
 #ifndef CUSTOM_MODES_ONLY
- #ifdef OPUS_FIXED_POINT
-  #include "opus/celt/static_modes_fixed.h"
+ #ifdef FIXED_POINT
+  #include "static_modes_fixed.h"
  #else
-  #include "opus/celt/static_modes_float.h"
+  #include "static_modes_float.h"
  #endif
 #endif /* CUSTOM_MODES_ONLY */
 
@@ -368,7 +371,7 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
    if (window==NULL)
       goto failure;
 
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
    for (i=0;i<mode->overlap;i++)
       window[i] = Q15ONE*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap));
 #else
diff --git a/drivers/opus/celt/modes.h b/thirdparty/opus/celt/modes.h
index a5f1c30ac9..be813ccc8b 100644
--- a/drivers/opus/celt/modes.h
+++ b/thirdparty/opus/celt/modes.h
@@ -30,12 +30,12 @@
 #ifndef MODES_H
 #define MODES_H
 
-#include "opus/opus_types.h"
-#include "opus/celt/celt.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/mdct.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
+#include "opus_types.h"
+#include "celt.h"
+#include "arch.h"
+#include "mdct.h"
+#include "entenc.h"
+#include "entdec.h"
 
 #define MAX_PERIOD 1024
 
diff --git a/drivers/opus/celt/opus_custom_demo.c b/thirdparty/opus/celt/opus_custom_demo.c
index 956bec4e45..ae41c0de5a 100644
--- a/drivers/opus/celt/opus_custom_demo.c
+++ b/thirdparty/opus/celt/opus_custom_demo.c
@@ -25,10 +25,13 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus_custom.h"
-#include "opus/celt/arch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus_custom.h"
+#include "arch.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/drivers/opus/celt/os_support.h b/thirdparty/opus/celt/os_support.h
index 5e36b3ae56..a2171971e9 100644
--- a/drivers/opus/celt/os_support.h
+++ b/thirdparty/opus/celt/os_support.h
@@ -35,8 +35,8 @@
 #  include "custom_support.h"
 #endif
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#include "opus_types.h"
+#include "opus_defines.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/drivers/opus/celt/pitch.c b/thirdparty/opus/celt/pitch.c
index 1bcbabe943..1d89cb0342 100644
--- a/drivers/opus/celt/pitch.c
+++ b/thirdparty/opus/celt/pitch.c
@@ -30,18 +30,21 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/pitch.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/celt_lpc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pitch.h"
+#include "os_support.h"
+#include "modes.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "celt_lpc.h"
 
 static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
                             int max_pitch, int *best_pitch
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
                             , int yshift, opus_val32 maxcorr
 #endif
                             )
@@ -50,7 +53,7 @@ static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
    opus_val32 Syy=1;
    opus_val16 best_num[2];
    opus_val32 best_den[2];
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    int xshift;
 
    xshift = celt_ilog2(maxcorr)-14;
@@ -71,7 +74,7 @@ static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
          opus_val16 num;
          opus_val32 xcorr16;
          xcorr16 = EXTRACT16(VSHR32(xcorr[i], xshift));
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
          /* Considering the range of xcorr16, this should avoid both underflows
             and overflows (inf) when squaring xcorr16 */
          xcorr16 *= 1e-12f;
@@ -150,7 +153,7 @@ void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x
    opus_val16 lpc[4], mem[5]={0,0,0,0,0};
    opus_val16 lpc2[5];
    opus_val16 c1 = QCONST16(.8f,15);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    int shift;
    opus_val32 maxabs = celt_maxabs32(x[0], len);
    if (C==2)
@@ -180,7 +183,7 @@ void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x
                   4, len>>1, arch);
 
    /* Noise floor -40 dB */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    ac[0] += SHR32(ac[0],13);
 #else
    ac[0] *= 1.0001f;
@@ -189,7 +192,7 @@ void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x
    for (i=1;i<=4;i++)
    {
       /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
 #else
       ac[i] -= ac[i]*(.008f*i)*(.008f*i);
@@ -212,7 +215,7 @@ void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x
 }
 
 /* Pure C implementation. */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 opus_val32
 #else
 void
@@ -229,7 +232,7 @@ celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
 #if 0 /* This is a simple version of the pitch correlation that should work
          well on DSPs like Blackfin and TI C5x/C6x */
    int i, j;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    opus_val32 maxcorr=1;
 #endif
 #if !defined(OVERRIDE_PITCH_XCORR)
@@ -241,11 +244,11 @@ celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
       for (j=0;j<len;j++)
          sum = MAC16_16(sum, _x[j], _y[i+j]);
       xcorr[i] = sum;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       maxcorr = MAX32(maxcorr, sum);
 #endif
    }
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    return maxcorr;
 #endif
 
@@ -254,7 +257,7 @@ celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
    /*The EDSP version requires that max_pitch is at least 1, and that _x is
       32-bit aligned.
      Since it's hard to put asserts in assembly, put them here.*/
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    opus_val32 maxcorr=1;
 #endif
    celt_assert(max_pitch>0);
@@ -271,7 +274,7 @@ celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
       xcorr[i+1]=sum[1];
       xcorr[i+2]=sum[2];
       xcorr[i+3]=sum[3];
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       sum[0] = MAX32(sum[0], sum[1]);
       sum[2] = MAX32(sum[2], sum[3]);
       sum[0] = MAX32(sum[0], sum[2]);
@@ -288,11 +291,11 @@ celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
       sum = celt_inner_prod(_x, _y+i, len, arch);
 #endif
       xcorr[i] = sum;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       maxcorr = MAX32(maxcorr, sum);
 #endif
    }
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    return maxcorr;
 #endif
 #endif
@@ -307,7 +310,7 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
    VARDECL(opus_val16, x_lp4);
    VARDECL(opus_val16, y_lp4);
    VARDECL(opus_val32, xcorr);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    opus_val32 maxcorr;
    opus_val32 xmax, ymax;
    int shift=0;
@@ -330,7 +333,7 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
    for (j=0;j<lag>>2;j++)
       y_lp4[j] = y[2*j];
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    xmax = celt_maxabs16(x_lp4, len>>2);
    ymax = celt_maxabs16(y_lp4, lag>>2);
    shift = celt_ilog2(MAX32(1, MAX32(xmax, ymax)))-11;
@@ -349,19 +352,19 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
 
    /* Coarse search with 4x decimation */
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    maxcorr =
 #endif
    celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2, arch);
 
    find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
                    , 0, maxcorr
 #endif
                    );
 
    /* Finer search with 2x decimation */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    maxcorr=1;
 #endif
    for (i=0;i<max_pitch>>1;i++)
@@ -370,7 +373,7 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
       xcorr[i] = 0;
       if (abs(i-2*best_pitch[0])>2 && abs(i-2*best_pitch[1])>2)
          continue;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       sum = 0;
       for (j=0;j<len>>1;j++)
          sum += SHR32(MULT16_16(x_lp[j],y[i+j]), shift);
@@ -378,12 +381,12 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
       sum = celt_inner_prod_c(x_lp, y+i, len>>1);
 #endif
       xcorr[i] = MAX32(-1, sum);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       maxcorr = MAX32(maxcorr, sum);
 #endif
    }
    find_best_pitch(xcorr, y, len>>1, max_pitch>>1, best_pitch
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
                    , shift+1, maxcorr
 #endif
                    );
@@ -447,7 +450,7 @@ opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
    yy = yy_lookup[T0];
    best_xy = xy;
    best_yy = yy;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       {
          opus_val32 x2y2;
          int sh, t;
@@ -483,7 +486,7 @@ opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
       dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2, arch);
       xy += xy2;
       yy = yy_lookup[T1] + yy_lookup[T1b];
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       {
          opus_val32 x2y2;
          int sh, t;
diff --git a/drivers/opus/celt/pitch.h b/thirdparty/opus/celt/pitch.h
index ecae7667b8..65a77a6ecc 100644
--- a/drivers/opus/celt/pitch.h
+++ b/thirdparty/opus/celt/pitch.h
@@ -34,21 +34,21 @@
 #ifndef PITCH_H
 #define PITCH_H
 
-#include "opus/celt/modes.h"
-#include "opus/celt/cpu_support.h"
+#include "modes.h"
+#include "cpu_support.h"
 
 #if (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)) \
   || ((defined(OPUS_X86_MAY_HAVE_SSE4_1) || defined(OPUS_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT))
-#include "opus/celt/x86/pitch_sse.h"
+#include "x86/pitch_sse.h"
 #endif
 
 #if defined(MIPSr1_ASM)
-#include "opus/celt/mips/pitch_mipsr1.h"
+#include "mips/pitch_mipsr1.h"
 #endif
 
 #if ((defined(OPUS_ARM_ASM) && defined(FIXED_POINT)) \
   || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))
-# include "opus/celt/arm/pitch_arm.h"
+# include "arm/pitch_arm.h"
 #endif
 
 void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x_lp,
@@ -178,7 +178,7 @@ void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
 #endif
 
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 opus_val32
 #else
 void
@@ -206,7 +206,7 @@ void
         xcorr, len, max_pitch))
 # else
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 opus_val32
 #else
 void
diff --git a/drivers/opus/celt/quant_bands.c b/thirdparty/opus/celt/quant_bands.c
index b38bfa8b8e..95076e0af2 100644
--- a/drivers/opus/celt/quant_bands.c
+++ b/thirdparty/opus/celt/quant_bands.c
@@ -25,18 +25,21 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/laplace.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "quant_bands.h"
+#include "laplace.h"
 #include <math.h>
-#include "opus/celt/os_support.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/rate.h"
+#include "os_support.h"
+#include "arch.h"
+#include "mathops.h"
+#include "stack_alloc.h"
+#include "rate.h"
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 /* Mean energy in each band quantized in Q4 */
 const signed char eMeans[25] = {
       103,100, 92, 85, 81,
@@ -56,7 +59,7 @@ const opus_val16 eMeans[25] = {
 };
 #endif
 /* prediction coefficients: 0.9, 0.8, 0.65, 0.5 */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 static const opus_val16 pred_coef[4] = {29440, 26112, 21248, 16384};
 static const opus_val16 beta_coef[4] = {30147, 22282, 12124, 6554};
 static const opus_val16 beta_intra = 4915;
@@ -187,7 +190,7 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
          opus_val16 decay_bound;
          x = eBands[i+c*m->nbEBands];
          oldE = MAX16(-QCONST16(9.f,DB_SHIFT), oldEBands[i+c*m->nbEBands]);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          f = SHL32(EXTEND32(x),7) - PSHR32(MULT16_16(coef,oldE), 8) - prev[c];
          /* Rounding to nearest integer here is really important! */
          qi = (f+QCONST32(.5f,DB_SHIFT+7))>>(DB_SHIFT+7);
@@ -245,7 +248,7 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
          q = (opus_val32)SHL32(EXTEND32(qi),DB_SHIFT);
 
          tmp = PSHR32(MULT16_16(coef,oldE),8) + prev[c] + SHL32(q,7);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          tmp = MAX32(-QCONST32(28.f, DB_SHIFT+7), tmp);
 #endif
          oldEBands[i+c*m->nbEBands] = PSHR32(tmp, 7);
@@ -282,7 +285,7 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
    max_decay = QCONST16(16.f,DB_SHIFT);
    if (end-start>10)
    {
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       max_decay = MIN32(max_decay, SHL32(EXTEND32(nbAvailableBytes),DB_SHIFT-3));
 #else
       max_decay = MIN32(max_decay, .125f*nbAvailableBytes);
@@ -369,7 +372,7 @@ void quant_fine_energy(const CELTMode *m, int start, int end, opus_val16 *oldEBa
       do {
          int q2;
          opus_val16 offset;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          /* Has to be without rounding */
          q2 = (error[i+c*m->nbEBands]+QCONST16(.5f,DB_SHIFT))>>(DB_SHIFT-fine_quant[i]);
 #else
@@ -380,7 +383,7 @@ void quant_fine_energy(const CELTMode *m, int start, int end, opus_val16 *oldEBa
          if (q2<0)
             q2 = 0;
          ec_enc_bits(enc, q2, fine_quant[i]);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          offset = SUB16(SHR32(SHL32(EXTEND32(q2),DB_SHIFT)+QCONST16(.5f,DB_SHIFT),fine_quant[i]),QCONST16(.5f,DB_SHIFT));
 #else
          offset = (q2+.5f)*(1<<(14-fine_quant[i]))*(1.f/16384) - .5f;
@@ -409,7 +412,7 @@ void quant_energy_finalise(const CELTMode *m, int start, int end, opus_val16 *ol
             opus_val16 offset;
             q2 = error[i+c*m->nbEBands]<0 ? 0 : 1;
             ec_enc_bits(enc, q2, 1);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             offset = SHR16(SHL16(q2,DB_SHIFT)-QCONST16(.5f,DB_SHIFT),fine_quant[i]+1);
 #else
             offset = (q2-.5f)*(1<<(14-fine_quant[i]-1))*(1.f/16384);
@@ -477,7 +480,7 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, opus_val16 *ol
 
          oldEBands[i+c*m->nbEBands] = MAX16(-QCONST16(9.f,DB_SHIFT), oldEBands[i+c*m->nbEBands]);
          tmp = PSHR32(MULT16_16(coef,oldEBands[i+c*m->nbEBands]),8) + prev[c] + SHL32(q,7);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          tmp = MAX32(-QCONST32(28.f, DB_SHIFT+7), tmp);
 #endif
          oldEBands[i+c*m->nbEBands] = PSHR32(tmp, 7);
@@ -499,7 +502,7 @@ void unquant_fine_energy(const CELTMode *m, int start, int end, opus_val16 *oldE
          int q2;
          opus_val16 offset;
          q2 = ec_dec_bits(dec, fine_quant[i]);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          offset = SUB16(SHR32(SHL32(EXTEND32(q2),DB_SHIFT)+QCONST16(.5f,DB_SHIFT),fine_quant[i]),QCONST16(.5f,DB_SHIFT));
 #else
          offset = (q2+.5f)*(1<<(14-fine_quant[i]))*(1.f/16384) - .5f;
@@ -525,7 +528,7 @@ void unquant_energy_finalise(const CELTMode *m, int start, int end, opus_val16 *
             int q2;
             opus_val16 offset;
             q2 = ec_dec_bits(dec, 1);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             offset = SHR16(SHL16(q2,DB_SHIFT)-QCONST16(.5f,DB_SHIFT),fine_quant[i]+1);
 #else
             offset = (q2-.5f)*(1<<(14-fine_quant[i]-1))*(1.f/16384);
diff --git a/drivers/opus/celt/quant_bands.h b/thirdparty/opus/celt/quant_bands.h
index 31d4b94e41..0490bca4b4 100644
--- a/drivers/opus/celt/quant_bands.h
+++ b/thirdparty/opus/celt/quant_bands.h
@@ -29,13 +29,13 @@
 #ifndef QUANT_BANDS
 #define QUANT_BANDS
 
-#include "opus/celt/arch.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
-#include "opus/celt/mathops.h"
+#include "arch.h"
+#include "modes.h"
+#include "entenc.h"
+#include "entdec.h"
+#include "mathops.h"
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 extern const signed char eMeans[25];
 #else
 extern const opus_val16 eMeans[25];
diff --git a/drivers/opus/celt/rate.c b/thirdparty/opus/celt/rate.c
index e69fb3f030..b28d8feccd 100644
--- a/drivers/opus/celt/rate.c
+++ b/thirdparty/opus/celt/rate.c
@@ -25,16 +25,19 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <math.h>
-#include "opus/celt/modes.h"
-#include "opus/celt/cwrs.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/os_support.h"
+#include "modes.h"
+#include "cwrs.h"
+#include "arch.h"
+#include "os_support.h"
 
-#include "opus/celt/entcode.h"
-#include "opus/celt/rate.h"
+#include "entcode.h"
+#include "rate.h"
 
 static const unsigned char LOG2_FRAC_TABLE[24]={
    0,
diff --git a/drivers/opus/celt/rate.h b/thirdparty/opus/celt/rate.h
index cf8085fccf..515f7687ce 100644
--- a/drivers/opus/celt/rate.h
+++ b/thirdparty/opus/celt/rate.h
@@ -40,8 +40,8 @@
 #define QTHETA_OFFSET 4
 #define QTHETA_OFFSET_TWOPHASE 16
 
-#include "opus/celt/cwrs.h"
-#include "opus/celt/modes.h"
+#include "cwrs.h"
+#include "modes.h"
 
 void compute_pulse_cache(CELTMode *m, int LM);
 
diff --git a/drivers/opus/celt/stack_alloc.h b/thirdparty/opus/celt/stack_alloc.h
index 7cd6c56ccf..2b51c8d80c 100644
--- a/drivers/opus/celt/stack_alloc.h
+++ b/thirdparty/opus/celt/stack_alloc.h
@@ -32,8 +32,8 @@
 #ifndef STACK_ALLOC_H
 #define STACK_ALLOC_H
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#include "opus_types.h"
+#include "opus_defines.h"
 
 #if (!defined (VAR_ARRAYS) && !defined (USE_ALLOCA) && !defined (NONTHREADSAFE_PSEUDOSTACK))
 #error "Opus requires one of VAR_ARRAYS, USE_ALLOCA, or NONTHREADSAFE_PSEUDOSTACK be defined to select the temporary allocation mode."
@@ -151,7 +151,7 @@ extern char *global_stack_top;
 
 #endif /* ENABLE_VALGRIND */
 
-#include "opus/celt/os_support.h"
+#include "os_support.h"
 #define VARDECL(type, var) type *var
 #define ALLOC(var, size, type) var = PUSH(global_stack, size, type)
 #define SAVE_STACK char *_saved_stack = global_stack;
diff --git a/drivers/opus/celt/static_modes_fixed.h b/thirdparty/opus/celt/static_modes_fixed.h
index 352642f507..8717d626cb 100644
--- a/drivers/opus/celt/static_modes_fixed.h
+++ b/thirdparty/opus/celt/static_modes_fixed.h
@@ -1,12 +1,12 @@
 /* The contents of this file was automatically generated by dump_modes.c
    with arguments: 48000 960
    It contains static definitions for some pre-defined modes. */
-#include "opus/celt/modes.h"
-#include "opus/celt/rate.h"
+#include "modes.h"
+#include "rate.h"
 
 #ifdef HAVE_ARM_NE10
 #define OVERRIDE_FFT 1
-#include "opus/celt/static_modes_fixed_arm_ne10.h"
+#include "static_modes_fixed_arm_ne10.h"
 #endif
 
 #ifndef DEF_WINDOW120
diff --git a/drivers/opus/celt/static_modes_fixed_arm_ne10.h b/thirdparty/opus/celt/static_modes_fixed_arm_ne10.h
index b8ef0cee98..b8ef0cee98 100644
--- a/drivers/opus/celt/static_modes_fixed_arm_ne10.h
+++ b/thirdparty/opus/celt/static_modes_fixed_arm_ne10.h
diff --git a/drivers/opus/celt/static_modes_float.h b/thirdparty/opus/celt/static_modes_float.h
index f7d501a993..e102a38391 100644
--- a/drivers/opus/celt/static_modes_float.h
+++ b/thirdparty/opus/celt/static_modes_float.h
@@ -1,12 +1,12 @@
 /* The contents of this file was automatically generated by dump_modes.c
    with arguments: 48000 960
    It contains static definitions for some pre-defined modes. */
-#include "opus/celt/modes.h"
-#include "opus/celt/rate.h"
+#include "modes.h"
+#include "rate.h"
 
 #ifdef HAVE_ARM_NE10
 #define OVERRIDE_FFT 1
-#include "opus/celt/static_modes_float_arm_ne10.h"
+#include "static_modes_float_arm_ne10.h"
 #endif
 
 #ifndef DEF_WINDOW120
diff --git a/drivers/opus/celt/static_modes_float_arm_ne10.h b/thirdparty/opus/celt/static_modes_float_arm_ne10.h
index 934a82a420..934a82a420 100644
--- a/drivers/opus/celt/static_modes_float_arm_ne10.h
+++ b/thirdparty/opus/celt/static_modes_float_arm_ne10.h
diff --git a/thirdparty/opus/celt/tests/test_unit_cwrs32.c b/thirdparty/opus/celt/tests/test_unit_cwrs32.c
new file mode 100644
index 0000000000..36dd8af5f5
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_cwrs32.c
@@ -0,0 +1,161 @@
+/* Copyright (c) 2008-2011 Xiph.Org Foundation, Mozilla Corporation,
+                           Gregory Maxwell
+   Written by Jean-Marc Valin, Gregory Maxwell, and Timothy B. Terriberry */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#ifndef CUSTOM_MODES
+#define CUSTOM_MODES
+#else
+#define TEST_CUSTOM_MODES
+#endif
+
+#define CELT_C
+#include "stack_alloc.h"
+#include "entenc.c"
+#include "entdec.c"
+#include "entcode.c"
+#include "cwrs.c"
+#include "mathops.c"
+#include "rate.h"
+
+#define NMAX (240)
+#define KMAX (128)
+
+#ifdef TEST_CUSTOM_MODES
+
+#define NDIMS (44)
+static const int pn[NDIMS]={
+   2,   3,   4,   5,   6,   7,   8,   9,  10,
+  11,  12,  13,  14,  15,  16,  18,  20,  22,
+  24,  26,  28,  30,  32,  36,  40,  44,  48,
+  52,  56,  60,  64,  72,  80,  88,  96, 104,
+ 112, 120, 128, 144, 160, 176, 192, 208
+};
+static const int pkmax[NDIMS]={
+ 128, 128, 128, 128,  88,  52,  36,  26,  22,
+  18,  16,  15,  13,  12,  12,  11,  10,   9,
+   9,   8,   8,   7,   7,   7,   7,   6,   6,
+   6,   6,   6,   5,   5,   5,   5,   5,   5,
+   4,   4,   4,   4,   4,   4,   4,   4
+};
+
+#else /* TEST_CUSTOM_MODES */
+
+#define NDIMS (22)
+static const int pn[NDIMS]={
+   2,   3,   4,   6,   8,   9,  11,  12,  16,
+  18,  22,  24,  32,  36,  44,  48,  64,  72,
+  88,  96, 144, 176
+};
+static const int pkmax[NDIMS]={
+ 128, 128, 128,  88,  36,  26,  18,  16,  12,
+  11,   9,   9,   7,   7,   6,   6,   5,   5,
+   5,   5,   4,   4
+};
+
+#endif
+
+int main(void){
+  int t;
+  int n;
+  ALLOC_STACK;
+  for(t=0;t<NDIMS;t++){
+    int pseudo;
+    n=pn[t];
+    for(pseudo=1;pseudo<41;pseudo++)
+    {
+      int k;
+#if defined(SMALL_FOOTPRINT)
+      opus_uint32 uu[KMAX+2U];
+#endif
+      opus_uint32 inc;
+      opus_uint32 nc;
+      opus_uint32 i;
+      k=get_pulses(pseudo);
+      if (k>pkmax[t])break;
+      printf("Testing CWRS with N=%i, K=%i...\n",n,k);
+#if defined(SMALL_FOOTPRINT)
+      nc=ncwrs_urow(n,k,uu);
+#else
+      nc=CELT_PVQ_V(n,k);
+#endif
+      inc=nc/20000;
+      if(inc<1)inc=1;
+      for(i=0;i<nc;i+=inc){
+#if defined(SMALL_FOOTPRINT)
+        opus_uint32 u[KMAX+2U];
+#endif
+        int         y[NMAX];
+        int         sy;
+        opus_uint32 v;
+        opus_uint32 ii;
+        int         j;
+#if defined(SMALL_FOOTPRINT)
+        memcpy(u,uu,(k+2U)*sizeof(*u));
+        cwrsi(n,k,i,y,u);
+#else
+        cwrsi(n,k,i,y);
+#endif
+        sy=0;
+        for(j=0;j<n;j++)sy+=abs(y[j]);
+        if(sy!=k){
+          fprintf(stderr,"N=%d Pulse count mismatch in cwrsi (%d!=%d).\n",
+           n,sy,k);
+          return 99;
+        }
+        /*printf("%6u of %u:",i,nc);
+        for(j=0;j<n;j++)printf(" %+3i",y[j]);
+        printf(" ->");*/
+#if defined(SMALL_FOOTPRINT)
+        ii=icwrs(n,k,&v,y,u);
+#else
+        ii=icwrs(n,y);
+        v=CELT_PVQ_V(n,k);
+#endif
+        if(ii!=i){
+          fprintf(stderr,"Combination-index mismatch (%lu!=%lu).\n",
+           (long)ii,(long)i);
+          return 1;
+        }
+        if(v!=nc){
+          fprintf(stderr,"Combination count mismatch (%lu!=%lu).\n",
+           (long)v,(long)nc);
+          return 2;
+        }
+        /*printf(" %6u\n",i);*/
+      }
+      /*printf("\n");*/
+    }
+  }
+  return 0;
+}
diff --git a/thirdparty/opus/celt/tests/test_unit_dft.c b/thirdparty/opus/celt/tests/test_unit_dft.c
new file mode 100644
index 0000000000..6166eb0e4f
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_dft.c
@@ -0,0 +1,189 @@
+/* Copyright (c) 2008 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define SKIP_CONFIG_H
+
+#ifndef CUSTOM_MODES
+#define CUSTOM_MODES
+#endif
+
+#include <stdio.h>
+
+#define CELT_C
+#define TEST_UNIT_DFT_C
+#include "stack_alloc.h"
+#include "kiss_fft.h"
+#include "kiss_fft.c"
+#include "mathops.c"
+#include "entcode.c"
+
+#if defined(OPUS_X86_MAY_HAVE_SSE2) || defined(OPUS_X86_MAY_HAVE_SSE4_1)
+# include "x86/x86cpu.c"
+#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# include "arm/armcpu.c"
+# include "celt_lpc.c"
+# include "pitch.c"
+# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  include "arm/celt_neon_intr.c"
+#  if defined(HAVE_ARM_NE10)
+#   include "mdct.c"
+#   include "arm/celt_ne10_fft.c"
+#   include "arm/celt_ne10_mdct.c"
+#  endif
+# endif
+# include "arm/arm_celt_map.c"
+#endif
+
+#ifndef M_PI
+#define M_PI 3.141592653
+#endif
+
+int ret = 0;
+
+void check(kiss_fft_cpx  * in,kiss_fft_cpx  * out,int nfft,int isinverse)
+{
+    int bin,k;
+    double errpow=0,sigpow=0, snr;
+
+    for (bin=0;bin<nfft;++bin) {
+        double ansr = 0;
+        double ansi = 0;
+        double difr;
+        double difi;
+
+        for (k=0;k<nfft;++k) {
+            double phase = -2*M_PI*bin*k/nfft;
+            double re = cos(phase);
+            double im = sin(phase);
+            if (isinverse)
+                im = -im;
+
+            if (!isinverse)
+            {
+               re /= nfft;
+               im /= nfft;
+            }
+
+            ansr += in[k].r * re - in[k].i * im;
+            ansi += in[k].r * im + in[k].i * re;
+        }
+        /*printf ("%d %d ", (int)ansr, (int)ansi);*/
+        difr = ansr - out[bin].r;
+        difi = ansi - out[bin].i;
+        errpow += difr*difr + difi*difi;
+        sigpow += ansr*ansr+ansi*ansi;
+    }
+    snr = 10*log10(sigpow/errpow);
+    printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );
+    if (snr<60) {
+       printf( "** poor snr: %f ** \n", snr);
+       ret = 1;
+    }
+}
+
+void test1d(int nfft,int isinverse,int arch)
+{
+    size_t buflen = sizeof(kiss_fft_cpx)*nfft;
+
+    kiss_fft_cpx  * in = (kiss_fft_cpx*)malloc(buflen);
+    kiss_fft_cpx  * out= (kiss_fft_cpx*)malloc(buflen);
+    kiss_fft_state *cfg = opus_fft_alloc(nfft,0,0,arch);
+    int k;
+
+    for (k=0;k<nfft;++k) {
+        in[k].r = (rand() % 32767) - 16384;
+        in[k].i = (rand() % 32767) - 16384;
+    }
+
+    for (k=0;k<nfft;++k) {
+       in[k].r *= 32768;
+       in[k].i *= 32768;
+    }
+
+    if (isinverse)
+    {
+       for (k=0;k<nfft;++k) {
+          in[k].r /= nfft;
+          in[k].i /= nfft;
+       }
+    }
+
+    /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/
+
+    if (isinverse)
+       opus_ifft(cfg,in,out, arch);
+    else
+       opus_fft(cfg,in,out, arch);
+
+    /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/
+
+    check(in,out,nfft,isinverse);
+
+    free(in);
+    free(out);
+    opus_fft_free(cfg, arch);
+}
+
+int main(int argc,char ** argv)
+{
+    ALLOC_STACK;
+    int arch = opus_select_arch();
+
+    if (argc>1) {
+        int k;
+        for (k=1;k<argc;++k) {
+            test1d(atoi(argv[k]),0,arch);
+            test1d(atoi(argv[k]),1,arch);
+        }
+    }else{
+        test1d(32,0,arch);
+        test1d(32,1,arch);
+        test1d(128,0,arch);
+        test1d(128,1,arch);
+        test1d(256,0,arch);
+        test1d(256,1,arch);
+#ifndef RADIX_TWO_ONLY
+        test1d(36,0,arch);
+        test1d(36,1,arch);
+        test1d(50,0,arch);
+        test1d(50,1,arch);
+        test1d(60,0,arch);
+        test1d(60,1,arch);
+        test1d(120,0,arch);
+        test1d(120,1,arch);
+        test1d(240,0,arch);
+        test1d(240,1,arch);
+        test1d(480,0,arch);
+        test1d(480,1,arch);
+#endif
+    }
+    return ret;
+}
diff --git a/thirdparty/opus/celt/tests/test_unit_entropy.c b/thirdparty/opus/celt/tests/test_unit_entropy.c
new file mode 100644
index 0000000000..ff9265864c
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_entropy.c
@@ -0,0 +1,382 @@
+/* Copyright (c) 2007-2011 Xiph.Org Foundation, Mozilla Corporation,
+                           Gregory Maxwell
+   Written by Jean-Marc Valin, Gregory Maxwell, and Timothy B. Terriberry */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <time.h>
+#include "entcode.h"
+#include "entenc.h"
+#include "entdec.h"
+#include <string.h>
+
+#include "entenc.c"
+#include "entdec.c"
+#include "entcode.c"
+
+#ifndef M_LOG2E
+# define M_LOG2E    1.4426950408889634074
+#endif
+#define DATA_SIZE 10000000
+#define DATA_SIZE2 10000
+
+int main(int _argc,char **_argv){
+  ec_enc         enc;
+  ec_dec         dec;
+  long           nbits;
+  long           nbits2;
+  double         entropy;
+  int            ft;
+  int            ftb;
+  int            sz;
+  int            i;
+  int            ret;
+  unsigned int   sym;
+  unsigned int   seed;
+  unsigned char *ptr;
+  const char    *env_seed;
+  ret=0;
+  entropy=0;
+  if (_argc > 2) {
+    fprintf(stderr, "Usage: %s [<seed>]\n", _argv[0]);
+    return 1;
+  }
+  env_seed = getenv("SEED");
+  if (_argc > 1)
+    seed = atoi(_argv[1]);
+  else if (env_seed)
+    seed = atoi(env_seed);
+  else
+    seed = time(NULL);
+  /*Testing encoding of raw bit values.*/
+  ptr = (unsigned char *)malloc(DATA_SIZE);
+  ec_enc_init(&enc,ptr, DATA_SIZE);
+  for(ft=2;ft<1024;ft++){
+    for(i=0;i<ft;i++){
+      entropy+=log(ft)*M_LOG2E;
+      ec_enc_uint(&enc,i,ft);
+    }
+  }
+  /*Testing encoding of raw bit values.*/
+  for(ftb=1;ftb<16;ftb++){
+    for(i=0;i<(1<<ftb);i++){
+      entropy+=ftb;
+      nbits=ec_tell(&enc);
+      ec_enc_bits(&enc,i,ftb);
+      nbits2=ec_tell(&enc);
+      if(nbits2-nbits!=ftb){
+        fprintf(stderr,"Used %li bits to encode %i bits directly.\n",
+         nbits2-nbits,ftb);
+        ret=-1;
+      }
+    }
+  }
+  nbits=ec_tell_frac(&enc);
+  ec_enc_done(&enc);
+  fprintf(stderr,
+   "Encoded %0.2lf bits of entropy to %0.2lf bits (%0.3lf%% wasted).\n",
+   entropy,ldexp(nbits,-3),100*(nbits-ldexp(entropy,3))/nbits);
+  fprintf(stderr,"Packed to %li bytes.\n",(long)ec_range_bytes(&enc));
+  ec_dec_init(&dec,ptr,DATA_SIZE);
+  for(ft=2;ft<1024;ft++){
+    for(i=0;i<ft;i++){
+      sym=ec_dec_uint(&dec,ft);
+      if(sym!=(unsigned)i){
+        fprintf(stderr,"Decoded %i instead of %i with ft of %i.\n",sym,i,ft);
+        ret=-1;
+      }
+    }
+  }
+  for(ftb=1;ftb<16;ftb++){
+    for(i=0;i<(1<<ftb);i++){
+      sym=ec_dec_bits(&dec,ftb);
+      if(sym!=(unsigned)i){
+        fprintf(stderr,"Decoded %i instead of %i with ftb of %i.\n",sym,i,ftb);
+        ret=-1;
+      }
+    }
+  }
+  nbits2=ec_tell_frac(&dec);
+  if(nbits!=nbits2){
+    fprintf(stderr,
+     "Reported number of bits used was %0.2lf, should be %0.2lf.\n",
+     ldexp(nbits2,-3),ldexp(nbits,-3));
+    ret=-1;
+  }
+  /*Testing an encoder bust prefers range coder data over raw bits.
+    This isn't a general guarantee, will only work for data that is buffered in
+     the encoder state and not yet stored in the user buffer, and should never
+     get used in practice.
+    It's mostly here for code coverage completeness.*/
+  /*Start with a 16-bit buffer.*/
+  ec_enc_init(&enc,ptr,2);
+  /*Write 7 raw bits.*/
+  ec_enc_bits(&enc,0x55,7);
+  /*Write 12.3 bits of range coder data.*/
+  ec_enc_uint(&enc,1,2);
+  ec_enc_uint(&enc,1,3);
+  ec_enc_uint(&enc,1,4);
+  ec_enc_uint(&enc,1,5);
+  ec_enc_uint(&enc,2,6);
+  ec_enc_uint(&enc,6,7);
+  ec_enc_done(&enc);
+  ec_dec_init(&dec,ptr,2);
+  if(!enc.error
+   /*The raw bits should have been overwritten by the range coder data.*/
+   ||ec_dec_bits(&dec,7)!=0x05
+   /*And all the range coder data should have been encoded correctly.*/
+   ||ec_dec_uint(&dec,2)!=1
+   ||ec_dec_uint(&dec,3)!=1
+   ||ec_dec_uint(&dec,4)!=1
+   ||ec_dec_uint(&dec,5)!=1
+   ||ec_dec_uint(&dec,6)!=2
+   ||ec_dec_uint(&dec,7)!=6){
+    fprintf(stderr,"Encoder bust overwrote range coder data with raw bits.\n");
+    ret=-1;
+  }
+  srand(seed);
+  fprintf(stderr,"Testing random streams... Random seed: %u (%.4X)\n", seed, rand() % 65536);
+  for(i=0;i<409600;i++){
+    unsigned *data;
+    unsigned *tell;
+    unsigned tell_bits;
+    int       j;
+    int zeros;
+    ft=rand()/((RAND_MAX>>(rand()%11U))+1U)+10;
+    sz=rand()/((RAND_MAX>>(rand()%9U))+1U);
+    data=(unsigned *)malloc(sz*sizeof(*data));
+    tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
+    ec_enc_init(&enc,ptr,DATA_SIZE2);
+    zeros = rand()%13==0;
+    tell[0]=ec_tell_frac(&enc);
+    for(j=0;j<sz;j++){
+      if (zeros)
+        data[j]=0;
+      else
+        data[j]=rand()%ft;
+      ec_enc_uint(&enc,data[j],ft);
+      tell[j+1]=ec_tell_frac(&enc);
+    }
+    if (rand()%2==0)
+      while(ec_tell(&enc)%8 != 0)
+        ec_enc_uint(&enc, rand()%2, 2);
+    tell_bits = ec_tell(&enc);
+    ec_enc_done(&enc);
+    if(tell_bits!=(unsigned)ec_tell(&enc)){
+      fprintf(stderr,"ec_tell() changed after ec_enc_done(): %i instead of %i (Random seed: %u)\n",
+       ec_tell(&enc),tell_bits,seed);
+      ret=-1;
+    }
+    if ((tell_bits+7)/8 < ec_range_bytes(&enc))
+    {
+      fprintf (stderr, "ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
+               ec_range_bytes(&enc), (tell_bits+7)/8,seed);
+      ret=-1;
+    }
+    ec_dec_init(&dec,ptr,DATA_SIZE2);
+    if(ec_tell_frac(&dec)!=tell[0]){
+      fprintf(stderr,
+       "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+       0,ec_tell_frac(&dec),tell[0],seed);
+    }
+    for(j=0;j<sz;j++){
+      sym=ec_dec_uint(&dec,ft);
+      if(sym!=data[j]){
+        fprintf(stderr,
+         "Decoded %i instead of %i with ft of %i at position %i of %i (Random seed: %u).\n",
+         sym,data[j],ft,j,sz,seed);
+        ret=-1;
+      }
+      if(ec_tell_frac(&dec)!=tell[j+1]){
+        fprintf(stderr,
+         "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+         j+1,ec_tell_frac(&dec),tell[j+1],seed);
+      }
+    }
+    free(tell);
+    free(data);
+  }
+  /*Test compatibility between multiple different encode/decode routines.*/
+  for(i=0;i<409600;i++){
+    unsigned *logp1;
+    unsigned *data;
+    unsigned *tell;
+    unsigned *enc_method;
+    int       j;
+    sz=rand()/((RAND_MAX>>(rand()%9U))+1U);
+    logp1=(unsigned *)malloc(sz*sizeof(*logp1));
+    data=(unsigned *)malloc(sz*sizeof(*data));
+    tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
+    enc_method=(unsigned *)malloc(sz*sizeof(*enc_method));
+    ec_enc_init(&enc,ptr,DATA_SIZE2);
+    tell[0]=ec_tell_frac(&enc);
+    for(j=0;j<sz;j++){
+      data[j]=rand()/((RAND_MAX>>1)+1);
+      logp1[j]=(rand()%15)+1;
+      enc_method[j]=rand()/((RAND_MAX>>2)+1);
+      switch(enc_method[j]){
+        case 0:{
+          ec_encode(&enc,data[j]?(1<<logp1[j])-1:0,
+           (1<<logp1[j])-(data[j]?0:1),1<<logp1[j]);
+        }break;
+        case 1:{
+          ec_encode_bin(&enc,data[j]?(1<<logp1[j])-1:0,
+           (1<<logp1[j])-(data[j]?0:1),logp1[j]);
+        }break;
+        case 2:{
+          ec_enc_bit_logp(&enc,data[j],logp1[j]);
+        }break;
+        case 3:{
+          unsigned char icdf[2];
+          icdf[0]=1;
+          icdf[1]=0;
+          ec_enc_icdf(&enc,data[j],icdf,logp1[j]);
+        }break;
+      }
+      tell[j+1]=ec_tell_frac(&enc);
+    }
+    ec_enc_done(&enc);
+    if((ec_tell(&enc)+7U)/8U<ec_range_bytes(&enc)){
+      fprintf(stderr,"tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
+       ec_range_bytes(&enc),(ec_tell(&enc)+7)/8,seed);
+      ret=-1;
+    }
+    ec_dec_init(&dec,ptr,DATA_SIZE2);
+    if(ec_tell_frac(&dec)!=tell[0]){
+      fprintf(stderr,
+       "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+       0,ec_tell_frac(&dec),tell[0],seed);
+    }
+    for(j=0;j<sz;j++){
+      int fs;
+      int dec_method;
+      dec_method=rand()/((RAND_MAX>>2)+1);
+      switch(dec_method){
+        case 0:{
+          fs=ec_decode(&dec,1<<logp1[j]);
+          sym=fs>=(1<<logp1[j])-1;
+          ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
+           (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
+        }break;
+        case 1:{
+          fs=ec_decode_bin(&dec,logp1[j]);
+          sym=fs>=(1<<logp1[j])-1;
+          ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
+           (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
+        }break;
+        case 2:{
+          sym=ec_dec_bit_logp(&dec,logp1[j]);
+        }break;
+        case 3:{
+          unsigned char icdf[2];
+          icdf[0]=1;
+          icdf[1]=0;
+          sym=ec_dec_icdf(&dec,icdf,logp1[j]);
+        }break;
+      }
+      if(sym!=data[j]){
+        fprintf(stderr,
+         "Decoded %i instead of %i with logp1 of %i at position %i of %i (Random seed: %u).\n",
+         sym,data[j],logp1[j],j,sz,seed);
+        fprintf(stderr,"Encoding method: %i, decoding method: %i\n",
+         enc_method[j],dec_method);
+        ret=-1;
+      }
+      if(ec_tell_frac(&dec)!=tell[j+1]){
+        fprintf(stderr,
+         "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+         j+1,ec_tell_frac(&dec),tell[j+1],seed);
+      }
+    }
+    free(enc_method);
+    free(tell);
+    free(data);
+    free(logp1);
+  }
+  ec_enc_init(&enc,ptr,DATA_SIZE2);
+  ec_enc_bit_logp(&enc,0,1);
+  ec_enc_bit_logp(&enc,0,1);
+  ec_enc_bit_logp(&enc,0,1);
+  ec_enc_bit_logp(&enc,0,1);
+  ec_enc_bit_logp(&enc,0,2);
+  ec_enc_patch_initial_bits(&enc,3,2);
+  if(enc.error){
+    fprintf(stderr,"patch_initial_bits failed");
+    ret=-1;
+  }
+  ec_enc_patch_initial_bits(&enc,0,5);
+  if(!enc.error){
+    fprintf(stderr,"patch_initial_bits didn't fail when it should have");
+    ret=-1;
+  }
+  ec_enc_done(&enc);
+  if(ec_range_bytes(&enc)!=1||ptr[0]!=192){
+    fprintf(stderr,"Got %d when expecting 192 for patch_initial_bits",ptr[0]);
+    ret=-1;
+  }
+  ec_enc_init(&enc,ptr,DATA_SIZE2);
+  ec_enc_bit_logp(&enc,0,1);
+  ec_enc_bit_logp(&enc,0,1);
+  ec_enc_bit_logp(&enc,1,6);
+  ec_enc_bit_logp(&enc,0,2);
+  ec_enc_patch_initial_bits(&enc,0,2);
+  if(enc.error){
+    fprintf(stderr,"patch_initial_bits failed");
+    ret=-1;
+  }
+  ec_enc_done(&enc);
+  if(ec_range_bytes(&enc)!=2||ptr[0]!=63){
+    fprintf(stderr,"Got %d when expecting 63 for patch_initial_bits",ptr[0]);
+    ret=-1;
+  }
+  ec_enc_init(&enc,ptr,2);
+  ec_enc_bit_logp(&enc,0,2);
+  for(i=0;i<48;i++){
+    ec_enc_bits(&enc,0,1);
+  }
+  ec_enc_done(&enc);
+  if(!enc.error){
+    fprintf(stderr,"Raw bits overfill didn't fail when it should have");
+    ret=-1;
+  }
+  ec_enc_init(&enc,ptr,2);
+  for(i=0;i<17;i++){
+    ec_enc_bits(&enc,0,1);
+  }
+  ec_enc_done(&enc);
+  if(!enc.error){
+    fprintf(stderr,"17 raw bits encoded in two bytes");
+    ret=-1;
+  }
+  free(ptr);
+  return ret;
+}
diff --git a/thirdparty/opus/celt/tests/test_unit_laplace.c b/thirdparty/opus/celt/tests/test_unit_laplace.c
new file mode 100644
index 0000000000..22951e29ee
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_laplace.c
@@ -0,0 +1,93 @@
+/* Copyright (c) 2008-2011 Xiph.Org Foundation, Mozilla Corporation
+   Written by Jean-Marc Valin and Timothy B. Terriberry */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "laplace.h"
+#define CELT_C
+#include "stack_alloc.h"
+
+#include "entenc.c"
+#include "entdec.c"
+#include "entcode.c"
+#include "laplace.c"
+
+#define DATA_SIZE 40000
+
+int ec_laplace_get_start_freq(int decay)
+{
+   opus_uint32 ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN+1);
+   int fs = (ft*(16384-decay))/(16384+decay);
+   return fs+LAPLACE_MINP;
+}
+
+int main(void)
+{
+   int i;
+   int ret = 0;
+   ec_enc enc;
+   ec_dec dec;
+   unsigned char *ptr;
+   int val[10000], decay[10000];
+   ALLOC_STACK;
+   ptr = (unsigned char *)malloc(DATA_SIZE);
+   ec_enc_init(&enc,ptr,DATA_SIZE);
+
+   val[0] = 3; decay[0] = 6000;
+   val[1] = 0; decay[1] = 5800;
+   val[2] = -1; decay[2] = 5600;
+   for (i=3;i<10000;i++)
+   {
+      val[i] = rand()%15-7;
+      decay[i] = rand()%11000+5000;
+   }
+   for (i=0;i<10000;i++)
+      ec_laplace_encode(&enc, &val[i],
+            ec_laplace_get_start_freq(decay[i]), decay[i]);
+
+   ec_enc_done(&enc);
+
+   ec_dec_init(&dec,ec_get_buffer(&enc),ec_range_bytes(&enc));
+
+   for (i=0;i<10000;i++)
+   {
+      int d = ec_laplace_decode(&dec,
+            ec_laplace_get_start_freq(decay[i]), decay[i]);
+      if (d != val[i])
+      {
+         fprintf (stderr, "Got %d instead of %d\n", d, val[i]);
+         ret = 1;
+      }
+   }
+
+   free(ptr);
+   return ret;
+}
diff --git a/thirdparty/opus/celt/tests/test_unit_mathops.c b/thirdparty/opus/celt/tests/test_unit_mathops.c
new file mode 100644
index 0000000000..fd3319da91
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_mathops.c
@@ -0,0 +1,304 @@
+/* Copyright (c) 2008-2011 Xiph.Org Foundation, Mozilla Corporation,
+                           Gregory Maxwell
+   Written by Jean-Marc Valin, Gregory Maxwell, and Timothy B. Terriberry */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef CUSTOM_MODES
+#define CUSTOM_MODES
+#endif
+
+#define CELT_C
+
+#include <stdio.h>
+#include <math.h>
+#include "mathops.c"
+#include "entenc.c"
+#include "entdec.c"
+#include "entcode.c"
+#include "bands.c"
+#include "quant_bands.c"
+#include "laplace.c"
+#include "vq.c"
+#include "cwrs.c"
+#include "pitch.c"
+#include "celt_lpc.c"
+#include "celt.c"
+
+#if defined(OPUS_X86_MAY_HAVE_SSE) || defined(OPUS_X86_MAY_HAVE_SSE2) || defined(OPUS_X86_MAY_HAVE_SSE4_1)
+# if defined(OPUS_X86_MAY_HAVE_SSE)
+#  include "x86/pitch_sse.c"
+# endif
+# if defined(OPUS_X86_MAY_HAVE_SSE2)
+#  include "x86/pitch_sse2.c"
+# endif
+# if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#  include "x86/pitch_sse4_1.c"
+#  include "x86/celt_lpc_sse.c"
+# endif
+# include "x86/x86_celt_map.c"
+#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# include "arm/armcpu.c"
+# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  include "arm/celt_neon_intr.c"
+#  if defined(HAVE_ARM_NE10)
+#   include "kiss_fft.c"
+#   include "mdct.c"
+#   include "arm/celt_ne10_fft.c"
+#   include "arm/celt_ne10_mdct.c"
+#  endif
+# endif
+# include "arm/arm_celt_map.c"
+#endif
+
+#ifdef FIXED_POINT
+#define WORD "%d"
+#else
+#define WORD "%f"
+#endif
+
+int ret = 0;
+
+void testdiv(void)
+{
+   opus_int32 i;
+   for (i=1;i<=327670;i++)
+   {
+      double prod;
+      opus_val32 val;
+      val = celt_rcp(i);
+#ifdef FIXED_POINT
+      prod = (1./32768./65526.)*val*i;
+#else
+      prod = val*i;
+#endif
+      if (fabs(prod-1) > .00025)
+      {
+         fprintf (stderr, "div failed: 1/%d="WORD" (product = %f)\n", i, val, prod);
+         ret = 1;
+      }
+   }
+}
+
+void testsqrt(void)
+{
+   opus_int32 i;
+   for (i=1;i<=1000000000;i++)
+   {
+      double ratio;
+      opus_val16 val;
+      val = celt_sqrt(i);
+      ratio = val/sqrt(i);
+      if (fabs(ratio - 1) > .0005 && fabs(val-sqrt(i)) > 2)
+      {
+         fprintf (stderr, "sqrt failed: sqrt(%d)="WORD" (ratio = %f)\n", i, val, ratio);
+         ret = 1;
+      }
+      i+= i>>10;
+   }
+}
+
+void testbitexactcos(void)
+{
+   int i;
+   opus_int32 min_d,max_d,last,chk;
+   chk=max_d=0;
+   last=min_d=32767;
+   for(i=64;i<=16320;i++)
+   {
+      opus_int32 d;
+      opus_int32 q=bitexact_cos(i);
+      chk ^= q*i;
+      d = last - q;
+      if (d>max_d)max_d=d;
+      if (d<min_d)min_d=d;
+      last = q;
+   }
+   if ((chk!=89408644)||(max_d!=5)||(min_d!=0)||(bitexact_cos(64)!=32767)||
+       (bitexact_cos(16320)!=200)||(bitexact_cos(8192)!=23171))
+   {
+      fprintf (stderr, "bitexact_cos failed\n");
+      ret = 1;
+   }
+}
+
+void testbitexactlog2tan(void)
+{
+   int i,fail;
+   opus_int32 min_d,max_d,last,chk;
+   fail=chk=max_d=0;
+   last=min_d=15059;
+   for(i=64;i<8193;i++)
+   {
+      opus_int32 d;
+      opus_int32 mid=bitexact_cos(i);
+      opus_int32 side=bitexact_cos(16384-i);
+      opus_int32 q=bitexact_log2tan(mid,side);
+      chk ^= q*i;
+      d = last - q;
+      if (q!=-1*bitexact_log2tan(side,mid))
+        fail = 1;
+      if (d>max_d)max_d=d;
+      if (d<min_d)min_d=d;
+      last = q;
+   }
+   if ((chk!=15821257)||(max_d!=61)||(min_d!=-2)||fail||
+       (bitexact_log2tan(32767,200)!=15059)||(bitexact_log2tan(30274,12540)!=2611)||
+       (bitexact_log2tan(23171,23171)!=0))
+   {
+      fprintf (stderr, "bitexact_log2tan failed\n");
+      ret = 1;
+   }
+}
+
+#ifndef FIXED_POINT
+void testlog2(void)
+{
+   float x;
+   for (x=0.001;x<1677700.0;x+=(x/8.0))
+   {
+      float error = fabs((1.442695040888963387*log(x))-celt_log2(x));
+      if (error>0.0009)
+      {
+         fprintf (stderr, "celt_log2 failed: fabs((1.442695040888963387*log(x))-celt_log2(x))>0.001 (x = %f, error = %f)\n", x,error);
+         ret = 1;
+      }
+   }
+}
+
+void testexp2(void)
+{
+   float x;
+   for (x=-11.0;x<24.0;x+=0.0007)
+   {
+      float error = fabs(x-(1.442695040888963387*log(celt_exp2(x))));
+      if (error>0.0002)
+      {
+         fprintf (stderr, "celt_exp2 failed: fabs(x-(1.442695040888963387*log(celt_exp2(x))))>0.0005 (x = %f, error = %f)\n", x,error);
+         ret = 1;
+      }
+   }
+}
+
+void testexp2log2(void)
+{
+   float x;
+   for (x=-11.0;x<24.0;x+=0.0007)
+   {
+      float error = fabs(x-(celt_log2(celt_exp2(x))));
+      if (error>0.001)
+      {
+         fprintf (stderr, "celt_log2/celt_exp2 failed: fabs(x-(celt_log2(celt_exp2(x))))>0.001 (x = %f, error = %f)\n", x,error);
+         ret = 1;
+      }
+   }
+}
+#else
+void testlog2(void)
+{
+   opus_val32 x;
+   for (x=8;x<1073741824;x+=(x>>3))
+   {
+      float error = fabs((1.442695040888963387*log(x/16384.0))-celt_log2(x)/1024.0);
+      if (error>0.003)
+      {
+         fprintf (stderr, "celt_log2 failed: x = %ld, error = %f\n", (long)x,error);
+         ret = 1;
+      }
+   }
+}
+
+void testexp2(void)
+{
+   opus_val16 x;
+   for (x=-32768;x<15360;x++)
+   {
+      float error1 = fabs(x/1024.0-(1.442695040888963387*log(celt_exp2(x)/65536.0)));
+      float error2 = fabs(exp(0.6931471805599453094*x/1024.0)-celt_exp2(x)/65536.0);
+      if (error1>0.0002&&error2>0.00004)
+      {
+         fprintf (stderr, "celt_exp2 failed: x = "WORD", error1 = %f, error2 = %f\n", x,error1,error2);
+         ret = 1;
+      }
+   }
+}
+
+void testexp2log2(void)
+{
+   opus_val32 x;
+   for (x=8;x<65536;x+=(x>>3))
+   {
+      float error = fabs(x-0.25*celt_exp2(celt_log2(x)))/16384;
+      if (error>0.004)
+      {
+         fprintf (stderr, "celt_log2/celt_exp2 failed: fabs(x-(celt_exp2(celt_log2(x))))>0.001 (x = %ld, error = %f)\n", (long)x,error);
+         ret = 1;
+      }
+   }
+}
+
+void testilog2(void)
+{
+   opus_val32 x;
+   for (x=1;x<=268435455;x+=127)
+   {
+      opus_val32 lg;
+      opus_val32 y;
+
+      lg = celt_ilog2(x);
+      if (lg<0 || lg>=31)
+      {
+         printf("celt_ilog2 failed: 0<=celt_ilog2(x)<31 (x = %d, celt_ilog2(x) = %d)\n",x,lg);
+         ret = 1;
+      }
+      y = 1<<lg;
+
+      if (x<y || (x>>1)>=y)
+      {
+         printf("celt_ilog2 failed: 2**celt_ilog2(x)<=x<2**(celt_ilog2(x)+1) (x = %d, 2**celt_ilog2(x) = %d)\n",x,y);
+         ret = 1;
+      }
+   }
+}
+#endif
+
+int main(void)
+{
+   testbitexactcos();
+   testbitexactlog2tan();
+   testdiv();
+   testsqrt();
+   testlog2();
+   testexp2();
+   testexp2log2();
+#ifdef FIXED_POINT
+   testilog2();
+#endif
+   return ret;
+}
diff --git a/thirdparty/opus/celt/tests/test_unit_mdct.c b/thirdparty/opus/celt/tests/test_unit_mdct.c
new file mode 100644
index 0000000000..8dbb9caa2e
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_mdct.c
@@ -0,0 +1,230 @@
+/* Copyright (c) 2008-2011 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define SKIP_CONFIG_H
+
+#ifndef CUSTOM_MODES
+#define CUSTOM_MODES
+#endif
+
+#include <stdio.h>
+
+#define CELT_C
+#include "mdct.h"
+#include "stack_alloc.h"
+
+#include "kiss_fft.c"
+#include "mdct.c"
+#include "mathops.c"
+#include "entcode.c"
+
+#if defined(OPUS_X86_MAY_HAVE_SSE2) || defined(OPUS_X86_MAY_HAVE_SSE4_1)
+# include "x86/x86cpu.c"
+#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# include "arm/armcpu.c"
+# include "pitch.c"
+# include "celt_lpc.c"
+# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  include "arm/celt_neon_intr.c"
+#  if defined(HAVE_ARM_NE10)
+#   include "arm/celt_ne10_fft.c"
+#   include "arm/celt_ne10_mdct.c"
+#  endif
+# endif
+# include "arm/arm_celt_map.c"
+#endif
+
+#ifndef M_PI
+#define M_PI 3.141592653
+#endif
+
+int ret = 0;
+void check(kiss_fft_scalar  * in,kiss_fft_scalar  * out,int nfft,int isinverse)
+{
+    int bin,k;
+    double errpow=0,sigpow=0;
+    double snr;
+    for (bin=0;bin<nfft/2;++bin) {
+        double ansr = 0;
+        double difr;
+
+        for (k=0;k<nfft;++k) {
+           double phase = 2*M_PI*(k+.5+.25*nfft)*(bin+.5)/nfft;
+           double re = cos(phase);
+
+           re /= nfft/4;
+
+           ansr += in[k] * re;
+        }
+        /*printf ("%f %f\n", ansr, out[bin]);*/
+        difr = ansr - out[bin];
+        errpow += difr*difr;
+        sigpow += ansr*ansr;
+    }
+    snr = 10*log10(sigpow/errpow);
+    printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );
+    if (snr<60) {
+       printf( "** poor snr: %f **\n", snr);
+       ret = 1;
+    }
+}
+
+void check_inv(kiss_fft_scalar  * in,kiss_fft_scalar  * out,int nfft,int isinverse)
+{
+   int bin,k;
+   double errpow=0,sigpow=0;
+   double snr;
+   for (bin=0;bin<nfft;++bin) {
+      double ansr = 0;
+      double difr;
+
+      for (k=0;k<nfft/2;++k) {
+         double phase = 2*M_PI*(bin+.5+.25*nfft)*(k+.5)/nfft;
+         double re = cos(phase);
+
+         /*re *= 2;*/
+
+         ansr += in[k] * re;
+      }
+      /*printf ("%f %f\n", ansr, out[bin]);*/
+      difr = ansr - out[bin];
+      errpow += difr*difr;
+      sigpow += ansr*ansr;
+   }
+   snr = 10*log10(sigpow/errpow);
+   printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );
+   if (snr<60) {
+      printf( "** poor snr: %f **\n", snr);
+      ret = 1;
+   }
+}
+
+
+void test1d(int nfft,int isinverse,int arch)
+{
+    mdct_lookup cfg;
+    size_t buflen = sizeof(kiss_fft_scalar)*nfft;
+
+    kiss_fft_scalar  * in = (kiss_fft_scalar*)malloc(buflen);
+    kiss_fft_scalar  * in_copy = (kiss_fft_scalar*)malloc(buflen);
+    kiss_fft_scalar  * out= (kiss_fft_scalar*)malloc(buflen);
+    opus_val16  * window= (opus_val16*)malloc(sizeof(opus_val16)*nfft/2);
+    int k;
+
+    clt_mdct_init(&cfg, nfft, 0, arch);
+    for (k=0;k<nfft;++k) {
+        in[k] = (rand() % 32768) - 16384;
+    }
+
+    for (k=0;k<nfft/2;++k) {
+       window[k] = Q15ONE;
+    }
+    for (k=0;k<nfft;++k) {
+       in[k] *= 32768;
+    }
+
+    if (isinverse)
+    {
+       for (k=0;k<nfft;++k) {
+          in[k] /= nfft;
+       }
+    }
+
+    for (k=0;k<nfft;++k)
+       in_copy[k] = in[k];
+    /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/
+
+    if (isinverse)
+    {
+       for (k=0;k<nfft;++k)
+          out[k] = 0;
+       clt_mdct_backward(&cfg,in,out, window, nfft/2, 0, 1, arch);
+       /* apply TDAC because clt_mdct_backward() no longer does that */
+       for (k=0;k<nfft/4;++k)
+          out[nfft-k-1] = out[nfft/2+k];
+       check_inv(in,out,nfft,isinverse);
+    } else {
+       clt_mdct_forward(&cfg,in,out,window, nfft/2, 0, 1, arch);
+       check(in_copy,out,nfft,isinverse);
+    }
+    /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/
+
+
+    free(in);
+    free(in_copy);
+    free(out);
+    free(window);
+    clt_mdct_clear(&cfg, arch);
+}
+
+int main(int argc,char ** argv)
+{
+    ALLOC_STACK;
+    int arch = opus_select_arch();
+
+    if (argc>1) {
+        int k;
+        for (k=1;k<argc;++k) {
+            test1d(atoi(argv[k]),0,arch);
+            test1d(atoi(argv[k]),1,arch);
+        }
+    }else{
+        test1d(32,0,arch);
+        test1d(32,1,arch);
+        test1d(256,0,arch);
+        test1d(256,1,arch);
+        test1d(512,0,arch);
+        test1d(512,1,arch);
+        test1d(1024,0,arch);
+        test1d(1024,1,arch);
+        test1d(2048,0,arch);
+        test1d(2048,1,arch);
+#ifndef RADIX_TWO_ONLY
+        test1d(36,0,arch);
+        test1d(36,1,arch);
+        test1d(40,0,arch);
+        test1d(40,1,arch);
+        test1d(60,0,arch);
+        test1d(60,1,arch);
+        test1d(120,0,arch);
+        test1d(120,1,arch);
+        test1d(240,0,arch);
+        test1d(240,1,arch);
+        test1d(480,0,arch);
+        test1d(480,1,arch);
+        test1d(960,0,arch);
+        test1d(960,1,arch);
+        test1d(1920,0,arch);
+        test1d(1920,1,arch);
+#endif
+    }
+    return ret;
+}
diff --git a/thirdparty/opus/celt/tests/test_unit_rotation.c b/thirdparty/opus/celt/tests/test_unit_rotation.c
new file mode 100644
index 0000000000..1080c2085d
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_rotation.c
@@ -0,0 +1,120 @@
+/* Copyright (c) 2008-2011 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef CUSTOM_MODES
+#define CUSTOM_MODES
+#endif
+
+#define CELT_C
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "vq.c"
+#include "cwrs.c"
+#include "entcode.c"
+#include "entenc.c"
+#include "entdec.c"
+#include "mathops.c"
+#include "bands.h"
+#include "pitch.c"
+#include "celt_lpc.c"
+#include "celt.c"
+#include <math.h>
+
+#if defined(OPUS_X86_MAY_HAVE_SSE) || defined(OPUS_X86_MAY_HAVE_SSE2) || defined(OPUS_X86_MAY_HAVE_SSE4_1)
+# if defined(OPUS_X86_MAY_HAVE_SSE)
+#  include "x86/pitch_sse.c"
+# endif
+# if defined(OPUS_X86_MAY_HAVE_SSE2)
+#  include "x86/pitch_sse2.c"
+# endif
+# if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#  include "x86/pitch_sse4_1.c"
+#  include "x86/celt_lpc_sse.c"
+# endif
+# include "x86/x86_celt_map.c"
+#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# include "arm/armcpu.c"
+# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  include "arm/celt_neon_intr.c"
+#  if defined(HAVE_ARM_NE10)
+#   include "kiss_fft.c"
+#   include "mdct.c"
+#   include "arm/celt_ne10_fft.c"
+#   include "arm/celt_ne10_mdct.c"
+#  endif
+# endif
+# include "arm/arm_celt_map.c"
+#endif
+
+#define MAX_SIZE 100
+
+int ret=0;
+void test_rotation(int N, int K)
+{
+   int i;
+   double err = 0, ener = 0, snr, snr0;
+   opus_val16 x0[MAX_SIZE];
+   opus_val16 x1[MAX_SIZE];
+   for (i=0;i<N;i++)
+      x1[i] = x0[i] = rand()%32767-16384;
+   exp_rotation(x1, N, 1, 1, K, SPREAD_NORMAL);
+   for (i=0;i<N;i++)
+   {
+      err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
+      ener += x0[i]*(double)x0[i];
+   }
+   snr0 = 20*log10(ener/err);
+   err = ener = 0;
+   exp_rotation(x1, N, -1, 1, K, SPREAD_NORMAL);
+   for (i=0;i<N;i++)
+   {
+      err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
+      ener += x0[i]*(double)x0[i];
+   }
+   snr = 20*log10(ener/err);
+   printf ("SNR for size %d (%d pulses) is %f (was %f without inverse)\n", N, K, snr, snr0);
+   if (snr < 60 || snr0 > 20)
+   {
+      fprintf(stderr, "FAIL!\n");
+      ret = 1;
+   }
+}
+
+int main(void)
+{
+   ALLOC_STACK;
+   test_rotation(15, 3);
+   test_rotation(23, 5);
+   test_rotation(50, 3);
+   test_rotation(80, 1);
+   return ret;
+}
diff --git a/thirdparty/opus/celt/tests/test_unit_types.c b/thirdparty/opus/celt/tests/test_unit_types.c
new file mode 100644
index 0000000000..67a0fb8ed3
--- /dev/null
+++ b/thirdparty/opus/celt/tests/test_unit_types.c
@@ -0,0 +1,50 @@
+/* Copyright (c) 2008-2011 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus_types.h"
+#include <stdio.h>
+
+int main(void)
+{
+   opus_int16 i = 1;
+   i <<= 14;
+   if (i>>14 != 1)
+   {
+      fprintf(stderr, "opus_int16 isn't 16 bits\n");
+      return 1;
+   }
+   if (sizeof(opus_int16)*2 != sizeof(opus_int32))
+   {
+      fprintf(stderr, "16*2 != 32\n");
+      return 1;
+   }
+   return 0;
+}
diff --git a/drivers/opus/celt/vq.c b/thirdparty/opus/celt/vq.c
index 3061e3006f..f358396065 100644
--- a/drivers/opus/celt/vq.c
+++ b/thirdparty/opus/celt/vq.c
@@ -25,16 +25,19 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/mathops.h"
-#include "opus/celt/cwrs.h"
-#include "opus/celt/vq.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/bands.h"
-#include "opus/celt/rate.h"
-#include "opus/celt/pitch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mathops.h"
+#include "cwrs.h"
+#include "vq.h"
+#include "arch.h"
+#include "os_support.h"
+#include "bands.h"
+#include "rate.h"
+#include "pitch.h"
 
 #ifndef OVERRIDE_vq_exp_rotation1
 static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s)
@@ -115,13 +118,13 @@ static void normalise_residual(int * OPUS_RESTRICT iy, celt_norm * OPUS_RESTRICT
       int N, opus_val32 Ryy, opus_val16 gain)
 {
    int i;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    int k;
 #endif
    opus_val32 t;
    opus_val16 g;
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    k = celt_ilog2(Ryy)>>1;
 #endif
    t = VSHR32(Ryy, 2*(k-7));
@@ -208,7 +211,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc
       }  while (++j<N);
 
       /* If X is too small, just replace it with a pulse at 0 */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       if (sum <= K)
 #else
       /* Prevents infinities and NaNs from causing too many pulses
@@ -224,7 +227,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc
       }
       rcp = EXTRACT16(MULT16_32_Q16(K-1, celt_rcp(sum)));
       j=0; do {
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
          /* It's really important to round *towards zero* here */
          iy[j] = MULT16_16_Q15(X[j],rcp);
 #else
@@ -241,7 +244,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc
 
    /* This should never happen, but just in case it does (e.g. on silence)
       we fill the first bin with pulses. */
-#ifdef OPUS_FIXED_POINT_DEBUG
+#ifdef FIXED_POINT_DEBUG
    celt_assert2(pulsesLeft<=N+3, "Not enough pulses in the quick pass");
 #endif
    if (pulsesLeft > N+3)
@@ -259,10 +262,10 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc
       int best_id;
       opus_val32 best_num = -VERY_LARGE16;
       opus_val16 best_den = 0;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       int rshift;
 #endif
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       rshift = 1+celt_ilog2(K-pulsesLeft+i+1);
 #endif
       best_id = 0;
@@ -346,7 +349,7 @@ unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
 void renormalise_vector(celt_norm *X, int N, opus_val16 gain, int arch)
 {
    int i;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    int k;
 #endif
    opus_val32 E;
@@ -354,7 +357,7 @@ void renormalise_vector(celt_norm *X, int N, opus_val16 gain, int arch)
    opus_val32 t;
    celt_norm *xptr;
    E = EPSILON + celt_inner_prod(X, X, N, arch);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    k = celt_ilog2(E)>>1;
 #endif
    t = VSHR32(E, 2*(k-7));
@@ -394,7 +397,7 @@ int stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int
    }
    mid = celt_sqrt(Emid);
    side = celt_sqrt(Eside);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    /* 0.63662 = 2/pi */
    itheta = MULT16_16_Q15(QCONST16(0.63662f,15),celt_atan2p(side, mid));
 #else
diff --git a/drivers/opus/celt/vq.h b/thirdparty/opus/celt/vq.h
index 10b5e55306..5cfcbe50ea 100644
--- a/drivers/opus/celt/vq.h
+++ b/thirdparty/opus/celt/vq.h
@@ -33,12 +33,12 @@
 #ifndef VQ_H
 #define VQ_H
 
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
-#include "opus/celt/modes.h"
+#include "entenc.h"
+#include "entdec.h"
+#include "modes.h"
 
 #if defined(MIPSr1_ASM)
-#include "opus/celt/mips/vq_mipsr1.h"
+#include "mips/vq_mipsr1.h"
 #endif
 
 
diff --git a/drivers/opus/celt/x86/celt_lpc_sse.c b/thirdparty/opus/celt/x86/celt_lpc_sse.c
index cfc86dc66c..67e5592acf 100644
--- a/drivers/opus/celt/x86/celt_lpc_sse.c
+++ b/thirdparty/opus/celt/x86/celt_lpc_sse.c
@@ -24,16 +24,19 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/x86/x86cpu.h"
+#include "celt_lpc.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "pitch.h"
+#include "x86cpu.h"
 
 #if defined(FIXED_POINT)
 
diff --git a/drivers/opus/celt/x86/celt_lpc_sse.h b/thirdparty/opus/celt/x86/celt_lpc_sse.h
index 3787afd3ff..c5ec796ed5 100644
--- a/drivers/opus/celt/x86/celt_lpc_sse.h
+++ b/thirdparty/opus/celt/x86/celt_lpc_sse.h
@@ -27,7 +27,10 @@
 
 #ifndef CELT_LPC_SSE_H
 #define CELT_LPC_SSE_H
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #if defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 #define OVERRIDE_CELT_FIR
diff --git a/drivers/opus/celt/x86/pitch_sse.c b/thirdparty/opus/celt/x86/pitch_sse.c
index 9f22ffd9ab..20e73126b6 100644
--- a/drivers/opus/celt/x86/pitch_sse.c
+++ b/thirdparty/opus/celt/x86/pitch_sse.c
@@ -24,18 +24,21 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/silk/macros.h"
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/pitch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "macros.h"
+#include "celt_lpc.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "pitch.h"
 
 #if defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 
 #include <xmmintrin.h>
-#include "opus/celt/arch.h"
+#include "arch.h"
 
 void xcorr_kernel_sse(const opus_val16 *x, const opus_val16 *y, opus_val32 sum[4], int len)
 {
diff --git a/drivers/opus/celt/x86/pitch_sse.h b/thirdparty/opus/celt/x86/pitch_sse.h
index 2b4b54f61f..d4cbeb8b9c 100644
--- a/drivers/opus/celt/x86/pitch_sse.h
+++ b/thirdparty/opus/celt/x86/pitch_sse.h
@@ -32,7 +32,10 @@
 
 #ifndef PITCH_SSE_H
 #define PITCH_SSE_H
-#include "opus/opus_config.h"
+
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #if defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 void xcorr_kernel_sse4_1(
diff --git a/drivers/opus/celt/x86/pitch_sse2.c b/thirdparty/opus/celt/x86/pitch_sse2.c
index b5a78b4acd..a0e7d1beaf 100644
--- a/drivers/opus/celt/x86/pitch_sse2.c
+++ b/thirdparty/opus/celt/x86/pitch_sse2.c
@@ -24,16 +24,19 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 
-#include "opus/silk/macros.h"
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/pitch.h"
+#include "macros.h"
+#include "celt_lpc.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "pitch.h"
 
 #if defined(OPUS_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
 opus_val32 celt_inner_prod_sse2(const opus_val16 *x, const opus_val16 *y,
diff --git a/drivers/opus/celt/x86/pitch_sse4_1.c b/thirdparty/opus/celt/x86/pitch_sse4_1.c
index 57fb332210..a092c68b24 100644
--- a/drivers/opus/celt/x86/pitch_sse4_1.c
+++ b/thirdparty/opus/celt/x86/pitch_sse4_1.c
@@ -24,20 +24,23 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 
-#include "opus/silk/macros.h"
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/pitch.h"
+#include "macros.h"
+#include "celt_lpc.h"
+#include "stack_alloc.h"
+#include "mathops.h"
+#include "pitch.h"
 
 #if defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 #include <smmintrin.h>
-#include "opus/celt/x86/x86cpu.h"
+#include "x86cpu.h"
 
 opus_val32 celt_inner_prod_sse4_1(const opus_val16 *x, const opus_val16 *y,
       int N)
diff --git a/drivers/opus/celt/x86/x86_celt_map.c b/thirdparty/opus/celt/x86/x86_celt_map.c
index 5146ea2b38..8e5e449275 100644
--- a/drivers/opus/celt/x86/x86_celt_map.c
+++ b/thirdparty/opus/celt/x86/x86_celt_map.c
@@ -24,12 +24,15 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/x86/x86cpu.h"
-#include "opus/celt/celt_lpc.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/x86/pitch_sse.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
+#include "x86/x86cpu.h"
+#include "celt_lpc.h"
+#include "pitch.h"
+#include "pitch_sse.h"
 
 #if defined(OPUS_HAVE_RTCD)
 
diff --git a/drivers/opus/celt/x86/x86cpu.c b/thirdparty/opus/celt/x86/x86cpu.c
index 91b9b185c2..555a576b8a 100644
--- a/drivers/opus/celt/x86/x86cpu.c
+++ b/thirdparty/opus/celt/x86/x86cpu.c
@@ -24,13 +24,16 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/cpu_support.h"
-#include "opus/silk/macros.h"
-#include "opus/silk/main.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/x86/x86cpu.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "cpu_support.h"
+#include "macros.h"
+#include "main.h"
+#include "pitch.h"
+#include "x86cpu.h"
 
 #if (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \
   (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \
diff --git a/drivers/opus/celt/x86/x86cpu.h b/thirdparty/opus/celt/x86/x86cpu.h
index 04fd48aac4..04fd48aac4 100644
--- a/drivers/opus/celt/x86/x86cpu.h
+++ b/thirdparty/opus/celt/x86/x86cpu.h
diff --git a/drivers/opus/opus_config.h b/thirdparty/opus/config.h
index 7b9c92c6a8..7b9c92c6a8 100644
--- a/drivers/opus/opus_config.h
+++ b/thirdparty/opus/config.h
diff --git a/drivers/opus/http.c b/thirdparty/opus/http.c
index 602d514f6e..cfd4e626a4 100644
--- a/drivers/opus/http.c
+++ b/thirdparty/opus/http.c
@@ -9,9 +9,11 @@
  * by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
  *                                                                  *
  ********************************************************************/
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include "opus/internal.h"
+#include "internal.h"
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -212,7 +214,7 @@ static const char *op_parse_file_url(const char *_src){
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
 #  include <openssl/ssl.h>
-#  include "opus/winerrno.h"
+#  include "winerrno.h"
 
 typedef SOCKET op_sock;
 
diff --git a/drivers/opus/info.c b/thirdparty/opus/info.c
index b94393351e..55e2906d5f 100644
--- a/drivers/opus/info.c
+++ b/thirdparty/opus/info.c
@@ -9,9 +9,11 @@
  * by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
  *                                                                  *
  ********************************************************************/
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include "opus/internal.h"
+#include "internal.h"
 #include <limits.h>
 #include <string.h>
 
diff --git a/drivers/opus/internal.c b/thirdparty/opus/internal.c
index bd7d2ee4bb..96c80def82 100644
--- a/drivers/opus/internal.c
+++ b/thirdparty/opus/internal.c
@@ -9,9 +9,11 @@
  * by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
  *                                                                  *
  ********************************************************************/
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include "opus/internal.h"
+#include "internal.h"
 
 #if defined(OP_ENABLE_ASSERTIONS)
 void op_fatal_impl(const char *_str,const char *_file,int _line){
diff --git a/drivers/opus/internal.h b/thirdparty/opus/internal.h
index f7a5bd8c74..ee48ea34c9 100644
--- a/drivers/opus/internal.h
+++ b/thirdparty/opus/internal.h
@@ -29,7 +29,7 @@
 # endif
 
 # include <stdlib.h>
-# include "opus/opusfile.h"
+# include <opusfile.h>
 
 typedef struct OggOpusLink OggOpusLink;
 
diff --git a/drivers/opus/mlp.c b/thirdparty/opus/mlp.c
index 125106e882..ff9e50df47 100644
--- a/drivers/opus/mlp.c
+++ b/thirdparty/opus/mlp.c
@@ -24,15 +24,18 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus_types.h"
+#include "opus_defines.h"
 
 #include <math.h>
-#include "opus/mlp.h"
-#include "opus/celt/arch.h"
-#include "opus/tansig_table.h"
+#include "mlp.h"
+#include "arch.h"
+#include "tansig_table.h"
 #define MAX_NEURONS 100
 
 #if 0
@@ -72,7 +75,7 @@ static OPUS_INLINE float tansig_approx(float x)
         return 1;
     if (!(x>-8))
         return -1;
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
     /* Another check in case of -ffast-math */
     if (celt_isnan(x))
        return 0;
diff --git a/drivers/opus/mlp.h b/thirdparty/opus/mlp.h
index 2b4962625d..618e246e2c 100644
--- a/drivers/opus/mlp.h
+++ b/thirdparty/opus/mlp.h
@@ -28,7 +28,7 @@
 #ifndef _MLP_H_
 #define _MLP_H_
 
-#include "opus/celt/arch.h"
+#include "arch.h"
 
 typedef struct {
     int layers;
diff --git a/drivers/opus/mlp_data.c b/thirdparty/opus/mlp_data.c
index c542a509cf..c2fda4e2e5 100644
--- a/drivers/opus/mlp_data.c
+++ b/thirdparty/opus/mlp_data.c
@@ -1,8 +1,11 @@
 /* The contents of this file was automatically generated by mlp_train.c
    It contains multi-layer perceptron (MLP) weights. */
-#include "opus/opus_config.h"
 
-#include "opus/mlp.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mlp.h"
 
 /* RMS error was 0.138320, seed was 1361535663 */
 
diff --git a/drivers/opus/opus.c b/thirdparty/opus/opus.c
index 762a9d7469..e9ce93b308 100644
--- a/drivers/opus/opus.c
+++ b/thirdparty/opus/opus.c
@@ -24,10 +24,13 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus.h"
-#include "opus/opus_private.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus.h"
+#include "opus_private.h"
 
 #ifndef DISABLE_FLOAT_API
 OPUS_EXPORT void opus_pcm_soft_clip(float *_x, int N, int C, float *declip_mem)
diff --git a/drivers/opus/opus.h b/thirdparty/opus/opus.h
index 4cb171378b..b0bdf6f2df 100644
--- a/drivers/opus/opus.h
+++ b/thirdparty/opus/opus.h
@@ -33,8 +33,8 @@
 #ifndef OPUS_H
 #define OPUS_H
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#include "opus_types.h"
+#include "opus_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/opus/opus_compare.c b/thirdparty/opus/opus_compare.c
index 06c67d752f..06c67d752f 100644
--- a/drivers/opus/opus_compare.c
+++ b/thirdparty/opus/opus_compare.c
diff --git a/drivers/opus/opus_custom.h b/thirdparty/opus/opus_custom.h
index 32fcb81ac7..41f36bf2fb 100644
--- a/drivers/opus/opus_custom.h
+++ b/thirdparty/opus/opus_custom.h
@@ -35,7 +35,7 @@
 #ifndef OPUS_CUSTOM_H
 #define OPUS_CUSTOM_H
 
-#include "opus/opus_defines.h"
+#include "opus_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/opus/opus_decoder.c b/thirdparty/opus/opus_decoder.c
index b954b98f02..080bec5072 100644
--- a/drivers/opus/opus_decoder.c
+++ b/thirdparty/opus/opus_decoder.c
@@ -24,7 +24,10 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #ifndef OPUS_BUILD
 # error "OPUS_BUILD _MUST_ be defined to build Opus. This probably means you need other defines as well, as in a config.h. See the included build files for details."
@@ -35,19 +38,19 @@
 #endif
 
 #include <stdarg.h>
-#include "opus/celt/celt.h"
-#include "opus/opus.h"
-#include "opus/celt/entdec.h"
-#include "opus/celt/modes.h"
-#include "opus/silk/API.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/float_cast.h"
-#include "opus/opus_private.h"
-#include "opus/celt/os_support.h"
-#include "opus/silk/structs.h"
-#include "opus/silk/define.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/cpu_support.h"
+#include "celt.h"
+#include "opus.h"
+#include "entdec.h"
+#include "modes.h"
+#include "API.h"
+#include "stack_alloc.h"
+#include "float_cast.h"
+#include "opus_private.h"
+#include "os_support.h"
+#include "structs.h"
+#include "define.h"
+#include "mathops.h"
+#include "cpu_support.h"
 
 struct OpusDecoder {
    int          celt_dec_offset;
@@ -68,7 +71,7 @@ struct OpusDecoder {
    int          frame_size;
    int          prev_redundancy;
    int          last_packet_duration;
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
    opus_val16   softclip_mem[2];
 #endif
 
@@ -291,7 +294,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 
    /* In fixed-point, we can tell CELT to do the accumulation on top of the
       SILK PCM buffer. This saves some stack space. */
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    celt_accum = (mode != MODE_CELT_ONLY) && (frame_size >= F10);
 #else
    celt_accum = 0;
@@ -335,7 +338,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
    {
       int lost_flag, decoded_samples;
       opus_int16 *pcm_ptr;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       if (celt_accum)
          pcm_ptr = pcm;
       else
@@ -504,7 +507,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 
    if (mode != MODE_CELT_ONLY && !celt_accum)
    {
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
       for (i=0;i<frame_size*st->channels;i++)
          pcm[i] = SAT16(ADD32(pcm[i], pcm_silk[i]));
 #else
@@ -696,7 +699,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
    st->last_packet_duration = nb_samples;
    if (OPUS_CHECK_ARRAY(pcm, nb_samples*st->channels))
       OPUS_PRINT_INT(nb_samples);
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
    if (soft_clip)
       opus_pcm_soft_clip(pcm, nb_samples, st->channels, st->softclip_mem);
    else
@@ -705,7 +708,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
    return nb_samples;
 }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 int opus_decode(OpusDecoder *st, const unsigned char *data,
       opus_int32 len, opus_val16 *pcm, int frame_size, int decode_fec)
diff --git a/drivers/opus/opus_defines.h b/thirdparty/opus/opus_defines.h
index b972ce0eb9..647ed5d6f2 100644
--- a/drivers/opus/opus_defines.h
+++ b/thirdparty/opus/opus_defines.h
@@ -33,7 +33,7 @@
 #ifndef OPUS_DEFINES_H
 #define OPUS_DEFINES_H
 
-#include "opus/opus_types.h"
+#include "opus_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/opus/opus_encoder.c b/thirdparty/opus/opus_encoder.c
index 5c6af5a199..a7e19127d6 100644
--- a/drivers/opus/opus_encoder.c
+++ b/thirdparty/opus/opus_encoder.c
@@ -24,28 +24,31 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdarg.h>
-#include "opus/celt/celt.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/modes.h"
-#include "opus/silk/API.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/float_cast.h"
-#include "opus/opus.h"
-#include "opus/celt/arch.h"
-#include "opus/celt/pitch.h"
-#include "opus/opus_private.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/cpu_support.h"
-#include "opus/analysis.h"
-#include "opus/celt/mathops.h"
-#include "opus/silk/tuning_parameters.h"
-#ifdef OPUS_FIXED_POINT
-#include "opus/silk/fixed/structs_FIX.h"
+#include "celt.h"
+#include "entenc.h"
+#include "modes.h"
+#include "API.h"
+#include "stack_alloc.h"
+#include "float_cast.h"
+#include "opus.h"
+#include "arch.h"
+#include "pitch.h"
+#include "opus_private.h"
+#include "os_support.h"
+#include "cpu_support.h"
+#include "analysis.h"
+#include "mathops.h"
+#include "tuning_parameters.h"
+#ifdef FIXED_POINT
+#include "fixed/structs_FIX.h"
 #else
-#include "opus/silk/float/structs_FLP.h"
+#include "float/structs_FLP.h"
 #endif
 
 #define MAX_ENCODER_BUFFER 480
@@ -280,7 +283,7 @@ static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channel
    return toc;
 }
 
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
 static void silk_biquad_float(
     const opus_val16      *in,            /* I:    Input signal                   */
     const opus_int32      *B_Q28,         /* I:    MA coefficients [3]            */
@@ -342,7 +345,7 @@ static void hp_cutoff(const opus_val16 *in, opus_int32 cutoff_Hz, opus_val16 *ou
    A_Q28[ 0 ] = silk_SMULWW( r_Q22, silk_SMULWW( Fc_Q19, Fc_Q19 ) - SILK_FIX_CONST( 2.0,  22 ) );
    A_Q28[ 1 ] = silk_SMULWW( r_Q22, r_Q22 );
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    silk_biquad_alt( in, B_Q28, A_Q28, hp_mem, out, len, channels );
    if( channels == 2 ) {
        silk_biquad_alt( in+1, B_Q28, A_Q28, hp_mem+2, out+1, len, channels );
@@ -355,7 +358,7 @@ static void hp_cutoff(const opus_val16 *in, opus_int32 cutoff_Hz, opus_val16 *ou
 #endif
 }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 static void dc_reject(const opus_val16 *in, opus_int32 cutoff_Hz, opus_val16 *out, opus_val32 *hp_mem, int len, int channels, opus_int32 Fs)
 {
    int c, i;
@@ -727,7 +730,7 @@ static int optimize_framesize(const void *x, int len, int C, opus_int32 Fs,
 #endif
 
 #ifndef DISABLE_FLOAT_API
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 #define PCM2VAL(x) FLOAT2INT16(x)
 #else
 #define PCM2VAL(x) SCALEIN(x)
@@ -753,7 +756,7 @@ void downmix_float(const void *_x, opus_val32 *sub, int subframe, int offset, in
             sub[j] += PCM2VAL(x[(j+offset)*C+c]);
       }
    }
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    scale = (1<<SIG_SHIFT);
 #else
    scale = 1.f;
@@ -788,7 +791,7 @@ void downmix_int(const void *_x, opus_val32 *sub, int subframe, int offset, int
             sub[j] += x[(j+offset)*C+c];
       }
    }
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    scale = (1<<SIG_SHIFT);
 #else
    scale = 1.f/32768;
@@ -998,7 +1001,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
     celt_encoder_ctl(celt_enc, CELT_GET_MODE(&celt_mode));
 #ifndef DISABLE_FLOAT_API
     analysis_info.valid = 0;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
     if (st->silk_mode.complexity >= 10 && st->Fs==48000)
 #else
     if (st->silk_mode.complexity >= 7 && st->Fs==48000)
@@ -1459,7 +1462,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
     } else {
        dc_reject(pcm, 3, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs);
     }
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
     if (float_api)
     {
        opus_val32 sum;
@@ -1480,7 +1483,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
     if (st->mode != MODE_CELT_ONLY)
     {
         opus_int32 total_bitRate, celt_rate;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
        const opus_int16 *pcm_silk;
 #else
        VARDECL(opus_int16, pcm_silk);
@@ -1628,7 +1631,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
             gain_fade(st->delay_buffer+prefill_offset, st->delay_buffer+prefill_offset,
                   0, Q15ONE, celt_mode->overlap, st->Fs/400, st->channels, celt_mode->window, st->Fs);
             OPUS_CLEAR(st->delay_buffer, prefill_offset);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             pcm_silk = st->delay_buffer;
 #else
             for (i=0;i<st->encoder_buffer*st->channels;i++)
@@ -1637,7 +1640,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
             silk_Encode( silk_enc, &st->silk_mode, pcm_silk, st->encoder_buffer, NULL, &zero, 1 );
         }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
         pcm_silk = pcm_buf+total_buffer*st->channels;
 #else
         for (i=0;i<frame_size*st->channels;i++)
@@ -1781,7 +1784,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
             opus_val16 g1, g2;
             g1 = st->hybrid_stereo_width_Q14;
             g2 = (opus_val16)(st->silk_mode.stereoWidth_Q14);
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             g1 = g1==16384 ? Q15ONE : SHL16(g1,1);
             g2 = g2==16384 ? Q15ONE : SHL16(g2,1);
 #else
@@ -1961,7 +1964,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
     return ret;
 }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 #ifndef DISABLE_FLOAT_API
 opus_int32 opus_encode_float(OpusEncoder *st, const float *pcm, int analysis_frame_size,
diff --git a/drivers/opus/opus_multistream.c b/thirdparty/opus/opus_multistream.c
index aa94803779..09c3639b7f 100644
--- a/drivers/opus/opus_multistream.c
+++ b/thirdparty/opus/opus_multistream.c
@@ -24,15 +24,18 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus_multistream.h"
-#include "opus/opus.h"
-#include "opus/opus_private.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus_multistream.h"
+#include "opus.h"
+#include "opus_private.h"
+#include "stack_alloc.h"
 #include <stdarg.h>
-#include "opus/celt/float_cast.h"
-#include "opus/celt/os_support.h"
+#include "float_cast.h"
+#include "os_support.h"
 
 
 int validate_layout(const ChannelLayout *layout)
diff --git a/drivers/opus/opus_multistream.h b/thirdparty/opus/opus_multistream.h
index 5519c46a9f..47e03900bd 100644
--- a/drivers/opus/opus_multistream.h
+++ b/thirdparty/opus/opus_multistream.h
@@ -33,7 +33,7 @@
 #ifndef OPUS_MULTISTREAM_H
 #define OPUS_MULTISTREAM_H
 
-#include "opus/opus.h"
+#include "opus.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/opus/opus_multistream_decoder.c b/thirdparty/opus/opus_multistream_decoder.c
index 25100edba2..b95eaa6eac 100644
--- a/drivers/opus/opus_multistream_decoder.c
+++ b/thirdparty/opus/opus_multistream_decoder.c
@@ -24,15 +24,18 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus_multistream.h"
-#include "opus/opus.h"
-#include "opus/opus_private.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus_multistream.h"
+#include "opus.h"
+#include "opus_private.h"
+#include "stack_alloc.h"
 #include <stdarg.h>
-#include "opus/celt/float_cast.h"
-#include "opus/celt/os_support.h"
+#include "float_cast.h"
+#include "os_support.h"
 
 struct OpusMSDecoder {
    ChannelLayout layout;
@@ -358,7 +361,7 @@ static void opus_copy_channel_out_short(
 
 
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 int opus_multistream_decode(
       OpusMSDecoder *st,
       const unsigned char *data,
diff --git a/drivers/opus/opus_multistream_encoder.c b/thirdparty/opus/opus_multistream_encoder.c
index 426c72e997..9e85773573 100644
--- a/drivers/opus/opus_multistream_encoder.c
+++ b/thirdparty/opus/opus_multistream_encoder.c
@@ -24,21 +24,24 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus_multistream.h"
-#include "opus/opus.h"
-#include "opus/opus_private.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus_multistream.h"
+#include "opus.h"
+#include "opus_private.h"
+#include "stack_alloc.h"
 #include <stdarg.h>
-#include "opus/celt/float_cast.h"
-#include "opus/celt/os_support.h"
-#include "opus/celt/mathops.h"
-#include "opus/celt/mdct.h"
-#include "opus/celt/modes.h"
-#include "opus/celt/bands.h"
-#include "opus/celt/quant_bands.h"
-#include "opus/celt/pitch.h"
+#include "float_cast.h"
+#include "os_support.h"
+#include "mathops.h"
+#include "mdct.h"
+#include "modes.h"
+#include "bands.h"
+#include "quant_bands.h"
+#include "pitch.h"
 
 typedef struct {
    int nb_streams;
@@ -202,7 +205,7 @@ static opus_val16 logSum(opus_val16 a, opus_val16 b)
    }
    if (!(diff < QCONST16(8.f, DB_SHIFT)))  /* inverted to catch NaNs */
       return max;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    low = SHR32(diff, DB_SHIFT-1);
    frac = SHL16(diff - SHL16(low, DB_SHIFT-1), 16-DB_SHIFT);
 #else
@@ -258,7 +261,7 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, opus_val16 *b
       OPUS_COPY(in, mem+c*overlap, overlap);
       (*copy_channel_in)(x, 1, pcm, channels, c, len);
       celt_preemphasis(x, in+overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem+c, 0);
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
       {
          opus_val32 sum;
          sum = celt_inner_prod(in, in, frame_size+overlap, 0);
@@ -668,7 +671,7 @@ static opus_int32 surround_rate_allocation(
             + nb_lfe*lfe_ratio;
       channel_rate = 256*(st->bitrate_bps-lfe_offset*nb_lfe-stream_offset*(nb_coupled+nb_uncoupled))/total;
    }
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
    if (st->variable_duration==OPUS_FRAMESIZE_VARIABLE && frame_size != Fs/50)
    {
       opus_int32 bonus;
@@ -955,7 +958,7 @@ static void opus_copy_channel_in_short(
 }
 
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 int opus_multistream_encode(
     OpusMSEncoder *st,
     const opus_val16 *pcm,
diff --git a/drivers/opus/opus_private.h b/thirdparty/opus/opus_private.h
index 129977ed11..3b62eed096 100644
--- a/drivers/opus/opus_private.h
+++ b/thirdparty/opus/opus_private.h
@@ -29,9 +29,9 @@
 #ifndef OPUS_PRIVATE_H
 #define OPUS_PRIVATE_H
 
-#include "opus/celt/arch.h"
-#include "opus/opus.h"
-#include "opus/celt/celt.h"
+#include "arch.h"
+#include "opus.h"
+#include "celt.h"
 
 #include <stddef.h> /* offsetof */
 
diff --git a/drivers/opus/opus_types.h b/thirdparty/opus/opus_types.h
index b28e03aea2..b28e03aea2 100644
--- a/drivers/opus/opus_types.h
+++ b/thirdparty/opus/opus_types.h
diff --git a/drivers/opus/opusfile.c b/thirdparty/opus/opusfile.c
index a9d6cc4d63..9c9b684ca4 100644
--- a/drivers/opus/opusfile.c
+++ b/thirdparty/opus/opusfile.c
@@ -14,9 +14,11 @@
  last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $
 
  ********************************************************************/
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include "opus/internal.h"
+#include "internal.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -24,7 +26,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "opus/opusfile.h"
+#include "opusfile.h"
 
 /*This implementation is largely based off of libvorbisfile.
   All of the Ogg bits work roughly the same, though I have made some
diff --git a/drivers/opus/opusfile.h b/thirdparty/opus/opusfile.h
index da31a29769..3604115c31 100644
--- a/drivers/opus/opusfile.h
+++ b/thirdparty/opus/opusfile.h
@@ -107,7 +107,7 @@ extern "C" {
 # include <stdarg.h>
 # include <stdio.h>
 # include <ogg/ogg.h>
-# include "opus/opus_multistream.h"
+# include <opus_multistream.h>
 
 /**@cond PRIVATE*/
 
diff --git a/drivers/opus/repacketizer.c b/thirdparty/opus/repacketizer.c
index 3822f9c86f..f27e9ab958 100644
--- a/drivers/opus/repacketizer.c
+++ b/thirdparty/opus/repacketizer.c
@@ -24,11 +24,14 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus.h"
-#include "opus/opus_private.h"
-#include "opus/celt/os_support.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus.h"
+#include "opus_private.h"
+#include "os_support.h"
 
 
 int opus_repacketizer_get_size(void)
diff --git a/drivers/opus/repacketizer_demo.c b/thirdparty/opus/repacketizer_demo.c
index 57acf6a53f..dc05c1b359 100644
--- a/drivers/opus/repacketizer_demo.c
+++ b/thirdparty/opus/repacketizer_demo.c
@@ -24,9 +24,12 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/opus.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/drivers/opus/silk/A2NLSF.c b/thirdparty/opus/silk/A2NLSF.c
index 38dbefc3bf..b6e9e5ffcc 100644
--- a/drivers/opus/silk/A2NLSF.c
+++ b/thirdparty/opus/silk/A2NLSF.c
@@ -30,10 +30,13 @@ POSSIBILITY OF SUCH DAMAGE.
 /* A piecewise linear approximation maps LSF <-> cos(LSF)       */
 /* Therefore the result is not accurate NLSFs, but the two      */
 /* functions are accurate inverses of each other                */
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "tables.h"
 
 /* Number of binary divisions, when not in low complexity mode */
 #define BIN_DIV_STEPS_A2NLSF_FIX      3 /* must be no higher than 16 - log2( LSF_COS_TAB_SZ_FIX ) */
diff --git a/drivers/opus/silk/API.h b/thirdparty/opus/silk/API.h
index ce868c0c99..0131acbb08 100644
--- a/drivers/opus/silk/API.h
+++ b/thirdparty/opus/silk/API.h
@@ -28,11 +28,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_API_H
 #define SILK_API_H
 
-#include "opus/silk/control.h"
-#include "opus/silk/typedef.h"
-#include "opus/silk/errors.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
+#include "control.h"
+#include "typedef.h"
+#include "errors.h"
+#include "entenc.h"
+#include "entdec.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/CNG.c b/thirdparty/opus/silk/CNG.c
index 595a288865..61787c2302 100644
--- a/drivers/opus/silk/CNG.c
+++ b/thirdparty/opus/silk/CNG.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 /* Generates excitation for CNG LPC synthesis */
 static OPUS_INLINE void silk_CNG_exc(
diff --git a/drivers/opus/silk/HP_variable_cutoff.c b/thirdparty/opus/silk/HP_variable_cutoff.c
index 6b93fdb5a3..bbe10f04ce 100644
--- a/drivers/opus/silk/HP_variable_cutoff.c
+++ b/thirdparty/opus/silk/HP_variable_cutoff.c
@@ -24,13 +24,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
-#ifdef OPUS_FIXED_POINT
-#include "opus/silk/fixed/main_FIX.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef FIXED_POINT
+#include "main_FIX.h"
 #else
-#include "opus/silk/float/main_FLP.h"
+#include "main_FLP.h"
 #endif
-#include "opus/silk/tuning_parameters.h"
+#include "tuning_parameters.h"
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
 void silk_HP_variable_cutoff(
diff --git a/drivers/opus/silk/Inlines.h b/thirdparty/opus/silk/Inlines.h
index ec986cdfdd..ec986cdfdd 100644
--- a/drivers/opus/silk/Inlines.h
+++ b/thirdparty/opus/silk/Inlines.h
diff --git a/drivers/opus/silk/LPC_analysis_filter.c b/thirdparty/opus/silk/LPC_analysis_filter.c
index f3c34b5482..20906673ff 100644
--- a/drivers/opus/silk/LPC_analysis_filter.c
+++ b/thirdparty/opus/silk/LPC_analysis_filter.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/celt/celt_lpc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "celt_lpc.h"
 
 /*******************************************/
 /* LPC analysis filter                     */
@@ -46,7 +49,7 @@ void silk_LPC_analysis_filter(
 )
 {
     opus_int   j;
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
     opus_int16 mem[SILK_MAX_ORDER_LPC];
     opus_int16 num[SILK_MAX_ORDER_LPC];
 #else
@@ -59,7 +62,7 @@ void silk_LPC_analysis_filter(
     silk_assert( (d & 1) == 0 );
     silk_assert( d <= len );
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
     silk_assert( d <= SILK_MAX_ORDER_LPC );
     for ( j = 0; j < d; j++ ) {
         num[ j ] = -B[ j ];
diff --git a/drivers/opus/silk/LPC_inv_pred_gain.c b/thirdparty/opus/silk/LPC_inv_pred_gain.c
index 8ace51500c..4af89aa5fa 100644
--- a/drivers/opus/silk/LPC_inv_pred_gain.c
+++ b/thirdparty/opus/silk/LPC_inv_pred_gain.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 #define QA                          24
 #define A_LIMIT                     SILK_FIX_CONST( 0.99975, QA )
@@ -127,7 +130,7 @@ opus_int32 silk_LPC_inverse_pred_gain(              /* O   Returns inverse predi
     return LPC_inverse_pred_gain_QA( Atmp_QA, order );
 }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 
 /* For input in Q24 domain */
 opus_int32 silk_LPC_inverse_pred_gain_Q24(          /* O    Returns inverse prediction gain in energy domain, Q30       */
diff --git a/drivers/opus/silk/LP_variable_cutoff.c b/thirdparty/opus/silk/LP_variable_cutoff.c
index b39497c4d9..f639e1f899 100644
--- a/drivers/opus/silk/LP_variable_cutoff.c
+++ b/thirdparty/opus/silk/LP_variable_cutoff.c
@@ -24,7 +24,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*
     Elliptic/Cauer filters designed with 0.1 dB passband ripple,
@@ -32,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
     [0.95 : 0.15 : 0.35] normalized cut off frequencies.
 */
 
-#include "opus/silk/main.h"
+#include "main.h"
 
 /* Helper function, interpolates the filter taps */
 static OPUS_INLINE void silk_LP_interpolate_filter_taps(
diff --git a/drivers/opus/silk/MacroCount.h b/thirdparty/opus/silk/MacroCount.h
index 834817d058..834817d058 100644
--- a/drivers/opus/silk/MacroCount.h
+++ b/thirdparty/opus/silk/MacroCount.h
diff --git a/drivers/opus/silk/MacroDebug.h b/thirdparty/opus/silk/MacroDebug.h
index 35aedc5c5f..35aedc5c5f 100644
--- a/drivers/opus/silk/MacroDebug.h
+++ b/thirdparty/opus/silk/MacroDebug.h
diff --git a/drivers/opus/silk/NLSF2A.c b/thirdparty/opus/silk/NLSF2A.c
index 09db1c1c3f..b1c559ea68 100644
--- a/drivers/opus/silk/NLSF2A.c
+++ b/thirdparty/opus/silk/NLSF2A.c
@@ -24,7 +24,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* conversion between prediction filter coefficients and LSFs   */
 /* order should be even                                         */
@@ -32,8 +35,8 @@ POSSIBILITY OF SUCH DAMAGE.
 /* therefore the result is not accurate LSFs, but the two       */
 /* functions are accurate inverses of each other                */
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/tables.h"
+#include "SigProc_FIX.h"
+#include "tables.h"
 
 #define QA      16
 
diff --git a/drivers/opus/silk/NLSF_VQ.c b/thirdparty/opus/silk/NLSF_VQ.c
index 99a37d4e0d..69b6e22e18 100644
--- a/drivers/opus/silk/NLSF_VQ.c
+++ b/thirdparty/opus/silk/NLSF_VQ.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
 void silk_NLSF_VQ(
diff --git a/drivers/opus/silk/NLSF_VQ_weights_laroia.c b/thirdparty/opus/silk/NLSF_VQ_weights_laroia.c
index 5743a4dee9..04894c59ab 100644
--- a/drivers/opus/silk/NLSF_VQ_weights_laroia.c
+++ b/thirdparty/opus/silk/NLSF_VQ_weights_laroia.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/define.h"
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "define.h"
+#include "SigProc_FIX.h"
 
 /*
 R. Laroia, N. Phamdo and N. Farvardin, "Robust and Efficient Quantization of Speech LSP
diff --git a/drivers/opus/silk/NLSF_decode.c b/thirdparty/opus/silk/NLSF_decode.c
index 6b922f3eee..9f715060b8 100644
--- a/drivers/opus/silk/NLSF_decode.c
+++ b/thirdparty/opus/silk/NLSF_decode.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Predictive dequantizer for NLSF residuals */
 static OPUS_INLINE void silk_NLSF_residual_dequant(               /* O    Returns RD value in Q30                     */
diff --git a/drivers/opus/silk/NLSF_del_dec_quant.c b/thirdparty/opus/silk/NLSF_del_dec_quant.c
index 3f81b2028c..c3b9efccfa 100644
--- a/drivers/opus/silk/NLSF_del_dec_quant.c
+++ b/thirdparty/opus/silk/NLSF_del_dec_quant.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Delayed-decision quantizer for NLSF residuals */
 opus_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
diff --git a/drivers/opus/silk/NLSF_encode.c b/thirdparty/opus/silk/NLSF_encode.c
index 9efb3e5158..03a036fda2 100644
--- a/drivers/opus/silk/NLSF_encode.c
+++ b/thirdparty/opus/silk/NLSF_encode.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 /***********************/
 /* NLSF vector encoder */
diff --git a/drivers/opus/silk/NLSF_stabilize.c b/thirdparty/opus/silk/NLSF_stabilize.c
index 1a45e16925..1fa1ea379b 100644
--- a/drivers/opus/silk/NLSF_stabilize.c
+++ b/thirdparty/opus/silk/NLSF_stabilize.c
@@ -24,7 +24,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* NLSF stabilizer:                                         */
 /*                                                          */
@@ -35,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* - Output are sorted NLSF coefficients                    */
 /*                                                          */
 
-#include "opus/silk/SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Constant Definitions */
 #define MAX_LOOPS        20
diff --git a/drivers/opus/silk/NLSF_unpack.c b/thirdparty/opus/silk/NLSF_unpack.c
index c958f4a6ef..17bd23f752 100644
--- a/drivers/opus/silk/NLSF_unpack.c
+++ b/thirdparty/opus/silk/NLSF_unpack.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Unpack predictor values and indices for entropy coding tables */
 void silk_NLSF_unpack(
diff --git a/drivers/opus/silk/NSQ.c b/thirdparty/opus/silk/NSQ.c
index e41e533bde..a065884070 100644
--- a/drivers/opus/silk/NSQ.c
+++ b/thirdparty/opus/silk/NSQ.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 static OPUS_INLINE void silk_nsq_scale_states(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
diff --git a/thirdparty/opus/silk/NSQ.h b/thirdparty/opus/silk/NSQ.h
new file mode 100644
index 0000000000..971832f660
--- /dev/null
+++ b/thirdparty/opus/silk/NSQ.h
@@ -0,0 +1,101 @@
+/***********************************************************************
+Copyright (c) 2014 Vidyo.
+Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+***********************************************************************/
+#ifndef SILK_NSQ_H
+#define SILK_NSQ_H
+
+#include "SigProc_FIX.h"
+
+#undef silk_short_prediction_create_arch_coef
+
+static OPUS_INLINE opus_int32 silk_noise_shape_quantizer_short_prediction_c(const opus_int32 *buf32, const opus_int16 *coef16, opus_int order)
+{
+    opus_int32 out;
+    silk_assert( order == 10 || order == 16 );
+
+    /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
+    out = silk_RSHIFT( order, 1 );
+    out = silk_SMLAWB( out, buf32[  0 ], coef16[ 0 ] );
+    out = silk_SMLAWB( out, buf32[ -1 ], coef16[ 1 ] );
+    out = silk_SMLAWB( out, buf32[ -2 ], coef16[ 2 ] );
+    out = silk_SMLAWB( out, buf32[ -3 ], coef16[ 3 ] );
+    out = silk_SMLAWB( out, buf32[ -4 ], coef16[ 4 ] );
+    out = silk_SMLAWB( out, buf32[ -5 ], coef16[ 5 ] );
+    out = silk_SMLAWB( out, buf32[ -6 ], coef16[ 6 ] );
+    out = silk_SMLAWB( out, buf32[ -7 ], coef16[ 7 ] );
+    out = silk_SMLAWB( out, buf32[ -8 ], coef16[ 8 ] );
+    out = silk_SMLAWB( out, buf32[ -9 ], coef16[ 9 ] );
+
+    if( order == 16 )
+    {
+        out = silk_SMLAWB( out, buf32[ -10 ], coef16[ 10 ] );
+        out = silk_SMLAWB( out, buf32[ -11 ], coef16[ 11 ] );
+        out = silk_SMLAWB( out, buf32[ -12 ], coef16[ 12 ] );
+        out = silk_SMLAWB( out, buf32[ -13 ], coef16[ 13 ] );
+        out = silk_SMLAWB( out, buf32[ -14 ], coef16[ 14 ] );
+        out = silk_SMLAWB( out, buf32[ -15 ], coef16[ 15 ] );
+    }
+    return out;
+}
+
+#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch,silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
+
+static OPUS_INLINE opus_int32 silk_NSQ_noise_shape_feedback_loop_c(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order)
+{
+    opus_int32 out;
+    opus_int32 tmp1, tmp2;
+    opus_int j;
+
+    tmp2 = data0[0];
+    tmp1 = data1[0];
+    data1[0] = tmp2;
+
+    out = silk_RSHIFT(order, 1);
+    out = silk_SMLAWB(out, tmp2, coef[0]);
+
+    for (j = 2; j < order; j += 2) {
+        tmp2 = data1[j - 1];
+        data1[j - 1] = tmp1;
+        out = silk_SMLAWB(out, tmp1, coef[j - 1]);
+        tmp1 = data1[j + 0];
+        data1[j + 0] = tmp2;
+        out = silk_SMLAWB(out, tmp2, coef[j]);
+    }
+    data1[order - 1] = tmp1;
+    out = silk_SMLAWB(out, tmp1, coef[order - 1]);
+    /* Q11 -> Q12 */
+    out = silk_LSHIFT32( out, 1 );
+    return out;
+}
+
+#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch,silk_NSQ_noise_shape_feedback_loop_c(data0, data1, coef, order))
+
+#if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#include "arm/NSQ_neon.h"
+#endif
+
+#endif /* SILK_NSQ_H */
diff --git a/drivers/opus/silk/NSQ_del_dec.c b/thirdparty/opus/silk/NSQ_del_dec.c
index 28b385e415..aff560c221 100644
--- a/drivers/opus/silk/NSQ_del_dec.c
+++ b/thirdparty/opus/silk/NSQ_del_dec.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 typedef struct {
     opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
@@ -55,7 +58,7 @@ typedef struct {
 typedef NSQ_sample_struct  NSQ_sample_pair[ 2 ];
 
 #if defined(MIPSr1_ASM)
-#include "opus/silk/mips/NSQ_del_dec_mipsr1.h"
+#include "mips/NSQ_del_dec_mipsr1.h"
 #endif
 static OPUS_INLINE void silk_nsq_del_dec_scale_states(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
diff --git a/drivers/opus/silk/PLC.c b/thirdparty/opus/silk/PLC.c
index 4007112c5a..34a94bc313 100644
--- a/drivers/opus/silk/PLC.c
+++ b/thirdparty/opus/silk/PLC.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/PLC.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
+#include "PLC.h"
 
 #define NB_ATT 2
 static const opus_int16 HARM_ATT_Q15[NB_ATT]              = { 32440, 31130 }; /* 0.99, 0.95 */
diff --git a/drivers/opus/silk/PLC.h b/thirdparty/opus/silk/PLC.h
index 209c2de48f..6438f51633 100644
--- a/drivers/opus/silk/PLC.h
+++ b/thirdparty/opus/silk/PLC.h
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_PLC_H
 #define SILK_PLC_H
 
-#include "opus/silk/main.h"
+#include "main.h"
 
 #define BWE_COEF                        0.99
 #define V_PITCH_GAIN_START_MIN_Q14      11469               /* 0.7 in Q14               */
diff --git a/drivers/opus/silk/SigProc_FIX.h b/thirdparty/opus/silk/SigProc_FIX.h
index 743cf7800c..b63299441e 100644
--- a/drivers/opus/silk/SigProc_FIX.h
+++ b/thirdparty/opus/silk/SigProc_FIX.h
@@ -38,13 +38,13 @@ extern "C"
 #define SILK_MAX_ORDER_LPC            16            /* max order of the LPC analysis in schur() and k2a() */
 
 #include <string.h>                                 /* for memset(), memcpy(), memmove() */
-#include "opus/silk/typedef.h"
-#include "opus/silk/resampler_structs.h"
-#include "opus/silk/macros.h"
-#include "opus/celt/cpu_support.h"
+#include "typedef.h"
+#include "resampler_structs.h"
+#include "macros.h"
+#include "cpu_support.h"
 
 #if defined(OPUS_X86_MAY_HAVE_SSE4_1)
-#include "opus/silk/x86/SigProc_FIX_sse.h"
+#include "x86/SigProc_FIX_sse.h"
 #endif
 
 /********************************************************************/
@@ -591,20 +591,20 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
     ((void)(arch),silk_inner_prod16_aligned_64_c(inVec1, inVec2, len))
 #endif
 
-#include "opus/silk/Inlines.h"
-#include "opus/silk/MacroCount.h"
-#include "opus/silk/MacroDebug.h"
+#include "Inlines.h"
+#include "MacroCount.h"
+#include "MacroDebug.h"
 
 #ifdef OPUS_ARM_INLINE_ASM
-#include "opus/silk/arm/SigProc_FIX_armv4.h"
+#include "arm/SigProc_FIX_armv4.h"
 #endif
 
 #ifdef OPUS_ARM_INLINE_EDSP
-#include "opus/silk/arm/SigProc_FIX_armv5e.h"
+#include "arm/SigProc_FIX_armv5e.h"
 #endif
 
 #if defined(MIPSr1_ASM)
-#include "opus/silk/mips/sigproc_fix_mipsr1.h"
+#include "mips/sigproc_fix_mipsr1.h"
 #endif
 
 
diff --git a/drivers/opus/silk/VAD.c b/thirdparty/opus/silk/VAD.c
index bb664cff87..0a782af2f1 100644
--- a/drivers/opus/silk/VAD.c
+++ b/thirdparty/opus/silk/VAD.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 /* Silk VAD noise level estimation */
 # if !defined(OPUS_X86_MAY_HAVE_SSE4_1)
diff --git a/drivers/opus/silk/VQ_WMat_EC.c b/thirdparty/opus/silk/VQ_WMat_EC.c
index fec9ee8dde..7983f1db80 100644
--- a/drivers/opus/silk/VQ_WMat_EC.c
+++ b/thirdparty/opus/silk/VQ_WMat_EC.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
 void silk_VQ_WMat_EC_c(
diff --git a/drivers/opus/silk/ana_filt_bank_1.c b/thirdparty/opus/silk/ana_filt_bank_1.c
index b49bdd90be..24cfb03fdb 100644
--- a/drivers/opus/silk/ana_filt_bank_1.c
+++ b/thirdparty/opus/silk/ana_filt_bank_1.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Coefficients for 2-band filter bank based on first-order allpass filters */
 static opus_int16 A_fb1_20 = 5394 << 1;
diff --git a/thirdparty/opus/silk/arm/NSQ_neon.c b/thirdparty/opus/silk/arm/NSQ_neon.c
new file mode 100644
index 0000000000..9642529973
--- /dev/null
+++ b/thirdparty/opus/silk/arm/NSQ_neon.c
@@ -0,0 +1,112 @@
+/***********************************************************************
+Copyright (C) 2014 Vidyo
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+***********************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <arm_neon.h>
+#include "main.h"
+#include "stack_alloc.h"
+#include "NSQ.h"
+#include "celt/cpu_support.h"
+#include "celt/arm/armcpu.h"
+
+opus_int32 silk_noise_shape_quantizer_short_prediction_neon(const opus_int32 *buf32, const opus_int32 *coef32, opus_int order)
+{
+    int32x4_t coef0 = vld1q_s32(coef32);
+    int32x4_t coef1 = vld1q_s32(coef32 + 4);
+    int32x4_t coef2 = vld1q_s32(coef32 + 8);
+    int32x4_t coef3 = vld1q_s32(coef32 + 12);
+
+    int32x4_t a0 = vld1q_s32(buf32 - 15);
+    int32x4_t a1 = vld1q_s32(buf32 - 11);
+    int32x4_t a2 = vld1q_s32(buf32 - 7);
+    int32x4_t a3 = vld1q_s32(buf32 - 3);
+
+    int32x4_t b0 = vqdmulhq_s32(coef0, a0);
+    int32x4_t b1 = vqdmulhq_s32(coef1, a1);
+    int32x4_t b2 = vqdmulhq_s32(coef2, a2);
+    int32x4_t b3 = vqdmulhq_s32(coef3, a3);
+
+    int32x4_t c0 = vaddq_s32(b0, b1);
+    int32x4_t c1 = vaddq_s32(b2, b3);
+
+    int32x4_t d = vaddq_s32(c0, c1);
+
+    int64x2_t e = vpaddlq_s32(d);
+
+    int64x1_t f = vadd_s64(vget_low_s64(e), vget_high_s64(e));
+
+    opus_int32 out = vget_lane_s32(vreinterpret_s32_s64(f), 0);
+
+    out += silk_RSHIFT( order, 1 );
+
+    return out;
+}
+
+
+opus_int32 silk_NSQ_noise_shape_feedback_loop_neon(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order)
+{
+    opus_int32 out;
+    if (order == 8)
+    {
+        int32x4_t a00 = vdupq_n_s32(data0[0]);
+        int32x4_t a01 = vld1q_s32(data1);  /* data1[0] ... [3] */
+
+        int32x4_t a0 = vextq_s32 (a00, a01, 3); /* data0[0] data1[0] ...[2] */
+        int32x4_t a1 = vld1q_s32(data1 + 3);  /* data1[3] ... [6] */
+
+        /*TODO: Convert these once in advance instead of once per sample, like
+          silk_noise_shape_quantizer_short_prediction_neon() does.*/
+        int16x8_t coef16 = vld1q_s16(coef);
+        int32x4_t coef0 = vmovl_s16(vget_low_s16(coef16));
+        int32x4_t coef1 = vmovl_s16(vget_high_s16(coef16));
+
+        /*This is not bit-exact with the C version, since we do not drop the
+          lower 16 bits of each multiply, but wait until the end to truncate
+          precision. This is an encoder-specific calculation (and unlike
+          silk_noise_shape_quantizer_short_prediction_neon(), is not meant to
+          simulate what the decoder will do). We still could use vqdmulhq_s32()
+          like silk_noise_shape_quantizer_short_prediction_neon() and save
+          half the multiplies, but the speed difference is not large, since we
+          then need two extra adds.*/
+        int64x2_t b0 = vmull_s32(vget_low_s32(a0), vget_low_s32(coef0));
+        int64x2_t b1 = vmlal_s32(b0, vget_high_s32(a0), vget_high_s32(coef0));
+        int64x2_t b2 = vmlal_s32(b1, vget_low_s32(a1), vget_low_s32(coef1));
+        int64x2_t b3 = vmlal_s32(b2, vget_high_s32(a1), vget_high_s32(coef1));
+
+        int64x1_t c = vadd_s64(vget_low_s64(b3), vget_high_s64(b3));
+        int64x1_t cS = vrshr_n_s64(c, 15);
+        int32x2_t d = vreinterpret_s32_s64(cS);
+
+        out = vget_lane_s32(d, 0);
+        vst1q_s32(data1, a0);
+        vst1q_s32(data1 + 4, a1);
+        return out;
+    }
+    return silk_NSQ_noise_shape_feedback_loop_c(data0, data1, coef, order);
+}
diff --git a/thirdparty/opus/silk/arm/NSQ_neon.h b/thirdparty/opus/silk/arm/NSQ_neon.h
new file mode 100644
index 0000000000..77c946af85
--- /dev/null
+++ b/thirdparty/opus/silk/arm/NSQ_neon.h
@@ -0,0 +1,113 @@
+/***********************************************************************
+Copyright (C) 2014 Vidyo
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+***********************************************************************/
+#ifndef SILK_NSQ_NEON_H
+#define SILK_NSQ_NEON_H
+
+#include "cpu_support.h"
+
+#undef silk_short_prediction_create_arch_coef
+/* For vectorized calc, reverse a_Q12 coefs, convert to 32-bit, and shift for vqdmulhq_s32. */
+static OPUS_INLINE void silk_short_prediction_create_arch_coef_neon(opus_int32 *out, const opus_int16 *in, opus_int order)
+{
+    out[15] = in[0] << 15;
+    out[14] = in[1] << 15;
+    out[13] = in[2] << 15;
+    out[12] = in[3] << 15;
+    out[11] = in[4] << 15;
+    out[10] = in[5] << 15;
+    out[9]  = in[6] << 15;
+    out[8]  = in[7] << 15;
+    out[7]  = in[8] << 15;
+    out[6]  = in[9] << 15;
+
+    if (order == 16)
+    {
+        out[5] = in[10] << 15;
+        out[4] = in[11] << 15;
+        out[3] = in[12] << 15;
+        out[2] = in[13] << 15;
+        out[1] = in[14] << 15;
+        out[0] = in[15] << 15;
+    }
+    else
+    {
+        out[5] = 0;
+        out[4] = 0;
+        out[3] = 0;
+        out[2] = 0;
+        out[1] = 0;
+        out[0] = 0;
+    }
+}
+
+#if defined(OPUS_ARM_PRESUME_NEON_INTR)
+
+#define silk_short_prediction_create_arch_coef(out, in, order) \
+    (silk_short_prediction_create_arch_coef_neon(out, in, order))
+
+#elif defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+
+#define silk_short_prediction_create_arch_coef(out, in, order) \
+    do { if (arch == OPUS_ARCH_ARM_NEON) { silk_short_prediction_create_arch_coef_neon(out, in, order); } } while (0)
+
+#endif
+
+opus_int32 silk_noise_shape_quantizer_short_prediction_neon(const opus_int32 *buf32, const opus_int32 *coef32, opus_int order);
+
+opus_int32 silk_NSQ_noise_shape_feedback_loop_neon(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order);
+
+#if defined(OPUS_ARM_PRESUME_NEON_INTR)
+#undef silk_noise_shape_quantizer_short_prediction
+#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch) \
+    ((void)arch,silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order))
+
+#undef silk_NSQ_noise_shape_feedback_loop
+#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch,silk_NSQ_noise_shape_feedback_loop_neon(data0, data1, coef, order))
+
+#elif defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+
+/* silk_noise_shape_quantizer_short_prediction implementations take different parameters based on arch
+   (coef vs. coefRev) so can't use the usual IMPL table implementation */
+#undef silk_noise_shape_quantizer_short_prediction
+#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  \
+    (arch == OPUS_ARCH_ARM_NEON ? \
+        silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order) : \
+        silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
+
+extern opus_int32
+ (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OPUS_ARCHMASK+1])(
+ const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef,
+ opus_int order);
+
+#undef silk_NSQ_noise_shape_feedback_loop
+#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch) \
+ (SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[(arch)&OPUS_ARCHMASK](data0, data1, \
+ coef, order))
+
+#endif
+
+#endif /* SILK_NSQ_NEON_H */
diff --git a/drivers/opus/silk/arm/SigProc_FIX_armv4.h b/thirdparty/opus/silk/arm/SigProc_FIX_armv4.h
index ff62b1e5d6..ff62b1e5d6 100644
--- a/drivers/opus/silk/arm/SigProc_FIX_armv4.h
+++ b/thirdparty/opus/silk/arm/SigProc_FIX_armv4.h
diff --git a/drivers/opus/silk/arm/SigProc_FIX_armv5e.h b/thirdparty/opus/silk/arm/SigProc_FIX_armv5e.h
index 617a09cab1..617a09cab1 100644
--- a/drivers/opus/silk/arm/SigProc_FIX_armv5e.h
+++ b/thirdparty/opus/silk/arm/SigProc_FIX_armv5e.h
diff --git a/thirdparty/opus/silk/arm/arm_silk_map.c b/thirdparty/opus/silk/arm/arm_silk_map.c
new file mode 100644
index 0000000000..9bd86a7b21
--- /dev/null
+++ b/thirdparty/opus/silk/arm/arm_silk_map.c
@@ -0,0 +1,55 @@
+/***********************************************************************
+Copyright (C) 2014 Vidyo
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+***********************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "NSQ.h"
+
+#if defined(OPUS_HAVE_RTCD)
+
+# if (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && \
+ !defined(OPUS_ARM_PRESUME_NEON_INTR))
+
+/*There is no table for silk_noise_shape_quantizer_short_prediction because the
+   NEON version takes different parameters than the C version.
+  Instead RTCD is done via if statements at the call sites.
+  See NSQ_neon.h for details.*/
+
+opus_int32
+ (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OPUS_ARCHMASK+1])(
+ const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef,
+ opus_int order) = {
+  silk_NSQ_noise_shape_feedback_loop_c,    /* ARMv4 */
+  silk_NSQ_noise_shape_feedback_loop_c,    /* EDSP */
+  silk_NSQ_noise_shape_feedback_loop_c,    /* Media */
+  silk_NSQ_noise_shape_feedback_loop_neon, /* NEON */
+};
+
+# endif
+
+#endif /* OPUS_HAVE_RTCD */
diff --git a/thirdparty/opus/silk/arm/macros_arm64.h b/thirdparty/opus/silk/arm/macros_arm64.h
new file mode 100644
index 0000000000..ed030413c5
--- /dev/null
+++ b/thirdparty/opus/silk/arm/macros_arm64.h
@@ -0,0 +1,39 @@
+/***********************************************************************
+Copyright (C) 2015 Vidyo
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+***********************************************************************/
+
+#ifndef SILK_MACROS_ARM64_H
+#define SILK_MACROS_ARM64_H
+
+#include <arm_neon.h>
+
+#undef silk_ADD_SAT32
+#define silk_ADD_SAT32(a, b) (vqadds_s32((a), (b)))
+
+#undef silk_SUB_SAT32
+#define silk_SUB_SAT32(a, b) (vqsubs_s32((a), (b)))
+
+#endif /* SILK_MACROS_ARM64_H */
diff --git a/drivers/opus/silk/arm/macros_armv4.h b/thirdparty/opus/silk/arm/macros_armv4.h
index 3f30e97288..3f30e97288 100644
--- a/drivers/opus/silk/arm/macros_armv4.h
+++ b/thirdparty/opus/silk/arm/macros_armv4.h
diff --git a/drivers/opus/silk/arm/macros_armv5e.h b/thirdparty/opus/silk/arm/macros_armv5e.h
index aad4117e46..aad4117e46 100644
--- a/drivers/opus/silk/arm/macros_armv5e.h
+++ b/thirdparty/opus/silk/arm/macros_armv5e.h
diff --git a/drivers/opus/silk/biquad_alt.c b/thirdparty/opus/silk/biquad_alt.c
index f797d1e709..d55f5ee92e 100644
--- a/drivers/opus/silk/biquad_alt.c
+++ b/thirdparty/opus/silk/biquad_alt.c
@@ -31,9 +31,12 @@ POSSIBILITY OF SUCH DAMAGE.
  * Second order ARMA filter                                             *
  * Can handle slowly varying filter coefficients                        *
  *                                                                      */
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Second order ARMA filter, alternative implementation */
 void silk_biquad_alt(
diff --git a/drivers/opus/silk/bwexpander.c b/thirdparty/opus/silk/bwexpander.c
index e7cc448520..2eb4456695 100644
--- a/drivers/opus/silk/bwexpander.c
+++ b/thirdparty/opus/silk/bwexpander.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander(
diff --git a/drivers/opus/silk/bwexpander_32.c b/thirdparty/opus/silk/bwexpander_32.c
index dedd213b3e..d0010f73df 100644
--- a/drivers/opus/silk/bwexpander_32.c
+++ b/thirdparty/opus/silk/bwexpander_32.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander_32(
diff --git a/drivers/opus/silk/check_control_input.c b/thirdparty/opus/silk/check_control_input.c
index 61a7cc1f33..b5de9ce48d 100644
--- a/drivers/opus/silk/check_control_input.c
+++ b/thirdparty/opus/silk/check_control_input.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/silk/control.h"
-#include "opus/silk/errors.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "control.h"
+#include "errors.h"
 
 /* Check encoder control struct */
 opus_int check_control_input(
diff --git a/drivers/opus/silk/code_signs.c b/thirdparty/opus/silk/code_signs.c
index 79c1893514..dfd1dca9a1 100644
--- a/drivers/opus/silk/code_signs.c
+++ b/thirdparty/opus/silk/code_signs.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /*#define silk_enc_map(a)                ((a) > 0 ? 1 : 0)*/
 /*#define silk_dec_map(a)                ((a) > 0 ? 1 : -1)*/
diff --git a/drivers/opus/silk/control.h b/thirdparty/opus/silk/control.h
index 4b20c4a8b8..747e5426a0 100644
--- a/drivers/opus/silk/control.h
+++ b/thirdparty/opus/silk/control.h
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_CONTROL_H
 #define SILK_CONTROL_H
 
-#include "opus/silk/typedef.h"
+#include "typedef.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/control_SNR.c b/thirdparty/opus/silk/control_SNR.c
index 5aebfcf385..cee87eb0d8 100644
--- a/drivers/opus/silk/control_SNR.c
+++ b/thirdparty/opus/silk/control_SNR.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "tuning_parameters.h"
 
 /* Control SNR of redidual quantizer */
 opus_int silk_control_SNR(
diff --git a/drivers/opus/silk/control_audio_bandwidth.c b/thirdparty/opus/silk/control_audio_bandwidth.c
index 04640f53fe..4f9bc5cbda 100644
--- a/drivers/opus/silk/control_audio_bandwidth.c
+++ b/thirdparty/opus/silk/control_audio_bandwidth.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "tuning_parameters.h"
 
 /* Control internal sampling rate */
 opus_int silk_control_audio_bandwidth(
diff --git a/drivers/opus/silk/control_codec.c b/thirdparty/opus/silk/control_codec.c
index 03caab36a9..044eea3f2a 100644
--- a/drivers/opus/silk/control_codec.c
+++ b/thirdparty/opus/silk/control_codec.c
@@ -24,17 +24,20 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
-#ifdef OPUS_FIXED_POINT
-#include "opus/silk/fixed/main_FIX.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef FIXED_POINT
+#include "main_FIX.h"
 #define silk_encoder_state_Fxx      silk_encoder_state_FIX
 #else
-#include "opus/silk/float/main_FLP.h"
+#include "main_FLP.h"
 #define silk_encoder_state_Fxx      silk_encoder_state_FLP
 #endif
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
-#include "opus/silk/pitch_est_defines.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
+#include "pitch_est_defines.h"
 
 static opus_int silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
@@ -145,7 +148,7 @@ static opus_int silk_setup_resamplers(
         } else {
             VARDECL( opus_int16, x_buf_API_fs_Hz );
             VARDECL( silk_resampler_state_struct, temp_resampler_state );
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
             opus_int16 *x_bufFIX = psEnc->x_buf;
 #else
             VARDECL( opus_int16, x_bufFIX );
@@ -158,7 +161,7 @@ static opus_int silk_setup_resamplers(
             buf_length_ms = silk_LSHIFT( psEnc->sCmn.nb_subfr * 5, 1 ) + LA_SHAPE_MS;
             old_buf_samples = buf_length_ms * psEnc->sCmn.fs_kHz;
 
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
             new_buf_samples = buf_length_ms * fs_kHz;
             ALLOC( x_bufFIX, silk_max( old_buf_samples, new_buf_samples ),
                    opus_int16 );
@@ -182,7 +185,7 @@ static opus_int silk_setup_resamplers(
             /* Correct resampler state by resampling buffered data from API_fs_Hz to fs_kHz */
             ret += silk_resampler( &psEnc->sCmn.resampler_state, x_bufFIX, x_buf_API_fs_Hz, api_buf_samples );
 
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
             silk_short2float_array( psEnc->x_buf, x_bufFIX, new_buf_samples);
 #endif
         }
diff --git a/drivers/opus/silk/debug.c b/thirdparty/opus/silk/debug.c
index ffb3f811a1..9253faf71b 100644
--- a/drivers/opus/silk/debug.c
+++ b/thirdparty/opus/silk/debug.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/debug.h"
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "debug.h"
+#include "SigProc_FIX.h"
 
 #if SILK_TIC_TOC
 
diff --git a/drivers/opus/silk/debug.h b/thirdparty/opus/silk/debug.h
index d2eccfa1e4..efb6d3e99e 100644
--- a/drivers/opus/silk/debug.h
+++ b/thirdparty/opus/silk/debug.h
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_DEBUG_H
 #define SILK_DEBUG_H
 
-#include "opus/silk/typedef.h"
+#include "typedef.h"
 #include <stdio.h>      /* file writing */
 #include <string.h>     /* strcpy, strcmp */
 
diff --git a/drivers/opus/silk/dec_API.c b/thirdparty/opus/silk/dec_API.c
index 2fd681c0d2..b7d8ed48d8 100644
--- a/drivers/opus/silk/dec_API.c
+++ b/thirdparty/opus/silk/dec_API.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
-#include "opus/silk/API.h"
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/celt/os_support.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "API.h"
+#include "main.h"
+#include "stack_alloc.h"
+#include "os_support.h"
 
 /************************/
 /* Decoder Super Struct */
diff --git a/drivers/opus/silk/decode_core.c b/thirdparty/opus/silk/decode_core.c
index 8ca1adffdd..b88991e349 100644
--- a/drivers/opus/silk/decode_core.c
+++ b/thirdparty/opus/silk/decode_core.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 /**********************************************************/
 /* Core decoder. Performs inverse NSQ operation LTP + LPC */
diff --git a/drivers/opus/silk/decode_frame.c b/thirdparty/opus/silk/decode_frame.c
index 18e2bc9b1a..a605d95ac6 100644
--- a/drivers/opus/silk/decode_frame.c
+++ b/thirdparty/opus/silk/decode_frame.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/PLC.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
+#include "PLC.h"
 
 /****************/
 /* Decode frame */
diff --git a/drivers/opus/silk/decode_indices.c b/thirdparty/opus/silk/decode_indices.c
index fa8066e5f7..7afe5c26c1 100644
--- a/drivers/opus/silk/decode_indices.c
+++ b/thirdparty/opus/silk/decode_indices.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Decode side-information parameters from payload */
 void silk_decode_indices(
diff --git a/drivers/opus/silk/decode_parameters.c b/thirdparty/opus/silk/decode_parameters.c
index d17cb8a3df..e345b1dcef 100644
--- a/drivers/opus/silk/decode_parameters.c
+++ b/thirdparty/opus/silk/decode_parameters.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Decode parameters from payload */
 void silk_decode_parameters(
diff --git a/drivers/opus/silk/decode_pitch.c b/thirdparty/opus/silk/decode_pitch.c
index 1d98ee7f33..fedbc6a525 100644
--- a/drivers/opus/silk/decode_pitch.c
+++ b/thirdparty/opus/silk/decode_pitch.c
@@ -24,13 +24,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /***********************************************************
 * Pitch analyser function
 ********************************************************** */
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/pitch_est_defines.h"
+#include "SigProc_FIX.h"
+#include "pitch_est_defines.h"
 
 void silk_decode_pitch(
     opus_int16                  lagIndex,           /* I                                                                */
diff --git a/drivers/opus/silk/decode_pulses.c b/thirdparty/opus/silk/decode_pulses.c
index c687d3bfa8..d6bbec9225 100644
--- a/drivers/opus/silk/decode_pulses.c
+++ b/thirdparty/opus/silk/decode_pulses.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /*********************************************/
 /* Decode quantization indices of excitation */
diff --git a/drivers/opus/silk/decoder_set_fs.c b/thirdparty/opus/silk/decoder_set_fs.c
index 0079a506ee..eef0fd25e1 100644
--- a/drivers/opus/silk/decoder_set_fs.c
+++ b/thirdparty/opus/silk/decoder_set_fs.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Set decoder sampling rate */
 opus_int silk_decoder_set_fs(
diff --git a/drivers/opus/silk/define.h b/thirdparty/opus/silk/define.h
index c6165e3cff..19c9b00e25 100644
--- a/drivers/opus/silk/define.h
+++ b/thirdparty/opus/silk/define.h
@@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_DEFINE_H
 #define SILK_DEFINE_H
 
-#include "opus/silk/errors.h"
-#include "opus/silk/typedef.h"
+#include "errors.h"
+#include "typedef.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/enc_API.c b/thirdparty/opus/silk/enc_API.c
index beb46214d8..f8060286db 100644
--- a/drivers/opus/silk/enc_API.c
+++ b/thirdparty/opus/silk/enc_API.c
@@ -24,18 +24,21 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
-#include "opus/silk/define.h"
-#include "opus/silk/API.h"
-#include "opus/silk/control.h"
-#include "opus/silk/typedef.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/structs.h"
-#include "opus/silk/tuning_parameters.h"
-#ifdef OPUS_FIXED_POINT
-#include "opus/silk/fixed/main_FIX.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "define.h"
+#include "API.h"
+#include "control.h"
+#include "typedef.h"
+#include "stack_alloc.h"
+#include "structs.h"
+#include "tuning_parameters.h"
+#ifdef FIXED_POINT
+#include "main_FIX.h"
 #else
-#include "opus/silk/float/main_FLP.h"
+#include "main_FLP.h"
 #endif
 
 /***************************************/
diff --git a/drivers/opus/silk/encode_indices.c b/thirdparty/opus/silk/encode_indices.c
index 72fc6a80e8..666c8c0b13 100644
--- a/drivers/opus/silk/encode_indices.c
+++ b/thirdparty/opus/silk/encode_indices.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Encode side-information parameters to payload */
 void silk_encode_indices(
diff --git a/drivers/opus/silk/encode_pulses.c b/thirdparty/opus/silk/encode_pulses.c
index 238eec1e42..ab00264f99 100644
--- a/drivers/opus/silk/encode_pulses.c
+++ b/thirdparty/opus/silk/encode_pulses.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 /*********************************************/
 /* Encode quantization indices of excitation */
diff --git a/drivers/opus/silk/errors.h b/thirdparty/opus/silk/errors.h
index 45070800f2..45070800f2 100644
--- a/drivers/opus/silk/errors.h
+++ b/thirdparty/opus/silk/errors.h
diff --git a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c b/thirdparty/opus/silk/fixed/LTP_analysis_filter_FIX.c
index 041e85f0b9..5574e7069f 100644
--- a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c
+++ b/thirdparty/opus/silk/fixed/LTP_analysis_filter_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
 
 void silk_LTP_analysis_filter_FIX(
     opus_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
diff --git a/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c b/thirdparty/opus/silk/fixed/LTP_scale_ctrl_FIX.c
index dac1fbc08a..3dcedef891 100644
--- a/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c
+++ b/thirdparty/opus/silk/fixed/LTP_scale_ctrl_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
 
 /* Calculation of LTP state scaling */
 void silk_LTP_scale_ctrl_FIX(
diff --git a/drivers/opus/silk/fixed/apply_sine_window_FIX.c b/thirdparty/opus/silk/fixed/apply_sine_window_FIX.c
index 9d63e7bce2..4502b7130e 100644
--- a/drivers/opus/silk/fixed/apply_sine_window_FIX.c
+++ b/thirdparty/opus/silk/fixed/apply_sine_window_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Apply sine window to signal vector.                                      */
 /* Window types:                                                            */
diff --git a/drivers/opus/silk/fixed/autocorr_FIX.c b/thirdparty/opus/silk/fixed/autocorr_FIX.c
index db39a0335b..de95c98693 100644
--- a/drivers/opus/silk/fixed/autocorr_FIX.c
+++ b/thirdparty/opus/silk/fixed/autocorr_FIX.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/celt/celt_lpc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "celt_lpc.h"
 
 /* Compute autocorrelation */
 void silk_autocorr(
diff --git a/drivers/opus/silk/fixed/burg_modified_FIX.c b/thirdparty/opus/silk/fixed/burg_modified_FIX.c
index 48d64eccc5..4878553b65 100644
--- a/drivers/opus/silk/fixed/burg_modified_FIX.c
+++ b/thirdparty/opus/silk/fixed/burg_modified_FIX.c
@@ -24,12 +24,15 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/define.h"
-#include "opus/silk/tuning_parameters.h"
-#include "opus/celt/pitch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "define.h"
+#include "tuning_parameters.h"
+#include "pitch.h"
 
 #define MAX_FRAME_SIZE              384             /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384 */
 
diff --git a/drivers/opus/silk/fixed/corrMatrix_FIX.c b/thirdparty/opus/silk/fixed/corrMatrix_FIX.c
index ac5331fe57..c1d437c785 100644
--- a/drivers/opus/silk/fixed/corrMatrix_FIX.c
+++ b/thirdparty/opus/silk/fixed/corrMatrix_FIX.c
@@ -24,13 +24,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /**********************************************************************
  * Correlation Matrix Computations for LS estimate.
  **********************************************************************/
 
-#include "opus/silk/fixed/main_FIX.h"
+#include "main_FIX.h"
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FIX(
diff --git a/drivers/opus/silk/fixed/encode_frame_FIX.c b/thirdparty/opus/silk/fixed/encode_frame_FIX.c
index e4ead0afef..5ef44b03fc 100644
--- a/drivers/opus/silk/fixed/encode_frame_FIX.c
+++ b/thirdparty/opus/silk/fixed/encode_frame_FIX.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
 
 /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate           */
 static OPUS_INLINE void silk_LBRR_encode_FIX(
diff --git a/drivers/opus/silk/fixed/find_LPC_FIX.c b/thirdparty/opus/silk/fixed/find_LPC_FIX.c
index 5b56c41702..e11cdc86e6 100644
--- a/drivers/opus/silk/fixed/find_LPC_FIX.c
+++ b/thirdparty/opus/silk/fixed/find_LPC_FIX.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
 
 /* Finds LPC vector from correlations, and converts to NLSF */
 void silk_find_LPC_FIX(
diff --git a/drivers/opus/silk/fixed/find_LTP_FIX.c b/thirdparty/opus/silk/fixed/find_LTP_FIX.c
index a5a253516d..1314a28137 100644
--- a/drivers/opus/silk/fixed/find_LTP_FIX.c
+++ b/thirdparty/opus/silk/fixed/find_LTP_FIX.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* Head room for correlations */
 #define LTP_CORRS_HEAD_ROOM                             2
diff --git a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c b/thirdparty/opus/silk/fixed/find_pitch_lags_FIX.c
index bfd2c1b2d2..b8440a8247 100644
--- a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c
+++ b/thirdparty/opus/silk/fixed/find_pitch_lags_FIX.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
 
 /* Find pitch lags */
 void silk_find_pitch_lags_FIX(
diff --git a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c b/thirdparty/opus/silk/fixed/find_pred_coefs_FIX.c
index d0280963bd..d308e9cf5f 100644
--- a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c
+++ b/thirdparty/opus/silk/fixed/find_pred_coefs_FIX.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
 
 void silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
diff --git a/drivers/opus/silk/fixed/k2a_FIX.c b/thirdparty/opus/silk/fixed/k2a_FIX.c
index 64771f370c..5fee599bcb 100644
--- a/drivers/opus/silk/fixed/k2a_FIX.c
+++ b/thirdparty/opus/silk/fixed/k2a_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a(
diff --git a/drivers/opus/silk/fixed/k2a_Q16_FIX.c b/thirdparty/opus/silk/fixed/k2a_Q16_FIX.c
index 49d90a862e..3b03987544 100644
--- a/drivers/opus/silk/fixed/k2a_Q16_FIX.c
+++ b/thirdparty/opus/silk/fixed/k2a_Q16_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a_Q16(
diff --git a/drivers/opus/silk/fixed/main_FIX.h b/thirdparty/opus/silk/fixed/main_FIX.h
index f824c47653..375b5eb32e 100644
--- a/drivers/opus/silk/fixed/main_FIX.h
+++ b/thirdparty/opus/silk/fixed/main_FIX.h
@@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_MAIN_FIX_H
 #define SILK_MAIN_FIX_H
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/fixed/structs_FIX.h"
-#include "opus/silk/control.h"
-#include "opus/silk/main.h"
-#include "opus/silk/PLC.h"
-#include "opus/silk/debug.h"
-#include "opus/celt/entenc.h"
+#include "SigProc_FIX.h"
+#include "structs_FIX.h"
+#include "control.h"
+#include "main.h"
+#include "PLC.h"
+#include "debug.h"
+#include "entenc.h"
 
 #ifndef FORCE_CPP_BUILD
 #ifdef __cplusplus
diff --git a/drivers/opus/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h b/thirdparty/opus/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h
index c30481e437..c30481e437 100644
--- a/drivers/opus/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h
+++ b/thirdparty/opus/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h
diff --git a/drivers/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h b/thirdparty/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h
index c7f04279a0..21b256885f 100644
--- a/drivers/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h
+++ b/thirdparty/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h
@@ -26,11 +26,14 @@ POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 #ifndef __PREFILTER_FIX_MIPSR1_H__
 #define __PREFILTER_FIX_MIPSR1_H__
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
 
 #define OVERRIDE_silk_warped_LPC_analysis_filter_FIX
 void silk_warped_LPC_analysis_filter_FIX(
diff --git a/drivers/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/thirdparty/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
index eba7711db7..e803ef0fce 100644
--- a/drivers/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
+++ b/thirdparty/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
@@ -27,9 +27,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__
 #define __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
 
 #undef QC
 #define QC  10
diff --git a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c b/thirdparty/opus/silk/fixed/noise_shape_analysis_FIX.c
index 6f1dc3ddd5..22a89f75ae 100644
--- a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c
+++ b/thirdparty/opus/silk/fixed/noise_shape_analysis_FIX.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
 
 /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a   */
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */
@@ -136,7 +139,7 @@ static OPUS_INLINE void limit_warped_coefs(
 }
 
 #if defined(MIPSr1_ASM)
-#include "opus/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h"
+#include "mips/noise_shape_analysis_FIX_mipsr1.h"
 #endif
 
 /**************************************************************/
diff --git a/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c b/thirdparty/opus/silk/fixed/pitch_analysis_core_FIX.c
index cf421c9612..01bb9fc0a8 100644
--- a/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c
+++ b/thirdparty/opus/silk/fixed/pitch_analysis_core_FIX.c
@@ -24,16 +24,19 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /***********************************************************
 * Pitch analyser function
 ********************************************************** */
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/pitch_est_defines.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/debug.h"
-#include "opus/celt/pitch.h"
+#include "SigProc_FIX.h"
+#include "pitch_est_defines.h"
+#include "stack_alloc.h"
+#include "debug.h"
+#include "pitch.h"
 
 #define SCRATCH_SIZE    22
 #define SF_LENGTH_4KHZ  ( PE_SUBFR_LENGTH_MS * 4 )
diff --git a/drivers/opus/silk/fixed/prefilter_FIX.c b/thirdparty/opus/silk/fixed/prefilter_FIX.c
index 344be2badd..6a8e35152e 100644
--- a/drivers/opus/silk/fixed/prefilter_FIX.c
+++ b/thirdparty/opus/silk/fixed/prefilter_FIX.c
@@ -24,14 +24,17 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
 
 #if defined(MIPSr1_ASM)
-#include "opus/silk/fixed/mips/prefilter_FIX_mipsr1.h"
+#include "mips/prefilter_FIX_mipsr1.h"
 #endif
 
 
diff --git a/drivers/opus/silk/fixed/process_gains_FIX.c b/thirdparty/opus/silk/fixed/process_gains_FIX.c
index c0d591210b..05aba31788 100644
--- a/drivers/opus/silk/fixed/process_gains_FIX.c
+++ b/thirdparty/opus/silk/fixed/process_gains_FIX.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* Processing of gains */
 void silk_process_gains_FIX(
diff --git a/drivers/opus/silk/fixed/regularize_correlations_FIX.c b/thirdparty/opus/silk/fixed/regularize_correlations_FIX.c
index c38a5589b6..a2836b05f4 100644
--- a/drivers/opus/silk/fixed/regularize_correlations_FIX.c
+++ b/thirdparty/opus/silk/fixed/regularize_correlations_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
 
 /* Add noise to matrix diagonal */
 void silk_regularize_correlations_FIX(
diff --git a/drivers/opus/silk/fixed/residual_energy16_FIX.c b/thirdparty/opus/silk/fixed/residual_energy16_FIX.c
index 39bc96fd90..ebffb2a66f 100644
--- a/drivers/opus/silk/fixed/residual_energy16_FIX.c
+++ b/thirdparty/opus/silk/fixed/residual_energy16_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
 opus_int32 silk_residual_energy16_covar_FIX(
diff --git a/drivers/opus/silk/fixed/residual_energy_FIX.c b/thirdparty/opus/silk/fixed/residual_energy_FIX.c
index 0e51f4baa1..41f74778e8 100644
--- a/drivers/opus/silk/fixed/residual_energy_FIX.c
+++ b/thirdparty/opus/silk/fixed/residual_energy_FIX.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
diff --git a/drivers/opus/silk/fixed/schur64_FIX.c b/thirdparty/opus/silk/fixed/schur64_FIX.c
index 69ef76e028..764a10ef3e 100644
--- a/drivers/opus/silk/fixed/schur64_FIX.c
+++ b/thirdparty/opus/silk/fixed/schur64_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Slower than schur(), but more accurate.                              */
 /* Uses SMULL(), available on armv4                                     */
diff --git a/drivers/opus/silk/fixed/schur_FIX.c b/thirdparty/opus/silk/fixed/schur_FIX.c
index 9effa59daf..c4c0ef23b4 100644
--- a/drivers/opus/silk/fixed/schur_FIX.c
+++ b/thirdparty/opus/silk/fixed/schur_FIX.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Faster than schur64(), but much less accurate.                       */
 /* uses SMLAWB(), requiring armv5E and higher.                          */
diff --git a/drivers/opus/silk/fixed/solve_LS_FIX.c b/thirdparty/opus/silk/fixed/solve_LS_FIX.c
index 4ff97497be..51d7d49d02 100644
--- a/drivers/opus/silk/fixed/solve_LS_FIX.c
+++ b/thirdparty/opus/silk/fixed/solve_LS_FIX.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
-#include "opus/celt/stack_alloc.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
+#include "stack_alloc.h"
+#include "tuning_parameters.h"
 
 /*****************************/
 /* Internal function headers */
diff --git a/drivers/opus/silk/fixed/structs_FIX.h b/thirdparty/opus/silk/fixed/structs_FIX.h
index 36ddff0a9e..3294b25128 100644
--- a/drivers/opus/silk/fixed/structs_FIX.h
+++ b/thirdparty/opus/silk/fixed/structs_FIX.h
@@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_STRUCTS_FIX_H
 #define SILK_STRUCTS_FIX_H
 
-#include "opus/silk/typedef.h"
-#include "opus/silk/main.h"
-#include "opus/silk/structs.h"
+#include "typedef.h"
+#include "main.h"
+#include "structs.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/fixed/vector_ops_FIX.c b/thirdparty/opus/silk/fixed/vector_ops_FIX.c
index 1e8fdec0cb..d94980014f 100644
--- a/drivers/opus/silk/fixed/vector_ops_FIX.c
+++ b/thirdparty/opus/silk/fixed/vector_ops_FIX.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/celt/pitch.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "pitch.h"
 
 /* Copy and multiply a vector by a constant */
 void silk_scale_copy_vector16(
@@ -72,7 +75,7 @@ opus_int32 silk_inner_prod_aligned(
     int                         arch                /*    I Run-time architecture                                       */
 )
 {
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
    return celt_inner_prod(inVec1, inVec2, len, arch);
 #else
     opus_int   i;
diff --git a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c b/thirdparty/opus/silk/fixed/warped_autocorrelation_FIX.c
index 3b8d52d5c6..6ca6c1184d 100644
--- a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c
+++ b/thirdparty/opus/silk/fixed/warped_autocorrelation_FIX.c
@@ -24,15 +24,18 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/fixed/main_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FIX.h"
 
 #define QC  10
 #define QS  14
 
 #if defined(MIPSr1_ASM)
-#include "opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h"
+#include "mips/warped_autocorrelation_FIX_mipsr1.h"
 #endif
 
 
diff --git a/drivers/opus/silk/fixed/x86/burg_modified_FIX_sse.c b/thirdparty/opus/silk/fixed/x86/burg_modified_FIX_sse.c
index f7d46487df..3756095fbe 100644
--- a/drivers/opus/silk/fixed/x86/burg_modified_FIX_sse.c
+++ b/thirdparty/opus/silk/fixed/x86/burg_modified_FIX_sse.c
@@ -24,17 +24,20 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/define.h"
-#include "opus/silk/tuning_parameters.h"
-#include "opus/celt/pitch.h"
-#include "opus/celt/x86/x86cpu.h"
+#include "SigProc_FIX.h"
+#include "define.h"
+#include "tuning_parameters.h"
+#include "pitch.h"
+#include "celt/x86/x86cpu.h"
 
 #define MAX_FRAME_SIZE              384             /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384 */
 
diff --git a/drivers/opus/silk/fixed/x86/prefilter_FIX_sse.c b/thirdparty/opus/silk/fixed/x86/prefilter_FIX_sse.c
index febb105645..488a603f5d 100644
--- a/drivers/opus/silk/fixed/x86/prefilter_FIX_sse.c
+++ b/thirdparty/opus/silk/fixed/x86/prefilter_FIX_sse.c
@@ -24,13 +24,16 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include "opus/silk/main.h"
-#include "opus/celt/x86/x86cpu.h"
+#include "main.h"
+#include "celt/x86/x86cpu.h"
 
 void silk_warped_LPC_analysis_filter_FIX_sse4_1(
     opus_int32                  state[],                    /* I/O  State [order + 1]                   */
diff --git a/drivers/opus/silk/fixed/x86/vector_ops_FIX_sse.c b/thirdparty/opus/silk/fixed/x86/vector_ops_FIX_sse.c
index 920d58cebc..c1e90564d0 100644
--- a/drivers/opus/silk/fixed/x86/vector_ops_FIX_sse.c
+++ b/thirdparty/opus/silk/fixed/x86/vector_ops_FIX_sse.c
@@ -24,15 +24,18 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include "opus/silk/main.h"
+#include "main.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/celt/pitch.h"
+#include "SigProc_FIX.h"
+#include "pitch.h"
 
 opus_int64 silk_inner_prod16_aligned_64_sse4_1(
     const opus_int16            *inVec1,            /*    I input vector 1                                              */
diff --git a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c b/thirdparty/opus/silk/float/LPC_analysis_filter_FLP.c
index 344e52ade2..cae89a0a18 100644
--- a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c
+++ b/thirdparty/opus/silk/float/LPC_analysis_filter_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
-#include "opus/silk/float/main_FLP.h"
+#include "main_FLP.h"
 
 /************************************************/
 /* LPC analysis filter                          */
diff --git a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c b/thirdparty/opus/silk/float/LPC_inv_pred_gain_FLP.c
index f99a427623..25178bacdd 100644
--- a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c
+++ b/thirdparty/opus/silk/float/LPC_inv_pred_gain_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "SigProc_FLP.h"
 
 #define RC_THRESHOLD        0.9999f
 
diff --git a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c b/thirdparty/opus/silk/float/LTP_analysis_filter_FLP.c
index 853040d160..849b7c1c52 100644
--- a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c
+++ b/thirdparty/opus/silk/float/LTP_analysis_filter_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 void silk_LTP_analysis_filter_FLP(
     silk_float                      *LTP_res,                           /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */
diff --git a/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c b/thirdparty/opus/silk/float/LTP_scale_ctrl_FLP.c
index 4219c14c5b..8dbe29d0fa 100644
--- a/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c
+++ b/thirdparty/opus/silk/float/LTP_scale_ctrl_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 void silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
diff --git a/drivers/opus/silk/float/SigProc_FLP.h b/thirdparty/opus/silk/float/SigProc_FLP.h
index 9b14f24f21..f0cb3733be 100644
--- a/drivers/opus/silk/float/SigProc_FLP.h
+++ b/thirdparty/opus/silk/float/SigProc_FLP.h
@@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_SIGPROC_FLP_H
 #define SILK_SIGPROC_FLP_H
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/celt/float_cast.h"
+#include "SigProc_FIX.h"
+#include "float_cast.h"
 #include <math.h>
 
 #ifdef  __cplusplus
diff --git a/drivers/opus/silk/float/apply_sine_window_FLP.c b/thirdparty/opus/silk/float/apply_sine_window_FLP.c
index 0d9c894cd8..6aae57c0ab 100644
--- a/drivers/opus/silk/float/apply_sine_window_FLP.c
+++ b/thirdparty/opus/silk/float/apply_sine_window_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 /* Apply sine window to signal vector   */
 /* Window types:                        */
diff --git a/drivers/opus/silk/float/autocorrelation_FLP.c b/thirdparty/opus/silk/float/autocorrelation_FLP.c
index 0b78b0230d..8b8a9e659a 100644
--- a/drivers/opus/silk/float/autocorrelation_FLP.c
+++ b/thirdparty/opus/silk/float/autocorrelation_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/typedef.h"
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "typedef.h"
+#include "SigProc_FLP.h"
 
 /* compute autocorrelation */
 void silk_autocorrelation_FLP(
diff --git a/drivers/opus/silk/float/burg_modified_FLP.c b/thirdparty/opus/silk/float/burg_modified_FLP.c
index 567990b850..ea5dc25a93 100644
--- a/drivers/opus/silk/float/burg_modified_FLP.c
+++ b/thirdparty/opus/silk/float/burg_modified_FLP.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
-#include "opus/silk/tuning_parameters.h"
-#include "opus/silk/define.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
+#include "tuning_parameters.h"
+#include "define.h"
 
 #define MAX_FRAME_SIZE              384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/
 
diff --git a/drivers/opus/silk/float/bwexpander_FLP.c b/thirdparty/opus/silk/float/bwexpander_FLP.c
index c47bfa9433..d55a4d79ab 100644
--- a/drivers/opus/silk/float/bwexpander_FLP.c
+++ b/thirdparty/opus/silk/float/bwexpander_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 /* Chirp (bw expand) LP AR filter */
 void silk_bwexpander_FLP(
diff --git a/drivers/opus/silk/float/corrMatrix_FLP.c b/thirdparty/opus/silk/float/corrMatrix_FLP.c
index e34b42b541..eae6a1cfca 100644
--- a/drivers/opus/silk/float/corrMatrix_FLP.c
+++ b/thirdparty/opus/silk/float/corrMatrix_FLP.c
@@ -24,13 +24,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /**********************************************************************
  * Correlation matrix computations for LS estimate.
  **********************************************************************/
 
-#include "opus/silk/float/main_FLP.h"
+#include "main_FLP.h"
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FLP(
diff --git a/drivers/opus/silk/float/encode_frame_FLP.c b/thirdparty/opus/silk/float/encode_frame_FLP.c
index 4e46a52ee8..2092a4d9e2 100644
--- a/drivers/opus/silk/float/encode_frame_FLP.c
+++ b/thirdparty/opus/silk/float/encode_frame_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */
 static OPUS_INLINE void silk_LBRR_encode_FLP(
diff --git a/drivers/opus/silk/float/energy_FLP.c b/thirdparty/opus/silk/float/energy_FLP.c
index 443f52bb16..24b8179f9e 100644
--- a/drivers/opus/silk/float/energy_FLP.c
+++ b/thirdparty/opus/silk/float/energy_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 /* sum of squares of a silk_float array, with result as double */
 double silk_energy_FLP(
diff --git a/drivers/opus/silk/float/find_LPC_FLP.c b/thirdparty/opus/silk/float/find_LPC_FLP.c
index 162a490d1d..fcfe1c3681 100644
--- a/drivers/opus/silk/float/find_LPC_FLP.c
+++ b/thirdparty/opus/silk/float/find_LPC_FLP.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/define.h"
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "define.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /* LPC analysis */
 void silk_find_LPC_FLP(
diff --git a/drivers/opus/silk/float/find_LTP_FLP.c b/thirdparty/opus/silk/float/find_LTP_FLP.c
index 9c03eeb6a7..7229996014 100644
--- a/drivers/opus/silk/float/find_LTP_FLP.c
+++ b/thirdparty/opus/silk/float/find_LTP_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 void silk_find_LTP_FLP(
     silk_float                      b[ MAX_NB_SUBFR * LTP_ORDER ],      /* O    LTP coefs                                   */
diff --git a/drivers/opus/silk/float/find_pitch_lags_FLP.c b/thirdparty/opus/silk/float/find_pitch_lags_FLP.c
index bb7ef8ec2e..f3b22d25ce 100644
--- a/drivers/opus/silk/float/find_pitch_lags_FLP.c
+++ b/thirdparty/opus/silk/float/find_pitch_lags_FLP.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 void silk_find_pitch_lags_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
diff --git a/drivers/opus/silk/float/find_pred_coefs_FLP.c b/thirdparty/opus/silk/float/find_pred_coefs_FLP.c
index c0496ff1b5..1af4fe5f1b 100644
--- a/drivers/opus/silk/float/find_pred_coefs_FLP.c
+++ b/thirdparty/opus/silk/float/find_pred_coefs_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 /* Find LPC and LTP coefficients */
 void silk_find_pred_coefs_FLP(
diff --git a/drivers/opus/silk/float/inner_product_FLP.c b/thirdparty/opus/silk/float/inner_product_FLP.c
index 0586c4d7fb..029c012911 100644
--- a/drivers/opus/silk/float/inner_product_FLP.c
+++ b/thirdparty/opus/silk/float/inner_product_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 /* inner product of two silk_float arrays, with result as double */
 double silk_inner_product_FLP(
diff --git a/drivers/opus/silk/float/k2a_FLP.c b/thirdparty/opus/silk/float/k2a_FLP.c
index 26ba94e610..12af4e7669 100644
--- a/drivers/opus/silk/float/k2a_FLP.c
+++ b/thirdparty/opus/silk/float/k2a_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 /* step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a_FLP(
diff --git a/drivers/opus/silk/float/levinsondurbin_FLP.c b/thirdparty/opus/silk/float/levinsondurbin_FLP.c
index 7e3c9d6531..f0ba606981 100644
--- a/drivers/opus/silk/float/levinsondurbin_FLP.c
+++ b/thirdparty/opus/silk/float/levinsondurbin_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 /* Solve the normal equations using the Levinson-Durbin recursion */
 silk_float silk_levinsondurbin_FLP(         /* O    prediction error energy                                     */
diff --git a/drivers/opus/silk/float/main_FLP.h b/thirdparty/opus/silk/float/main_FLP.h
index 8f35177549..e5a75972e5 100644
--- a/drivers/opus/silk/float/main_FLP.h
+++ b/thirdparty/opus/silk/float/main_FLP.h
@@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_MAIN_FLP_H
 #define SILK_MAIN_FLP_H
 
-#include "opus/silk/float/SigProc_FLP.h"
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/float/structs_FLP.h"
-#include "opus/silk/main.h"
-#include "opus/silk/define.h"
-#include "opus/silk/debug.h"
-#include "opus/celt/entenc.h"
+#include "SigProc_FLP.h"
+#include "SigProc_FIX.h"
+#include "structs_FLP.h"
+#include "main.h"
+#include "define.h"
+#include "debug.h"
+#include "entenc.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/float/noise_shape_analysis_FLP.c b/thirdparty/opus/silk/float/noise_shape_analysis_FLP.c
index cbb8ba4470..65f6ea5870 100644
--- a/drivers/opus/silk/float/noise_shape_analysis_FLP.c
+++ b/thirdparty/opus/silk/float/noise_shape_analysis_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a   */
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */
diff --git a/drivers/opus/silk/float/pitch_analysis_core_FLP.c b/thirdparty/opus/silk/float/pitch_analysis_core_FLP.c
index 6a48ae498c..d0e637a29d 100644
--- a/drivers/opus/silk/float/pitch_analysis_core_FLP.c
+++ b/thirdparty/opus/silk/float/pitch_analysis_core_FLP.c
@@ -24,15 +24,18 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*****************************************************************************
 * Pitch analyser function
 ******************************************************************************/
-#include "opus/silk/float/SigProc_FLP.h"
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/pitch_est_defines.h"
-#include "opus/celt/pitch.h"
+#include "SigProc_FLP.h"
+#include "SigProc_FIX.h"
+#include "pitch_est_defines.h"
+#include "pitch.h"
 
 #define SCRATCH_SIZE        22
 
diff --git a/drivers/opus/silk/float/prefilter_FLP.c b/thirdparty/opus/silk/float/prefilter_FLP.c
index 0857888b91..8bc32fb410 100644
--- a/drivers/opus/silk/float/prefilter_FLP.c
+++ b/thirdparty/opus/silk/float/prefilter_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /*
 * Prefilter for finding Quantizer input signal
diff --git a/drivers/opus/silk/float/process_gains_FLP.c b/thirdparty/opus/silk/float/process_gains_FLP.c
index 3a1e46f096..c0da0dae44 100644
--- a/drivers/opus/silk/float/process_gains_FLP.c
+++ b/thirdparty/opus/silk/float/process_gains_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /* Processing of gains */
 void silk_process_gains_FLP(
diff --git a/drivers/opus/silk/float/regularize_correlations_FLP.c b/thirdparty/opus/silk/float/regularize_correlations_FLP.c
index 20e9074a0b..df4612604c 100644
--- a/drivers/opus/silk/float/regularize_correlations_FLP.c
+++ b/thirdparty/opus/silk/float/regularize_correlations_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 /* Add noise to matrix diagonal */
 void silk_regularize_correlations_FLP(
diff --git a/drivers/opus/silk/float/residual_energy_FLP.c b/thirdparty/opus/silk/float/residual_energy_FLP.c
index cc462a9e54..b2e03a86a4 100644
--- a/drivers/opus/silk/float/residual_energy_FLP.c
+++ b/thirdparty/opus/silk/float/residual_energy_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 #define MAX_ITERATIONS_RESIDUAL_NRG         10
 #define REGULARIZATION_FACTOR               1e-8f
diff --git a/drivers/opus/silk/float/scale_copy_vector_FLP.c b/thirdparty/opus/silk/float/scale_copy_vector_FLP.c
index 2656963e88..20db32b3b1 100644
--- a/drivers/opus/silk/float/scale_copy_vector_FLP.c
+++ b/thirdparty/opus/silk/float/scale_copy_vector_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 /* copy and multiply a vector by a constant */
 void silk_scale_copy_vector_FLP(
diff --git a/drivers/opus/silk/float/scale_vector_FLP.c b/thirdparty/opus/silk/float/scale_vector_FLP.c
index ea2aa0e330..108fdcbed5 100644
--- a/drivers/opus/silk/float/scale_vector_FLP.c
+++ b/thirdparty/opus/silk/float/scale_vector_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 /* multiply a vector by a constant */
 void silk_scale_vector_FLP(
diff --git a/drivers/opus/silk/float/schur_FLP.c b/thirdparty/opus/silk/float/schur_FLP.c
index f2071db214..ee436f8351 100644
--- a/drivers/opus/silk/float/schur_FLP.c
+++ b/thirdparty/opus/silk/float/schur_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/SigProc_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FLP.h"
 
 silk_float silk_schur_FLP(                  /* O    returns residual energy                                     */
     silk_float          refl_coef[],        /* O    reflection coefficients (length order)                      */
diff --git a/drivers/opus/silk/float/solve_LS_FLP.c b/thirdparty/opus/silk/float/solve_LS_FLP.c
index 9d625c695d..7c90d665a0 100644
--- a/drivers/opus/silk/float/solve_LS_FLP.c
+++ b/thirdparty/opus/silk/float/solve_LS_FLP.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /**********************************************************************
  * LDL Factorisation. Finds the upper triangular matrix L and the diagonal
diff --git a/drivers/opus/silk/float/sort_FLP.c b/thirdparty/opus/silk/float/sort_FLP.c
index ed212c63c9..f08d7592c5 100644
--- a/drivers/opus/silk/float/sort_FLP.c
+++ b/thirdparty/opus/silk/float/sort_FLP.c
@@ -24,14 +24,17 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* Insertion sort (fast for already almost sorted arrays):  */
 /* Best case:  O(n)   for an already sorted array           */
 /* Worst case: O(n^2) for an inversely sorted array         */
 
-#include "opus/silk/typedef.h"
-#include "opus/silk/float/SigProc_FLP.h"
+#include "typedef.h"
+#include "SigProc_FLP.h"
 
 void silk_insertion_sort_decreasing_FLP(
     silk_float          *a,                 /* I/O  Unsorted / Sorted vector                                    */
diff --git a/drivers/opus/silk/float/structs_FLP.h b/thirdparty/opus/silk/float/structs_FLP.h
index 9eb5eb05eb..14d647ced2 100644
--- a/drivers/opus/silk/float/structs_FLP.h
+++ b/thirdparty/opus/silk/float/structs_FLP.h
@@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_STRUCTS_FLP_H
 #define SILK_STRUCTS_FLP_H
 
-#include "opus/silk/typedef.h"
-#include "opus/silk/main.h"
-#include "opus/silk/structs.h"
+#include "typedef.h"
+#include "main.h"
+#include "structs.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/float/warped_autocorrelation_FLP.c b/thirdparty/opus/silk/float/warped_autocorrelation_FLP.c
index b814661b92..542414f48e 100644
--- a/drivers/opus/silk/float/warped_autocorrelation_FLP.c
+++ b/thirdparty/opus/silk/float/warped_autocorrelation_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 /* Autocorrelations for a warped frequency axis */
 void silk_warped_autocorrelation_FLP(
diff --git a/drivers/opus/silk/float/wrappers_FLP.c b/thirdparty/opus/silk/float/wrappers_FLP.c
index c80c618a92..6666b8efaa 100644
--- a/drivers/opus/silk/float/wrappers_FLP.c
+++ b/thirdparty/opus/silk/float/wrappers_FLP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/float/main_FLP.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main_FLP.h"
 
 /* Wrappers. Calls flp / fix code */
 
diff --git a/drivers/opus/silk/gain_quant.c b/thirdparty/opus/silk/gain_quant.c
index 7b7a65d674..64ccd0611b 100644
--- a/drivers/opus/silk/gain_quant.c
+++ b/thirdparty/opus/silk/gain_quant.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 #define OFFSET                  ( ( MIN_QGAIN_DB * 128 ) / 6 + 16 * 128 )
 #define SCALE_Q16               ( ( 65536 * ( N_LEVELS_QGAIN - 1 ) ) / ( ( ( MAX_QGAIN_DB - MIN_QGAIN_DB ) * 128 ) / 6 ) )
diff --git a/drivers/opus/silk/init_decoder.c b/thirdparty/opus/silk/init_decoder.c
index c8f694c9d7..f887c67886 100644
--- a/drivers/opus/silk/init_decoder.c
+++ b/thirdparty/opus/silk/init_decoder.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /************************/
 /* Init Decoder State   */
diff --git a/drivers/opus/silk/init_encoder.c b/thirdparty/opus/silk/init_encoder.c
index 1c63edb4b8..65995c33fa 100644
--- a/drivers/opus/silk/init_encoder.c
+++ b/thirdparty/opus/silk/init_encoder.c
@@ -24,14 +24,17 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
-#ifdef OPUS_FIXED_POINT
-#include "opus/silk/fixed/main_FIX.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef FIXED_POINT
+#include "main_FIX.h"
 #else
-#include "opus/silk/float/main_FLP.h"
+#include "main_FLP.h"
 #endif
-#include "opus/silk/tuning_parameters.h"
-#include "opus/celt/cpu_support.h"
+#include "tuning_parameters.h"
+#include "cpu_support.h"
 
 /*********************************/
 /* Initialize Silk Encoder state */
diff --git a/drivers/opus/silk/inner_prod_aligned.c b/thirdparty/opus/silk/inner_prod_aligned.c
index 7bd7297c7d..257ae9e04e 100644
--- a/drivers/opus/silk/inner_prod_aligned.c
+++ b/thirdparty/opus/silk/inner_prod_aligned.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 opus_int32 silk_inner_prod_aligned_scale(
     const opus_int16 *const     inVec1,             /*    I input vector 1                                              */
diff --git a/drivers/opus/silk/interpolate.c b/thirdparty/opus/silk/interpolate.c
index 25091b4fa6..1bd8ca4d53 100644
--- a/drivers/opus/silk/interpolate.c
+++ b/thirdparty/opus/silk/interpolate.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Interpolate two vectors */
 void silk_interpolate(
diff --git a/drivers/opus/silk/lin2log.c b/thirdparty/opus/silk/lin2log.c
index 694eb1e876..d4fe515321 100644
--- a/drivers/opus/silk/lin2log.c
+++ b/thirdparty/opus/silk/lin2log.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 /* Approximation of 128 * log2() (very close inverse of silk_log2lin()) */
 /* Convert input to a log scale    */
 opus_int32 silk_lin2log(
diff --git a/drivers/opus/silk/log2lin.c b/thirdparty/opus/silk/log2lin.c
index 8d14150a41..b7c48e4740 100644
--- a/drivers/opus/silk/log2lin.c
+++ b/thirdparty/opus/silk/log2lin.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Approximation of 2^() (very close inverse of silk_lin2log()) */
 /* Convert input to a linear scale    */
diff --git a/drivers/opus/silk/macros.h b/thirdparty/opus/silk/macros.h
index 29efd11ace..bc30303466 100644
--- a/drivers/opus/silk/macros.h
+++ b/thirdparty/opus/silk/macros.h
@@ -27,10 +27,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef SILK_MACROS_H
 #define SILK_MACROS_H
-#include "opus/opus_config.h"
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "opus_types.h"
+#include "opus_defines.h"
 
 #if OPUS_GNUC_PREREQ(3, 0)
 #define opus_likely(x)       (__builtin_expect(!!(x), 1))
@@ -108,10 +111,10 @@ POSSIBILITY OF SUCH DAMAGE.
                                         ((((a)^0x80000000) & (b)  & 0x80000000) ? silk_int32_MAX : (a)-(b)) )
 
 #if defined(MIPSr1_ASM)
-#include "opus/silk/mips/macros_mipsr1.h"
+#include "mips/macros_mipsr1.h"
 #endif
 
-#include "opus/celt/ecintrin.h"
+#include "ecintrin.h"
 #ifndef OVERRIDE_silk_CLZ16
 static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16)
 {
@@ -139,11 +142,11 @@ static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32)
 #endif
 
 #ifdef OPUS_ARM_INLINE_ASM
-#include "opus/silk/arm/macros_armv4.h"
+#include "arm/macros_armv4.h"
 #endif
 
 #ifdef OPUS_ARM_INLINE_EDSP
-#include "opus/silk/arm/macros_armv5e.h"
+#include "arm/macros_armv5e.h"
 #endif
 
 #endif /* SILK_MACROS_H */
diff --git a/drivers/opus/silk/main.h b/thirdparty/opus/silk/main.h
index a6ec2d7e4c..2f90d68f7d 100644
--- a/drivers/opus/silk/main.h
+++ b/thirdparty/opus/silk/main.h
@@ -28,18 +28,18 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_MAIN_H
 #define SILK_MAIN_H
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/define.h"
-#include "opus/silk/structs.h"
-#include "opus/silk/tables.h"
-#include "opus/silk/PLC.h"
-#include "opus/silk/control.h"
-#include "opus/silk/debug.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
+#include "SigProc_FIX.h"
+#include "define.h"
+#include "structs.h"
+#include "tables.h"
+#include "PLC.h"
+#include "control.h"
+#include "debug.h"
+#include "entenc.h"
+#include "entdec.h"
 
 #if defined(OPUS_X86_MAY_HAVE_SSE4_1)
-#include "opus/silk/x86/main_sse.h"
+#include "x86/main_sse.h"
 #endif
 
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
diff --git a/drivers/opus/silk/mips/NSQ_del_dec_mipsr1.h b/thirdparty/opus/silk/mips/NSQ_del_dec_mipsr1.h
index 5cecca28b7..f6afd923e8 100644
--- a/drivers/opus/silk/mips/NSQ_del_dec_mipsr1.h
+++ b/thirdparty/opus/silk/mips/NSQ_del_dec_mipsr1.h
@@ -27,10 +27,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef __NSQ_DEL_DEC_MIPSR1_H__
 #define __NSQ_DEL_DEC_MIPSR1_H__
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 #define OVERRIDE_silk_noise_shape_quantizer_del_dec
 static inline void silk_noise_shape_quantizer_del_dec(
diff --git a/drivers/opus/silk/mips/macros_mipsr1.h b/thirdparty/opus/silk/mips/macros_mipsr1.h
index 12ed981a6e..12ed981a6e 100644
--- a/drivers/opus/silk/mips/macros_mipsr1.h
+++ b/thirdparty/opus/silk/mips/macros_mipsr1.h
diff --git a/drivers/opus/silk/mips/sigproc_fix_mipsr1.h b/thirdparty/opus/silk/mips/sigproc_fix_mipsr1.h
index 3b0a695365..3b0a695365 100644
--- a/drivers/opus/silk/mips/sigproc_fix_mipsr1.h
+++ b/thirdparty/opus/silk/mips/sigproc_fix_mipsr1.h
diff --git a/drivers/opus/silk/pitch_est_defines.h b/thirdparty/opus/silk/pitch_est_defines.h
index e2d9e517c4..e1e4b5d768 100644
--- a/drivers/opus/silk/pitch_est_defines.h
+++ b/thirdparty/opus/silk/pitch_est_defines.h
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_PE_DEFINES_H
 #define SILK_PE_DEFINES_H
 
-#include "opus/silk/SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /********************************************************/
 /* Definitions for pitch estimator                      */
diff --git a/drivers/opus/silk/pitch_est_tables.c b/thirdparty/opus/silk/pitch_est_tables.c
index eb17bf0b26..81a8bacaca 100644
--- a/drivers/opus/silk/pitch_est_tables.c
+++ b/thirdparty/opus/silk/pitch_est_tables.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/typedef.h"
-#include "opus/silk/pitch_est_defines.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "typedef.h"
+#include "pitch_est_defines.h"
 
 const opus_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ PE_NB_CBKS_STAGE2_10MS ] =
 {
diff --git a/drivers/opus/silk/process_NLSFs.c b/thirdparty/opus/silk/process_NLSFs.c
index 9d8f96d7b7..c27cf03046 100644
--- a/drivers/opus/silk/process_NLSFs.c
+++ b/thirdparty/opus/silk/process_NLSFs.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Limit, stabilize, convert and quantize NLSFs */
 void silk_process_NLSFs(
diff --git a/drivers/opus/silk/quant_LTP_gains.c b/thirdparty/opus/silk/quant_LTP_gains.c
index ffc3cb24ab..513a8c4468 100644
--- a/drivers/opus/silk/quant_LTP_gains.c
+++ b/thirdparty/opus/silk/quant_LTP_gains.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/silk/tuning_parameters.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "tuning_parameters.h"
 
 void silk_quant_LTP_gains(
     opus_int16                  B_Q14[ MAX_NB_SUBFR * LTP_ORDER ],          /* I/O  (un)quantized LTP gains         */
diff --git a/drivers/opus/silk/resampler.c b/thirdparty/opus/silk/resampler.c
index 12b2f92060..374fbb3722 100644
--- a/drivers/opus/silk/resampler.c
+++ b/thirdparty/opus/silk/resampler.c
@@ -24,7 +24,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*
  * Matrix of resampling methods used:
@@ -44,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
  * AF  -> AR2 filter followed by FIR interpolation
  */
 
-#include "opus/silk/resampler_private.h"
+#include "resampler_private.h"
 
 /* Tables with delay compensation values to equalize total delay for different modes */
 static const opus_int8 delay_matrix_enc[ 5 ][ 3 ] = {
diff --git a/drivers/opus/silk/resampler_down2.c b/thirdparty/opus/silk/resampler_down2.c
index 20a42c98a6..cec3634640 100644
--- a/drivers/opus/silk/resampler_down2.c
+++ b/thirdparty/opus/silk/resampler_down2.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/resampler_rom.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "resampler_rom.h"
 
 /* Downsample by a factor 2 */
 void silk_resampler_down2(
diff --git a/drivers/opus/silk/resampler_down2_3.c b/thirdparty/opus/silk/resampler_down2_3.c
index e01dd2bc72..4342614dcc 100644
--- a/drivers/opus/silk/resampler_down2_3.c
+++ b/thirdparty/opus/silk/resampler_down2_3.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/resampler_private.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "resampler_private.h"
+#include "stack_alloc.h"
 
 #define ORDER_FIR                   4
 
diff --git a/drivers/opus/silk/resampler_private.h b/thirdparty/opus/silk/resampler_private.h
index 5c0ee110fc..422a7d9d95 100644
--- a/drivers/opus/silk/resampler_private.h
+++ b/thirdparty/opus/silk/resampler_private.h
@@ -32,9 +32,9 @@ POSSIBILITY OF SUCH DAMAGE.
 extern "C" {
 #endif
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/resampler_structs.h"
-#include "opus/silk/resampler_rom.h"
+#include "SigProc_FIX.h"
+#include "resampler_structs.h"
+#include "resampler_rom.h"
 
 /* Number of input samples to process in the inner loop */
 #define RESAMPLER_MAX_BATCH_SIZE_MS             10
diff --git a/drivers/opus/silk/resampler_private_AR2.c b/thirdparty/opus/silk/resampler_private_AR2.c
index cc753ea704..5fff23714f 100644
--- a/drivers/opus/silk/resampler_private_AR2.c
+++ b/thirdparty/opus/silk/resampler_private_AR2.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/resampler_private.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "resampler_private.h"
 
 /* Second order AR filter with single delay elements */
 void silk_resampler_private_AR2(
diff --git a/drivers/opus/silk/resampler_private_IIR_FIR.c b/thirdparty/opus/silk/resampler_private_IIR_FIR.c
index 9a8733fbbb..6b2b3a2e18 100644
--- a/drivers/opus/silk/resampler_private_IIR_FIR.c
+++ b/thirdparty/opus/silk/resampler_private_IIR_FIR.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/resampler_private.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "resampler_private.h"
+#include "stack_alloc.h"
 
 static OPUS_INLINE opus_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
     opus_int16  *out,
diff --git a/drivers/opus/silk/resampler_private_down_FIR.c b/thirdparty/opus/silk/resampler_private_down_FIR.c
index fb9acc60a7..783e42b356 100644
--- a/drivers/opus/silk/resampler_private_down_FIR.c
+++ b/thirdparty/opus/silk/resampler_private_down_FIR.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/resampler_private.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "resampler_private.h"
+#include "stack_alloc.h"
 
 static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL(
     opus_int16          *out,
diff --git a/drivers/opus/silk/resampler_private_up2_HQ.c b/thirdparty/opus/silk/resampler_private_up2_HQ.c
index 0b23c16dab..c7ec8de365 100644
--- a/drivers/opus/silk/resampler_private_up2_HQ.c
+++ b/thirdparty/opus/silk/resampler_private_up2_HQ.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/resampler_private.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
+#include "resampler_private.h"
 
 /* Upsample by a factor 2, high quality */
 /* Uses 2nd order allpass filters for the 2x upsampling, followed by a      */
diff --git a/drivers/opus/silk/resampler_rom.c b/thirdparty/opus/silk/resampler_rom.c
index 7079efe1dc..5e6b04476a 100644
--- a/drivers/opus/silk/resampler_rom.c
+++ b/thirdparty/opus/silk/resampler_rom.c
@@ -24,12 +24,15 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* Filter coefficients for IIR/FIR polyphase resampling     *
  * Total size: 179 Words (358 Bytes)                        */
 
-#include "opus/silk/resampler_private.h"
+#include "resampler_private.h"
 
 /* Matlab code for the notch filter coefficients: */
 /* B = [1, 0.147, 1];  A = [1, 0.107, 0.89]; G = 0.93; freqz(G * B, A, 2^14, 16e3); axis([0, 8000, -10, 1]) */
diff --git a/drivers/opus/silk/resampler_rom.h b/thirdparty/opus/silk/resampler_rom.h
index 2fa586ebf2..490b3388dc 100644
--- a/drivers/opus/silk/resampler_rom.h
+++ b/thirdparty/opus/silk/resampler_rom.h
@@ -33,8 +33,8 @@ extern "C"
 {
 #endif
 
-#include "opus/silk/typedef.h"
-#include "opus/silk/resampler_structs.h"
+#include "typedef.h"
+#include "resampler_structs.h"
 
 #define RESAMPLER_DOWN_ORDER_FIR0               18
 #define RESAMPLER_DOWN_ORDER_FIR1               24
diff --git a/drivers/opus/silk/resampler_structs.h b/thirdparty/opus/silk/resampler_structs.h
index 9e9457d11c..9e9457d11c 100644
--- a/drivers/opus/silk/resampler_structs.h
+++ b/thirdparty/opus/silk/resampler_structs.h
diff --git a/drivers/opus/silk/shell_coder.c b/thirdparty/opus/silk/shell_coder.c
index 67a5446927..4af341474b 100644
--- a/drivers/opus/silk/shell_coder.c
+++ b/thirdparty/opus/silk/shell_coder.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* shell coder; pulse-subframe length is hardcoded */
 
diff --git a/drivers/opus/silk/sigm_Q15.c b/thirdparty/opus/silk/sigm_Q15.c
index 3171d15f4a..3c507d255b 100644
--- a/drivers/opus/silk/sigm_Q15.c
+++ b/thirdparty/opus/silk/sigm_Q15.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* Approximate sigmoid function */
 
-#include "opus/silk/SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* fprintf(1, '%d, ', round(1024 * ([1 ./ (1 + exp(-(1:5))), 1] - 1 ./ (1 + exp(-(0:5)))))); */
 static const opus_int32 sigm_LUT_slope_Q10[ 6 ] = {
diff --git a/drivers/opus/silk/sort.c b/thirdparty/opus/silk/sort.c
index dd2988e5b8..8670dbdd02 100644
--- a/drivers/opus/silk/sort.c
+++ b/thirdparty/opus/silk/sort.c
@@ -24,7 +24,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* Insertion sort (fast for already almost sorted arrays):   */
 /* Best case:  O(n)   for an already sorted array            */
@@ -32,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /*                                                           */
 /* Shell short:    http://en.wikipedia.org/wiki/Shell_sort   */
 
-#include "opus/silk/SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 void silk_insertion_sort_increasing(
     opus_int32           *a,             /* I/O   Unsorted / Sorted vector               */
@@ -80,7 +83,7 @@ void silk_insertion_sort_increasing(
     }
 }
 
-#ifdef OPUS_FIXED_POINT
+#ifdef FIXED_POINT
 /* This function is only used by the fixed-point build */
 void silk_insertion_sort_decreasing_int16(
     opus_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
diff --git a/drivers/opus/silk/stereo_LR_to_MS.c b/thirdparty/opus/silk/stereo_LR_to_MS.c
index cf8affa90b..42906e6f67 100644
--- a/drivers/opus/silk/stereo_LR_to_MS.c
+++ b/thirdparty/opus/silk/stereo_LR_to_MS.c
@@ -24,10 +24,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
+#include "stack_alloc.h"
 
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
 void silk_stereo_LR_to_MS(
diff --git a/drivers/opus/silk/stereo_MS_to_LR.c b/thirdparty/opus/silk/stereo_MS_to_LR.c
index 4f553eb694..62521a4f35 100644
--- a/drivers/opus/silk/stereo_MS_to_LR.c
+++ b/thirdparty/opus/silk/stereo_MS_to_LR.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Convert adaptive Mid/Side representation to Left/Right stereo signal */
 void silk_stereo_MS_to_LR(
diff --git a/drivers/opus/silk/stereo_decode_pred.c b/thirdparty/opus/silk/stereo_decode_pred.c
index 9e8abf39d0..56ba3925e8 100644
--- a/drivers/opus/silk/stereo_decode_pred.c
+++ b/thirdparty/opus/silk/stereo_decode_pred.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Decode mid/side predictors */
 void silk_stereo_decode_pred(
diff --git a/drivers/opus/silk/stereo_encode_pred.c b/thirdparty/opus/silk/stereo_encode_pred.c
index a864d404f6..e6dd195066 100644
--- a/drivers/opus/silk/stereo_encode_pred.c
+++ b/thirdparty/opus/silk/stereo_encode_pred.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Entropy code the mid/side quantization indices */
 void silk_stereo_encode_pred(
diff --git a/drivers/opus/silk/stereo_find_predictor.c b/thirdparty/opus/silk/stereo_find_predictor.c
index c7fa3ac555..e30e90bddc 100644
--- a/drivers/opus/silk/stereo_find_predictor.c
+++ b/thirdparty/opus/silk/stereo_find_predictor.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Find least-squares prediction gain for one signal based on another and quantize it */
 opus_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
diff --git a/drivers/opus/silk/stereo_quant_pred.c b/thirdparty/opus/silk/stereo_quant_pred.c
index ff2971e7c1..d4ced6c3e8 100644
--- a/drivers/opus/silk/stereo_quant_pred.c
+++ b/thirdparty/opus/silk/stereo_quant_pred.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/main.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "main.h"
 
 /* Quantize mid/side predictors */
 void silk_stereo_quant_pred(
diff --git a/drivers/opus/silk/structs.h b/thirdparty/opus/silk/structs.h
index a2876b62a2..827829dc6f 100644
--- a/drivers/opus/silk/structs.h
+++ b/thirdparty/opus/silk/structs.h
@@ -28,11 +28,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_STRUCTS_H
 #define SILK_STRUCTS_H
 
-#include "opus/silk/typedef.h"
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/silk/define.h"
-#include "opus/celt/entenc.h"
-#include "opus/celt/entdec.h"
+#include "typedef.h"
+#include "SigProc_FIX.h"
+#include "define.h"
+#include "entenc.h"
+#include "entdec.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/sum_sqr_shift.c b/thirdparty/opus/silk/sum_sqr_shift.c
index 1d1da449f4..129df191d8 100644
--- a/drivers/opus/silk/sum_sqr_shift.c
+++ b/thirdparty/opus/silk/sum_sqr_shift.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/SigProc_FIX.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SigProc_FIX.h"
 
 /* Compute number of bits to right shift the sum of squares of a vector */
 /* of int16s to make it fit in an int32                                 */
diff --git a/drivers/opus/silk/table_LSF_cos.c b/thirdparty/opus/silk/table_LSF_cos.c
index d350df9add..ec9dc63927 100644
--- a/drivers/opus/silk/table_LSF_cos.c
+++ b/thirdparty/opus/silk/table_LSF_cos.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tables.h"
 
 /* Cosine approximation table for LSF conversion */
 /* Q12 values (even) */
diff --git a/drivers/opus/silk/tables.h b/thirdparty/opus/silk/tables.h
index 2ad69eec80..7fea6fda39 100644
--- a/drivers/opus/silk/tables.h
+++ b/thirdparty/opus/silk/tables.h
@@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_TABLES_H
 #define SILK_TABLES_H
 
-#include "opus/silk/define.h"
-#include "opus/silk/structs.h"
+#include "define.h"
+#include "structs.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/tables_LTP.c b/thirdparty/opus/silk/tables_LTP.c
index 9f500b25f2..0e6a0254d5 100644
--- a/drivers/opus/silk/tables_LTP.c
+++ b/thirdparty/opus/silk/tables_LTP.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tables.h"
 
 const opus_uint8 silk_LTP_per_index_iCDF[3] = {
        179,     99,      0
diff --git a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c b/thirdparty/opus/silk/tables_NLSF_CB_NB_MB.c
index d1cf99356d..8c59d207aa 100644
--- a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c
+++ b/thirdparty/opus/silk/tables_NLSF_CB_NB_MB.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tables.h"
 
 static const opus_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = {
         12,     35,     60,     83,    108,    132,    157,    180,
diff --git a/drivers/opus/silk/tables_NLSF_CB_WB.c b/thirdparty/opus/silk/tables_NLSF_CB_WB.c
index 5ee6e880c4..50af87eb2e 100644
--- a/drivers/opus/silk/tables_NLSF_CB_WB.c
+++ b/thirdparty/opus/silk/tables_NLSF_CB_WB.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tables.h"
 
 static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = {
          7,     23,     38,     54,     69,     85,    100,    116,
diff --git a/drivers/opus/silk/tables_gain.c b/thirdparty/opus/silk/tables_gain.c
index e1e4319d7d..37e41d890c 100644
--- a/drivers/opus/silk/tables_gain.c
+++ b/thirdparty/opus/silk/tables_gain.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tables.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/tables_other.c b/thirdparty/opus/silk/tables_other.c
index 3713ff8227..398686bf26 100644
--- a/drivers/opus/silk/tables_other.c
+++ b/thirdparty/opus/silk/tables_other.c
@@ -24,11 +24,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/structs.h"
-#include "opus/silk/define.h"
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "structs.h"
+#include "define.h"
+#include "tables.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/drivers/opus/silk/tables_pitch_lag.c b/thirdparty/opus/silk/tables_pitch_lag.c
index f435b7e016..e80cc59a27 100644
--- a/drivers/opus/silk/tables_pitch_lag.c
+++ b/thirdparty/opus/silk/tables_pitch_lag.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tables.h"
 
 const opus_uint8 silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ] = {
        253,    250,    244,    233,    212,    182,    150,    131,
diff --git a/drivers/opus/silk/tables_pulses_per_block.c b/thirdparty/opus/silk/tables_pulses_per_block.c
index 21f430791a..c7c01c8893 100644
--- a/drivers/opus/silk/tables_pulses_per_block.c
+++ b/thirdparty/opus/silk/tables_pulses_per_block.c
@@ -24,9 +24,12 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
-#include "opus/opus_config.h"
 
-#include "opus/silk/tables.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tables.h"
 
 const opus_uint8 silk_max_pulses_table[ 4 ] = {
          8,     10,     12,     16
diff --git a/drivers/opus/silk/tuning_parameters.h b/thirdparty/opus/silk/tuning_parameters.h
index 5b8f404235..5b8f404235 100644
--- a/drivers/opus/silk/tuning_parameters.h
+++ b/thirdparty/opus/silk/tuning_parameters.h
diff --git a/drivers/opus/silk/typedef.h b/thirdparty/opus/silk/typedef.h
index 3e193b4a45..97b7e709be 100644
--- a/drivers/opus/silk/typedef.h
+++ b/thirdparty/opus/silk/typedef.h
@@ -28,10 +28,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_TYPEDEF_H
 #define SILK_TYPEDEF_H
 
-#include "opus/opus_types.h"
-#include "opus/opus_defines.h"
+#include "opus_types.h"
+#include "opus_defines.h"
 
-#ifndef OPUS_FIXED_POINT
+#ifndef FIXED_POINT
 # include <float.h>
 # define silk_float      float
 # define silk_float_MAX  FLT_MAX
diff --git a/drivers/opus/silk/x86/NSQ_del_dec_sse.c b/thirdparty/opus/silk/x86/NSQ_del_dec_sse.c
index e9afbba01b..21d4a8bc1e 100644
--- a/drivers/opus/silk/x86/NSQ_del_dec_sse.c
+++ b/thirdparty/opus/silk/x86/NSQ_del_dec_sse.c
@@ -24,15 +24,18 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include "opus/silk/main.h"
-#include "opus/celt/x86/x86cpu.h"
+#include "main.h"
+#include "celt/x86/x86cpu.h"
 
-#include "opus/celt/stack_alloc.h"
+#include "stack_alloc.h"
 
 typedef struct {
     opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
diff --git a/drivers/opus/silk/x86/NSQ_sse.c b/thirdparty/opus/silk/x86/NSQ_sse.c
index ac0fa1ab04..72f34fd6fc 100644
--- a/drivers/opus/silk/x86/NSQ_sse.c
+++ b/thirdparty/opus/silk/x86/NSQ_sse.c
@@ -24,14 +24,17 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include "opus/silk/main.h"
-#include "opus/celt/x86/x86cpu.h"
-#include "opus/celt/stack_alloc.h"
+#include "main.h"
+#include "celt/x86/x86cpu.h"
+#include "stack_alloc.h"
 
 static OPUS_INLINE void silk_nsq_scale_states_sse4_1(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
diff --git a/drivers/opus/silk/x86/SigProc_FIX_sse.h b/thirdparty/opus/silk/x86/SigProc_FIX_sse.h
index 67ab30fd78..61efa8da41 100644
--- a/drivers/opus/silk/x86/SigProc_FIX_sse.h
+++ b/thirdparty/opus/silk/x86/SigProc_FIX_sse.h
@@ -27,7 +27,10 @@
 
 #ifndef SIGPROC_FIX_SSE_H
 #define SIGPROC_FIX_SSE_H
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #if defined(OPUS_X86_MAY_HAVE_SSE4_1)
 void silk_burg_modified_sse4_1(
diff --git a/drivers/opus/silk/x86/VAD_sse.c b/thirdparty/opus/silk/x86/VAD_sse.c
index 5db2c86aa9..4e90f4410d 100644
--- a/drivers/opus/silk/x86/VAD_sse.c
+++ b/thirdparty/opus/silk/x86/VAD_sse.c
@@ -24,14 +24,17 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
 
-#include "opus/silk/main.h"
-#include "opus/celt/stack_alloc.h"
+#include "main.h"
+#include "stack_alloc.h"
 
 /* Weighting factors for tilt measure */
 static const opus_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -12000 };
diff --git a/drivers/opus/silk/x86/VQ_WMat_EC_sse.c b/thirdparty/opus/silk/x86/VQ_WMat_EC_sse.c
index 3afa42a6e5..74d6c6d0ec 100644
--- a/drivers/opus/silk/x86/VQ_WMat_EC_sse.c
+++ b/thirdparty/opus/silk/x86/VQ_WMat_EC_sse.c
@@ -24,13 +24,16 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include "opus/silk/main.h"
-#include "opus/celt/x86/x86cpu.h"
+#include "main.h"
+#include "celt/x86/x86cpu.h"
 
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
 void silk_VQ_WMat_EC_sse4_1(
diff --git a/drivers/opus/silk/x86/main_sse.h b/thirdparty/opus/silk/x86/main_sse.h
index 6fef1b358b..afd5ec26e1 100644
--- a/drivers/opus/silk/x86/main_sse.h
+++ b/thirdparty/opus/silk/x86/main_sse.h
@@ -27,7 +27,10 @@
 
 #ifndef MAIN_SSE_H
 #define MAIN_SSE_H
-#include "opus/opus_config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 # if defined(OPUS_X86_MAY_HAVE_SSE4_1)
 
diff --git a/drivers/opus/silk/x86/x86_silk_map.c b/thirdparty/opus/silk/x86/x86_silk_map.c
index c3502114d1..818841f2c1 100644
--- a/drivers/opus/silk/x86/x86_silk_map.c
+++ b/thirdparty/opus/silk/x86/x86_silk_map.c
@@ -24,19 +24,22 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opus/opus_config.h"
 
-#include "opus/celt/x86/x86cpu.h"
-#include "opus/silk/structs.h"
-#include "opus/silk/SigProc_FIX.h"
-#include "opus/celt/pitch.h"
-#include "opus/silk/main.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
+#include "celt/x86/x86cpu.h"
+#include "structs.h"
+#include "SigProc_FIX.h"
+#include "pitch.h"
+#include "main.h"
 
 #if !defined(OPUS_X86_PRESUME_SSE4_1)
 
 #if defined(FIXED_POINT)
 
-#include "opus/silk/fixed/main_FIX.h"
+#include "fixed/main_FIX.h"
 
 opus_int64 (*const SILK_INNER_PROD16_ALIGNED_64_IMPL[ OPUS_ARCHMASK + 1 ] )(
     const opus_int16 *inVec1,
diff --git a/drivers/opus/stream.c b/thirdparty/opus/stream.c
index 2ac12642dd..0238a6b31b 100644
--- a/drivers/opus/stream.c
+++ b/thirdparty/opus/stream.c
@@ -14,9 +14,11 @@
  last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $
 
  ********************************************************************/
-#include "opus/opus_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include "opus/internal.h"
+#include "internal.h"
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/drivers/opus/tansig_table.h b/thirdparty/opus/tansig_table.h
index c76f844a72..c76f844a72 100644
--- a/drivers/opus/tansig_table.h
+++ b/thirdparty/opus/tansig_table.h
diff --git a/drivers/opus/wincerts.c b/thirdparty/opus/wincerts.c
index 1a5b634063..b0e35aa352 100644
--- a/drivers/opus/wincerts.c
+++ b/thirdparty/opus/wincerts.c
@@ -15,9 +15,12 @@
    action, so I'm giving up and re-implementing it locally.
 
   [1] <http://rt.openssl.org/Ticket/Display.html?id=2158>*/
-#include "opus/opus_config.h"
 
-#include "opus/internal.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "internal.h"
 #if defined(OP_ENABLE_HTTP)&&defined(_WIN32)
 /*You must include windows.h before wincrypt.h and x509.h.*/
 # define WIN32_LEAN_AND_MEAN
diff --git a/drivers/opus/winerrno.h b/thirdparty/opus/winerrno.h
index 32a90b4ee1..32a90b4ee1 100644
--- a/drivers/opus/winerrno.h
+++ b/thirdparty/opus/winerrno.h
diff --git a/drivers/pvr/AlphaBitmap.h b/thirdparty/pvrtccompressor/AlphaBitmap.h
index 57c6b026ea..57c6b026ea 100644
--- a/drivers/pvr/AlphaBitmap.h
+++ b/thirdparty/pvrtccompressor/AlphaBitmap.h
diff --git a/drivers/pvr/BitScale.cpp b/thirdparty/pvrtccompressor/BitScale.cpp
index 97b3f0aa25..97b3f0aa25 100644
--- a/drivers/pvr/BitScale.cpp
+++ b/thirdparty/pvrtccompressor/BitScale.cpp
diff --git a/drivers/pvr/BitScale.h b/thirdparty/pvrtccompressor/BitScale.h
index 36613aeeee..36613aeeee 100644
--- a/drivers/pvr/BitScale.h
+++ b/thirdparty/pvrtccompressor/BitScale.h
diff --git a/drivers/pvr/BitUtility.h b/thirdparty/pvrtccompressor/BitUtility.h
index 588ff3e892..588ff3e892 100644
--- a/drivers/pvr/BitUtility.h
+++ b/thirdparty/pvrtccompressor/BitUtility.h
diff --git a/drivers/pvr/Bitmap.h b/thirdparty/pvrtccompressor/Bitmap.h
index 508ed8cb75..508ed8cb75 100644
--- a/drivers/pvr/Bitmap.h
+++ b/thirdparty/pvrtccompressor/Bitmap.h
diff --git a/drivers/pvr/ColorRgba.h b/thirdparty/pvrtccompressor/ColorRgba.h
index 0701420566..0701420566 100644
--- a/drivers/pvr/ColorRgba.h
+++ b/thirdparty/pvrtccompressor/ColorRgba.h
diff --git a/drivers/pvr/Interval.h b/thirdparty/pvrtccompressor/Interval.h
index a7252e8375..a7252e8375 100644
--- a/drivers/pvr/Interval.h
+++ b/thirdparty/pvrtccompressor/Interval.h
diff --git a/thirdparty/pvrtccompressor/LICENSE.TXT b/thirdparty/pvrtccompressor/LICENSE.TXT
new file mode 100644
index 0000000000..974fc09e25
--- /dev/null
+++ b/thirdparty/pvrtccompressor/LICENSE.TXT
@@ -0,0 +1,25 @@
+Copyright © 2014, Jeffrey Lim. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/drivers/pvr/MortonTable.cpp b/thirdparty/pvrtccompressor/MortonTable.cpp
index 29a5af67f6..29a5af67f6 100644
--- a/drivers/pvr/MortonTable.cpp
+++ b/thirdparty/pvrtccompressor/MortonTable.cpp
diff --git a/drivers/pvr/MortonTable.h b/thirdparty/pvrtccompressor/MortonTable.h
index 7a27e59544..7a27e59544 100644
--- a/drivers/pvr/MortonTable.h
+++ b/thirdparty/pvrtccompressor/MortonTable.h
diff --git a/drivers/pvr/Point2.h b/thirdparty/pvrtccompressor/Point2.h
index 89fa4b6322..89fa4b6322 100644
--- a/drivers/pvr/Point2.h
+++ b/thirdparty/pvrtccompressor/Point2.h
diff --git a/drivers/pvr/PvrTcDecoder.cpp b/thirdparty/pvrtccompressor/PvrTcDecoder.cpp
index d8a36b342c..d8a36b342c 100644
--- a/drivers/pvr/PvrTcDecoder.cpp
+++ b/thirdparty/pvrtccompressor/PvrTcDecoder.cpp
diff --git a/drivers/pvr/PvrTcDecoder.h b/thirdparty/pvrtccompressor/PvrTcDecoder.h
index 1b6fcf964c..1b6fcf964c 100644
--- a/drivers/pvr/PvrTcDecoder.h
+++ b/thirdparty/pvrtccompressor/PvrTcDecoder.h
diff --git a/drivers/pvr/PvrTcEncoder.cpp b/thirdparty/pvrtccompressor/PvrTcEncoder.cpp
index 587b1320f1..587b1320f1 100644
--- a/drivers/pvr/PvrTcEncoder.cpp
+++ b/thirdparty/pvrtccompressor/PvrTcEncoder.cpp
diff --git a/drivers/pvr/PvrTcEncoder.h b/thirdparty/pvrtccompressor/PvrTcEncoder.h
index b9344367d9..b9344367d9 100644
--- a/drivers/pvr/PvrTcEncoder.h
+++ b/thirdparty/pvrtccompressor/PvrTcEncoder.h
diff --git a/drivers/pvr/PvrTcPacket.cpp b/thirdparty/pvrtccompressor/PvrTcPacket.cpp
index 2e40d371e8..2e40d371e8 100644
--- a/drivers/pvr/PvrTcPacket.cpp
+++ b/thirdparty/pvrtccompressor/PvrTcPacket.cpp
diff --git a/drivers/pvr/PvrTcPacket.h b/thirdparty/pvrtccompressor/PvrTcPacket.h
index ac3b6a4dd1..ac3b6a4dd1 100644
--- a/drivers/pvr/PvrTcPacket.h
+++ b/thirdparty/pvrtccompressor/PvrTcPacket.h
diff --git a/drivers/pvr/RgbBitmap.h b/thirdparty/pvrtccompressor/RgbBitmap.h
index cf1d78667d..cf1d78667d 100644
--- a/drivers/pvr/RgbBitmap.h
+++ b/thirdparty/pvrtccompressor/RgbBitmap.h
diff --git a/drivers/pvr/RgbaBitmap.h b/thirdparty/pvrtccompressor/RgbaBitmap.h
index 66b5542c1a..66b5542c1a 100644
--- a/drivers/pvr/RgbaBitmap.h
+++ b/thirdparty/pvrtccompressor/RgbaBitmap.h
diff --git a/drivers/etc1/rg_etc1.cpp b/thirdparty/rg-etc1/rg_etc1.cpp
index 8e28b53f9d..8e28b53f9d 100644
--- a/drivers/etc1/rg_etc1.cpp
+++ b/thirdparty/rg-etc1/rg_etc1.cpp
diff --git a/drivers/etc1/rg_etc1.h b/thirdparty/rg-etc1/rg_etc1.h
index 9ce89a6cc6..9ce89a6cc6 100644
--- a/drivers/etc1/rg_etc1.h
+++ b/thirdparty/rg-etc1/rg_etc1.h
diff --git a/drivers/rtaudio/RtAudio.cpp b/thirdparty/rtaudio/RtAudio.cpp
index 04159776f7..04159776f7 100644
--- a/drivers/rtaudio/RtAudio.cpp
+++ b/thirdparty/rtaudio/RtAudio.cpp
diff --git a/drivers/rtaudio/RtAudio.h b/thirdparty/rtaudio/RtAudio.h
index 4392e95f32..4392e95f32 100644
--- a/drivers/rtaudio/RtAudio.h
+++ b/thirdparty/rtaudio/RtAudio.h
diff --git a/thirdparty/squish/alpha.cpp b/thirdparty/squish/alpha.cpp
new file mode 100644
index 0000000000..7039c1a3b8
--- /dev/null
+++ b/thirdparty/squish/alpha.cpp
@@ -0,0 +1,350 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include "alpha.h"
+
+#include <climits>
+#include <algorithm>
+
+namespace squish {
+
+static int FloatToInt( float a, int limit )
+{
+    // use ANSI round-to-zero behaviour to get round-to-nearest
+    int i = ( int )( a + 0.5f );
+
+    // clamp to the limit
+    if( i < 0 )
+        i = 0;
+    else if( i > limit )
+        i = limit;
+
+    // done
+    return i;
+}
+
+void CompressAlphaDxt3( u8 const* rgba, int mask, void* block )
+{
+    u8* bytes = reinterpret_cast< u8* >( block );
+
+    // quantise and pack the alpha values pairwise
+    for( int i = 0; i < 8; ++i )
+    {
+        // quantise down to 4 bits
+        float alpha1 = ( float )rgba[8*i + 3] * ( 15.0f/255.0f );
+        float alpha2 = ( float )rgba[8*i + 7] * ( 15.0f/255.0f );
+        int quant1 = FloatToInt( alpha1, 15 );
+        int quant2 = FloatToInt( alpha2, 15 );
+
+        // set alpha to zero where masked
+        int bit1 = 1 << ( 2*i );
+        int bit2 = 1 << ( 2*i + 1 );
+        if( ( mask & bit1 ) == 0 )
+            quant1 = 0;
+        if( ( mask & bit2 ) == 0 )
+            quant2 = 0;
+
+        // pack into the byte
+        bytes[i] = ( u8 )( quant1 | ( quant2 << 4 ) );
+    }
+}
+
+void DecompressAlphaDxt3( u8* rgba, void const* block )
+{
+    u8 const* bytes = reinterpret_cast< u8 const* >( block );
+
+    // unpack the alpha values pairwise
+    for( int i = 0; i < 8; ++i )
+    {
+        // quantise down to 4 bits
+        u8 quant = bytes[i];
+
+        // unpack the values
+        u8 lo = quant & 0x0f;
+        u8 hi = quant & 0xf0;
+
+        // convert back up to bytes
+        rgba[8*i + 3] = lo | ( lo << 4 );
+        rgba[8*i + 7] = hi | ( hi >> 4 );
+    }
+}
+
+static void FixRange( int& min, int& max, int steps )
+{
+    if( max - min < steps )
+        max = std::min( min + steps, 255 );
+    if( max - min < steps )
+        min = std::max( 0, max - steps );
+}
+
+static int FitCodes( u8 const* rgba, int mask, u8 const* codes, u8* indices )
+{
+    // fit each alpha value to the codebook
+    int err = 0;
+    for( int i = 0; i < 16; ++i )
+    {
+        // check this pixel is valid
+        int bit = 1 << i;
+        if( ( mask & bit ) == 0 )
+        {
+            // use the first code
+            indices[i] = 0;
+            continue;
+        }
+
+        // find the least error and corresponding index
+        int value = rgba[4*i + 3];
+        int least = INT_MAX;
+        int index = 0;
+        for( int j = 0; j < 8; ++j )
+        {
+            // get the squared error from this code
+            int dist = ( int )value - ( int )codes[j];
+            dist *= dist;
+
+            // compare with the best so far
+            if( dist < least )
+            {
+                least = dist;
+                index = j;
+            }
+        }
+
+        // save this index and accumulate the error
+        indices[i] = ( u8 )index;
+        err += least;
+    }
+
+    // return the total error
+    return err;
+}
+
+static void WriteAlphaBlock( int alpha0, int alpha1, u8 const* indices, void* block )
+{
+    u8* bytes = reinterpret_cast< u8* >( block );
+
+    // write the first two bytes
+    bytes[0] = ( u8 )alpha0;
+    bytes[1] = ( u8 )alpha1;
+
+    // pack the indices with 3 bits each
+    u8* dest = bytes + 2;
+    u8 const* src = indices;
+    for( int i = 0; i < 2; ++i )
+    {
+        // pack 8 3-bit values
+        int value = 0;
+        for( int j = 0; j < 8; ++j )
+        {
+            int index = *src++;
+            value |= ( index << 3*j );
+        }
+
+        // store in 3 bytes
+        for( int j = 0; j < 3; ++j )
+        {
+            int byte = ( value >> 8*j ) & 0xff;
+            *dest++ = ( u8 )byte;
+        }
+    }
+}
+
+static void WriteAlphaBlock5( int alpha0, int alpha1, u8 const* indices, void* block )
+{
+    // check the relative values of the endpoints
+    if( alpha0 > alpha1 )
+    {
+        // swap the indices
+        u8 swapped[16];
+        for( int i = 0; i < 16; ++i )
+        {
+            u8 index = indices[i];
+            if( index == 0 )
+                swapped[i] = 1;
+            else if( index == 1 )
+                swapped[i] = 0;
+            else if( index <= 5 )
+                swapped[i] = 7 - index;
+            else
+                swapped[i] = index;
+        }
+
+        // write the block
+        WriteAlphaBlock( alpha1, alpha0, swapped, block );
+    }
+    else
+    {
+        // write the block
+        WriteAlphaBlock( alpha0, alpha1, indices, block );
+    }
+}
+
+static void WriteAlphaBlock7( int alpha0, int alpha1, u8 const* indices, void* block )
+{
+    // check the relative values of the endpoints
+    if( alpha0 < alpha1 )
+    {
+        // swap the indices
+        u8 swapped[16];
+        for( int i = 0; i < 16; ++i )
+        {
+            u8 index = indices[i];
+            if( index == 0 )
+                swapped[i] = 1;
+            else if( index == 1 )
+                swapped[i] = 0;
+            else
+                swapped[i] = 9 - index;
+        }
+
+        // write the block
+        WriteAlphaBlock( alpha1, alpha0, swapped, block );
+    }
+    else
+    {
+        // write the block
+        WriteAlphaBlock( alpha0, alpha1, indices, block );
+    }
+}
+
+void CompressAlphaDxt5( u8 const* rgba, int mask, void* block )
+{
+    // get the range for 5-alpha and 7-alpha interpolation
+    int min5 = 255;
+    int max5 = 0;
+    int min7 = 255;
+    int max7 = 0;
+    for( int i = 0; i < 16; ++i )
+    {
+        // check this pixel is valid
+        int bit = 1 << i;
+        if( ( mask & bit ) == 0 )
+            continue;
+
+        // incorporate into the min/max
+        int value = rgba[4*i + 3];
+        if( value < min7 )
+            min7 = value;
+        if( value > max7 )
+            max7 = value;
+        if( value != 0 && value < min5 )
+            min5 = value;
+        if( value != 255 && value > max5 )
+            max5 = value;
+    }
+
+    // handle the case that no valid range was found
+    if( min5 > max5 )
+        min5 = max5;
+    if( min7 > max7 )
+        min7 = max7;
+
+    // fix the range to be the minimum in each case
+    FixRange( min5, max5, 5 );
+    FixRange( min7, max7, 7 );
+
+    // set up the 5-alpha code book
+    u8 codes5[8];
+    codes5[0] = ( u8 )min5;
+    codes5[1] = ( u8 )max5;
+    for( int i = 1; i < 5; ++i )
+        codes5[1 + i] = ( u8 )( ( ( 5 - i )*min5 + i*max5 )/5 );
+    codes5[6] = 0;
+    codes5[7] = 255;
+
+    // set up the 7-alpha code book
+    u8 codes7[8];
+    codes7[0] = ( u8 )min7;
+    codes7[1] = ( u8 )max7;
+    for( int i = 1; i < 7; ++i )
+        codes7[1 + i] = ( u8 )( ( ( 7 - i )*min7 + i*max7 )/7 );
+
+    // fit the data to both code books
+    u8 indices5[16];
+    u8 indices7[16];
+    int err5 = FitCodes( rgba, mask, codes5, indices5 );
+    int err7 = FitCodes( rgba, mask, codes7, indices7 );
+
+    // save the block with least error
+    if( err5 <= err7 )
+        WriteAlphaBlock5( min5, max5, indices5, block );
+    else
+        WriteAlphaBlock7( min7, max7, indices7, block );
+}
+
+void DecompressAlphaDxt5( u8* rgba, void const* block )
+{
+    // get the two alpha values
+    u8 const* bytes = reinterpret_cast< u8 const* >( block );
+    int alpha0 = bytes[0];
+    int alpha1 = bytes[1];
+
+    // compare the values to build the codebook
+    u8 codes[8];
+    codes[0] = ( u8 )alpha0;
+    codes[1] = ( u8 )alpha1;
+    if( alpha0 <= alpha1 )
+    {
+        // use 5-alpha codebook
+        for( int i = 1; i < 5; ++i )
+            codes[1 + i] = ( u8 )( ( ( 5 - i )*alpha0 + i*alpha1 )/5 );
+        codes[6] = 0;
+        codes[7] = 255;
+    }
+    else
+    {
+        // use 7-alpha codebook
+        for( int i = 1; i < 7; ++i )
+            codes[1 + i] = ( u8 )( ( ( 7 - i )*alpha0 + i*alpha1 )/7 );
+    }
+
+    // decode the indices
+    u8 indices[16];
+    u8 const* src = bytes + 2;
+    u8* dest = indices;
+    for( int i = 0; i < 2; ++i )
+    {
+        // grab 3 bytes
+        int value = 0;
+        for( int j = 0; j < 3; ++j )
+        {
+            int byte = *src++;
+            value |= ( byte << 8*j );
+        }
+
+        // unpack 8 3-bit values from it
+        for( int j = 0; j < 8; ++j )
+        {
+            int index = ( value >> 3*j ) & 0x7;
+            *dest++ = ( u8 )index;
+        }
+    }
+
+    // write out the indexed codebook values
+    for( int i = 0; i < 16; ++i )
+        rgba[4*i + 3] = codes[indices[i]];
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/alpha.h b/thirdparty/squish/alpha.h
new file mode 100644
index 0000000000..a1fffd4049
--- /dev/null
+++ b/thirdparty/squish/alpha.h
@@ -0,0 +1,41 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_ALPHA_H
+#define SQUISH_ALPHA_H
+
+#include "squish.h"
+
+namespace squish {
+
+void CompressAlphaDxt3( u8 const* rgba, int mask, void* block );
+void CompressAlphaDxt5( u8 const* rgba, int mask, void* block );
+
+void DecompressAlphaDxt3( u8* rgba, void const* block );
+void DecompressAlphaDxt5( u8* rgba, void const* block );
+
+} // namespace squish
+
+#endif // ndef SQUISH_ALPHA_H
diff --git a/thirdparty/squish/clusterfit.cpp b/thirdparty/squish/clusterfit.cpp
new file mode 100644
index 0000000000..1610ecb5d8
--- /dev/null
+++ b/thirdparty/squish/clusterfit.cpp
@@ -0,0 +1,392 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+    Copyright (c) 2007 Ignacio Castano                   icastano@nvidia.com
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include "clusterfit.h"
+#include "colourset.h"
+#include "colourblock.h"
+#include <cfloat>
+
+namespace squish {
+
+ClusterFit::ClusterFit( ColourSet const* colours, int flags, float* metric )
+  : ColourFit( colours, flags )
+{
+    // set the iteration count
+    m_iterationCount = ( m_flags & kColourIterativeClusterFit ) ? kMaxIterations : 1;
+
+    // initialise the metric (old perceptual = 0.2126f, 0.7152f, 0.0722f)
+    if( metric )
+        m_metric = Vec4( metric[0], metric[1], metric[2], 1.0f );
+    else
+        m_metric = VEC4_CONST( 1.0f );
+
+    // initialise the best error
+    m_besterror = VEC4_CONST( FLT_MAX );
+
+    // cache some values
+    int const count = m_colours->GetCount();
+    Vec3 const* values = m_colours->GetPoints();
+
+    // get the covariance matrix
+    Sym3x3 covariance = ComputeWeightedCovariance( count, values, m_colours->GetWeights() );
+
+    // compute the principle component
+    m_principle = ComputePrincipleComponent( covariance );
+}
+
+bool ClusterFit::ConstructOrdering( Vec3 const& axis, int iteration )
+{
+    // cache some values
+    int const count = m_colours->GetCount();
+    Vec3 const* values = m_colours->GetPoints();
+
+    // build the list of dot products
+    float dps[16];
+    u8* order = ( u8* )m_order + 16*iteration;
+    for( int i = 0; i < count; ++i )
+    {
+        dps[i] = Dot( values[i], axis );
+        order[i] = ( u8 )i;
+    }
+
+    // stable sort using them
+    for( int i = 0; i < count; ++i )
+    {
+        for( int j = i; j > 0 && dps[j] < dps[j - 1]; --j )
+        {
+            std::swap( dps[j], dps[j - 1] );
+            std::swap( order[j], order[j - 1] );
+        }
+    }
+
+    // check this ordering is unique
+    for( int it = 0; it < iteration; ++it )
+    {
+        u8 const* prev = ( u8* )m_order + 16*it;
+        bool same = true;
+        for( int i = 0; i < count; ++i )
+        {
+            if( order[i] != prev[i] )
+            {
+                same = false;
+                break;
+            }
+        }
+        if( same )
+            return false;
+    }
+
+    // copy the ordering and weight all the points
+    Vec3 const* unweighted = m_colours->GetPoints();
+    float const* weights = m_colours->GetWeights();
+    m_xsum_wsum = VEC4_CONST( 0.0f );
+    for( int i = 0; i < count; ++i )
+    {
+        int j = order[i];
+        Vec4 p( unweighted[j].X(), unweighted[j].Y(), unweighted[j].Z(), 1.0f );
+        Vec4 w( weights[j] );
+        Vec4 x = p*w;
+        m_points_weights[i] = x;
+        m_xsum_wsum += x;
+    }
+    return true;
+}
+
+void ClusterFit::Compress3( void* block )
+{
+    // declare variables
+    int const count = m_colours->GetCount();
+    Vec4 const two = VEC4_CONST( 2.0 );
+    Vec4 const one = VEC4_CONST( 1.0f );
+    Vec4 const half_half2( 0.5f, 0.5f, 0.5f, 0.25f );
+    Vec4 const zero = VEC4_CONST( 0.0f );
+    Vec4 const half = VEC4_CONST( 0.5f );
+    Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f );
+    Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
+
+    // prepare an ordering using the principle axis
+    ConstructOrdering( m_principle, 0 );
+
+    // check all possible clusters and iterate on the total order
+    Vec4 beststart = VEC4_CONST( 0.0f );
+    Vec4 bestend = VEC4_CONST( 0.0f );
+    Vec4 besterror = m_besterror;
+    u8 bestindices[16];
+    int bestiteration = 0;
+    int besti = 0, bestj = 0;
+
+    // loop over iterations (we avoid the case that all points in first or last cluster)
+    for( int iterationIndex = 0;; )
+    {
+        // first cluster [0,i) is at the start
+        Vec4 part0 = VEC4_CONST( 0.0f );
+        for( int i = 0; i < count; ++i )
+        {
+            // second cluster [i,j) is half along
+            Vec4 part1 = ( i == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f );
+            int jmin = ( i == 0 ) ? 1 : i;
+            for( int j = jmin;; )
+            {
+                // last cluster [j,count) is at the end
+                Vec4 part2 = m_xsum_wsum - part1 - part0;
+
+                // compute least squares terms directly
+                Vec4 alphax_sum = MultiplyAdd( part1, half_half2, part0 );
+                Vec4 alpha2_sum = alphax_sum.SplatW();
+
+                Vec4 betax_sum = MultiplyAdd( part1, half_half2, part2 );
+                Vec4 beta2_sum = betax_sum.SplatW();
+
+                Vec4 alphabeta_sum = ( part1*half_half2 ).SplatW();
+
+                // compute the least-squares optimal points
+                Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) );
+                Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor;
+                Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor;
+
+                // clamp to the grid
+                a = Min( one, Max( zero, a ) );
+                b = Min( one, Max( zero, b ) );
+                a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp;
+                b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp;
+
+                // compute the error (we skip the constant xxsum)
+                Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum );
+                Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum );
+                Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 );
+                Vec4 e4 = MultiplyAdd( two, e3, e1 );
+
+                // apply the metric to the error term
+                Vec4 e5 = e4*m_metric;
+                Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ();
+
+                // keep the solution if it wins
+                if( CompareAnyLessThan( error, besterror ) )
+                {
+                    beststart = a;
+                    bestend = b;
+                    besti = i;
+                    bestj = j;
+                    besterror = error;
+                    bestiteration = iterationIndex;
+                }
+
+                // advance
+                if( j == count )
+                    break;
+                part1 += m_points_weights[j];
+                ++j;
+            }
+
+            // advance
+            part0 += m_points_weights[i];
+        }
+
+        // stop if we didn't improve in this iteration
+        if( bestiteration != iterationIndex )
+            break;
+
+        // advance if possible
+        ++iterationIndex;
+        if( iterationIndex == m_iterationCount )
+            break;
+
+        // stop if a new iteration is an ordering that has already been tried
+        Vec3 axis = ( bestend - beststart ).GetVec3();
+        if( !ConstructOrdering( axis, iterationIndex ) )
+            break;
+    }
+
+    // save the block if necessary
+    if( CompareAnyLessThan( besterror, m_besterror ) )
+    {
+        // remap the indices
+        u8 const* order = ( u8* )m_order + 16*bestiteration;
+
+        u8 unordered[16];
+        for( int m = 0; m < besti; ++m )
+            unordered[order[m]] = 0;
+        for( int m = besti; m < bestj; ++m )
+            unordered[order[m]] = 2;
+        for( int m = bestj; m < count; ++m )
+            unordered[order[m]] = 1;
+
+        m_colours->RemapIndices( unordered, bestindices );
+
+        // save the block
+        WriteColourBlock3( beststart.GetVec3(), bestend.GetVec3(), bestindices, block );
+
+        // save the error
+        m_besterror = besterror;
+    }
+}
+
+void ClusterFit::Compress4( void* block )
+{
+    // declare variables
+    int const count = m_colours->GetCount();
+    Vec4 const two = VEC4_CONST( 2.0f );
+    Vec4 const one = VEC4_CONST( 1.0f );
+    Vec4 const onethird_onethird2( 1.0f/3.0f, 1.0f/3.0f, 1.0f/3.0f, 1.0f/9.0f );
+    Vec4 const twothirds_twothirds2( 2.0f/3.0f, 2.0f/3.0f, 2.0f/3.0f, 4.0f/9.0f );
+    Vec4 const twonineths = VEC4_CONST( 2.0f/9.0f );
+    Vec4 const zero = VEC4_CONST( 0.0f );
+    Vec4 const half = VEC4_CONST( 0.5f );
+    Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f );
+    Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
+
+    // prepare an ordering using the principle axis
+    ConstructOrdering( m_principle, 0 );
+
+    // check all possible clusters and iterate on the total order
+    Vec4 beststart = VEC4_CONST( 0.0f );
+    Vec4 bestend = VEC4_CONST( 0.0f );
+    Vec4 besterror = m_besterror;
+    u8 bestindices[16];
+    int bestiteration = 0;
+    int besti = 0, bestj = 0, bestk = 0;
+
+    // loop over iterations (we avoid the case that all points in first or last cluster)
+    for( int iterationIndex = 0;; )
+    {
+        // first cluster [0,i) is at the start
+        Vec4 part0 = VEC4_CONST( 0.0f );
+        for( int i = 0; i < count; ++i )
+        {
+            // second cluster [i,j) is one third along
+            Vec4 part1 = VEC4_CONST( 0.0f );
+            for( int j = i;; )
+            {
+                // third cluster [j,k) is two thirds along
+                Vec4 part2 = ( j == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f );
+                int kmin = ( j == 0 ) ? 1 : j;
+                for( int k = kmin;; )
+                {
+                    // last cluster [k,count) is at the end
+                    Vec4 part3 = m_xsum_wsum - part2 - part1 - part0;
+
+                    // compute least squares terms directly
+                    Vec4 const alphax_sum = MultiplyAdd( part2, onethird_onethird2, MultiplyAdd( part1, twothirds_twothirds2, part0 ) );
+                    Vec4 const alpha2_sum = alphax_sum.SplatW();
+
+                    Vec4 const betax_sum = MultiplyAdd( part1, onethird_onethird2, MultiplyAdd( part2, twothirds_twothirds2, part3 ) );
+                    Vec4 const beta2_sum = betax_sum.SplatW();
+
+                    Vec4 const alphabeta_sum = twonineths*( part1 + part2 ).SplatW();
+
+                    // compute the least-squares optimal points
+                    Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) );
+                    Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor;
+                    Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor;
+
+                    // clamp to the grid
+                    a = Min( one, Max( zero, a ) );
+                    b = Min( one, Max( zero, b ) );
+                    a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp;
+                    b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp;
+
+                    // compute the error (we skip the constant xxsum)
+                    Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum );
+                    Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum );
+                    Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 );
+                    Vec4 e4 = MultiplyAdd( two, e3, e1 );
+
+                    // apply the metric to the error term
+                    Vec4 e5 = e4*m_metric;
+                    Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ();
+
+                    // keep the solution if it wins
+                    if( CompareAnyLessThan( error, besterror ) )
+                    {
+                        beststart = a;
+                        bestend = b;
+                        besterror = error;
+                        besti = i;
+                        bestj = j;
+                        bestk = k;
+                        bestiteration = iterationIndex;
+                    }
+
+                    // advance
+                    if( k == count )
+                        break;
+                    part2 += m_points_weights[k];
+                    ++k;
+                }
+
+                // advance
+                if( j == count )
+                    break;
+                part1 += m_points_weights[j];
+                ++j;
+            }
+
+            // advance
+            part0 += m_points_weights[i];
+        }
+
+        // stop if we didn't improve in this iteration
+        if( bestiteration != iterationIndex )
+            break;
+
+        // advance if possible
+        ++iterationIndex;
+        if( iterationIndex == m_iterationCount )
+            break;
+
+        // stop if a new iteration is an ordering that has already been tried
+        Vec3 axis = ( bestend - beststart ).GetVec3();
+        if( !ConstructOrdering( axis, iterationIndex ) )
+            break;
+    }
+
+    // save the block if necessary
+    if( CompareAnyLessThan( besterror, m_besterror ) )
+    {
+        // remap the indices
+        u8 const* order = ( u8* )m_order + 16*bestiteration;
+
+        u8 unordered[16];
+        for( int m = 0; m < besti; ++m )
+            unordered[order[m]] = 0;
+        for( int m = besti; m < bestj; ++m )
+            unordered[order[m]] = 2;
+        for( int m = bestj; m < bestk; ++m )
+            unordered[order[m]] = 3;
+        for( int m = bestk; m < count; ++m )
+            unordered[order[m]] = 1;
+
+        m_colours->RemapIndices( unordered, bestindices );
+
+        // save the block
+        WriteColourBlock4( beststart.GetVec3(), bestend.GetVec3(), bestindices, block );
+
+        // save the error
+        m_besterror = besterror;
+    }
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/clusterfit.h b/thirdparty/squish/clusterfit.h
new file mode 100644
index 0000000000..999396b262
--- /dev/null
+++ b/thirdparty/squish/clusterfit.h
@@ -0,0 +1,61 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+    Copyright (c) 2007 Ignacio Castano                   icastano@nvidia.com
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_CLUSTERFIT_H
+#define SQUISH_CLUSTERFIT_H
+
+#include "squish.h"
+#include "maths.h"
+#include "simd.h"
+#include "colourfit.h"
+
+namespace squish {
+
+class ClusterFit : public ColourFit
+{
+public:
+    ClusterFit( ColourSet const* colours, int flags, float* metric );
+
+private:
+    bool ConstructOrdering( Vec3 const& axis, int iteration );
+
+    virtual void Compress3( void* block );
+    virtual void Compress4( void* block );
+
+    enum { kMaxIterations = 8 };
+
+    int m_iterationCount;
+    Vec3 m_principle;
+    u8 m_order[16*kMaxIterations];
+    Vec4 m_points_weights[16];
+    Vec4 m_xsum_wsum;
+    Vec4 m_metric;
+    Vec4 m_besterror;
+};
+
+} // namespace squish
+
+#endif // ndef SQUISH_CLUSTERFIT_H
diff --git a/thirdparty/squish/colourblock.cpp b/thirdparty/squish/colourblock.cpp
new file mode 100644
index 0000000000..af8b980365
--- /dev/null
+++ b/thirdparty/squish/colourblock.cpp
@@ -0,0 +1,214 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include "colourblock.h"
+
+namespace squish {
+
+static int FloatToInt( float a, int limit )
+{
+    // use ANSI round-to-zero behaviour to get round-to-nearest
+    int i = ( int )( a + 0.5f );
+
+    // clamp to the limit
+    if( i < 0 )
+        i = 0;
+    else if( i > limit )
+        i = limit;
+
+    // done
+    return i;
+}
+
+static int FloatTo565( Vec3::Arg colour )
+{
+    // get the components in the correct range
+    int r = FloatToInt( 31.0f*colour.X(), 31 );
+    int g = FloatToInt( 63.0f*colour.Y(), 63 );
+    int b = FloatToInt( 31.0f*colour.Z(), 31 );
+
+    // pack into a single value
+    return ( r << 11 ) | ( g << 5 ) | b;
+}
+
+static void WriteColourBlock( int a, int b, u8* indices, void* block )
+{
+    // get the block as bytes
+    u8* bytes = ( u8* )block;
+
+    // write the endpoints
+    bytes[0] = ( u8 )( a & 0xff );
+    bytes[1] = ( u8 )( a >> 8 );
+    bytes[2] = ( u8 )( b & 0xff );
+    bytes[3] = ( u8 )( b >> 8 );
+
+    // write the indices
+    for( int i = 0; i < 4; ++i )
+    {
+        u8 const* ind = indices + 4*i;
+        bytes[4 + i] = ind[0] | ( ind[1] << 2 ) | ( ind[2] << 4 ) | ( ind[3] << 6 );
+    }
+}
+
+void WriteColourBlock3( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block )
+{
+    // get the packed values
+    int a = FloatTo565( start );
+    int b = FloatTo565( end );
+
+    // remap the indices
+    u8 remapped[16];
+    if( a <= b )
+    {
+        // use the indices directly
+        for( int i = 0; i < 16; ++i )
+            remapped[i] = indices[i];
+    }
+    else
+    {
+        // swap a and b
+        std::swap( a, b );
+        for( int i = 0; i < 16; ++i )
+        {
+            if( indices[i] == 0 )
+                remapped[i] = 1;
+            else if( indices[i] == 1 )
+                remapped[i] = 0;
+            else
+                remapped[i] = indices[i];
+        }
+    }
+
+    // write the block
+    WriteColourBlock( a, b, remapped, block );
+}
+
+void WriteColourBlock4( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block )
+{
+    // get the packed values
+    int a = FloatTo565( start );
+    int b = FloatTo565( end );
+
+    // remap the indices
+    u8 remapped[16];
+    if( a < b )
+    {
+        // swap a and b
+        std::swap( a, b );
+        for( int i = 0; i < 16; ++i )
+            remapped[i] = ( indices[i] ^ 0x1 ) & 0x3;
+    }
+    else if( a == b )
+    {
+        // use index 0
+        for( int i = 0; i < 16; ++i )
+            remapped[i] = 0;
+    }
+    else
+    {
+        // use the indices directly
+        for( int i = 0; i < 16; ++i )
+            remapped[i] = indices[i];
+    }
+
+    // write the block
+    WriteColourBlock( a, b, remapped, block );
+}
+
+static int Unpack565( u8 const* packed, u8* colour )
+{
+    // build the packed value
+    int value = ( int )packed[0] | ( ( int )packed[1] << 8 );
+
+    // get the components in the stored range
+    u8 red = ( u8 )( ( value >> 11 ) & 0x1f );
+    u8 green = ( u8 )( ( value >> 5 ) & 0x3f );
+    u8 blue = ( u8 )( value & 0x1f );
+
+    // scale up to 8 bits
+    colour[0] = ( red << 3 ) | ( red >> 2 );
+    colour[1] = ( green << 2 ) | ( green >> 4 );
+    colour[2] = ( blue << 3 ) | ( blue >> 2 );
+    colour[3] = 255;
+
+    // return the value
+    return value;
+}
+
+void DecompressColour( u8* rgba, void const* block, bool isDxt1 )
+{
+    // get the block bytes
+    u8 const* bytes = reinterpret_cast< u8 const* >( block );
+
+    // unpack the endpoints
+    u8 codes[16];
+    int a = Unpack565( bytes, codes );
+    int b = Unpack565( bytes + 2, codes + 4 );
+
+    // generate the midpoints
+    for( int i = 0; i < 3; ++i )
+    {
+        int c = codes[i];
+        int d = codes[4 + i];
+
+        if( isDxt1 && a <= b )
+        {
+            codes[8 + i] = ( u8 )( ( c + d )/2 );
+            codes[12 + i] = 0;
+        }
+        else
+        {
+            codes[8 + i] = ( u8 )( ( 2*c + d )/3 );
+            codes[12 + i] = ( u8 )( ( c + 2*d )/3 );
+        }
+    }
+
+    // fill in alpha for the intermediate values
+    codes[8 + 3] = 255;
+    codes[12 + 3] = ( isDxt1 && a <= b ) ? 0 : 255;
+
+    // unpack the indices
+    u8 indices[16];
+    for( int i = 0; i < 4; ++i )
+    {
+        u8* ind = indices + 4*i;
+        u8 packed = bytes[4 + i];
+
+        ind[0] = packed & 0x3;
+        ind[1] = ( packed >> 2 ) & 0x3;
+        ind[2] = ( packed >> 4 ) & 0x3;
+        ind[3] = ( packed >> 6 ) & 0x3;
+    }
+
+    // store out the colours
+    for( int i = 0; i < 16; ++i )
+    {
+        u8 offset = 4*indices[i];
+        for( int j = 0; j < 4; ++j )
+            rgba[4*i + j] = codes[offset + j];
+    }
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/colourblock.h b/thirdparty/squish/colourblock.h
new file mode 100644
index 0000000000..fee2cd7c5d
--- /dev/null
+++ b/thirdparty/squish/colourblock.h
@@ -0,0 +1,41 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_COLOURBLOCK_H
+#define SQUISH_COLOURBLOCK_H
+
+#include "squish.h"
+#include "maths.h"
+
+namespace squish {
+
+void WriteColourBlock3( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block );
+void WriteColourBlock4( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block );
+
+void DecompressColour( u8* rgba, void const* block, bool isDxt1 );
+
+} // namespace squish
+
+#endif // ndef SQUISH_COLOURBLOCK_H
diff --git a/thirdparty/squish/colourfit.cpp b/thirdparty/squish/colourfit.cpp
new file mode 100644
index 0000000000..e45b656557
--- /dev/null
+++ b/thirdparty/squish/colourfit.cpp
@@ -0,0 +1,54 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include "colourfit.h"
+#include "colourset.h"
+
+namespace squish {
+
+ColourFit::ColourFit( ColourSet const* colours, int flags )
+  : m_colours( colours ),
+    m_flags( flags )
+{
+}
+
+ColourFit::~ColourFit()
+{
+}
+
+void ColourFit::Compress( void* block )
+{
+    bool isDxt1 = ( ( m_flags & kDxt1 ) != 0 );
+    if( isDxt1 )
+    {
+        Compress3( block );
+        if( !m_colours->IsTransparent() )
+            Compress4( block );
+    }
+    else
+        Compress4( block );
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/colourfit.h b/thirdparty/squish/colourfit.h
new file mode 100644
index 0000000000..e73dceb2eb
--- /dev/null
+++ b/thirdparty/squish/colourfit.h
@@ -0,0 +1,56 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_COLOURFIT_H
+#define SQUISH_COLOURFIT_H
+
+#include "squish.h"
+#include "maths.h"
+
+#include <climits>
+
+namespace squish {
+
+class ColourSet;
+
+class ColourFit
+{
+public:
+    ColourFit( ColourSet const* colours, int flags );
+    virtual ~ColourFit();
+
+    void Compress( void* block );
+
+protected:
+    virtual void Compress3( void* block ) = 0;
+    virtual void Compress4( void* block ) = 0;
+
+    ColourSet const* m_colours;
+    int m_flags;
+};
+
+} // namespace squish
+
+#endif // ndef SQUISH_COLOURFIT_H
diff --git a/thirdparty/squish/colourset.cpp b/thirdparty/squish/colourset.cpp
new file mode 100644
index 0000000000..e900556471
--- /dev/null
+++ b/thirdparty/squish/colourset.cpp
@@ -0,0 +1,121 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include "colourset.h"
+
+namespace squish {
+
+ColourSet::ColourSet( u8 const* rgba, int mask, int flags )
+  : m_count( 0 ),
+    m_transparent( false )
+{
+    // check the compression mode for dxt1
+    bool isDxt1 = ( ( flags & kDxt1 ) != 0 );
+    bool weightByAlpha = ( ( flags & kWeightColourByAlpha ) != 0 );
+
+    // create the minimal set
+    for( int i = 0; i < 16; ++i )
+    {
+        // check this pixel is enabled
+        int bit = 1 << i;
+        if( ( mask & bit ) == 0 )
+        {
+            m_remap[i] = -1;
+            continue;
+        }
+
+        // check for transparent pixels when using dxt1
+        if( isDxt1 && rgba[4*i + 3] < 128 )
+        {
+            m_remap[i] = -1;
+            m_transparent = true;
+            continue;
+        }
+
+        // loop over previous points for a match
+        for( int j = 0;; ++j )
+        {
+            // allocate a new point
+            if( j == i )
+            {
+                // normalise coordinates to [0,1]
+                float x = ( float )rgba[4*i] / 255.0f;
+                float y = ( float )rgba[4*i + 1] / 255.0f;
+                float z = ( float )rgba[4*i + 2] / 255.0f;
+
+                // ensure there is always non-zero weight even for zero alpha
+                float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f;
+
+                // add the point
+                m_points[m_count] = Vec3( x, y, z );
+                m_weights[m_count] = ( weightByAlpha ? w : 1.0f );
+                m_remap[i] = m_count;
+
+                // advance
+                ++m_count;
+                break;
+            }
+
+            // check for a match
+            int oldbit = 1 << j;
+            bool match = ( ( mask & oldbit ) != 0 )
+                && ( rgba[4*i] == rgba[4*j] )
+                && ( rgba[4*i + 1] == rgba[4*j + 1] )
+                && ( rgba[4*i + 2] == rgba[4*j + 2] )
+                && ( rgba[4*j + 3] >= 128 || !isDxt1 );
+            if( match )
+            {
+                // get the index of the match
+                int index = m_remap[j];
+
+                // ensure there is always non-zero weight even for zero alpha
+                float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f;
+
+                // map to this point and increase the weight
+                m_weights[index] += ( weightByAlpha ? w : 1.0f );
+                m_remap[i] = index;
+                break;
+            }
+        }
+    }
+
+    // square root the weights
+    for( int i = 0; i < m_count; ++i )
+        m_weights[i] = std::sqrt( m_weights[i] );
+}
+
+void ColourSet::RemapIndices( u8 const* source, u8* target ) const
+{
+    for( int i = 0; i < 16; ++i )
+    {
+        int j = m_remap[i];
+        if( j == -1 )
+            target[i] = 3;
+        else
+            target[i] = source[j];
+    }
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/colourset.h b/thirdparty/squish/colourset.h
new file mode 100644
index 0000000000..e13bb6fc35
--- /dev/null
+++ b/thirdparty/squish/colourset.h
@@ -0,0 +1,58 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_COLOURSET_H
+#define SQUISH_COLOURSET_H
+
+#include "squish.h"
+#include "maths.h"
+
+namespace squish {
+
+/*! @brief Represents a set of block colours
+*/
+class ColourSet
+{
+public:
+    ColourSet( u8 const* rgba, int mask, int flags );
+
+    int GetCount() const { return m_count; }
+    Vec3 const* GetPoints() const { return m_points; }
+    float const* GetWeights() const { return m_weights; }
+    bool IsTransparent() const { return m_transparent; }
+
+    void RemapIndices( u8 const* source, u8* target ) const;
+
+private:
+    int m_count;
+    Vec3 m_points[16];
+    float m_weights[16];
+    int m_remap[16];
+    bool m_transparent;
+};
+
+} // namespace sqish
+
+#endif // ndef SQUISH_COLOURSET_H
diff --git a/thirdparty/squish/config.h b/thirdparty/squish/config.h
new file mode 100644
index 0000000000..92edefe966
--- /dev/null
+++ b/thirdparty/squish/config.h
@@ -0,0 +1,49 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_CONFIG_H
+#define SQUISH_CONFIG_H
+
+// Set to 1 when building squish to use Altivec instructions.
+#ifndef SQUISH_USE_ALTIVEC
+#define SQUISH_USE_ALTIVEC 0
+#endif
+
+// Set to 1 or 2 when building squish to use SSE or SSE2 instructions.
+#ifndef SQUISH_USE_SSE
+#define SQUISH_USE_SSE 0
+#endif
+
+// Internally set SQUISH_USE_SIMD when either Altivec or SSE is available.
+#if SQUISH_USE_ALTIVEC && SQUISH_USE_SSE
+#error "Cannot enable both Altivec and SSE!"
+#endif
+#if SQUISH_USE_ALTIVEC || SQUISH_USE_SSE
+#define SQUISH_USE_SIMD 1
+#else
+#define SQUISH_USE_SIMD 0
+#endif
+
+#endif // ndef SQUISH_CONFIG_H
diff --git a/thirdparty/squish/maths.cpp b/thirdparty/squish/maths.cpp
new file mode 100644
index 0000000000..4fa0bcfb35
--- /dev/null
+++ b/thirdparty/squish/maths.cpp
@@ -0,0 +1,259 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+/*! @file
+
+    The symmetric eigensystem solver algorithm is from
+    http://www.geometrictools.com/Documentation/EigenSymmetric3x3.pdf
+*/
+
+#include "maths.h"
+#include "simd.h"
+#include <cfloat>
+
+namespace squish {
+
+Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights )
+{
+    // compute the centroid
+    float total = 0.0f;
+    Vec3 centroid( 0.0f );
+    for( int i = 0; i < n; ++i )
+    {
+        total += weights[i];
+        centroid += weights[i]*points[i];
+    }
+    if( total > FLT_EPSILON )
+        centroid /= total;
+
+    // accumulate the covariance matrix
+    Sym3x3 covariance( 0.0f );
+    for( int i = 0; i < n; ++i )
+    {
+        Vec3 a = points[i] - centroid;
+        Vec3 b = weights[i]*a;
+
+        covariance[0] += a.X()*b.X();
+        covariance[1] += a.X()*b.Y();
+        covariance[2] += a.X()*b.Z();
+        covariance[3] += a.Y()*b.Y();
+        covariance[4] += a.Y()*b.Z();
+        covariance[5] += a.Z()*b.Z();
+    }
+
+    // return it
+    return covariance;
+}
+
+#if 0
+
+static Vec3 GetMultiplicity1Evector( Sym3x3 const& matrix, float evalue )
+{
+    // compute M
+    Sym3x3 m;
+    m[0] = matrix[0] - evalue;
+    m[1] = matrix[1];
+    m[2] = matrix[2];
+    m[3] = matrix[3] - evalue;
+    m[4] = matrix[4];
+    m[5] = matrix[5] - evalue;
+
+    // compute U
+    Sym3x3 u;
+    u[0] = m[3]*m[5] - m[4]*m[4];
+    u[1] = m[2]*m[4] - m[1]*m[5];
+    u[2] = m[1]*m[4] - m[2]*m[3];
+    u[3] = m[0]*m[5] - m[2]*m[2];
+    u[4] = m[1]*m[2] - m[4]*m[0];
+    u[5] = m[0]*m[3] - m[1]*m[1];
+
+    // find the largest component
+    float mc = std::fabs( u[0] );
+    int mi = 0;
+    for( int i = 1; i < 6; ++i )
+    {
+        float c = std::fabs( u[i] );
+        if( c > mc )
+        {
+            mc = c;
+            mi = i;
+        }
+    }
+
+    // pick the column with this component
+    switch( mi )
+    {
+    case 0:
+        return Vec3( u[0], u[1], u[2] );
+
+    case 1:
+    case 3:
+        return Vec3( u[1], u[3], u[4] );
+
+    default:
+        return Vec3( u[2], u[4], u[5] );
+    }
+}
+
+static Vec3 GetMultiplicity2Evector( Sym3x3 const& matrix, float evalue )
+{
+    // compute M
+    Sym3x3 m;
+    m[0] = matrix[0] - evalue;
+    m[1] = matrix[1];
+    m[2] = matrix[2];
+    m[3] = matrix[3] - evalue;
+    m[4] = matrix[4];
+    m[5] = matrix[5] - evalue;
+
+    // find the largest component
+    float mc = std::fabs( m[0] );
+    int mi = 0;
+    for( int i = 1; i < 6; ++i )
+    {
+        float c = std::fabs( m[i] );
+        if( c > mc )
+        {
+            mc = c;
+            mi = i;
+        }
+    }
+
+    // pick the first eigenvector based on this index
+    switch( mi )
+    {
+    case 0:
+    case 1:
+        return Vec3( -m[1], m[0], 0.0f );
+
+    case 2:
+        return Vec3( m[2], 0.0f, -m[0] );
+
+    case 3:
+    case 4:
+        return Vec3( 0.0f, -m[4], m[3] );
+
+    default:
+        return Vec3( 0.0f, -m[5], m[4] );
+    }
+}
+
+Vec3 ComputePrincipleComponent( Sym3x3 const& matrix )
+{
+    // compute the cubic coefficients
+    float c0 = matrix[0]*matrix[3]*matrix[5]
+        + 2.0f*matrix[1]*matrix[2]*matrix[4]
+        - matrix[0]*matrix[4]*matrix[4]
+        - matrix[3]*matrix[2]*matrix[2]
+        - matrix[5]*matrix[1]*matrix[1];
+    float c1 = matrix[0]*matrix[3] + matrix[0]*matrix[5] + matrix[3]*matrix[5]
+        - matrix[1]*matrix[1] - matrix[2]*matrix[2] - matrix[4]*matrix[4];
+    float c2 = matrix[0] + matrix[3] + matrix[5];
+
+    // compute the quadratic coefficients
+    float a = c1 - ( 1.0f/3.0f )*c2*c2;
+    float b = ( -2.0f/27.0f )*c2*c2*c2 + ( 1.0f/3.0f )*c1*c2 - c0;
+
+    // compute the root count check
+    float Q = 0.25f*b*b + ( 1.0f/27.0f )*a*a*a;
+
+    // test the multiplicity
+    if( FLT_EPSILON < Q )
+    {
+        // only one root, which implies we have a multiple of the identity
+        return Vec3( 1.0f );
+    }
+    else if( Q < -FLT_EPSILON )
+    {
+        // three distinct roots
+        float theta = std::atan2( std::sqrt( -Q ), -0.5f*b );
+        float rho = std::sqrt( 0.25f*b*b - Q );
+
+        float rt = std::pow( rho, 1.0f/3.0f );
+        float ct = std::cos( theta/3.0f );
+        float st = std::sin( theta/3.0f );
+
+        float l1 = ( 1.0f/3.0f )*c2 + 2.0f*rt*ct;
+        float l2 = ( 1.0f/3.0f )*c2 - rt*( ct + ( float )sqrt( 3.0f )*st );
+        float l3 = ( 1.0f/3.0f )*c2 - rt*( ct - ( float )sqrt( 3.0f )*st );
+
+        // pick the larger
+        if( std::fabs( l2 ) > std::fabs( l1 ) )
+            l1 = l2;
+        if( std::fabs( l3 ) > std::fabs( l1 ) )
+            l1 = l3;
+
+        // get the eigenvector
+        return GetMultiplicity1Evector( matrix, l1 );
+    }
+    else // if( -FLT_EPSILON <= Q && Q <= FLT_EPSILON )
+    {
+        // two roots
+        float rt;
+        if( b < 0.0f )
+            rt = -std::pow( -0.5f*b, 1.0f/3.0f );
+        else
+            rt = std::pow( 0.5f*b, 1.0f/3.0f );
+
+        float l1 = ( 1.0f/3.0f )*c2 + rt;        // repeated
+        float l2 = ( 1.0f/3.0f )*c2 - 2.0f*rt;
+
+        // get the eigenvector
+        if( std::fabs( l1 ) > std::fabs( l2 ) )
+            return GetMultiplicity2Evector( matrix, l1 );
+        else
+            return GetMultiplicity1Evector( matrix, l2 );
+    }
+}
+
+#else
+
+#define POWER_ITERATION_COUNT    8
+
+Vec3 ComputePrincipleComponent( Sym3x3 const& matrix )
+{
+    Vec4 const row0( matrix[0], matrix[1], matrix[2], 0.0f );
+    Vec4 const row1( matrix[1], matrix[3], matrix[4], 0.0f );
+    Vec4 const row2( matrix[2], matrix[4], matrix[5], 0.0f );
+    Vec4 v = VEC4_CONST( 1.0f );
+    for( int i = 0; i < POWER_ITERATION_COUNT; ++i )
+    {
+        // matrix multiply
+        Vec4 w = row0*v.SplatX();
+        w = MultiplyAdd(row1, v.SplatY(), w);
+        w = MultiplyAdd(row2, v.SplatZ(), w);
+
+        // get max component from xyz in all channels
+        Vec4 a = Max(w.SplatX(), Max(w.SplatY(), w.SplatZ()));
+
+        // divide through and advance
+        v = w*Reciprocal(a);
+    }
+    return v.GetVec3();
+}
+
+#endif
+
+} // namespace squish
diff --git a/thirdparty/squish/maths.h b/thirdparty/squish/maths.h
new file mode 100644
index 0000000000..59c32196b1
--- /dev/null
+++ b/thirdparty/squish/maths.h
@@ -0,0 +1,233 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_MATHS_H
+#define SQUISH_MATHS_H
+
+#include <cmath>
+#include <algorithm>
+#include "config.h"
+
+namespace squish {
+
+class Vec3
+{
+public:
+    typedef Vec3 const& Arg;
+
+    Vec3()
+    {
+    }
+
+    explicit Vec3( float s )
+    {
+        m_x = s;
+        m_y = s;
+        m_z = s;
+    }
+
+    Vec3( float x, float y, float z )
+    {
+        m_x = x;
+        m_y = y;
+        m_z = z;
+    }
+
+    float X() const { return m_x; }
+    float Y() const { return m_y; }
+    float Z() const { return m_z; }
+
+    Vec3 operator-() const
+    {
+        return Vec3( -m_x, -m_y, -m_z );
+    }
+
+    Vec3& operator+=( Arg v )
+    {
+        m_x += v.m_x;
+        m_y += v.m_y;
+        m_z += v.m_z;
+        return *this;
+    }
+
+    Vec3& operator-=( Arg v )
+    {
+        m_x -= v.m_x;
+        m_y -= v.m_y;
+        m_z -= v.m_z;
+        return *this;
+    }
+
+    Vec3& operator*=( Arg v )
+    {
+        m_x *= v.m_x;
+        m_y *= v.m_y;
+        m_z *= v.m_z;
+        return *this;
+    }
+
+    Vec3& operator*=( float s )
+    {
+        m_x *= s;
+        m_y *= s;
+        m_z *= s;
+        return *this;
+    }
+
+    Vec3& operator/=( Arg v )
+    {
+        m_x /= v.m_x;
+        m_y /= v.m_y;
+        m_z /= v.m_z;
+        return *this;
+    }
+
+    Vec3& operator/=( float s )
+    {
+        float t = 1.0f/s;
+        m_x *= t;
+        m_y *= t;
+        m_z *= t;
+        return *this;
+    }
+
+    friend Vec3 operator+( Arg left, Arg right )
+    {
+        Vec3 copy( left );
+        return copy += right;
+    }
+
+    friend Vec3 operator-( Arg left, Arg right )
+    {
+        Vec3 copy( left );
+        return copy -= right;
+    }
+
+    friend Vec3 operator*( Arg left, Arg right )
+    {
+        Vec3 copy( left );
+        return copy *= right;
+    }
+
+    friend Vec3 operator*( Arg left, float right )
+    {
+        Vec3 copy( left );
+        return copy *= right;
+    }
+
+    friend Vec3 operator*( float left, Arg right )
+    {
+        Vec3 copy( right );
+        return copy *= left;
+    }
+
+    friend Vec3 operator/( Arg left, Arg right )
+    {
+        Vec3 copy( left );
+        return copy /= right;
+    }
+
+    friend Vec3 operator/( Arg left, float right )
+    {
+        Vec3 copy( left );
+        return copy /= right;
+    }
+
+    friend float Dot( Arg left, Arg right )
+    {
+        return left.m_x*right.m_x + left.m_y*right.m_y + left.m_z*right.m_z;
+    }
+
+    friend Vec3 Min( Arg left, Arg right )
+    {
+        return Vec3(
+            std::min( left.m_x, right.m_x ),
+            std::min( left.m_y, right.m_y ),
+            std::min( left.m_z, right.m_z )
+        );
+    }
+
+    friend Vec3 Max( Arg left, Arg right )
+    {
+        return Vec3(
+            std::max( left.m_x, right.m_x ),
+            std::max( left.m_y, right.m_y ),
+            std::max( left.m_z, right.m_z )
+        );
+    }
+
+    friend Vec3 Truncate( Arg v )
+    {
+        return Vec3(
+            v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ),
+            v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ),
+            v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z )
+        );
+    }
+
+private:
+    float m_x;
+    float m_y;
+    float m_z;
+};
+
+inline float LengthSquared( Vec3::Arg v )
+{
+    return Dot( v, v );
+}
+
+class Sym3x3
+{
+public:
+    Sym3x3()
+    {
+    }
+
+    Sym3x3( float s )
+    {
+        for( int i = 0; i < 6; ++i )
+            m_x[i] = s;
+    }
+
+    float operator[]( int index ) const
+    {
+        return m_x[index];
+    }
+
+    float& operator[]( int index )
+    {
+        return m_x[index];
+    }
+
+private:
+    float m_x[6];
+};
+
+Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights );
+Vec3 ComputePrincipleComponent( Sym3x3 const& matrix );
+
+} // namespace squish
+
+#endif // ndef SQUISH_MATHS_H
diff --git a/thirdparty/squish/rangefit.cpp b/thirdparty/squish/rangefit.cpp
new file mode 100644
index 0000000000..adc07ed7d2
--- /dev/null
+++ b/thirdparty/squish/rangefit.cpp
@@ -0,0 +1,201 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include "rangefit.h"
+#include "colourset.h"
+#include "colourblock.h"
+#include <cfloat>
+
+namespace squish {
+
+RangeFit::RangeFit( ColourSet const* colours, int flags, float* metric )
+  : ColourFit( colours, flags )
+{
+    // initialise the metric (old perceptual = 0.2126f, 0.7152f, 0.0722f)
+    if( metric )
+        m_metric = Vec3( metric[0], metric[1], metric[2] );
+    else
+        m_metric = Vec3( 1.0f );
+
+    // initialise the best error
+    m_besterror = FLT_MAX;
+
+    // cache some values
+    int const count = m_colours->GetCount();
+    Vec3 const* values = m_colours->GetPoints();
+    float const* weights = m_colours->GetWeights();
+
+    // get the covariance matrix
+    Sym3x3 covariance = ComputeWeightedCovariance( count, values, weights );
+
+    // compute the principle component
+    Vec3 principle = ComputePrincipleComponent( covariance );
+
+    // get the min and max range as the codebook endpoints
+    Vec3 start( 0.0f );
+    Vec3 end( 0.0f );
+    if( count > 0 )
+    {
+        float min, max;
+
+        // compute the range
+        start = end = values[0];
+        min = max = Dot( values[0], principle );
+        for( int i = 1; i < count; ++i )
+        {
+            float val = Dot( values[i], principle );
+            if( val < min )
+            {
+                start = values[i];
+                min = val;
+            }
+            else if( val > max )
+            {
+                end = values[i];
+                max = val;
+            }
+        }
+    }
+
+    // clamp the output to [0, 1]
+    Vec3 const one( 1.0f );
+    Vec3 const zero( 0.0f );
+    start = Min( one, Max( zero, start ) );
+    end = Min( one, Max( zero, end ) );
+
+    // clamp to the grid and save
+    Vec3 const grid( 31.0f, 63.0f, 31.0f );
+    Vec3 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f );
+    Vec3 const half( 0.5f );
+    m_start = Truncate( grid*start + half )*gridrcp;
+    m_end = Truncate( grid*end + half )*gridrcp;
+}
+
+void RangeFit::Compress3( void* block )
+{
+    // cache some values
+    int const count = m_colours->GetCount();
+    Vec3 const* values = m_colours->GetPoints();
+
+    // create a codebook
+    Vec3 codes[3];
+    codes[0] = m_start;
+    codes[1] = m_end;
+    codes[2] = 0.5f*m_start + 0.5f*m_end;
+
+    // match each point to the closest code
+    u8 closest[16];
+    float error = 0.0f;
+    for( int i = 0; i < count; ++i )
+    {
+        // find the closest code
+        float dist = FLT_MAX;
+        int idx = 0;
+        for( int j = 0; j < 3; ++j )
+        {
+            float d = LengthSquared( m_metric*( values[i] - codes[j] ) );
+            if( d < dist )
+            {
+                dist = d;
+                idx = j;
+            }
+        }
+
+        // save the index
+        closest[i] = ( u8 )idx;
+
+        // accumulate the error
+        error += dist;
+    }
+
+    // save this scheme if it wins
+    if( error < m_besterror )
+    {
+        // remap the indices
+        u8 indices[16];
+        m_colours->RemapIndices( closest, indices );
+
+        // save the block
+        WriteColourBlock3( m_start, m_end, indices, block );
+
+        // save the error
+        m_besterror = error;
+    }
+}
+
+void RangeFit::Compress4( void* block )
+{
+    // cache some values
+    int const count = m_colours->GetCount();
+    Vec3 const* values = m_colours->GetPoints();
+
+    // create a codebook
+    Vec3 codes[4];
+    codes[0] = m_start;
+    codes[1] = m_end;
+    codes[2] = ( 2.0f/3.0f )*m_start + ( 1.0f/3.0f )*m_end;
+    codes[3] = ( 1.0f/3.0f )*m_start + ( 2.0f/3.0f )*m_end;
+
+    // match each point to the closest code
+    u8 closest[16];
+    float error = 0.0f;
+    for( int i = 0; i < count; ++i )
+    {
+        // find the closest code
+        float dist = FLT_MAX;
+        int idx = 0;
+        for( int j = 0; j < 4; ++j )
+        {
+            float d = LengthSquared( m_metric*( values[i] - codes[j] ) );
+            if( d < dist )
+            {
+                dist = d;
+                idx = j;
+            }
+        }
+
+        // save the index
+        closest[i] = ( u8 )idx;
+
+        // accumulate the error
+        error += dist;
+    }
+
+    // save this scheme if it wins
+    if( error < m_besterror )
+    {
+        // remap the indices
+        u8 indices[16];
+        m_colours->RemapIndices( closest, indices );
+
+        // save the block
+        WriteColourBlock4( m_start, m_end, indices, block );
+
+        // save the error
+        m_besterror = error;
+    }
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/rangefit.h b/thirdparty/squish/rangefit.h
new file mode 100644
index 0000000000..bdb21a9007
--- /dev/null
+++ b/thirdparty/squish/rangefit.h
@@ -0,0 +1,54 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_RANGEFIT_H
+#define SQUISH_RANGEFIT_H
+
+#include "squish.h"
+#include "colourfit.h"
+#include "maths.h"
+
+namespace squish {
+
+class ColourSet;
+
+class RangeFit : public ColourFit
+{
+public:
+    RangeFit( ColourSet const* colours, int flags, float* metric );
+
+private:
+    virtual void Compress3( void* block );
+    virtual void Compress4( void* block );
+
+    Vec3 m_metric;
+    Vec3 m_start;
+    Vec3 m_end;
+    float m_besterror;
+};
+
+} // squish
+
+#endif // ndef SQUISH_RANGEFIT_H
diff --git a/thirdparty/squish/simd.h b/thirdparty/squish/simd.h
new file mode 100644
index 0000000000..1e02fa160e
--- /dev/null
+++ b/thirdparty/squish/simd.h
@@ -0,0 +1,40 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_SIMD_H
+#define SQUISH_SIMD_H
+
+#include "maths.h"
+
+#if SQUISH_USE_ALTIVEC
+#include "simd_ve.h"
+#elif SQUISH_USE_SSE
+#include "simd_sse.h"
+#else
+#include "simd_float.h"
+#endif
+
+
+#endif // ndef SQUISH_SIMD_H
diff --git a/thirdparty/squish/simd_float.h b/thirdparty/squish/simd_float.h
new file mode 100644
index 0000000000..030ea70950
--- /dev/null
+++ b/thirdparty/squish/simd_float.h
@@ -0,0 +1,183 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_SIMD_FLOAT_H
+#define SQUISH_SIMD_FLOAT_H
+
+#include <algorithm>
+
+namespace squish {
+
+#define VEC4_CONST( X ) Vec4( X )
+
+class Vec4
+{
+public:
+    typedef Vec4 const& Arg;
+
+    Vec4() {}
+
+    explicit Vec4( float s )
+      : m_x( s ),
+        m_y( s ),
+        m_z( s ),
+        m_w( s )
+    {
+    }
+
+    Vec4( float x, float y, float z, float w )
+      : m_x( x ),
+        m_y( y ),
+        m_z( z ),
+        m_w( w )
+    {
+    }
+
+    Vec3 GetVec3() const
+    {
+        return Vec3( m_x, m_y, m_z );
+    }
+
+    Vec4 SplatX() const { return Vec4( m_x ); }
+    Vec4 SplatY() const { return Vec4( m_y ); }
+    Vec4 SplatZ() const { return Vec4( m_z ); }
+    Vec4 SplatW() const { return Vec4( m_w ); }
+
+    Vec4& operator+=( Arg v )
+    {
+        m_x += v.m_x;
+        m_y += v.m_y;
+        m_z += v.m_z;
+        m_w += v.m_w;
+        return *this;
+    }
+
+    Vec4& operator-=( Arg v )
+    {
+        m_x -= v.m_x;
+        m_y -= v.m_y;
+        m_z -= v.m_z;
+        m_w -= v.m_w;
+        return *this;
+    }
+
+    Vec4& operator*=( Arg v )
+    {
+        m_x *= v.m_x;
+        m_y *= v.m_y;
+        m_z *= v.m_z;
+        m_w *= v.m_w;
+        return *this;
+    }
+
+    friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right  )
+    {
+        Vec4 copy( left );
+        return copy += right;
+    }
+
+    friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right  )
+    {
+        Vec4 copy( left );
+        return copy -= right;
+    }
+
+    friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right  )
+    {
+        Vec4 copy( left );
+        return copy *= right;
+    }
+
+    //! Returns a*b + c
+    friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
+    {
+        return a*b + c;
+    }
+
+    //! Returns -( a*b - c )
+    friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
+    {
+        return c - a*b;
+    }
+
+    friend Vec4 Reciprocal( Vec4::Arg v )
+    {
+        return Vec4(
+            1.0f/v.m_x,
+            1.0f/v.m_y,
+            1.0f/v.m_z,
+            1.0f/v.m_w
+        );
+    }
+
+    friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
+    {
+        return Vec4(
+            std::min( left.m_x, right.m_x ),
+            std::min( left.m_y, right.m_y ),
+            std::min( left.m_z, right.m_z ),
+            std::min( left.m_w, right.m_w )
+        );
+    }
+
+    friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
+    {
+        return Vec4(
+            std::max( left.m_x, right.m_x ),
+            std::max( left.m_y, right.m_y ),
+            std::max( left.m_z, right.m_z ),
+            std::max( left.m_w, right.m_w )
+        );
+    }
+
+    friend Vec4 Truncate( Vec4::Arg v )
+    {
+        return Vec4(
+            v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ),
+            v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ),
+            v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z ),
+            v.m_w > 0.0f ? std::floor( v.m_w ) : std::ceil( v.m_w )
+        );
+    }
+
+    friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
+    {
+        return left.m_x < right.m_x
+            || left.m_y < right.m_y
+            || left.m_z < right.m_z
+            || left.m_w < right.m_w;
+    }
+
+private:
+    float m_x;
+    float m_y;
+    float m_z;
+    float m_w;
+};
+
+} // namespace squish
+
+#endif // ndef SQUISH_SIMD_FLOAT_H
+
diff --git a/thirdparty/squish/simd_sse.h b/thirdparty/squish/simd_sse.h
new file mode 100644
index 0000000000..2e8be4ca7b
--- /dev/null
+++ b/thirdparty/squish/simd_sse.h
@@ -0,0 +1,180 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_SIMD_SSE_H
+#define SQUISH_SIMD_SSE_H
+
+#include <xmmintrin.h>
+#if ( SQUISH_USE_SSE > 1 )
+#include <emmintrin.h>
+#endif
+
+#define SQUISH_SSE_SPLAT( a )                                        \
+    ( ( a ) | ( ( a ) << 2 ) | ( ( a ) << 4 ) | ( ( a ) << 6 ) )
+
+#define SQUISH_SSE_SHUF( x, y, z, w )                                \
+    ( ( x ) | ( ( y ) << 2 ) | ( ( z ) << 4 ) | ( ( w ) << 6 ) )
+
+namespace squish {
+
+#define VEC4_CONST( X ) Vec4( X )
+
+class Vec4
+{
+public:
+    typedef Vec4 const& Arg;
+
+    Vec4() {}
+
+    explicit Vec4( __m128 v ) : m_v( v ) {}
+
+    Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+    Vec4& operator=( Vec4 const& arg )
+    {
+        m_v = arg.m_v;
+        return *this;
+    }
+
+    explicit Vec4( float s ) : m_v( _mm_set1_ps( s ) ) {}
+
+    Vec4( float x, float y, float z, float w ) : m_v( _mm_setr_ps( x, y, z, w ) ) {}
+
+    Vec3 GetVec3() const
+    {
+#ifdef __GNUC__
+        __attribute__ ((__aligned__ (16))) float c[4];
+#else
+        __declspec(align(16)) float c[4];
+#endif
+        _mm_store_ps( c, m_v );
+        return Vec3( c[0], c[1], c[2] );
+    }
+
+    Vec4 SplatX() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 0 ) ) ); }
+    Vec4 SplatY() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 1 ) ) ); }
+    Vec4 SplatZ() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 2 ) ) ); }
+    Vec4 SplatW() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 3 ) ) ); }
+
+    Vec4& operator+=( Arg v )
+    {
+        m_v = _mm_add_ps( m_v, v.m_v );
+        return *this;
+    }
+
+    Vec4& operator-=( Arg v )
+    {
+        m_v = _mm_sub_ps( m_v, v.m_v );
+        return *this;
+    }
+
+    Vec4& operator*=( Arg v )
+    {
+        m_v = _mm_mul_ps( m_v, v.m_v );
+        return *this;
+    }
+
+    friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right  )
+    {
+        return Vec4( _mm_add_ps( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right  )
+    {
+        return Vec4( _mm_sub_ps( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right  )
+    {
+        return Vec4( _mm_mul_ps( left.m_v, right.m_v ) );
+    }
+
+    //! Returns a*b + c
+    friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
+    {
+        return Vec4( _mm_add_ps( _mm_mul_ps( a.m_v, b.m_v ), c.m_v ) );
+    }
+
+    //! Returns -( a*b - c )
+    friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
+    {
+        return Vec4( _mm_sub_ps( c.m_v, _mm_mul_ps( a.m_v, b.m_v ) ) );
+    }
+
+    friend Vec4 Reciprocal( Vec4::Arg v )
+    {
+        // get the reciprocal estimate
+        __m128 estimate = _mm_rcp_ps( v.m_v );
+
+        // one round of Newton-Rhaphson refinement
+        __m128 diff = _mm_sub_ps( _mm_set1_ps( 1.0f ), _mm_mul_ps( estimate, v.m_v ) );
+        return Vec4( _mm_add_ps( _mm_mul_ps( diff, estimate ), estimate ) );
+    }
+
+    friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
+    {
+        return Vec4( _mm_min_ps( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
+    {
+        return Vec4( _mm_max_ps( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 Truncate( Vec4::Arg v )
+    {
+#if ( SQUISH_USE_SSE == 1 )
+        // convert to ints
+        __m128 input = v.m_v;
+        __m64 lo = _mm_cvttps_pi32( input );
+        __m64 hi = _mm_cvttps_pi32( _mm_movehl_ps( input, input ) );
+
+        // convert to floats
+        __m128 part = _mm_movelh_ps( input, _mm_cvtpi32_ps( input, hi ) );
+        __m128 truncated = _mm_cvtpi32_ps( part, lo );
+
+        // clear out the MMX multimedia state to allow FP calls later
+        _mm_empty();
+        return Vec4( truncated );
+#else
+        // use SSE2 instructions
+        return Vec4( _mm_cvtepi32_ps( _mm_cvttps_epi32( v.m_v ) ) );
+#endif
+    }
+
+    friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
+    {
+        __m128 bits = _mm_cmplt_ps( left.m_v, right.m_v );
+        int value = _mm_movemask_ps( bits );
+        return value != 0;
+    }
+
+private:
+    __m128 m_v;
+};
+
+} // namespace squish
+
+#endif // ndef SQUISH_SIMD_SSE_H
diff --git a/thirdparty/squish/simd_ve.h b/thirdparty/squish/simd_ve.h
new file mode 100644
index 0000000000..08a1537503
--- /dev/null
+++ b/thirdparty/squish/simd_ve.h
@@ -0,0 +1,166 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_SIMD_VE_H
+#define SQUISH_SIMD_VE_H
+
+#include <altivec.h>
+#undef bool
+
+namespace squish {
+
+#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
+
+class Vec4
+{
+public:
+    typedef Vec4 Arg;
+
+    Vec4() {}
+
+    explicit Vec4( vector float v ) : m_v( v ) {}
+
+    Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+    Vec4& operator=( Vec4 const& arg )
+    {
+        m_v = arg.m_v;
+        return *this;
+    }
+
+    explicit Vec4( float s )
+    {
+        union { vector float v; float c[4]; } u;
+        u.c[0] = s;
+        u.c[1] = s;
+        u.c[2] = s;
+        u.c[3] = s;
+        m_v = u.v;
+    }
+
+    Vec4( float x, float y, float z, float w )
+    {
+        union { vector float v; float c[4]; } u;
+        u.c[0] = x;
+        u.c[1] = y;
+        u.c[2] = z;
+        u.c[3] = w;
+        m_v = u.v;
+    }
+
+    Vec3 GetVec3() const
+    {
+        union { vector float v; float c[4]; } u;
+        u.v = m_v;
+        return Vec3( u.c[0], u.c[1], u.c[2] );
+    }
+
+    Vec4 SplatX() const { return Vec4( vec_splat( m_v, 0 ) ); }
+    Vec4 SplatY() const { return Vec4( vec_splat( m_v, 1 ) ); }
+    Vec4 SplatZ() const { return Vec4( vec_splat( m_v, 2 ) ); }
+    Vec4 SplatW() const { return Vec4( vec_splat( m_v, 3 ) ); }
+
+    Vec4& operator+=( Arg v )
+    {
+        m_v = vec_add( m_v, v.m_v );
+        return *this;
+    }
+
+    Vec4& operator-=( Arg v )
+    {
+        m_v = vec_sub( m_v, v.m_v );
+        return *this;
+    }
+
+    Vec4& operator*=( Arg v )
+    {
+        m_v = vec_madd( m_v, v.m_v, ( vector float ){ -0.0f } );
+        return *this;
+    }
+
+    friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right  )
+    {
+        return Vec4( vec_add( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right  )
+    {
+        return Vec4( vec_sub( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right  )
+    {
+        return Vec4( vec_madd( left.m_v, right.m_v, ( vector float ){ -0.0f } ) );
+    }
+
+    //! Returns a*b + c
+    friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
+    {
+        return Vec4( vec_madd( a.m_v, b.m_v, c.m_v ) );
+    }
+
+    //! Returns -( a*b - c )
+    friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
+    {
+        return Vec4( vec_nmsub( a.m_v, b.m_v, c.m_v ) );
+    }
+
+    friend Vec4 Reciprocal( Vec4::Arg v )
+    {
+        // get the reciprocal estimate
+        vector float estimate = vec_re( v.m_v );
+
+        // one round of Newton-Rhaphson refinement
+        vector float diff = vec_nmsub( estimate, v.m_v, ( vector float ){ 1.0f } );
+        return Vec4( vec_madd( diff, estimate, estimate ) );
+    }
+
+    friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
+    {
+        return Vec4( vec_min( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
+    {
+        return Vec4( vec_max( left.m_v, right.m_v ) );
+    }
+
+    friend Vec4 Truncate( Vec4::Arg v )
+    {
+        return Vec4( vec_trunc( v.m_v ) );
+    }
+
+    friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
+    {
+        return vec_any_lt( left.m_v, right.m_v ) != 0;
+    }
+
+private:
+    vector float m_v;
+};
+
+} // namespace squish
+
+#endif // ndef SQUISH_SIMD_VE_H
diff --git a/thirdparty/squish/singlecolourfit.cpp b/thirdparty/squish/singlecolourfit.cpp
new file mode 100644
index 0000000000..cef0ebc410
--- /dev/null
+++ b/thirdparty/squish/singlecolourfit.cpp
@@ -0,0 +1,172 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include "singlecolourfit.h"
+#include "colourset.h"
+#include "colourblock.h"
+
+namespace squish {
+
+struct SourceBlock
+{
+    u8 start;
+    u8 end;
+    u8 error;
+};
+
+struct SingleColourLookup
+{
+    SourceBlock sources[2];
+};
+
+#include "singlecolourlookup.inl"
+
+static int FloatToInt( float a, int limit )
+{
+    // use ANSI round-to-zero behaviour to get round-to-nearest
+    int i = ( int )( a + 0.5f );
+
+    // clamp to the limit
+    if( i < 0 )
+        i = 0;
+    else if( i > limit )
+        i = limit;
+
+    // done
+    return i;
+}
+
+SingleColourFit::SingleColourFit( ColourSet const* colours, int flags )
+  : ColourFit( colours, flags )
+{
+    // grab the single colour
+    Vec3 const* values = m_colours->GetPoints();
+    m_colour[0] = ( u8 )FloatToInt( 255.0f*values->X(), 255 );
+    m_colour[1] = ( u8 )FloatToInt( 255.0f*values->Y(), 255 );
+    m_colour[2] = ( u8 )FloatToInt( 255.0f*values->Z(), 255 );
+
+    // initialise the best error
+    m_besterror = INT_MAX;
+}
+
+void SingleColourFit::Compress3( void* block )
+{
+    // build the table of lookups
+    SingleColourLookup const* const lookups[] =
+    {
+        lookup_5_3,
+        lookup_6_3,
+        lookup_5_3
+    };
+
+    // find the best end-points and index
+    ComputeEndPoints( lookups );
+
+    // build the block if we win
+    if( m_error < m_besterror )
+    {
+        // remap the indices
+        u8 indices[16];
+        m_colours->RemapIndices( &m_index, indices );
+
+        // save the block
+        WriteColourBlock3( m_start, m_end, indices, block );
+
+        // save the error
+        m_besterror = m_error;
+    }
+}
+
+void SingleColourFit::Compress4( void* block )
+{
+    // build the table of lookups
+    SingleColourLookup const* const lookups[] =
+    {
+        lookup_5_4,
+        lookup_6_4,
+        lookup_5_4
+    };
+
+    // find the best end-points and index
+    ComputeEndPoints( lookups );
+
+    // build the block if we win
+    if( m_error < m_besterror )
+    {
+        // remap the indices
+        u8 indices[16];
+        m_colours->RemapIndices( &m_index, indices );
+
+        // save the block
+        WriteColourBlock4( m_start, m_end, indices, block );
+
+        // save the error
+        m_besterror = m_error;
+    }
+}
+
+void SingleColourFit::ComputeEndPoints( SingleColourLookup const* const* lookups )
+{
+    // check each index combination (endpoint or intermediate)
+    m_error = INT_MAX;
+    for( int index = 0; index < 2; ++index )
+    {
+        // check the error for this codebook index
+        SourceBlock const* sources[3];
+        int error = 0;
+        for( int channel = 0; channel < 3; ++channel )
+        {
+            // grab the lookup table and index for this channel
+            SingleColourLookup const* lookup = lookups[channel];
+            int target = m_colour[channel];
+
+            // store a pointer to the source for this channel
+            sources[channel] = lookup[target].sources + index;
+
+            // accumulate the error
+            int diff = sources[channel]->error;
+            error += diff*diff;
+        }
+
+        // keep it if the error is lower
+        if( error < m_error )
+        {
+            m_start = Vec3(
+                ( float )sources[0]->start/31.0f,
+                ( float )sources[1]->start/63.0f,
+                ( float )sources[2]->start/31.0f
+            );
+            m_end = Vec3(
+                ( float )sources[0]->end/31.0f,
+                ( float )sources[1]->end/63.0f,
+                ( float )sources[2]->end/31.0f
+            );
+            m_index = ( u8 )( 2*index );
+            m_error = error;
+        }
+    }
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/singlecolourfit.h b/thirdparty/squish/singlecolourfit.h
new file mode 100644
index 0000000000..974ce77256
--- /dev/null
+++ b/thirdparty/squish/singlecolourfit.h
@@ -0,0 +1,58 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_SINGLECOLOURFIT_H
+#define SQUISH_SINGLECOLOURFIT_H
+
+#include "squish.h"
+#include "colourfit.h"
+
+namespace squish {
+
+class ColourSet;
+struct SingleColourLookup;
+
+class SingleColourFit : public ColourFit
+{
+public:
+    SingleColourFit( ColourSet const* colours, int flags );
+
+private:
+    virtual void Compress3( void* block );
+    virtual void Compress4( void* block );
+
+    void ComputeEndPoints( SingleColourLookup const* const* lookups );
+
+    u8 m_colour[3];
+    Vec3 m_start;
+    Vec3 m_end;
+    u8 m_index;
+    int m_error;
+    int m_besterror;
+};
+
+} // namespace squish
+
+#endif // ndef SQUISH_SINGLECOLOURFIT_H
diff --git a/thirdparty/squish/singlecolourlookup.inl b/thirdparty/squish/singlecolourlookup.inl
new file mode 100644
index 0000000000..5b44a1e5e6
--- /dev/null
+++ b/thirdparty/squish/singlecolourlookup.inl
@@ -0,0 +1,1064 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+static SingleColourLookup const lookup_5_3[] =
+{
+    { { { 0, 0, 0 }, { 0, 0, 0 } } },
+    { { { 0, 0, 1 }, { 0, 0, 1 } } },
+    { { { 0, 0, 2 }, { 0, 0, 2 } } },
+    { { { 0, 0, 3 }, { 0, 1, 1 } } },
+    { { { 0, 0, 4 }, { 0, 1, 0 } } },
+    { { { 1, 0, 3 }, { 0, 1, 1 } } },
+    { { { 1, 0, 2 }, { 0, 1, 2 } } },
+    { { { 1, 0, 1 }, { 0, 2, 1 } } },
+    { { { 1, 0, 0 }, { 0, 2, 0 } } },
+    { { { 1, 0, 1 }, { 0, 2, 1 } } },
+    { { { 1, 0, 2 }, { 0, 2, 2 } } },
+    { { { 1, 0, 3 }, { 0, 3, 1 } } },
+    { { { 1, 0, 4 }, { 0, 3, 0 } } },
+    { { { 2, 0, 3 }, { 0, 3, 1 } } },
+    { { { 2, 0, 2 }, { 0, 3, 2 } } },
+    { { { 2, 0, 1 }, { 0, 4, 1 } } },
+    { { { 2, 0, 0 }, { 0, 4, 0 } } },
+    { { { 2, 0, 1 }, { 0, 4, 1 } } },
+    { { { 2, 0, 2 }, { 0, 4, 2 } } },
+    { { { 2, 0, 3 }, { 0, 5, 1 } } },
+    { { { 2, 0, 4 }, { 0, 5, 0 } } },
+    { { { 3, 0, 3 }, { 0, 5, 1 } } },
+    { { { 3, 0, 2 }, { 0, 5, 2 } } },
+    { { { 3, 0, 1 }, { 0, 6, 1 } } },
+    { { { 3, 0, 0 }, { 0, 6, 0 } } },
+    { { { 3, 0, 1 }, { 0, 6, 1 } } },
+    { { { 3, 0, 2 }, { 0, 6, 2 } } },
+    { { { 3, 0, 3 }, { 0, 7, 1 } } },
+    { { { 3, 0, 4 }, { 0, 7, 0 } } },
+    { { { 4, 0, 4 }, { 0, 7, 1 } } },
+    { { { 4, 0, 3 }, { 0, 7, 2 } } },
+    { { { 4, 0, 2 }, { 1, 7, 1 } } },
+    { { { 4, 0, 1 }, { 1, 7, 0 } } },
+    { { { 4, 0, 0 }, { 0, 8, 0 } } },
+    { { { 4, 0, 1 }, { 0, 8, 1 } } },
+    { { { 4, 0, 2 }, { 2, 7, 1 } } },
+    { { { 4, 0, 3 }, { 2, 7, 0 } } },
+    { { { 4, 0, 4 }, { 0, 9, 0 } } },
+    { { { 5, 0, 3 }, { 0, 9, 1 } } },
+    { { { 5, 0, 2 }, { 3, 7, 1 } } },
+    { { { 5, 0, 1 }, { 3, 7, 0 } } },
+    { { { 5, 0, 0 }, { 0, 10, 0 } } },
+    { { { 5, 0, 1 }, { 0, 10, 1 } } },
+    { { { 5, 0, 2 }, { 0, 10, 2 } } },
+    { { { 5, 0, 3 }, { 0, 11, 1 } } },
+    { { { 5, 0, 4 }, { 0, 11, 0 } } },
+    { { { 6, 0, 3 }, { 0, 11, 1 } } },
+    { { { 6, 0, 2 }, { 0, 11, 2 } } },
+    { { { 6, 0, 1 }, { 0, 12, 1 } } },
+    { { { 6, 0, 0 }, { 0, 12, 0 } } },
+    { { { 6, 0, 1 }, { 0, 12, 1 } } },
+    { { { 6, 0, 2 }, { 0, 12, 2 } } },
+    { { { 6, 0, 3 }, { 0, 13, 1 } } },
+    { { { 6, 0, 4 }, { 0, 13, 0 } } },
+    { { { 7, 0, 3 }, { 0, 13, 1 } } },
+    { { { 7, 0, 2 }, { 0, 13, 2 } } },
+    { { { 7, 0, 1 }, { 0, 14, 1 } } },
+    { { { 7, 0, 0 }, { 0, 14, 0 } } },
+    { { { 7, 0, 1 }, { 0, 14, 1 } } },
+    { { { 7, 0, 2 }, { 0, 14, 2 } } },
+    { { { 7, 0, 3 }, { 0, 15, 1 } } },
+    { { { 7, 0, 4 }, { 0, 15, 0 } } },
+    { { { 8, 0, 4 }, { 0, 15, 1 } } },
+    { { { 8, 0, 3 }, { 0, 15, 2 } } },
+    { { { 8, 0, 2 }, { 1, 15, 1 } } },
+    { { { 8, 0, 1 }, { 1, 15, 0 } } },
+    { { { 8, 0, 0 }, { 0, 16, 0 } } },
+    { { { 8, 0, 1 }, { 0, 16, 1 } } },
+    { { { 8, 0, 2 }, { 2, 15, 1 } } },
+    { { { 8, 0, 3 }, { 2, 15, 0 } } },
+    { { { 8, 0, 4 }, { 0, 17, 0 } } },
+    { { { 9, 0, 3 }, { 0, 17, 1 } } },
+    { { { 9, 0, 2 }, { 3, 15, 1 } } },
+    { { { 9, 0, 1 }, { 3, 15, 0 } } },
+    { { { 9, 0, 0 }, { 0, 18, 0 } } },
+    { { { 9, 0, 1 }, { 0, 18, 1 } } },
+    { { { 9, 0, 2 }, { 0, 18, 2 } } },
+    { { { 9, 0, 3 }, { 0, 19, 1 } } },
+    { { { 9, 0, 4 }, { 0, 19, 0 } } },
+    { { { 10, 0, 3 }, { 0, 19, 1 } } },
+    { { { 10, 0, 2 }, { 0, 19, 2 } } },
+    { { { 10, 0, 1 }, { 0, 20, 1 } } },
+    { { { 10, 0, 0 }, { 0, 20, 0 } } },
+    { { { 10, 0, 1 }, { 0, 20, 1 } } },
+    { { { 10, 0, 2 }, { 0, 20, 2 } } },
+    { { { 10, 0, 3 }, { 0, 21, 1 } } },
+    { { { 10, 0, 4 }, { 0, 21, 0 } } },
+    { { { 11, 0, 3 }, { 0, 21, 1 } } },
+    { { { 11, 0, 2 }, { 0, 21, 2 } } },
+    { { { 11, 0, 1 }, { 0, 22, 1 } } },
+    { { { 11, 0, 0 }, { 0, 22, 0 } } },
+    { { { 11, 0, 1 }, { 0, 22, 1 } } },
+    { { { 11, 0, 2 }, { 0, 22, 2 } } },
+    { { { 11, 0, 3 }, { 0, 23, 1 } } },
+    { { { 11, 0, 4 }, { 0, 23, 0 } } },
+    { { { 12, 0, 4 }, { 0, 23, 1 } } },
+    { { { 12, 0, 3 }, { 0, 23, 2 } } },
+    { { { 12, 0, 2 }, { 1, 23, 1 } } },
+    { { { 12, 0, 1 }, { 1, 23, 0 } } },
+    { { { 12, 0, 0 }, { 0, 24, 0 } } },
+    { { { 12, 0, 1 }, { 0, 24, 1 } } },
+    { { { 12, 0, 2 }, { 2, 23, 1 } } },
+    { { { 12, 0, 3 }, { 2, 23, 0 } } },
+    { { { 12, 0, 4 }, { 0, 25, 0 } } },
+    { { { 13, 0, 3 }, { 0, 25, 1 } } },
+    { { { 13, 0, 2 }, { 3, 23, 1 } } },
+    { { { 13, 0, 1 }, { 3, 23, 0 } } },
+    { { { 13, 0, 0 }, { 0, 26, 0 } } },
+    { { { 13, 0, 1 }, { 0, 26, 1 } } },
+    { { { 13, 0, 2 }, { 0, 26, 2 } } },
+    { { { 13, 0, 3 }, { 0, 27, 1 } } },
+    { { { 13, 0, 4 }, { 0, 27, 0 } } },
+    { { { 14, 0, 3 }, { 0, 27, 1 } } },
+    { { { 14, 0, 2 }, { 0, 27, 2 } } },
+    { { { 14, 0, 1 }, { 0, 28, 1 } } },
+    { { { 14, 0, 0 }, { 0, 28, 0 } } },
+    { { { 14, 0, 1 }, { 0, 28, 1 } } },
+    { { { 14, 0, 2 }, { 0, 28, 2 } } },
+    { { { 14, 0, 3 }, { 0, 29, 1 } } },
+    { { { 14, 0, 4 }, { 0, 29, 0 } } },
+    { { { 15, 0, 3 }, { 0, 29, 1 } } },
+    { { { 15, 0, 2 }, { 0, 29, 2 } } },
+    { { { 15, 0, 1 }, { 0, 30, 1 } } },
+    { { { 15, 0, 0 }, { 0, 30, 0 } } },
+    { { { 15, 0, 1 }, { 0, 30, 1 } } },
+    { { { 15, 0, 2 }, { 0, 30, 2 } } },
+    { { { 15, 0, 3 }, { 0, 31, 1 } } },
+    { { { 15, 0, 4 }, { 0, 31, 0 } } },
+    { { { 16, 0, 4 }, { 0, 31, 1 } } },
+    { { { 16, 0, 3 }, { 0, 31, 2 } } },
+    { { { 16, 0, 2 }, { 1, 31, 1 } } },
+    { { { 16, 0, 1 }, { 1, 31, 0 } } },
+    { { { 16, 0, 0 }, { 4, 28, 0 } } },
+    { { { 16, 0, 1 }, { 4, 28, 1 } } },
+    { { { 16, 0, 2 }, { 2, 31, 1 } } },
+    { { { 16, 0, 3 }, { 2, 31, 0 } } },
+    { { { 16, 0, 4 }, { 4, 29, 0 } } },
+    { { { 17, 0, 3 }, { 4, 29, 1 } } },
+    { { { 17, 0, 2 }, { 3, 31, 1 } } },
+    { { { 17, 0, 1 }, { 3, 31, 0 } } },
+    { { { 17, 0, 0 }, { 4, 30, 0 } } },
+    { { { 17, 0, 1 }, { 4, 30, 1 } } },
+    { { { 17, 0, 2 }, { 4, 30, 2 } } },
+    { { { 17, 0, 3 }, { 4, 31, 1 } } },
+    { { { 17, 0, 4 }, { 4, 31, 0 } } },
+    { { { 18, 0, 3 }, { 4, 31, 1 } } },
+    { { { 18, 0, 2 }, { 4, 31, 2 } } },
+    { { { 18, 0, 1 }, { 5, 31, 1 } } },
+    { { { 18, 0, 0 }, { 5, 31, 0 } } },
+    { { { 18, 0, 1 }, { 5, 31, 1 } } },
+    { { { 18, 0, 2 }, { 5, 31, 2 } } },
+    { { { 18, 0, 3 }, { 6, 31, 1 } } },
+    { { { 18, 0, 4 }, { 6, 31, 0 } } },
+    { { { 19, 0, 3 }, { 6, 31, 1 } } },
+    { { { 19, 0, 2 }, { 6, 31, 2 } } },
+    { { { 19, 0, 1 }, { 7, 31, 1 } } },
+    { { { 19, 0, 0 }, { 7, 31, 0 } } },
+    { { { 19, 0, 1 }, { 7, 31, 1 } } },
+    { { { 19, 0, 2 }, { 7, 31, 2 } } },
+    { { { 19, 0, 3 }, { 8, 31, 1 } } },
+    { { { 19, 0, 4 }, { 8, 31, 0 } } },
+    { { { 20, 0, 4 }, { 8, 31, 1 } } },
+    { { { 20, 0, 3 }, { 8, 31, 2 } } },
+    { { { 20, 0, 2 }, { 9, 31, 1 } } },
+    { { { 20, 0, 1 }, { 9, 31, 0 } } },
+    { { { 20, 0, 0 }, { 12, 28, 0 } } },
+    { { { 20, 0, 1 }, { 12, 28, 1 } } },
+    { { { 20, 0, 2 }, { 10, 31, 1 } } },
+    { { { 20, 0, 3 }, { 10, 31, 0 } } },
+    { { { 20, 0, 4 }, { 12, 29, 0 } } },
+    { { { 21, 0, 3 }, { 12, 29, 1 } } },
+    { { { 21, 0, 2 }, { 11, 31, 1 } } },
+    { { { 21, 0, 1 }, { 11, 31, 0 } } },
+    { { { 21, 0, 0 }, { 12, 30, 0 } } },
+    { { { 21, 0, 1 }, { 12, 30, 1 } } },
+    { { { 21, 0, 2 }, { 12, 30, 2 } } },
+    { { { 21, 0, 3 }, { 12, 31, 1 } } },
+    { { { 21, 0, 4 }, { 12, 31, 0 } } },
+    { { { 22, 0, 3 }, { 12, 31, 1 } } },
+    { { { 22, 0, 2 }, { 12, 31, 2 } } },
+    { { { 22, 0, 1 }, { 13, 31, 1 } } },
+    { { { 22, 0, 0 }, { 13, 31, 0 } } },
+    { { { 22, 0, 1 }, { 13, 31, 1 } } },
+    { { { 22, 0, 2 }, { 13, 31, 2 } } },
+    { { { 22, 0, 3 }, { 14, 31, 1 } } },
+    { { { 22, 0, 4 }, { 14, 31, 0 } } },
+    { { { 23, 0, 3 }, { 14, 31, 1 } } },
+    { { { 23, 0, 2 }, { 14, 31, 2 } } },
+    { { { 23, 0, 1 }, { 15, 31, 1 } } },
+    { { { 23, 0, 0 }, { 15, 31, 0 } } },
+    { { { 23, 0, 1 }, { 15, 31, 1 } } },
+    { { { 23, 0, 2 }, { 15, 31, 2 } } },
+    { { { 23, 0, 3 }, { 16, 31, 1 } } },
+    { { { 23, 0, 4 }, { 16, 31, 0 } } },
+    { { { 24, 0, 4 }, { 16, 31, 1 } } },
+    { { { 24, 0, 3 }, { 16, 31, 2 } } },
+    { { { 24, 0, 2 }, { 17, 31, 1 } } },
+    { { { 24, 0, 1 }, { 17, 31, 0 } } },
+    { { { 24, 0, 0 }, { 20, 28, 0 } } },
+    { { { 24, 0, 1 }, { 20, 28, 1 } } },
+    { { { 24, 0, 2 }, { 18, 31, 1 } } },
+    { { { 24, 0, 3 }, { 18, 31, 0 } } },
+    { { { 24, 0, 4 }, { 20, 29, 0 } } },
+    { { { 25, 0, 3 }, { 20, 29, 1 } } },
+    { { { 25, 0, 2 }, { 19, 31, 1 } } },
+    { { { 25, 0, 1 }, { 19, 31, 0 } } },
+    { { { 25, 0, 0 }, { 20, 30, 0 } } },
+    { { { 25, 0, 1 }, { 20, 30, 1 } } },
+    { { { 25, 0, 2 }, { 20, 30, 2 } } },
+    { { { 25, 0, 3 }, { 20, 31, 1 } } },
+    { { { 25, 0, 4 }, { 20, 31, 0 } } },
+    { { { 26, 0, 3 }, { 20, 31, 1 } } },
+    { { { 26, 0, 2 }, { 20, 31, 2 } } },
+    { { { 26, 0, 1 }, { 21, 31, 1 } } },
+    { { { 26, 0, 0 }, { 21, 31, 0 } } },
+    { { { 26, 0, 1 }, { 21, 31, 1 } } },
+    { { { 26, 0, 2 }, { 21, 31, 2 } } },
+    { { { 26, 0, 3 }, { 22, 31, 1 } } },
+    { { { 26, 0, 4 }, { 22, 31, 0 } } },
+    { { { 27, 0, 3 }, { 22, 31, 1 } } },
+    { { { 27, 0, 2 }, { 22, 31, 2 } } },
+    { { { 27, 0, 1 }, { 23, 31, 1 } } },
+    { { { 27, 0, 0 }, { 23, 31, 0 } } },
+    { { { 27, 0, 1 }, { 23, 31, 1 } } },
+    { { { 27, 0, 2 }, { 23, 31, 2 } } },
+    { { { 27, 0, 3 }, { 24, 31, 1 } } },
+    { { { 27, 0, 4 }, { 24, 31, 0 } } },
+    { { { 28, 0, 4 }, { 24, 31, 1 } } },
+    { { { 28, 0, 3 }, { 24, 31, 2 } } },
+    { { { 28, 0, 2 }, { 25, 31, 1 } } },
+    { { { 28, 0, 1 }, { 25, 31, 0 } } },
+    { { { 28, 0, 0 }, { 28, 28, 0 } } },
+    { { { 28, 0, 1 }, { 28, 28, 1 } } },
+    { { { 28, 0, 2 }, { 26, 31, 1 } } },
+    { { { 28, 0, 3 }, { 26, 31, 0 } } },
+    { { { 28, 0, 4 }, { 28, 29, 0 } } },
+    { { { 29, 0, 3 }, { 28, 29, 1 } } },
+    { { { 29, 0, 2 }, { 27, 31, 1 } } },
+    { { { 29, 0, 1 }, { 27, 31, 0 } } },
+    { { { 29, 0, 0 }, { 28, 30, 0 } } },
+    { { { 29, 0, 1 }, { 28, 30, 1 } } },
+    { { { 29, 0, 2 }, { 28, 30, 2 } } },
+    { { { 29, 0, 3 }, { 28, 31, 1 } } },
+    { { { 29, 0, 4 }, { 28, 31, 0 } } },
+    { { { 30, 0, 3 }, { 28, 31, 1 } } },
+    { { { 30, 0, 2 }, { 28, 31, 2 } } },
+    { { { 30, 0, 1 }, { 29, 31, 1 } } },
+    { { { 30, 0, 0 }, { 29, 31, 0 } } },
+    { { { 30, 0, 1 }, { 29, 31, 1 } } },
+    { { { 30, 0, 2 }, { 29, 31, 2 } } },
+    { { { 30, 0, 3 }, { 30, 31, 1 } } },
+    { { { 30, 0, 4 }, { 30, 31, 0 } } },
+    { { { 31, 0, 3 }, { 30, 31, 1 } } },
+    { { { 31, 0, 2 }, { 30, 31, 2 } } },
+    { { { 31, 0, 1 }, { 31, 31, 1 } } },
+    { { { 31, 0, 0 }, { 31, 31, 0 } } }
+};
+
+static SingleColourLookup const lookup_6_3[] =
+{
+    { { { 0, 0, 0 }, { 0, 0, 0 } } },
+    { { { 0, 0, 1 }, { 0, 1, 1 } } },
+    { { { 0, 0, 2 }, { 0, 1, 0 } } },
+    { { { 1, 0, 1 }, { 0, 2, 1 } } },
+    { { { 1, 0, 0 }, { 0, 2, 0 } } },
+    { { { 1, 0, 1 }, { 0, 3, 1 } } },
+    { { { 1, 0, 2 }, { 0, 3, 0 } } },
+    { { { 2, 0, 1 }, { 0, 4, 1 } } },
+    { { { 2, 0, 0 }, { 0, 4, 0 } } },
+    { { { 2, 0, 1 }, { 0, 5, 1 } } },
+    { { { 2, 0, 2 }, { 0, 5, 0 } } },
+    { { { 3, 0, 1 }, { 0, 6, 1 } } },
+    { { { 3, 0, 0 }, { 0, 6, 0 } } },
+    { { { 3, 0, 1 }, { 0, 7, 1 } } },
+    { { { 3, 0, 2 }, { 0, 7, 0 } } },
+    { { { 4, 0, 1 }, { 0, 8, 1 } } },
+    { { { 4, 0, 0 }, { 0, 8, 0 } } },
+    { { { 4, 0, 1 }, { 0, 9, 1 } } },
+    { { { 4, 0, 2 }, { 0, 9, 0 } } },
+    { { { 5, 0, 1 }, { 0, 10, 1 } } },
+    { { { 5, 0, 0 }, { 0, 10, 0 } } },
+    { { { 5, 0, 1 }, { 0, 11, 1 } } },
+    { { { 5, 0, 2 }, { 0, 11, 0 } } },
+    { { { 6, 0, 1 }, { 0, 12, 1 } } },
+    { { { 6, 0, 0 }, { 0, 12, 0 } } },
+    { { { 6, 0, 1 }, { 0, 13, 1 } } },
+    { { { 6, 0, 2 }, { 0, 13, 0 } } },
+    { { { 7, 0, 1 }, { 0, 14, 1 } } },
+    { { { 7, 0, 0 }, { 0, 14, 0 } } },
+    { { { 7, 0, 1 }, { 0, 15, 1 } } },
+    { { { 7, 0, 2 }, { 0, 15, 0 } } },
+    { { { 8, 0, 1 }, { 0, 16, 1 } } },
+    { { { 8, 0, 0 }, { 0, 16, 0 } } },
+    { { { 8, 0, 1 }, { 0, 17, 1 } } },
+    { { { 8, 0, 2 }, { 0, 17, 0 } } },
+    { { { 9, 0, 1 }, { 0, 18, 1 } } },
+    { { { 9, 0, 0 }, { 0, 18, 0 } } },
+    { { { 9, 0, 1 }, { 0, 19, 1 } } },
+    { { { 9, 0, 2 }, { 0, 19, 0 } } },
+    { { { 10, 0, 1 }, { 0, 20, 1 } } },
+    { { { 10, 0, 0 }, { 0, 20, 0 } } },
+    { { { 10, 0, 1 }, { 0, 21, 1 } } },
+    { { { 10, 0, 2 }, { 0, 21, 0 } } },
+    { { { 11, 0, 1 }, { 0, 22, 1 } } },
+    { { { 11, 0, 0 }, { 0, 22, 0 } } },
+    { { { 11, 0, 1 }, { 0, 23, 1 } } },
+    { { { 11, 0, 2 }, { 0, 23, 0 } } },
+    { { { 12, 0, 1 }, { 0, 24, 1 } } },
+    { { { 12, 0, 0 }, { 0, 24, 0 } } },
+    { { { 12, 0, 1 }, { 0, 25, 1 } } },
+    { { { 12, 0, 2 }, { 0, 25, 0 } } },
+    { { { 13, 0, 1 }, { 0, 26, 1 } } },
+    { { { 13, 0, 0 }, { 0, 26, 0 } } },
+    { { { 13, 0, 1 }, { 0, 27, 1 } } },
+    { { { 13, 0, 2 }, { 0, 27, 0 } } },
+    { { { 14, 0, 1 }, { 0, 28, 1 } } },
+    { { { 14, 0, 0 }, { 0, 28, 0 } } },
+    { { { 14, 0, 1 }, { 0, 29, 1 } } },
+    { { { 14, 0, 2 }, { 0, 29, 0 } } },
+    { { { 15, 0, 1 }, { 0, 30, 1 } } },
+    { { { 15, 0, 0 }, { 0, 30, 0 } } },
+    { { { 15, 0, 1 }, { 0, 31, 1 } } },
+    { { { 15, 0, 2 }, { 0, 31, 0 } } },
+    { { { 16, 0, 2 }, { 1, 31, 1 } } },
+    { { { 16, 0, 1 }, { 1, 31, 0 } } },
+    { { { 16, 0, 0 }, { 0, 32, 0 } } },
+    { { { 16, 0, 1 }, { 2, 31, 0 } } },
+    { { { 16, 0, 2 }, { 0, 33, 0 } } },
+    { { { 17, 0, 1 }, { 3, 31, 0 } } },
+    { { { 17, 0, 0 }, { 0, 34, 0 } } },
+    { { { 17, 0, 1 }, { 4, 31, 0 } } },
+    { { { 17, 0, 2 }, { 0, 35, 0 } } },
+    { { { 18, 0, 1 }, { 5, 31, 0 } } },
+    { { { 18, 0, 0 }, { 0, 36, 0 } } },
+    { { { 18, 0, 1 }, { 6, 31, 0 } } },
+    { { { 18, 0, 2 }, { 0, 37, 0 } } },
+    { { { 19, 0, 1 }, { 7, 31, 0 } } },
+    { { { 19, 0, 0 }, { 0, 38, 0 } } },
+    { { { 19, 0, 1 }, { 8, 31, 0 } } },
+    { { { 19, 0, 2 }, { 0, 39, 0 } } },
+    { { { 20, 0, 1 }, { 9, 31, 0 } } },
+    { { { 20, 0, 0 }, { 0, 40, 0 } } },
+    { { { 20, 0, 1 }, { 10, 31, 0 } } },
+    { { { 20, 0, 2 }, { 0, 41, 0 } } },
+    { { { 21, 0, 1 }, { 11, 31, 0 } } },
+    { { { 21, 0, 0 }, { 0, 42, 0 } } },
+    { { { 21, 0, 1 }, { 12, 31, 0 } } },
+    { { { 21, 0, 2 }, { 0, 43, 0 } } },
+    { { { 22, 0, 1 }, { 13, 31, 0 } } },
+    { { { 22, 0, 0 }, { 0, 44, 0 } } },
+    { { { 22, 0, 1 }, { 14, 31, 0 } } },
+    { { { 22, 0, 2 }, { 0, 45, 0 } } },
+    { { { 23, 0, 1 }, { 15, 31, 0 } } },
+    { { { 23, 0, 0 }, { 0, 46, 0 } } },
+    { { { 23, 0, 1 }, { 0, 47, 1 } } },
+    { { { 23, 0, 2 }, { 0, 47, 0 } } },
+    { { { 24, 0, 1 }, { 0, 48, 1 } } },
+    { { { 24, 0, 0 }, { 0, 48, 0 } } },
+    { { { 24, 0, 1 }, { 0, 49, 1 } } },
+    { { { 24, 0, 2 }, { 0, 49, 0 } } },
+    { { { 25, 0, 1 }, { 0, 50, 1 } } },
+    { { { 25, 0, 0 }, { 0, 50, 0 } } },
+    { { { 25, 0, 1 }, { 0, 51, 1 } } },
+    { { { 25, 0, 2 }, { 0, 51, 0 } } },
+    { { { 26, 0, 1 }, { 0, 52, 1 } } },
+    { { { 26, 0, 0 }, { 0, 52, 0 } } },
+    { { { 26, 0, 1 }, { 0, 53, 1 } } },
+    { { { 26, 0, 2 }, { 0, 53, 0 } } },
+    { { { 27, 0, 1 }, { 0, 54, 1 } } },
+    { { { 27, 0, 0 }, { 0, 54, 0 } } },
+    { { { 27, 0, 1 }, { 0, 55, 1 } } },
+    { { { 27, 0, 2 }, { 0, 55, 0 } } },
+    { { { 28, 0, 1 }, { 0, 56, 1 } } },
+    { { { 28, 0, 0 }, { 0, 56, 0 } } },
+    { { { 28, 0, 1 }, { 0, 57, 1 } } },
+    { { { 28, 0, 2 }, { 0, 57, 0 } } },
+    { { { 29, 0, 1 }, { 0, 58, 1 } } },
+    { { { 29, 0, 0 }, { 0, 58, 0 } } },
+    { { { 29, 0, 1 }, { 0, 59, 1 } } },
+    { { { 29, 0, 2 }, { 0, 59, 0 } } },
+    { { { 30, 0, 1 }, { 0, 60, 1 } } },
+    { { { 30, 0, 0 }, { 0, 60, 0 } } },
+    { { { 30, 0, 1 }, { 0, 61, 1 } } },
+    { { { 30, 0, 2 }, { 0, 61, 0 } } },
+    { { { 31, 0, 1 }, { 0, 62, 1 } } },
+    { { { 31, 0, 0 }, { 0, 62, 0 } } },
+    { { { 31, 0, 1 }, { 0, 63, 1 } } },
+    { { { 31, 0, 2 }, { 0, 63, 0 } } },
+    { { { 32, 0, 2 }, { 1, 63, 1 } } },
+    { { { 32, 0, 1 }, { 1, 63, 0 } } },
+    { { { 32, 0, 0 }, { 16, 48, 0 } } },
+    { { { 32, 0, 1 }, { 2, 63, 0 } } },
+    { { { 32, 0, 2 }, { 16, 49, 0 } } },
+    { { { 33, 0, 1 }, { 3, 63, 0 } } },
+    { { { 33, 0, 0 }, { 16, 50, 0 } } },
+    { { { 33, 0, 1 }, { 4, 63, 0 } } },
+    { { { 33, 0, 2 }, { 16, 51, 0 } } },
+    { { { 34, 0, 1 }, { 5, 63, 0 } } },
+    { { { 34, 0, 0 }, { 16, 52, 0 } } },
+    { { { 34, 0, 1 }, { 6, 63, 0 } } },
+    { { { 34, 0, 2 }, { 16, 53, 0 } } },
+    { { { 35, 0, 1 }, { 7, 63, 0 } } },
+    { { { 35, 0, 0 }, { 16, 54, 0 } } },
+    { { { 35, 0, 1 }, { 8, 63, 0 } } },
+    { { { 35, 0, 2 }, { 16, 55, 0 } } },
+    { { { 36, 0, 1 }, { 9, 63, 0 } } },
+    { { { 36, 0, 0 }, { 16, 56, 0 } } },
+    { { { 36, 0, 1 }, { 10, 63, 0 } } },
+    { { { 36, 0, 2 }, { 16, 57, 0 } } },
+    { { { 37, 0, 1 }, { 11, 63, 0 } } },
+    { { { 37, 0, 0 }, { 16, 58, 0 } } },
+    { { { 37, 0, 1 }, { 12, 63, 0 } } },
+    { { { 37, 0, 2 }, { 16, 59, 0 } } },
+    { { { 38, 0, 1 }, { 13, 63, 0 } } },
+    { { { 38, 0, 0 }, { 16, 60, 0 } } },
+    { { { 38, 0, 1 }, { 14, 63, 0 } } },
+    { { { 38, 0, 2 }, { 16, 61, 0 } } },
+    { { { 39, 0, 1 }, { 15, 63, 0 } } },
+    { { { 39, 0, 0 }, { 16, 62, 0 } } },
+    { { { 39, 0, 1 }, { 16, 63, 1 } } },
+    { { { 39, 0, 2 }, { 16, 63, 0 } } },
+    { { { 40, 0, 1 }, { 17, 63, 1 } } },
+    { { { 40, 0, 0 }, { 17, 63, 0 } } },
+    { { { 40, 0, 1 }, { 18, 63, 1 } } },
+    { { { 40, 0, 2 }, { 18, 63, 0 } } },
+    { { { 41, 0, 1 }, { 19, 63, 1 } } },
+    { { { 41, 0, 0 }, { 19, 63, 0 } } },
+    { { { 41, 0, 1 }, { 20, 63, 1 } } },
+    { { { 41, 0, 2 }, { 20, 63, 0 } } },
+    { { { 42, 0, 1 }, { 21, 63, 1 } } },
+    { { { 42, 0, 0 }, { 21, 63, 0 } } },
+    { { { 42, 0, 1 }, { 22, 63, 1 } } },
+    { { { 42, 0, 2 }, { 22, 63, 0 } } },
+    { { { 43, 0, 1 }, { 23, 63, 1 } } },
+    { { { 43, 0, 0 }, { 23, 63, 0 } } },
+    { { { 43, 0, 1 }, { 24, 63, 1 } } },
+    { { { 43, 0, 2 }, { 24, 63, 0 } } },
+    { { { 44, 0, 1 }, { 25, 63, 1 } } },
+    { { { 44, 0, 0 }, { 25, 63, 0 } } },
+    { { { 44, 0, 1 }, { 26, 63, 1 } } },
+    { { { 44, 0, 2 }, { 26, 63, 0 } } },
+    { { { 45, 0, 1 }, { 27, 63, 1 } } },
+    { { { 45, 0, 0 }, { 27, 63, 0 } } },
+    { { { 45, 0, 1 }, { 28, 63, 1 } } },
+    { { { 45, 0, 2 }, { 28, 63, 0 } } },
+    { { { 46, 0, 1 }, { 29, 63, 1 } } },
+    { { { 46, 0, 0 }, { 29, 63, 0 } } },
+    { { { 46, 0, 1 }, { 30, 63, 1 } } },
+    { { { 46, 0, 2 }, { 30, 63, 0 } } },
+    { { { 47, 0, 1 }, { 31, 63, 1 } } },
+    { { { 47, 0, 0 }, { 31, 63, 0 } } },
+    { { { 47, 0, 1 }, { 32, 63, 1 } } },
+    { { { 47, 0, 2 }, { 32, 63, 0 } } },
+    { { { 48, 0, 2 }, { 33, 63, 1 } } },
+    { { { 48, 0, 1 }, { 33, 63, 0 } } },
+    { { { 48, 0, 0 }, { 48, 48, 0 } } },
+    { { { 48, 0, 1 }, { 34, 63, 0 } } },
+    { { { 48, 0, 2 }, { 48, 49, 0 } } },
+    { { { 49, 0, 1 }, { 35, 63, 0 } } },
+    { { { 49, 0, 0 }, { 48, 50, 0 } } },
+    { { { 49, 0, 1 }, { 36, 63, 0 } } },
+    { { { 49, 0, 2 }, { 48, 51, 0 } } },
+    { { { 50, 0, 1 }, { 37, 63, 0 } } },
+    { { { 50, 0, 0 }, { 48, 52, 0 } } },
+    { { { 50, 0, 1 }, { 38, 63, 0 } } },
+    { { { 50, 0, 2 }, { 48, 53, 0 } } },
+    { { { 51, 0, 1 }, { 39, 63, 0 } } },
+    { { { 51, 0, 0 }, { 48, 54, 0 } } },
+    { { { 51, 0, 1 }, { 40, 63, 0 } } },
+    { { { 51, 0, 2 }, { 48, 55, 0 } } },
+    { { { 52, 0, 1 }, { 41, 63, 0 } } },
+    { { { 52, 0, 0 }, { 48, 56, 0 } } },
+    { { { 52, 0, 1 }, { 42, 63, 0 } } },
+    { { { 52, 0, 2 }, { 48, 57, 0 } } },
+    { { { 53, 0, 1 }, { 43, 63, 0 } } },
+    { { { 53, 0, 0 }, { 48, 58, 0 } } },
+    { { { 53, 0, 1 }, { 44, 63, 0 } } },
+    { { { 53, 0, 2 }, { 48, 59, 0 } } },
+    { { { 54, 0, 1 }, { 45, 63, 0 } } },
+    { { { 54, 0, 0 }, { 48, 60, 0 } } },
+    { { { 54, 0, 1 }, { 46, 63, 0 } } },
+    { { { 54, 0, 2 }, { 48, 61, 0 } } },
+    { { { 55, 0, 1 }, { 47, 63, 0 } } },
+    { { { 55, 0, 0 }, { 48, 62, 0 } } },
+    { { { 55, 0, 1 }, { 48, 63, 1 } } },
+    { { { 55, 0, 2 }, { 48, 63, 0 } } },
+    { { { 56, 0, 1 }, { 49, 63, 1 } } },
+    { { { 56, 0, 0 }, { 49, 63, 0 } } },
+    { { { 56, 0, 1 }, { 50, 63, 1 } } },
+    { { { 56, 0, 2 }, { 50, 63, 0 } } },
+    { { { 57, 0, 1 }, { 51, 63, 1 } } },
+    { { { 57, 0, 0 }, { 51, 63, 0 } } },
+    { { { 57, 0, 1 }, { 52, 63, 1 } } },
+    { { { 57, 0, 2 }, { 52, 63, 0 } } },
+    { { { 58, 0, 1 }, { 53, 63, 1 } } },
+    { { { 58, 0, 0 }, { 53, 63, 0 } } },
+    { { { 58, 0, 1 }, { 54, 63, 1 } } },
+    { { { 58, 0, 2 }, { 54, 63, 0 } } },
+    { { { 59, 0, 1 }, { 55, 63, 1 } } },
+    { { { 59, 0, 0 }, { 55, 63, 0 } } },
+    { { { 59, 0, 1 }, { 56, 63, 1 } } },
+    { { { 59, 0, 2 }, { 56, 63, 0 } } },
+    { { { 60, 0, 1 }, { 57, 63, 1 } } },
+    { { { 60, 0, 0 }, { 57, 63, 0 } } },
+    { { { 60, 0, 1 }, { 58, 63, 1 } } },
+    { { { 60, 0, 2 }, { 58, 63, 0 } } },
+    { { { 61, 0, 1 }, { 59, 63, 1 } } },
+    { { { 61, 0, 0 }, { 59, 63, 0 } } },
+    { { { 61, 0, 1 }, { 60, 63, 1 } } },
+    { { { 61, 0, 2 }, { 60, 63, 0 } } },
+    { { { 62, 0, 1 }, { 61, 63, 1 } } },
+    { { { 62, 0, 0 }, { 61, 63, 0 } } },
+    { { { 62, 0, 1 }, { 62, 63, 1 } } },
+    { { { 62, 0, 2 }, { 62, 63, 0 } } },
+    { { { 63, 0, 1 }, { 63, 63, 1 } } },
+    { { { 63, 0, 0 }, { 63, 63, 0 } } }
+};
+
+static SingleColourLookup const lookup_5_4[] =
+{
+    { { { 0, 0, 0 }, { 0, 0, 0 } } },
+    { { { 0, 0, 1 }, { 0, 1, 1 } } },
+    { { { 0, 0, 2 }, { 0, 1, 0 } } },
+    { { { 0, 0, 3 }, { 0, 1, 1 } } },
+    { { { 0, 0, 4 }, { 0, 2, 1 } } },
+    { { { 1, 0, 3 }, { 0, 2, 0 } } },
+    { { { 1, 0, 2 }, { 0, 2, 1 } } },
+    { { { 1, 0, 1 }, { 0, 3, 1 } } },
+    { { { 1, 0, 0 }, { 0, 3, 0 } } },
+    { { { 1, 0, 1 }, { 1, 2, 1 } } },
+    { { { 1, 0, 2 }, { 1, 2, 0 } } },
+    { { { 1, 0, 3 }, { 0, 4, 0 } } },
+    { { { 1, 0, 4 }, { 0, 5, 1 } } },
+    { { { 2, 0, 3 }, { 0, 5, 0 } } },
+    { { { 2, 0, 2 }, { 0, 5, 1 } } },
+    { { { 2, 0, 1 }, { 0, 6, 1 } } },
+    { { { 2, 0, 0 }, { 0, 6, 0 } } },
+    { { { 2, 0, 1 }, { 2, 3, 1 } } },
+    { { { 2, 0, 2 }, { 2, 3, 0 } } },
+    { { { 2, 0, 3 }, { 0, 7, 0 } } },
+    { { { 2, 0, 4 }, { 1, 6, 1 } } },
+    { { { 3, 0, 3 }, { 1, 6, 0 } } },
+    { { { 3, 0, 2 }, { 0, 8, 0 } } },
+    { { { 3, 0, 1 }, { 0, 9, 1 } } },
+    { { { 3, 0, 0 }, { 0, 9, 0 } } },
+    { { { 3, 0, 1 }, { 0, 9, 1 } } },
+    { { { 3, 0, 2 }, { 0, 10, 1 } } },
+    { { { 3, 0, 3 }, { 0, 10, 0 } } },
+    { { { 3, 0, 4 }, { 2, 7, 1 } } },
+    { { { 4, 0, 4 }, { 2, 7, 0 } } },
+    { { { 4, 0, 3 }, { 0, 11, 0 } } },
+    { { { 4, 0, 2 }, { 1, 10, 1 } } },
+    { { { 4, 0, 1 }, { 1, 10, 0 } } },
+    { { { 4, 0, 0 }, { 0, 12, 0 } } },
+    { { { 4, 0, 1 }, { 0, 13, 1 } } },
+    { { { 4, 0, 2 }, { 0, 13, 0 } } },
+    { { { 4, 0, 3 }, { 0, 13, 1 } } },
+    { { { 4, 0, 4 }, { 0, 14, 1 } } },
+    { { { 5, 0, 3 }, { 0, 14, 0 } } },
+    { { { 5, 0, 2 }, { 2, 11, 1 } } },
+    { { { 5, 0, 1 }, { 2, 11, 0 } } },
+    { { { 5, 0, 0 }, { 0, 15, 0 } } },
+    { { { 5, 0, 1 }, { 1, 14, 1 } } },
+    { { { 5, 0, 2 }, { 1, 14, 0 } } },
+    { { { 5, 0, 3 }, { 0, 16, 0 } } },
+    { { { 5, 0, 4 }, { 0, 17, 1 } } },
+    { { { 6, 0, 3 }, { 0, 17, 0 } } },
+    { { { 6, 0, 2 }, { 0, 17, 1 } } },
+    { { { 6, 0, 1 }, { 0, 18, 1 } } },
+    { { { 6, 0, 0 }, { 0, 18, 0 } } },
+    { { { 6, 0, 1 }, { 2, 15, 1 } } },
+    { { { 6, 0, 2 }, { 2, 15, 0 } } },
+    { { { 6, 0, 3 }, { 0, 19, 0 } } },
+    { { { 6, 0, 4 }, { 1, 18, 1 } } },
+    { { { 7, 0, 3 }, { 1, 18, 0 } } },
+    { { { 7, 0, 2 }, { 0, 20, 0 } } },
+    { { { 7, 0, 1 }, { 0, 21, 1 } } },
+    { { { 7, 0, 0 }, { 0, 21, 0 } } },
+    { { { 7, 0, 1 }, { 0, 21, 1 } } },
+    { { { 7, 0, 2 }, { 0, 22, 1 } } },
+    { { { 7, 0, 3 }, { 0, 22, 0 } } },
+    { { { 7, 0, 4 }, { 2, 19, 1 } } },
+    { { { 8, 0, 4 }, { 2, 19, 0 } } },
+    { { { 8, 0, 3 }, { 0, 23, 0 } } },
+    { { { 8, 0, 2 }, { 1, 22, 1 } } },
+    { { { 8, 0, 1 }, { 1, 22, 0 } } },
+    { { { 8, 0, 0 }, { 0, 24, 0 } } },
+    { { { 8, 0, 1 }, { 0, 25, 1 } } },
+    { { { 8, 0, 2 }, { 0, 25, 0 } } },
+    { { { 8, 0, 3 }, { 0, 25, 1 } } },
+    { { { 8, 0, 4 }, { 0, 26, 1 } } },
+    { { { 9, 0, 3 }, { 0, 26, 0 } } },
+    { { { 9, 0, 2 }, { 2, 23, 1 } } },
+    { { { 9, 0, 1 }, { 2, 23, 0 } } },
+    { { { 9, 0, 0 }, { 0, 27, 0 } } },
+    { { { 9, 0, 1 }, { 1, 26, 1 } } },
+    { { { 9, 0, 2 }, { 1, 26, 0 } } },
+    { { { 9, 0, 3 }, { 0, 28, 0 } } },
+    { { { 9, 0, 4 }, { 0, 29, 1 } } },
+    { { { 10, 0, 3 }, { 0, 29, 0 } } },
+    { { { 10, 0, 2 }, { 0, 29, 1 } } },
+    { { { 10, 0, 1 }, { 0, 30, 1 } } },
+    { { { 10, 0, 0 }, { 0, 30, 0 } } },
+    { { { 10, 0, 1 }, { 2, 27, 1 } } },
+    { { { 10, 0, 2 }, { 2, 27, 0 } } },
+    { { { 10, 0, 3 }, { 0, 31, 0 } } },
+    { { { 10, 0, 4 }, { 1, 30, 1 } } },
+    { { { 11, 0, 3 }, { 1, 30, 0 } } },
+    { { { 11, 0, 2 }, { 4, 24, 0 } } },
+    { { { 11, 0, 1 }, { 1, 31, 1 } } },
+    { { { 11, 0, 0 }, { 1, 31, 0 } } },
+    { { { 11, 0, 1 }, { 1, 31, 1 } } },
+    { { { 11, 0, 2 }, { 2, 30, 1 } } },
+    { { { 11, 0, 3 }, { 2, 30, 0 } } },
+    { { { 11, 0, 4 }, { 2, 31, 1 } } },
+    { { { 12, 0, 4 }, { 2, 31, 0 } } },
+    { { { 12, 0, 3 }, { 4, 27, 0 } } },
+    { { { 12, 0, 2 }, { 3, 30, 1 } } },
+    { { { 12, 0, 1 }, { 3, 30, 0 } } },
+    { { { 12, 0, 0 }, { 4, 28, 0 } } },
+    { { { 12, 0, 1 }, { 3, 31, 1 } } },
+    { { { 12, 0, 2 }, { 3, 31, 0 } } },
+    { { { 12, 0, 3 }, { 3, 31, 1 } } },
+    { { { 12, 0, 4 }, { 4, 30, 1 } } },
+    { { { 13, 0, 3 }, { 4, 30, 0 } } },
+    { { { 13, 0, 2 }, { 6, 27, 1 } } },
+    { { { 13, 0, 1 }, { 6, 27, 0 } } },
+    { { { 13, 0, 0 }, { 4, 31, 0 } } },
+    { { { 13, 0, 1 }, { 5, 30, 1 } } },
+    { { { 13, 0, 2 }, { 5, 30, 0 } } },
+    { { { 13, 0, 3 }, { 8, 24, 0 } } },
+    { { { 13, 0, 4 }, { 5, 31, 1 } } },
+    { { { 14, 0, 3 }, { 5, 31, 0 } } },
+    { { { 14, 0, 2 }, { 5, 31, 1 } } },
+    { { { 14, 0, 1 }, { 6, 30, 1 } } },
+    { { { 14, 0, 0 }, { 6, 30, 0 } } },
+    { { { 14, 0, 1 }, { 6, 31, 1 } } },
+    { { { 14, 0, 2 }, { 6, 31, 0 } } },
+    { { { 14, 0, 3 }, { 8, 27, 0 } } },
+    { { { 14, 0, 4 }, { 7, 30, 1 } } },
+    { { { 15, 0, 3 }, { 7, 30, 0 } } },
+    { { { 15, 0, 2 }, { 8, 28, 0 } } },
+    { { { 15, 0, 1 }, { 7, 31, 1 } } },
+    { { { 15, 0, 0 }, { 7, 31, 0 } } },
+    { { { 15, 0, 1 }, { 7, 31, 1 } } },
+    { { { 15, 0, 2 }, { 8, 30, 1 } } },
+    { { { 15, 0, 3 }, { 8, 30, 0 } } },
+    { { { 15, 0, 4 }, { 10, 27, 1 } } },
+    { { { 16, 0, 4 }, { 10, 27, 0 } } },
+    { { { 16, 0, 3 }, { 8, 31, 0 } } },
+    { { { 16, 0, 2 }, { 9, 30, 1 } } },
+    { { { 16, 0, 1 }, { 9, 30, 0 } } },
+    { { { 16, 0, 0 }, { 12, 24, 0 } } },
+    { { { 16, 0, 1 }, { 9, 31, 1 } } },
+    { { { 16, 0, 2 }, { 9, 31, 0 } } },
+    { { { 16, 0, 3 }, { 9, 31, 1 } } },
+    { { { 16, 0, 4 }, { 10, 30, 1 } } },
+    { { { 17, 0, 3 }, { 10, 30, 0 } } },
+    { { { 17, 0, 2 }, { 10, 31, 1 } } },
+    { { { 17, 0, 1 }, { 10, 31, 0 } } },
+    { { { 17, 0, 0 }, { 12, 27, 0 } } },
+    { { { 17, 0, 1 }, { 11, 30, 1 } } },
+    { { { 17, 0, 2 }, { 11, 30, 0 } } },
+    { { { 17, 0, 3 }, { 12, 28, 0 } } },
+    { { { 17, 0, 4 }, { 11, 31, 1 } } },
+    { { { 18, 0, 3 }, { 11, 31, 0 } } },
+    { { { 18, 0, 2 }, { 11, 31, 1 } } },
+    { { { 18, 0, 1 }, { 12, 30, 1 } } },
+    { { { 18, 0, 0 }, { 12, 30, 0 } } },
+    { { { 18, 0, 1 }, { 14, 27, 1 } } },
+    { { { 18, 0, 2 }, { 14, 27, 0 } } },
+    { { { 18, 0, 3 }, { 12, 31, 0 } } },
+    { { { 18, 0, 4 }, { 13, 30, 1 } } },
+    { { { 19, 0, 3 }, { 13, 30, 0 } } },
+    { { { 19, 0, 2 }, { 16, 24, 0 } } },
+    { { { 19, 0, 1 }, { 13, 31, 1 } } },
+    { { { 19, 0, 0 }, { 13, 31, 0 } } },
+    { { { 19, 0, 1 }, { 13, 31, 1 } } },
+    { { { 19, 0, 2 }, { 14, 30, 1 } } },
+    { { { 19, 0, 3 }, { 14, 30, 0 } } },
+    { { { 19, 0, 4 }, { 14, 31, 1 } } },
+    { { { 20, 0, 4 }, { 14, 31, 0 } } },
+    { { { 20, 0, 3 }, { 16, 27, 0 } } },
+    { { { 20, 0, 2 }, { 15, 30, 1 } } },
+    { { { 20, 0, 1 }, { 15, 30, 0 } } },
+    { { { 20, 0, 0 }, { 16, 28, 0 } } },
+    { { { 20, 0, 1 }, { 15, 31, 1 } } },
+    { { { 20, 0, 2 }, { 15, 31, 0 } } },
+    { { { 20, 0, 3 }, { 15, 31, 1 } } },
+    { { { 20, 0, 4 }, { 16, 30, 1 } } },
+    { { { 21, 0, 3 }, { 16, 30, 0 } } },
+    { { { 21, 0, 2 }, { 18, 27, 1 } } },
+    { { { 21, 0, 1 }, { 18, 27, 0 } } },
+    { { { 21, 0, 0 }, { 16, 31, 0 } } },
+    { { { 21, 0, 1 }, { 17, 30, 1 } } },
+    { { { 21, 0, 2 }, { 17, 30, 0 } } },
+    { { { 21, 0, 3 }, { 20, 24, 0 } } },
+    { { { 21, 0, 4 }, { 17, 31, 1 } } },
+    { { { 22, 0, 3 }, { 17, 31, 0 } } },
+    { { { 22, 0, 2 }, { 17, 31, 1 } } },
+    { { { 22, 0, 1 }, { 18, 30, 1 } } },
+    { { { 22, 0, 0 }, { 18, 30, 0 } } },
+    { { { 22, 0, 1 }, { 18, 31, 1 } } },
+    { { { 22, 0, 2 }, { 18, 31, 0 } } },
+    { { { 22, 0, 3 }, { 20, 27, 0 } } },
+    { { { 22, 0, 4 }, { 19, 30, 1 } } },
+    { { { 23, 0, 3 }, { 19, 30, 0 } } },
+    { { { 23, 0, 2 }, { 20, 28, 0 } } },
+    { { { 23, 0, 1 }, { 19, 31, 1 } } },
+    { { { 23, 0, 0 }, { 19, 31, 0 } } },
+    { { { 23, 0, 1 }, { 19, 31, 1 } } },
+    { { { 23, 0, 2 }, { 20, 30, 1 } } },
+    { { { 23, 0, 3 }, { 20, 30, 0 } } },
+    { { { 23, 0, 4 }, { 22, 27, 1 } } },
+    { { { 24, 0, 4 }, { 22, 27, 0 } } },
+    { { { 24, 0, 3 }, { 20, 31, 0 } } },
+    { { { 24, 0, 2 }, { 21, 30, 1 } } },
+    { { { 24, 0, 1 }, { 21, 30, 0 } } },
+    { { { 24, 0, 0 }, { 24, 24, 0 } } },
+    { { { 24, 0, 1 }, { 21, 31, 1 } } },
+    { { { 24, 0, 2 }, { 21, 31, 0 } } },
+    { { { 24, 0, 3 }, { 21, 31, 1 } } },
+    { { { 24, 0, 4 }, { 22, 30, 1 } } },
+    { { { 25, 0, 3 }, { 22, 30, 0 } } },
+    { { { 25, 0, 2 }, { 22, 31, 1 } } },
+    { { { 25, 0, 1 }, { 22, 31, 0 } } },
+    { { { 25, 0, 0 }, { 24, 27, 0 } } },
+    { { { 25, 0, 1 }, { 23, 30, 1 } } },
+    { { { 25, 0, 2 }, { 23, 30, 0 } } },
+    { { { 25, 0, 3 }, { 24, 28, 0 } } },
+    { { { 25, 0, 4 }, { 23, 31, 1 } } },
+    { { { 26, 0, 3 }, { 23, 31, 0 } } },
+    { { { 26, 0, 2 }, { 23, 31, 1 } } },
+    { { { 26, 0, 1 }, { 24, 30, 1 } } },
+    { { { 26, 0, 0 }, { 24, 30, 0 } } },
+    { { { 26, 0, 1 }, { 26, 27, 1 } } },
+    { { { 26, 0, 2 }, { 26, 27, 0 } } },
+    { { { 26, 0, 3 }, { 24, 31, 0 } } },
+    { { { 26, 0, 4 }, { 25, 30, 1 } } },
+    { { { 27, 0, 3 }, { 25, 30, 0 } } },
+    { { { 27, 0, 2 }, { 28, 24, 0 } } },
+    { { { 27, 0, 1 }, { 25, 31, 1 } } },
+    { { { 27, 0, 0 }, { 25, 31, 0 } } },
+    { { { 27, 0, 1 }, { 25, 31, 1 } } },
+    { { { 27, 0, 2 }, { 26, 30, 1 } } },
+    { { { 27, 0, 3 }, { 26, 30, 0 } } },
+    { { { 27, 0, 4 }, { 26, 31, 1 } } },
+    { { { 28, 0, 4 }, { 26, 31, 0 } } },
+    { { { 28, 0, 3 }, { 28, 27, 0 } } },
+    { { { 28, 0, 2 }, { 27, 30, 1 } } },
+    { { { 28, 0, 1 }, { 27, 30, 0 } } },
+    { { { 28, 0, 0 }, { 28, 28, 0 } } },
+    { { { 28, 0, 1 }, { 27, 31, 1 } } },
+    { { { 28, 0, 2 }, { 27, 31, 0 } } },
+    { { { 28, 0, 3 }, { 27, 31, 1 } } },
+    { { { 28, 0, 4 }, { 28, 30, 1 } } },
+    { { { 29, 0, 3 }, { 28, 30, 0 } } },
+    { { { 29, 0, 2 }, { 30, 27, 1 } } },
+    { { { 29, 0, 1 }, { 30, 27, 0 } } },
+    { { { 29, 0, 0 }, { 28, 31, 0 } } },
+    { { { 29, 0, 1 }, { 29, 30, 1 } } },
+    { { { 29, 0, 2 }, { 29, 30, 0 } } },
+    { { { 29, 0, 3 }, { 29, 30, 1 } } },
+    { { { 29, 0, 4 }, { 29, 31, 1 } } },
+    { { { 30, 0, 3 }, { 29, 31, 0 } } },
+    { { { 30, 0, 2 }, { 29, 31, 1 } } },
+    { { { 30, 0, 1 }, { 30, 30, 1 } } },
+    { { { 30, 0, 0 }, { 30, 30, 0 } } },
+    { { { 30, 0, 1 }, { 30, 31, 1 } } },
+    { { { 30, 0, 2 }, { 30, 31, 0 } } },
+    { { { 30, 0, 3 }, { 30, 31, 1 } } },
+    { { { 30, 0, 4 }, { 31, 30, 1 } } },
+    { { { 31, 0, 3 }, { 31, 30, 0 } } },
+    { { { 31, 0, 2 }, { 31, 30, 1 } } },
+    { { { 31, 0, 1 }, { 31, 31, 1 } } },
+    { { { 31, 0, 0 }, { 31, 31, 0 } } }
+};
+
+static SingleColourLookup const lookup_6_4[] =
+{
+    { { { 0, 0, 0 }, { 0, 0, 0 } } },
+    { { { 0, 0, 1 }, { 0, 1, 0 } } },
+    { { { 0, 0, 2 }, { 0, 2, 0 } } },
+    { { { 1, 0, 1 }, { 0, 3, 1 } } },
+    { { { 1, 0, 0 }, { 0, 3, 0 } } },
+    { { { 1, 0, 1 }, { 0, 4, 0 } } },
+    { { { 1, 0, 2 }, { 0, 5, 0 } } },
+    { { { 2, 0, 1 }, { 0, 6, 1 } } },
+    { { { 2, 0, 0 }, { 0, 6, 0 } } },
+    { { { 2, 0, 1 }, { 0, 7, 0 } } },
+    { { { 2, 0, 2 }, { 0, 8, 0 } } },
+    { { { 3, 0, 1 }, { 0, 9, 1 } } },
+    { { { 3, 0, 0 }, { 0, 9, 0 } } },
+    { { { 3, 0, 1 }, { 0, 10, 0 } } },
+    { { { 3, 0, 2 }, { 0, 11, 0 } } },
+    { { { 4, 0, 1 }, { 0, 12, 1 } } },
+    { { { 4, 0, 0 }, { 0, 12, 0 } } },
+    { { { 4, 0, 1 }, { 0, 13, 0 } } },
+    { { { 4, 0, 2 }, { 0, 14, 0 } } },
+    { { { 5, 0, 1 }, { 0, 15, 1 } } },
+    { { { 5, 0, 0 }, { 0, 15, 0 } } },
+    { { { 5, 0, 1 }, { 0, 16, 0 } } },
+    { { { 5, 0, 2 }, { 1, 15, 0 } } },
+    { { { 6, 0, 1 }, { 0, 17, 0 } } },
+    { { { 6, 0, 0 }, { 0, 18, 0 } } },
+    { { { 6, 0, 1 }, { 0, 19, 0 } } },
+    { { { 6, 0, 2 }, { 3, 14, 0 } } },
+    { { { 7, 0, 1 }, { 0, 20, 0 } } },
+    { { { 7, 0, 0 }, { 0, 21, 0 } } },
+    { { { 7, 0, 1 }, { 0, 22, 0 } } },
+    { { { 7, 0, 2 }, { 4, 15, 0 } } },
+    { { { 8, 0, 1 }, { 0, 23, 0 } } },
+    { { { 8, 0, 0 }, { 0, 24, 0 } } },
+    { { { 8, 0, 1 }, { 0, 25, 0 } } },
+    { { { 8, 0, 2 }, { 6, 14, 0 } } },
+    { { { 9, 0, 1 }, { 0, 26, 0 } } },
+    { { { 9, 0, 0 }, { 0, 27, 0 } } },
+    { { { 9, 0, 1 }, { 0, 28, 0 } } },
+    { { { 9, 0, 2 }, { 7, 15, 0 } } },
+    { { { 10, 0, 1 }, { 0, 29, 0 } } },
+    { { { 10, 0, 0 }, { 0, 30, 0 } } },
+    { { { 10, 0, 1 }, { 0, 31, 0 } } },
+    { { { 10, 0, 2 }, { 9, 14, 0 } } },
+    { { { 11, 0, 1 }, { 0, 32, 0 } } },
+    { { { 11, 0, 0 }, { 0, 33, 0 } } },
+    { { { 11, 0, 1 }, { 2, 30, 0 } } },
+    { { { 11, 0, 2 }, { 0, 34, 0 } } },
+    { { { 12, 0, 1 }, { 0, 35, 0 } } },
+    { { { 12, 0, 0 }, { 0, 36, 0 } } },
+    { { { 12, 0, 1 }, { 3, 31, 0 } } },
+    { { { 12, 0, 2 }, { 0, 37, 0 } } },
+    { { { 13, 0, 1 }, { 0, 38, 0 } } },
+    { { { 13, 0, 0 }, { 0, 39, 0 } } },
+    { { { 13, 0, 1 }, { 5, 30, 0 } } },
+    { { { 13, 0, 2 }, { 0, 40, 0 } } },
+    { { { 14, 0, 1 }, { 0, 41, 0 } } },
+    { { { 14, 0, 0 }, { 0, 42, 0 } } },
+    { { { 14, 0, 1 }, { 6, 31, 0 } } },
+    { { { 14, 0, 2 }, { 0, 43, 0 } } },
+    { { { 15, 0, 1 }, { 0, 44, 0 } } },
+    { { { 15, 0, 0 }, { 0, 45, 0 } } },
+    { { { 15, 0, 1 }, { 8, 30, 0 } } },
+    { { { 15, 0, 2 }, { 0, 46, 0 } } },
+    { { { 16, 0, 2 }, { 0, 47, 0 } } },
+    { { { 16, 0, 1 }, { 1, 46, 0 } } },
+    { { { 16, 0, 0 }, { 0, 48, 0 } } },
+    { { { 16, 0, 1 }, { 0, 49, 0 } } },
+    { { { 16, 0, 2 }, { 0, 50, 0 } } },
+    { { { 17, 0, 1 }, { 2, 47, 0 } } },
+    { { { 17, 0, 0 }, { 0, 51, 0 } } },
+    { { { 17, 0, 1 }, { 0, 52, 0 } } },
+    { { { 17, 0, 2 }, { 0, 53, 0 } } },
+    { { { 18, 0, 1 }, { 4, 46, 0 } } },
+    { { { 18, 0, 0 }, { 0, 54, 0 } } },
+    { { { 18, 0, 1 }, { 0, 55, 0 } } },
+    { { { 18, 0, 2 }, { 0, 56, 0 } } },
+    { { { 19, 0, 1 }, { 5, 47, 0 } } },
+    { { { 19, 0, 0 }, { 0, 57, 0 } } },
+    { { { 19, 0, 1 }, { 0, 58, 0 } } },
+    { { { 19, 0, 2 }, { 0, 59, 0 } } },
+    { { { 20, 0, 1 }, { 7, 46, 0 } } },
+    { { { 20, 0, 0 }, { 0, 60, 0 } } },
+    { { { 20, 0, 1 }, { 0, 61, 0 } } },
+    { { { 20, 0, 2 }, { 0, 62, 0 } } },
+    { { { 21, 0, 1 }, { 8, 47, 0 } } },
+    { { { 21, 0, 0 }, { 0, 63, 0 } } },
+    { { { 21, 0, 1 }, { 1, 62, 0 } } },
+    { { { 21, 0, 2 }, { 1, 63, 0 } } },
+    { { { 22, 0, 1 }, { 10, 46, 0 } } },
+    { { { 22, 0, 0 }, { 2, 62, 0 } } },
+    { { { 22, 0, 1 }, { 2, 63, 0 } } },
+    { { { 22, 0, 2 }, { 3, 62, 0 } } },
+    { { { 23, 0, 1 }, { 11, 47, 0 } } },
+    { { { 23, 0, 0 }, { 3, 63, 0 } } },
+    { { { 23, 0, 1 }, { 4, 62, 0 } } },
+    { { { 23, 0, 2 }, { 4, 63, 0 } } },
+    { { { 24, 0, 1 }, { 13, 46, 0 } } },
+    { { { 24, 0, 0 }, { 5, 62, 0 } } },
+    { { { 24, 0, 1 }, { 5, 63, 0 } } },
+    { { { 24, 0, 2 }, { 6, 62, 0 } } },
+    { { { 25, 0, 1 }, { 14, 47, 0 } } },
+    { { { 25, 0, 0 }, { 6, 63, 0 } } },
+    { { { 25, 0, 1 }, { 7, 62, 0 } } },
+    { { { 25, 0, 2 }, { 7, 63, 0 } } },
+    { { { 26, 0, 1 }, { 16, 45, 0 } } },
+    { { { 26, 0, 0 }, { 8, 62, 0 } } },
+    { { { 26, 0, 1 }, { 8, 63, 0 } } },
+    { { { 26, 0, 2 }, { 9, 62, 0 } } },
+    { { { 27, 0, 1 }, { 16, 48, 0 } } },
+    { { { 27, 0, 0 }, { 9, 63, 0 } } },
+    { { { 27, 0, 1 }, { 10, 62, 0 } } },
+    { { { 27, 0, 2 }, { 10, 63, 0 } } },
+    { { { 28, 0, 1 }, { 16, 51, 0 } } },
+    { { { 28, 0, 0 }, { 11, 62, 0 } } },
+    { { { 28, 0, 1 }, { 11, 63, 0 } } },
+    { { { 28, 0, 2 }, { 12, 62, 0 } } },
+    { { { 29, 0, 1 }, { 16, 54, 0 } } },
+    { { { 29, 0, 0 }, { 12, 63, 0 } } },
+    { { { 29, 0, 1 }, { 13, 62, 0 } } },
+    { { { 29, 0, 2 }, { 13, 63, 0 } } },
+    { { { 30, 0, 1 }, { 16, 57, 0 } } },
+    { { { 30, 0, 0 }, { 14, 62, 0 } } },
+    { { { 30, 0, 1 }, { 14, 63, 0 } } },
+    { { { 30, 0, 2 }, { 15, 62, 0 } } },
+    { { { 31, 0, 1 }, { 16, 60, 0 } } },
+    { { { 31, 0, 0 }, { 15, 63, 0 } } },
+    { { { 31, 0, 1 }, { 24, 46, 0 } } },
+    { { { 31, 0, 2 }, { 16, 62, 0 } } },
+    { { { 32, 0, 2 }, { 16, 63, 0 } } },
+    { { { 32, 0, 1 }, { 17, 62, 0 } } },
+    { { { 32, 0, 0 }, { 25, 47, 0 } } },
+    { { { 32, 0, 1 }, { 17, 63, 0 } } },
+    { { { 32, 0, 2 }, { 18, 62, 0 } } },
+    { { { 33, 0, 1 }, { 18, 63, 0 } } },
+    { { { 33, 0, 0 }, { 27, 46, 0 } } },
+    { { { 33, 0, 1 }, { 19, 62, 0 } } },
+    { { { 33, 0, 2 }, { 19, 63, 0 } } },
+    { { { 34, 0, 1 }, { 20, 62, 0 } } },
+    { { { 34, 0, 0 }, { 28, 47, 0 } } },
+    { { { 34, 0, 1 }, { 20, 63, 0 } } },
+    { { { 34, 0, 2 }, { 21, 62, 0 } } },
+    { { { 35, 0, 1 }, { 21, 63, 0 } } },
+    { { { 35, 0, 0 }, { 30, 46, 0 } } },
+    { { { 35, 0, 1 }, { 22, 62, 0 } } },
+    { { { 35, 0, 2 }, { 22, 63, 0 } } },
+    { { { 36, 0, 1 }, { 23, 62, 0 } } },
+    { { { 36, 0, 0 }, { 31, 47, 0 } } },
+    { { { 36, 0, 1 }, { 23, 63, 0 } } },
+    { { { 36, 0, 2 }, { 24, 62, 0 } } },
+    { { { 37, 0, 1 }, { 24, 63, 0 } } },
+    { { { 37, 0, 0 }, { 32, 47, 0 } } },
+    { { { 37, 0, 1 }, { 25, 62, 0 } } },
+    { { { 37, 0, 2 }, { 25, 63, 0 } } },
+    { { { 38, 0, 1 }, { 26, 62, 0 } } },
+    { { { 38, 0, 0 }, { 32, 50, 0 } } },
+    { { { 38, 0, 1 }, { 26, 63, 0 } } },
+    { { { 38, 0, 2 }, { 27, 62, 0 } } },
+    { { { 39, 0, 1 }, { 27, 63, 0 } } },
+    { { { 39, 0, 0 }, { 32, 53, 0 } } },
+    { { { 39, 0, 1 }, { 28, 62, 0 } } },
+    { { { 39, 0, 2 }, { 28, 63, 0 } } },
+    { { { 40, 0, 1 }, { 29, 62, 0 } } },
+    { { { 40, 0, 0 }, { 32, 56, 0 } } },
+    { { { 40, 0, 1 }, { 29, 63, 0 } } },
+    { { { 40, 0, 2 }, { 30, 62, 0 } } },
+    { { { 41, 0, 1 }, { 30, 63, 0 } } },
+    { { { 41, 0, 0 }, { 32, 59, 0 } } },
+    { { { 41, 0, 1 }, { 31, 62, 0 } } },
+    { { { 41, 0, 2 }, { 31, 63, 0 } } },
+    { { { 42, 0, 1 }, { 32, 61, 0 } } },
+    { { { 42, 0, 0 }, { 32, 62, 0 } } },
+    { { { 42, 0, 1 }, { 32, 63, 0 } } },
+    { { { 42, 0, 2 }, { 41, 46, 0 } } },
+    { { { 43, 0, 1 }, { 33, 62, 0 } } },
+    { { { 43, 0, 0 }, { 33, 63, 0 } } },
+    { { { 43, 0, 1 }, { 34, 62, 0 } } },
+    { { { 43, 0, 2 }, { 42, 47, 0 } } },
+    { { { 44, 0, 1 }, { 34, 63, 0 } } },
+    { { { 44, 0, 0 }, { 35, 62, 0 } } },
+    { { { 44, 0, 1 }, { 35, 63, 0 } } },
+    { { { 44, 0, 2 }, { 44, 46, 0 } } },
+    { { { 45, 0, 1 }, { 36, 62, 0 } } },
+    { { { 45, 0, 0 }, { 36, 63, 0 } } },
+    { { { 45, 0, 1 }, { 37, 62, 0 } } },
+    { { { 45, 0, 2 }, { 45, 47, 0 } } },
+    { { { 46, 0, 1 }, { 37, 63, 0 } } },
+    { { { 46, 0, 0 }, { 38, 62, 0 } } },
+    { { { 46, 0, 1 }, { 38, 63, 0 } } },
+    { { { 46, 0, 2 }, { 47, 46, 0 } } },
+    { { { 47, 0, 1 }, { 39, 62, 0 } } },
+    { { { 47, 0, 0 }, { 39, 63, 0 } } },
+    { { { 47, 0, 1 }, { 40, 62, 0 } } },
+    { { { 47, 0, 2 }, { 48, 46, 0 } } },
+    { { { 48, 0, 2 }, { 40, 63, 0 } } },
+    { { { 48, 0, 1 }, { 41, 62, 0 } } },
+    { { { 48, 0, 0 }, { 41, 63, 0 } } },
+    { { { 48, 0, 1 }, { 48, 49, 0 } } },
+    { { { 48, 0, 2 }, { 42, 62, 0 } } },
+    { { { 49, 0, 1 }, { 42, 63, 0 } } },
+    { { { 49, 0, 0 }, { 43, 62, 0 } } },
+    { { { 49, 0, 1 }, { 48, 52, 0 } } },
+    { { { 49, 0, 2 }, { 43, 63, 0 } } },
+    { { { 50, 0, 1 }, { 44, 62, 0 } } },
+    { { { 50, 0, 0 }, { 44, 63, 0 } } },
+    { { { 50, 0, 1 }, { 48, 55, 0 } } },
+    { { { 50, 0, 2 }, { 45, 62, 0 } } },
+    { { { 51, 0, 1 }, { 45, 63, 0 } } },
+    { { { 51, 0, 0 }, { 46, 62, 0 } } },
+    { { { 51, 0, 1 }, { 48, 58, 0 } } },
+    { { { 51, 0, 2 }, { 46, 63, 0 } } },
+    { { { 52, 0, 1 }, { 47, 62, 0 } } },
+    { { { 52, 0, 0 }, { 47, 63, 0 } } },
+    { { { 52, 0, 1 }, { 48, 61, 0 } } },
+    { { { 52, 0, 2 }, { 48, 62, 0 } } },
+    { { { 53, 0, 1 }, { 56, 47, 0 } } },
+    { { { 53, 0, 0 }, { 48, 63, 0 } } },
+    { { { 53, 0, 1 }, { 49, 62, 0 } } },
+    { { { 53, 0, 2 }, { 49, 63, 0 } } },
+    { { { 54, 0, 1 }, { 58, 46, 0 } } },
+    { { { 54, 0, 0 }, { 50, 62, 0 } } },
+    { { { 54, 0, 1 }, { 50, 63, 0 } } },
+    { { { 54, 0, 2 }, { 51, 62, 0 } } },
+    { { { 55, 0, 1 }, { 59, 47, 0 } } },
+    { { { 55, 0, 0 }, { 51, 63, 0 } } },
+    { { { 55, 0, 1 }, { 52, 62, 0 } } },
+    { { { 55, 0, 2 }, { 52, 63, 0 } } },
+    { { { 56, 0, 1 }, { 61, 46, 0 } } },
+    { { { 56, 0, 0 }, { 53, 62, 0 } } },
+    { { { 56, 0, 1 }, { 53, 63, 0 } } },
+    { { { 56, 0, 2 }, { 54, 62, 0 } } },
+    { { { 57, 0, 1 }, { 62, 47, 0 } } },
+    { { { 57, 0, 0 }, { 54, 63, 0 } } },
+    { { { 57, 0, 1 }, { 55, 62, 0 } } },
+    { { { 57, 0, 2 }, { 55, 63, 0 } } },
+    { { { 58, 0, 1 }, { 56, 62, 1 } } },
+    { { { 58, 0, 0 }, { 56, 62, 0 } } },
+    { { { 58, 0, 1 }, { 56, 63, 0 } } },
+    { { { 58, 0, 2 }, { 57, 62, 0 } } },
+    { { { 59, 0, 1 }, { 57, 63, 1 } } },
+    { { { 59, 0, 0 }, { 57, 63, 0 } } },
+    { { { 59, 0, 1 }, { 58, 62, 0 } } },
+    { { { 59, 0, 2 }, { 58, 63, 0 } } },
+    { { { 60, 0, 1 }, { 59, 62, 1 } } },
+    { { { 60, 0, 0 }, { 59, 62, 0 } } },
+    { { { 60, 0, 1 }, { 59, 63, 0 } } },
+    { { { 60, 0, 2 }, { 60, 62, 0 } } },
+    { { { 61, 0, 1 }, { 60, 63, 1 } } },
+    { { { 61, 0, 0 }, { 60, 63, 0 } } },
+    { { { 61, 0, 1 }, { 61, 62, 0 } } },
+    { { { 61, 0, 2 }, { 61, 63, 0 } } },
+    { { { 62, 0, 1 }, { 62, 62, 1 } } },
+    { { { 62, 0, 0 }, { 62, 62, 0 } } },
+    { { { 62, 0, 1 }, { 62, 63, 0 } } },
+    { { { 62, 0, 2 }, { 63, 62, 0 } } },
+    { { { 63, 0, 1 }, { 63, 63, 1 } } },
+    { { { 63, 0, 0 }, { 63, 63, 0 } } }
+};
diff --git a/thirdparty/squish/squish.cpp b/thirdparty/squish/squish.cpp
new file mode 100644
index 0000000000..d3cbabbafd
--- /dev/null
+++ b/thirdparty/squish/squish.cpp
@@ -0,0 +1,395 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#include <string.h>
+#include "squish.h"
+#include "colourset.h"
+#include "maths.h"
+#include "rangefit.h"
+#include "clusterfit.h"
+#include "colourblock.h"
+#include "alpha.h"
+#include "singlecolourfit.h"
+
+namespace squish {
+
+static int FixFlags( int flags )
+{
+    // grab the flag bits
+    int method = flags & ( kDxt1 | kDxt3 | kDxt5 | kBc4 | kBc5 );
+    int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit );
+    int extra = flags & kWeightColourByAlpha;
+
+    // set defaults
+    if ( method != kDxt3
+    &&   method != kDxt5
+    &&   method != kBc4
+    &&   method != kBc5 )
+    {
+        method = kDxt1;
+    }
+    if( fit != kColourRangeFit && fit != kColourIterativeClusterFit )
+        fit = kColourClusterFit;
+
+    // done
+    return method | fit | extra;
+}
+
+void CompressMasked( u8 const* rgba, int mask, void* block, int flags, float* metric )
+{
+    // fix any bad flags
+    flags = FixFlags( flags );
+
+    if ( ( flags & ( kBc4 | kBc5 ) ) != 0 )
+    {
+        u8 alpha[16*4];
+        for( int i = 0; i < 16; ++i )
+        {
+            alpha[i*4 + 3] = rgba[i*4 + 0]; // copy R to A
+        }
+
+        u8* rBlock = reinterpret_cast< u8* >( block );
+        CompressAlphaDxt5( alpha, mask, rBlock );
+
+        if ( ( flags & ( kBc5 ) ) != 0 )
+        {
+            for( int i = 0; i < 16; ++i )
+            {
+                alpha[i*4 + 3] = rgba[i*4 + 1]; // copy G to A
+            }
+
+            u8* gBlock = reinterpret_cast< u8* >( block ) + 8;
+            CompressAlphaDxt5( alpha, mask, gBlock );
+        }
+
+        return;
+    }
+
+    // get the block locations
+    void* colourBlock = block;
+    void* alphaBlock = block;
+    if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 )
+        colourBlock = reinterpret_cast< u8* >( block ) + 8;
+
+    // create the minimal point set
+    ColourSet colours( rgba, mask, flags );
+
+    // check the compression type and compress colour
+    if( colours.GetCount() == 1 )
+    {
+        // always do a single colour fit
+        SingleColourFit fit( &colours, flags );
+        fit.Compress( colourBlock );
+    }
+    else if( ( flags & kColourRangeFit ) != 0 || colours.GetCount() == 0 )
+    {
+        // do a range fit
+        RangeFit fit( &colours, flags, metric );
+        fit.Compress( colourBlock );
+    }
+    else
+    {
+        // default to a cluster fit (could be iterative or not)
+        ClusterFit fit( &colours, flags, metric );
+        fit.Compress( colourBlock );
+    }
+
+    // compress alpha separately if necessary
+    if( ( flags & kDxt3 ) != 0 )
+        CompressAlphaDxt3( rgba, mask, alphaBlock );
+    else if( ( flags & kDxt5 ) != 0 )
+        CompressAlphaDxt5( rgba, mask, alphaBlock );
+}
+
+void Decompress( u8* rgba, void const* block, int flags )
+{
+    // fix any bad flags
+    flags = FixFlags( flags );
+
+    // get the block locations
+    void const* colourBlock = block;
+    void const* alphaBlock = block;
+    if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 )
+        colourBlock = reinterpret_cast< u8 const* >( block ) + 8;
+
+    // decompress colour
+    DecompressColour( rgba, colourBlock, ( flags & kDxt1 ) != 0 );
+
+    // decompress alpha separately if necessary
+    if( ( flags & kDxt3 ) != 0 )
+        DecompressAlphaDxt3( rgba, alphaBlock );
+    else if( ( flags & kDxt5 ) != 0 )
+        DecompressAlphaDxt5( rgba, alphaBlock );
+}
+
+int GetStorageRequirements( int width, int height, int flags )
+{
+    // fix any bad flags
+    flags = FixFlags( flags );
+
+    // compute the storage requirements
+    int blockcount = ( ( width + 3 )/4 ) * ( ( height + 3 )/4 );
+    int blocksize = ( ( flags & ( kDxt1 | kBc4 ) ) != 0 ) ? 8 : 16;
+    return blockcount*blocksize;
+}
+
+void CopyRGBA( u8 const* source, u8* dest, int flags )
+{
+    if (flags & kSourceBGRA)
+    {
+        // convert from bgra to rgba
+        dest[0] = source[2];
+        dest[1] = source[1];
+        dest[2] = source[0];
+        dest[3] = source[3];
+    }
+    else
+    {
+        for( int i = 0; i < 4; ++i )
+            *dest++ = *source++;
+    }
+}
+
+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric )
+{
+    // fix any bad flags
+    flags = FixFlags( flags );
+
+    // initialise the block output
+    u8* targetBlock = reinterpret_cast< u8* >( blocks );
+    int bytesPerBlock = ( ( flags & ( kDxt1 | kBc4 ) ) != 0 ) ? 8 : 16;
+
+    // loop over blocks
+    for( int y = 0; y < height; y += 4 )
+    {
+        for( int x = 0; x < width; x += 4 )
+        {
+            // build the 4x4 block of pixels
+            u8 sourceRgba[16*4];
+            u8* targetPixel = sourceRgba;
+            int mask = 0;
+            for( int py = 0; py < 4; ++py )
+            {
+                for( int px = 0; px < 4; ++px )
+                {
+                    // get the source pixel in the image
+                    int sx = x + px;
+                    int sy = y + py;
+
+                    // enable if we're in the image
+                    if( sx < width && sy < height )
+                    {
+                        // copy the rgba value
+                        u8 const* sourcePixel = rgba + pitch*sy + 4*sx;
+                        CopyRGBA(sourcePixel, targetPixel, flags);
+                        // enable this pixel
+                        mask |= ( 1 << ( 4*py + px ) );
+                    }
+
+                    // advance to the next pixel
+                    targetPixel += 4;
+                }
+            }
+
+            // compress it into the output
+            CompressMasked( sourceRgba, mask, targetBlock, flags, metric );
+
+            // advance
+            targetBlock += bytesPerBlock;
+        }
+    }
+}
+
+void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric )
+{
+    CompressImage(rgba, width, height, width*4, blocks, flags, metric);
+}
+
+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags )
+{
+    // fix any bad flags
+    flags = FixFlags( flags );
+
+    // initialise the block input
+    u8 const* sourceBlock = reinterpret_cast< u8 const* >( blocks );
+    int bytesPerBlock = ( ( flags & ( kDxt1 | kBc4 ) ) != 0 ) ? 8 : 16;
+
+    // loop over blocks
+    for( int y = 0; y < height; y += 4 )
+    {
+        for( int x = 0; x < width; x += 4 )
+        {
+            // decompress the block
+            u8 targetRgba[4*16];
+            Decompress( targetRgba, sourceBlock, flags );
+
+            // write the decompressed pixels to the correct image locations
+            u8 const* sourcePixel = targetRgba;
+            for( int py = 0; py < 4; ++py )
+            {
+                for( int px = 0; px < 4; ++px )
+                {
+                    // get the target location
+                    int sx = x + px;
+                    int sy = y + py;
+
+                    // write if we're in the image
+                    if( sx < width && sy < height )
+                    {
+                        // copy the rgba value
+                        u8* targetPixel = rgba + pitch*sy + 4*sx;
+                        CopyRGBA(sourcePixel, targetPixel, flags);
+                    }
+
+                    // advance to the next pixel
+                    sourcePixel += 4;
+                }
+            }
+
+            // advance
+            sourceBlock += bytesPerBlock;
+        }
+    }
+}
+
+void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags )
+{
+    DecompressImage( rgba, width, height, width*4, blocks, flags );
+}
+
+static double ErrorSq(double x, double y)
+{
+    return (x - y) * (x - y);
+}
+
+static void ComputeBlockWMSE(u8 const *original, u8 const *compressed, unsigned int w, unsigned int h, double &cmse, double &amse)
+{
+    // Computes the MSE for the block and weights it by the variance of the original block.
+    // If the variance of the original block is less than 4 (i.e. a standard deviation of 1 per channel)
+    // then the block is close to being a single colour. Quantisation errors in single colour blocks
+    // are easier to see than similar errors in blocks that contain more colours, particularly when there
+    // are many such blocks in a large area (eg a blue sky background) as they cause banding.  Given that
+    // banding is easier to see than small errors in "complex" blocks, we weight the errors by a factor
+    // of 5. This implies that images with large, single colour areas will have a higher potential WMSE
+    // than images with lots of detail.
+
+    cmse = amse = 0;
+    unsigned int sum_p[4];  // per channel sum of pixels
+    unsigned int sum_p2[4]; // per channel sum of pixels squared
+    memset(sum_p, 0, sizeof(sum_p));
+    memset(sum_p2, 0, sizeof(sum_p2));
+    for( unsigned int py = 0; py < 4; ++py )
+    {
+        for( unsigned int px = 0; px < 4; ++px )
+        {
+            if( px < w && py < h )
+            {
+                double pixelCMSE = 0;
+                for( int i = 0; i < 3; ++i )
+                {
+                    pixelCMSE += ErrorSq(original[i], compressed[i]);
+                    sum_p[i] += original[i];
+                    sum_p2[i] += (unsigned int)original[i]*original[i];
+                }
+                if( original[3] == 0 && compressed[3] == 0 )
+                    pixelCMSE = 0; // transparent in both, so colour is inconsequential
+                amse += ErrorSq(original[3], compressed[3]);
+                cmse += pixelCMSE;
+                sum_p[3] += original[3];
+                sum_p2[3] += (unsigned int)original[3]*original[3];
+            }
+            original += 4;
+            compressed += 4;
+        }
+    }
+    unsigned int variance = 0;
+    for( int i = 0; i < 4; ++i )
+        variance += w*h*sum_p2[i] - sum_p[i]*sum_p[i];
+    if( variance < 4 * w * w * h * h )
+    {
+        amse *= 5;
+        cmse *= 5;
+    }
+}
+
+void ComputeMSE( u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
+{
+    // fix any bad flags
+    flags = FixFlags( flags );
+    colourMSE = alphaMSE = 0;
+
+    // initialise the block input
+    squish::u8 const* sourceBlock = dxt;
+    int bytesPerBlock = ( ( flags & squish::kDxt1 ) != 0 ) ? 8 : 16;
+
+    // loop over blocks
+    for( int y = 0; y < height; y += 4 )
+    {
+        for( int x = 0; x < width; x += 4 )
+        {
+            // decompress the block
+            u8 targetRgba[4*16];
+            Decompress( targetRgba, sourceBlock, flags );
+            u8 const* sourcePixel = targetRgba;
+
+            // copy across to a similar pixel block
+            u8 originalRgba[4*16];
+            u8* originalPixel = originalRgba;
+
+            for( int py = 0; py < 4; ++py )
+            {
+                for( int px = 0; px < 4; ++px )
+                {
+                    int sx = x + px;
+                    int sy = y + py;
+                    if( sx < width && sy < height )
+                    {
+                        u8 const* targetPixel = rgba + pitch*sy + 4*sx;
+                        CopyRGBA(targetPixel, originalPixel, flags);
+                    }
+                    sourcePixel += 4;
+                    originalPixel += 4;
+                }
+            }
+
+            // compute the weighted MSE of the block
+            double blockCMSE, blockAMSE;
+            ComputeBlockWMSE(originalRgba, targetRgba, std::min(4, width - x), std::min(4, height - y), blockCMSE, blockAMSE);
+            colourMSE += blockCMSE;
+            alphaMSE += blockAMSE;
+            // advance
+            sourceBlock += bytesPerBlock;
+        }
+    }
+    colourMSE /= (width * height * 3);
+    alphaMSE /= (width * height);
+}
+
+void ComputeMSE( u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
+{
+    ComputeMSE(rgba, width, height, width*4, dxt, flags, colourMSE, alphaMSE);
+}
+
+} // namespace squish
diff --git a/thirdparty/squish/squish.h b/thirdparty/squish/squish.h
new file mode 100644
index 0000000000..7c46e37ff1
--- /dev/null
+++ b/thirdparty/squish/squish.h
@@ -0,0 +1,300 @@
+/* -----------------------------------------------------------------------------
+
+    Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   -------------------------------------------------------------------------- */
+
+#ifndef SQUISH_H
+#define SQUISH_H
+
+//! All squish API functions live in this namespace.
+namespace squish {
+
+// -----------------------------------------------------------------------------
+
+//! Typedef a quantity that is a single unsigned byte.
+typedef unsigned char u8;
+
+// -----------------------------------------------------------------------------
+
+enum
+{
+    //! Use DXT1 compression.
+    kDxt1 = ( 1 << 0 ),
+
+    //! Use DXT3 compression.
+    kDxt3 = ( 1 << 1 ),
+
+    //! Use DXT5 compression.
+    kDxt5 = ( 1 << 2 ),
+
+    //! Use BC4 compression.
+    kBc4 = ( 1 << 3 ),
+
+    //! Use BC5 compression.
+    kBc5 = ( 1 << 4 ),
+
+    //! Use a slow but high quality colour compressor (the default).
+    kColourClusterFit = ( 1 << 5 ),
+
+    //! Use a fast but low quality colour compressor.
+    kColourRangeFit = ( 1 << 6 ),
+
+    //! Weight the colour by alpha during cluster fit (disabled by default).
+    kWeightColourByAlpha = ( 1 << 7 ),
+
+    //! Use a very slow but very high quality colour compressor.
+    kColourIterativeClusterFit = ( 1 << 8 ),
+
+    //! Source is BGRA rather than RGBA
+    kSourceBGRA = ( 1 << 9 )
+};
+
+// -----------------------------------------------------------------------------
+
+/*! @brief Compresses a 4x4 block of pixels.
+
+    @param rgba   The rgba values of the 16 source pixels.
+    @param mask   The valid pixel mask.
+    @param block  Storage for the compressed DXT block.
+    @param flags  Compression flags.
+    @param metric An optional perceptual metric.
+
+    The source pixels should be presented as a contiguous array of 16 rgba
+    values, with each component as 1 byte each. In memory this should be:
+
+        { r1, g1, b1, a1, .... , r16, g16, b16, a16 }
+
+    The mask parameter enables only certain pixels within the block. The lowest
+    bit enables the first pixel and so on up to the 16th bit. Bits beyond the
+    16th bit are ignored. Pixels that are not enabled are allowed to take
+    arbitrary colours in the output block. An example of how this can be used
+    is in the CompressImage function to disable pixels outside the bounds of
+    the image when the width or height is not divisible by 4.
+
+    The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
+    however, DXT1 will be used by default if none is specified. When using DXT1
+    compression, 8 bytes of storage are required for the compressed DXT block.
+    DXT3 and DXT5 compression require 16 bytes of storage per block.
+
+    The flags parameter can also specify a preferred colour compressor to use
+    when fitting the RGB components of the data. Possible colour compressors
+    are: kColourClusterFit (the default), kColourRangeFit (very fast, low
+    quality) or kColourIterativeClusterFit (slowest, best quality).
+
+    When using kColourClusterFit or kColourIterativeClusterFit, an additional
+    flag can be specified to weight the importance of each pixel by its alpha
+    value. For images that are rendered using alpha blending, this can
+    significantly increase the perceived quality.
+
+    The metric parameter can be used to weight the relative importance of each
+    colour channel, or pass NULL to use the default uniform weight of
+    { 1.0f, 1.0f, 1.0f }. This replaces the previous flag-based control that
+    allowed either uniform or "perceptual" weights with the fixed values
+    { 0.2126f, 0.7152f, 0.0722f }. If non-NULL, the metric should point to a
+    contiguous array of 3 floats.
+*/
+void CompressMasked( u8 const* rgba, int mask, void* block, int flags, float* metric = 0 );
+
+// -----------------------------------------------------------------------------
+
+/*! @brief Compresses a 4x4 block of pixels.
+
+    @param rgba   The rgba values of the 16 source pixels.
+    @param block  Storage for the compressed DXT block.
+    @param flags  Compression flags.
+    @param metric An optional perceptual metric.
+
+    The source pixels should be presented as a contiguous array of 16 rgba
+    values, with each component as 1 byte each. In memory this should be:
+
+        { r1, g1, b1, a1, .... , r16, g16, b16, a16 }
+
+    The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
+    however, DXT1 will be used by default if none is specified. When using DXT1
+    compression, 8 bytes of storage are required for the compressed DXT block.
+    DXT3 and DXT5 compression require 16 bytes of storage per block.
+
+    The flags parameter can also specify a preferred colour compressor to use
+    when fitting the RGB components of the data. Possible colour compressors
+    are: kColourClusterFit (the default), kColourRangeFit (very fast, low
+    quality) or kColourIterativeClusterFit (slowest, best quality).
+
+    When using kColourClusterFit or kColourIterativeClusterFit, an additional
+    flag can be specified to weight the importance of each pixel by its alpha
+    value. For images that are rendered using alpha blending, this can
+    significantly increase the perceived quality.
+
+    The metric parameter can be used to weight the relative importance of each
+    colour channel, or pass NULL to use the default uniform weight of
+    { 1.0f, 1.0f, 1.0f }. This replaces the previous flag-based control that
+    allowed either uniform or "perceptual" weights with the fixed values
+    { 0.2126f, 0.7152f, 0.0722f }. If non-NULL, the metric should point to a
+    contiguous array of 3 floats.
+
+    This method is an inline that calls CompressMasked with a mask of 0xffff,
+    provided for compatibility with older versions of squish.
+*/
+inline void Compress( u8 const* rgba, void* block, int flags, float* metric = 0 )
+{
+    CompressMasked( rgba, 0xffff, block, flags, metric );
+}
+
+// -----------------------------------------------------------------------------
+
+/*! @brief Decompresses a 4x4 block of pixels.
+
+    @param rgba  Storage for the 16 decompressed pixels.
+    @param block The compressed DXT block.
+    @param flags Compression flags.
+
+    The decompressed pixels will be written as a contiguous array of 16 rgba
+    values, with each component as 1 byte each. In memory this is:
+
+        { r1, g1, b1, a1, .... , r16, g16, b16, a16 }
+
+    The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
+    however, DXT1 will be used by default if none is specified. All other flags
+    are ignored.
+*/
+void Decompress( u8* rgba, void const* block, int flags );
+
+// -----------------------------------------------------------------------------
+
+/*! @brief Computes the amount of compressed storage required.
+
+    @param width  The width of the image.
+    @param height The height of the image.
+    @param flags  Compression flags.
+
+    The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
+    however, DXT1 will be used by default if none is specified. All other flags
+    are ignored.
+
+    Most DXT images will be a multiple of 4 in each dimension, but this
+    function supports arbitrary size images by allowing the outer blocks to
+    be only partially used.
+*/
+int GetStorageRequirements( int width, int height, int flags );
+
+// -----------------------------------------------------------------------------
+
+/*! @brief Compresses an image in memory.
+
+    @param rgba   The pixels of the source.
+    @param width  The width of the source image.
+    @param height The height of the source image.
+    @param pitch  The pitch of the source image.
+    @param blocks Storage for the compressed output.
+    @param flags  Compression flags.
+    @param metric An optional perceptual metric.
+
+    The source pixels should be presented as a contiguous array of width*height
+    rgba values, with each component as 1 byte each. In memory this should be:
+
+        { r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height
+
+    The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
+    however, DXT1 will be used by default if none is specified. When using DXT1
+    compression, 8 bytes of storage are required for each compressed DXT block.
+    DXT3 and DXT5 compression require 16 bytes of storage per block.
+
+    The flags parameter can also specify a preferred colour compressor to use
+    when fitting the RGB components of the data. Possible colour compressors
+    are: kColourClusterFit (the default), kColourRangeFit (very fast, low
+    quality) or kColourIterativeClusterFit (slowest, best quality).
+
+    When using kColourClusterFit or kColourIterativeClusterFit, an additional
+    flag can be specified to weight the importance of each pixel by its alpha
+    value. For images that are rendered using alpha blending, this can
+    significantly increase the perceived quality.
+
+    The metric parameter can be used to weight the relative importance of each
+    colour channel, or pass NULL to use the default uniform weight of
+    { 1.0f, 1.0f, 1.0f }. This replaces the previous flag-based control that
+    allowed either uniform or "perceptual" weights with the fixed values
+    { 0.2126f, 0.7152f, 0.0722f }. If non-NULL, the metric should point to a
+    contiguous array of 3 floats.
+
+    Internally this function calls squish::CompressMasked for each block, which
+    allows for pixels outside the image to take arbitrary values. The function
+    squish::GetStorageRequirements can be called to compute the amount of memory
+    to allocate for the compressed output.
+*/
+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 );
+void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 );
+
+// -----------------------------------------------------------------------------
+
+/*! @brief Decompresses an image in memory.
+
+    @param rgba   Storage for the decompressed pixels.
+    @param width  The width of the source image.
+    @param height The height of the source image.
+    @param pitch  The pitch of the decompressed pixels.
+    @param blocks The compressed DXT blocks.
+    @param flags  Compression flags.
+
+    The decompressed pixels will be written as a contiguous array of width*height
+    16 rgba values, with each component as 1 byte each. In memory this is:
+
+        { r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height
+
+    The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
+    however, DXT1 will be used by default if none is specified. All other flags
+    are ignored.
+
+    Internally this function calls squish::Decompress for each block.
+*/
+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags );
+void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags );
+
+// -----------------------------------------------------------------------------
+
+/*! @brief Computes MSE of an compressed image in memory.
+
+    @param rgba      The original image pixels.
+    @param width     The width of the source image.
+    @param height    The height of the source image.
+    @param pitch     The pitch of the source image.
+    @param dxt       The compressed dxt blocks
+    @param flags     Compression flags.
+    @param colourMSE The MSE of the colour values.
+    @param alphaMSE  The MSE of the alpha values.
+
+    The colour MSE and alpha MSE are computed across all pixels. The colour MSE is
+    averaged across all rgb values (i.e. colourMSE = sum sum_k ||dxt.k - rgba.k||/3)
+
+    The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
+    however, DXT1 will be used by default if none is specified. All other flags
+    are ignored.
+
+    Internally this function calls squish::Decompress for each block.
+*/
+void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
+void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
+
+// -----------------------------------------------------------------------------
+
+} // namespace squish
+
+#endif // ndef SQUISH_H
diff --git a/drivers/builtin_zlib/zlib/adler32.c b/thirdparty/zlib/adler32.c
index a868f073d8..a868f073d8 100644
--- a/drivers/builtin_zlib/zlib/adler32.c
+++ b/thirdparty/zlib/adler32.c
diff --git a/drivers/builtin_zlib/zlib/compress.c b/thirdparty/zlib/compress.c
index 6e9762676a..6e9762676a 100644
--- a/drivers/builtin_zlib/zlib/compress.c
+++ b/thirdparty/zlib/compress.c
diff --git a/drivers/builtin_zlib/zlib/crc32.c b/thirdparty/zlib/crc32.c
index 979a7190a3..979a7190a3 100644
--- a/drivers/builtin_zlib/zlib/crc32.c
+++ b/thirdparty/zlib/crc32.c
diff --git a/drivers/builtin_zlib/zlib/crc32.h b/thirdparty/zlib/crc32.h
index 9e0c778102..9e0c778102 100644
--- a/drivers/builtin_zlib/zlib/crc32.h
+++ b/thirdparty/zlib/crc32.h
diff --git a/drivers/builtin_zlib/zlib/deflate.c b/thirdparty/zlib/deflate.c
index 696957705b..696957705b 100644
--- a/drivers/builtin_zlib/zlib/deflate.c
+++ b/thirdparty/zlib/deflate.c
diff --git a/drivers/builtin_zlib/zlib/deflate.h b/thirdparty/zlib/deflate.h
index ce0299edd1..ce0299edd1 100644
--- a/drivers/builtin_zlib/zlib/deflate.h
+++ b/thirdparty/zlib/deflate.h
diff --git a/drivers/builtin_zlib/zlib/infback.c b/thirdparty/zlib/infback.c
index f3833c2e43..f3833c2e43 100644
--- a/drivers/builtin_zlib/zlib/infback.c
+++ b/thirdparty/zlib/infback.c
diff --git a/drivers/builtin_zlib/zlib/inffast.c b/thirdparty/zlib/inffast.c
index bda59ceb6a..bda59ceb6a 100644
--- a/drivers/builtin_zlib/zlib/inffast.c
+++ b/thirdparty/zlib/inffast.c
diff --git a/drivers/builtin_zlib/zlib/inffast.h b/thirdparty/zlib/inffast.h
index e5c1aa4ca8..e5c1aa4ca8 100644
--- a/drivers/builtin_zlib/zlib/inffast.h
+++ b/thirdparty/zlib/inffast.h
diff --git a/drivers/builtin_zlib/zlib/inffixed.h b/thirdparty/zlib/inffixed.h
index d628327769..d628327769 100644
--- a/drivers/builtin_zlib/zlib/inffixed.h
+++ b/thirdparty/zlib/inffixed.h
diff --git a/drivers/builtin_zlib/zlib/inflate.c b/thirdparty/zlib/inflate.c
index 870f89bb4d..870f89bb4d 100644
--- a/drivers/builtin_zlib/zlib/inflate.c
+++ b/thirdparty/zlib/inflate.c
diff --git a/drivers/builtin_zlib/zlib/inflate.h b/thirdparty/zlib/inflate.h
index 95f4986d40..95f4986d40 100644
--- a/drivers/builtin_zlib/zlib/inflate.h
+++ b/thirdparty/zlib/inflate.h
diff --git a/drivers/builtin_zlib/zlib/inftrees.c b/thirdparty/zlib/inftrees.c
index 44d89cf24e..44d89cf24e 100644
--- a/drivers/builtin_zlib/zlib/inftrees.c
+++ b/thirdparty/zlib/inftrees.c
diff --git a/drivers/builtin_zlib/zlib/inftrees.h b/thirdparty/zlib/inftrees.h
index baa53a0b1a..baa53a0b1a 100644
--- a/drivers/builtin_zlib/zlib/inftrees.h
+++ b/thirdparty/zlib/inftrees.h
diff --git a/drivers/builtin_zlib/zlib/trees.c b/thirdparty/zlib/trees.c
index 1fd7759ef0..1fd7759ef0 100644
--- a/drivers/builtin_zlib/zlib/trees.c
+++ b/thirdparty/zlib/trees.c
diff --git a/drivers/builtin_zlib/zlib/trees.h b/thirdparty/zlib/trees.h
index d35639d82a..d35639d82a 100644
--- a/drivers/builtin_zlib/zlib/trees.h
+++ b/thirdparty/zlib/trees.h
diff --git a/drivers/builtin_zlib/zlib/uncompr.c b/thirdparty/zlib/uncompr.c
index 242e9493df..242e9493df 100644
--- a/drivers/builtin_zlib/zlib/uncompr.c
+++ b/thirdparty/zlib/uncompr.c
diff --git a/drivers/builtin_zlib/zlib/zconf.h b/thirdparty/zlib/zconf.h
index f44af82fc2..f44af82fc2 100644
--- a/drivers/builtin_zlib/zlib/zconf.h
+++ b/thirdparty/zlib/zconf.h
diff --git a/drivers/builtin_zlib/zlib/zlib.h b/thirdparty/zlib/zlib.h
index 3e0c7672ac..3e0c7672ac 100644
--- a/drivers/builtin_zlib/zlib/zlib.h
+++ b/thirdparty/zlib/zlib.h
diff --git a/drivers/builtin_zlib/zlib/zutil.c b/thirdparty/zlib/zutil.c
index 23d2ebef00..23d2ebef00 100644
--- a/drivers/builtin_zlib/zlib/zutil.c
+++ b/thirdparty/zlib/zutil.c
diff --git a/drivers/builtin_zlib/zlib/zutil.h b/thirdparty/zlib/zutil.h
index 24ab06b1cf..24ab06b1cf 100644
--- a/drivers/builtin_zlib/zlib/zutil.h
+++ b/thirdparty/zlib/zutil.h