diff --git a/extraParams.hxml b/extraParams.hxml
index 8fa3d6a3d1..52c654c4a7 100644
--- a/extraParams.hxml
+++ b/extraParams.hxml
@@ -1 +1,2 @@
---macro lime._internal.macros.DefineMacro.run()
\ No newline at end of file
+--macro lime._internal.macros.DefineMacro.run()
+--macro haxe.macro.Compiler.addMetadata("@:autoBuild(lime._internal.macros.AssetsMacro.embedBytes())", "haxe.io.Bytes")
diff --git a/src/haxe/io/Bytes.hx b/src/haxe/io/Bytes.hx
deleted file mode 100644
index 5134e72fa4..0000000000
--- a/src/haxe/io/Bytes.hx
+++ /dev/null
@@ -1,1193 +0,0 @@
-/*
- * Copyright (C)2005-2018 Haxe Foundation
- *
- * 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.
- */
-
-package haxe.io;
-
-#if (!hl && !js && !eval)
-#if cpp
-using cpp.NativeArray;
-#end
-
-#if !macro
-@:autoBuild(lime._internal.macros.AssetsMacro.embedBytes()) // Enable @:bytes embed metadata
-#end
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-class Bytes
-{
-	public var length(default, null):Int;
-
-	var b:BytesData;
-
-	function new(length, b)
-	{
-		this.length = length;
-		this.b = b;
-		#if flash
-		b.endian = flash.utils.Endian.LITTLE_ENDIAN;
-		#end
-	}
-
-	public inline function get(pos:Int):Int
-	{
-		#if neko
-		return untyped $sget(b, pos);
-		#elseif flash
-		return b[pos];
-		#elseif (cpp || webassembly)
-		return untyped b[pos];
-		#elseif java
-		return untyped b[pos] & 0xFF;
-		#elseif python
-		return python.Syntax.arrayAccess(b, pos);
-		#else
-		return b[pos];
-		#end
-	}
-
-	public inline function set(pos:Int, v:Int):Void
-	{
-		#if neko
-		untyped $sset(b, pos, v);
-		#elseif flash
-		b[pos] = v;
-		#elseif (cpp || webassembly)
-		untyped b[pos] = v;
-		#elseif java
-		b[pos] = cast v;
-		#elseif cs
-		b[pos] = cast v;
-		#elseif python
-		python.Syntax.arraySet(b, pos, v & 0xFF);
-		#else
-		b[pos] = v & 0xFF;
-		#end
-	}
-
-	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void
-	{
-		#if !neko
-		if (pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length) throw Error.OutsideBounds;
-		#end
-		#if neko
-		try
-			untyped $sblit(b, pos, src.b, srcpos, len)
-		catch (e:Dynamic)
-			throw Error.OutsideBounds;
-		#elseif flash
-		b.position = pos;
-		if (len > 0) b.writeBytes(src.b, srcpos, len);
-		#elseif java
-		java.lang.System.arraycopy(src.b, srcpos, b, pos, len);
-		#elseif cs
-		cs.system.Array.Copy(src.b, srcpos, b, pos, len);
-		#elseif python
-		python.Syntax.code("self.b[{0}:{0}+{1}] = src.b[srcpos:srcpos+{1}]", pos, len);
-		#elseif (cpp || webassembly)
-		b.blit(pos, src.b, srcpos, len);
-		#else
-		var b1 = b;
-		var b2 = src.b;
-		if (b1 == b2 && pos > srcpos)
-		{
-			var i = len;
-			while (i > 0)
-			{
-				i--;
-				b1[i + pos] = b2[i + srcpos];
-			}
-			return;
-		}
-		for (i in 0...len)
-			b1[i + pos] = b2[i + srcpos];
-		#end
-	}
-
-	public function fill(pos:Int, len:Int, value:Int)
-	{
-		#if flash
-		var v4 = value & 0xFF;
-		v4 |= v4 << 8;
-		v4 |= v4 << 16;
-		b.position = pos;
-		for (i in 0...len >> 2)
-			b.writeUnsignedInt(v4);
-		pos += len & ~3;
-		for (i in 0...len & 3)
-			set(pos++, value);
-		#elseif (cpp || webassembly)
-		untyped __global__.__hxcpp_memory_memset(b, pos, len, value);
-		#else
-		for (i in 0...len)
-			set(pos++, value);
-		#end
-	}
-
-	public function sub(pos:Int, len:Int):Bytes
-	{
-		#if !neko
-		if (pos < 0 || len < 0 || pos + len > length) throw Error.OutsideBounds;
-		#end
-		#if neko
-		return try new Bytes(len, untyped __dollar__ssub(b, pos, len))
-		catch (e:Dynamic) throw Error.OutsideBounds;
-		#elseif flash
-		b.position = pos;
-		var b2 = new flash.utils.ByteArray();
-		b.readBytes(b2, 0, len);
-		return new Bytes(len, b2);
-		#elseif java
-		var newarr = new java.NativeArray(len);
-		java.lang.System.arraycopy(b, pos, newarr, 0, len);
-		return new Bytes(len, newarr);
-		#elseif cs
-		var newarr = new cs.NativeArray(len);
-		cs.system.Array.Copy(b, pos, newarr, 0, len);
-		return new Bytes(len, newarr);
-		#elseif python
-		return new Bytes(len, python.Syntax.arrayAccess(b, pos, pos + len));
-		#else
-		return new Bytes(len, b.slice(pos, pos + len));
-		#end
-	}
-
-	public function compare(other:Bytes):Int
-	{
-		#if neko
-		return untyped __dollar__compare(b, other.b);
-		#elseif flash
-		var len = (length < other.length) ? length : other.length;
-		var b1 = b;
-		var b2 = other.b;
-		b1.position = 0;
-		b2.position = 0;
-		b1.endian = flash.utils.Endian.BIG_ENDIAN;
-		b2.endian = flash.utils.Endian.BIG_ENDIAN;
-		for (i in 0...len >> 2)
-			if (b1.readUnsignedInt() != b2.readUnsignedInt())
-			{
-				b1.position -= 4;
-				b2.position -= 4;
-				var d = b1.readUnsignedInt() - b2.readUnsignedInt();
-				b1.endian = flash.utils.Endian.LITTLE_ENDIAN;
-				b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
-				return d;
-			}
-		for (i in 0...len & 3)
-			if (b1.readUnsignedByte() != b2.readUnsignedByte())
-			{
-				b1.endian = flash.utils.Endian.LITTLE_ENDIAN;
-				b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
-				return b1[b1.position - 1] - b2[b2.position - 1];
-			}
-		b1.endian = flash.utils.Endian.LITTLE_ENDIAN;
-		b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
-		return length - other.length;
-		// #elseif cs
-		// TODO: memcmp if unsafe flag is on
-		#elseif (cpp || webassembly)
-		return b.memcmp(other.b);
-		#else
-		var b1 = b;
-		var b2 = other.b;
-		var len = (length < other.length) ? length : other.length;
-		for (i in 0...len)
-			if (b1[i] != b2[i]) return untyped b1[i] - untyped b2[i];
-		return length - other.length;
-		#end
-	}
-
-	/**
-		Returns the IEEE double precision value at given position (in low endian encoding).
-		Result is unspecified if reading outside of the bounds
-	**/
-	#if (neko_v21 || (cpp && !cppia) || flash)
-	inline
-	#end
-	public function getDouble(pos:Int):Float
-	{
-		#if neko_v21
-		return untyped $sgetd(b, pos, false);
-		#elseif flash
-		b.position = pos;
-		return b.readDouble();
-		#elseif (cpp || webassembly)
-		if (pos < 0 || pos + 8 > length) throw Error.OutsideBounds;
-		return untyped __global__.__hxcpp_memory_get_double(b, pos);
-		#else
-		return FPHelper.i64ToDouble(getInt32(pos), getInt32(pos + 4));
-		#end
-	}
-
-	/**
-		Returns the IEEE single precision value at given position (in low endian encoding).
-		Result is unspecified if reading outside of the bounds
-	**/
-	#if (neko_v21 || (cpp && !cppia) || flash)
-	inline
-	#end
-	public function getFloat(pos:Int):Float
-	{
-		#if neko_v21
-		return untyped $sgetf(b, pos, false);
-		#elseif flash
-		b.position = pos;
-		return b.readFloat();
-		#elseif (cpp || webassembly)
-		if (pos < 0 || pos + 4 > length) throw Error.OutsideBounds;
-		return untyped __global__.__hxcpp_memory_get_float(b, pos);
-		#else
-		return FPHelper.i32ToFloat(getInt32(pos));
-		#end
-	}
-
-	/**
-		Store the IEEE double precision value at given position in low endian encoding.
-		Result is unspecified if writing outside of the bounds.
-	**/
-	#if (neko_v21 || flash)
-	inline
-	#end
-	public function setDouble(pos:Int, v:Float):Void
-	{
-		#if neko_v21
-		untyped $ssetd(b, pos, v, false);
-		#elseif neko
-		untyped $sblit(b, pos, FPHelper._double_bytes(v, false), 0, 8);
-		#elseif flash
-		b.position = pos;
-		b.writeDouble(v);
-		#elseif (cpp || webassembly)
-		if (pos < 0 || pos + 8 > length) throw Error.OutsideBounds;
-		untyped __global__.__hxcpp_memory_set_double(b, pos, v);
-		#else
-		var i = FPHelper.doubleToI64(v);
-		setInt32(pos, i.low);
-		setInt32(pos + 4, i.high);
-		#end
-	}
-
-	/**
-		Store the IEEE single precision value at given position in low endian encoding.
-		Result is unspecified if writing outside of the bounds.
-	**/
-	#if (neko_v21 || flash)
-	inline
-	#end
-	public function setFloat(pos:Int, v:Float):Void
-	{
-		#if neko_v21
-		untyped $ssetf(b, pos, v, false);
-		#elseif neko
-		untyped $sblit(b, pos, FPHelper._float_bytes(v, false), 0, 4);
-		#elseif flash
-		b.position = pos;
-		b.writeFloat(v);
-		#elseif (cpp || webassembly)
-		if (pos < 0 || pos + 4 > length) throw Error.OutsideBounds;
-		untyped __global__.__hxcpp_memory_set_float(b, pos, v);
-		#else
-		setInt32(pos, FPHelper.floatToI32(v));
-		#end
-	}
-
-	/**
-		Returns the 16 bit unsigned integer at given position (in low endian encoding).
-	**/
-	public inline function getUInt16(pos:Int):Int
-	{
-		#if neko_v21
-		return untyped $sget16(b, pos, false);
-		#else
-		return get(pos) | (get(pos + 1) << 8);
-		#end
-	}
-
-	/**
-		Store the 16 bit unsigned integer at given position (in low endian encoding).
-	**/
-	public inline function setUInt16(pos:Int, v:Int):Void
-	{
-		#if neko_v21
-		untyped $sset16(b, pos, v, false);
-		#else
-		set(pos, v);
-		set(pos + 1, v >> 8);
-		#end
-	}
-
-	/**
-		Returns the 32 bit integer at given position (in low endian encoding).
-	**/
-	public inline function getInt32(pos:Int):Int
-	{
-		#if neko_v21
-		return untyped $sget32(b, pos, false);
-		#elseif python
-		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos + 3) << 24);
-		return if (v & 0x80000000 != 0) v | 0x80000000 else v;
-		#elseif lua
-		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos + 3) << 24);
-		return lua.Boot.clamp(if (v & 0x80000000 != 0) v | 0x80000000 else v);
-		#else
-		return get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos + 3) << 24);
-		#end
-	}
-
-	/**
-		Returns the 64 bit integer at given position (in low endian encoding).
-	**/
-	public inline function getInt64(pos:Int):haxe.Int64
-	{
-		return haxe.Int64.make(getInt32(pos + 4), getInt32(pos));
-	}
-
-	/**
-		Store the 32 bit integer at given position (in low endian encoding).
-	**/
-	public inline function setInt32(pos:Int, v:Int):Void
-	{
-		#if neko_v21
-		untyped $sset32(b, pos, v, false);
-		#else
-		set(pos, v & 0xFF);
-		set(pos + 1, v >> 8 & 0xFF);
-		set(pos + 2, v >> 16 & 0xFF);
-		set(pos + 3, v >>> 24 & 0xFF);
-		#end
-	}
-
-	/**
-		Store the 64 bit integer at given position (in low endian encoding).
-	**/
-	public inline function setInt64(pos:Int, v:haxe.Int64):Void
-	{
-		setInt32(pos, v.low);
-		setInt32(pos + 4, v.high);
-	}
-
-	public function getString(pos:Int, len:Int, ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end):String
-	{
-		#if !neko
-		if (pos < 0 || len < 0 || pos + len > length) throw Error.OutsideBounds;
-		#end
-		#if neko
-		return try new String(untyped __dollar__ssub(b, pos, len))
-		catch (e:Dynamic) throw Error.OutsideBounds;
-		#elseif flash
-		b.position = pos;
-		return b.readUTFBytes(len);
-		#elseif (cpp || webassembly)
-		var result:String = "";
-		untyped __global__.__hxcpp_string_of_bytes(b, result, pos, len);
-		return result;
-		#elseif cs
-		return cs.system.text.Encoding.UTF8.GetString(b, pos, len);
-		#elseif java
-		try
-			return new String(b, pos, len, "UTF-8")
-		catch (e:Dynamic)
-			throw e;
-		#elseif python
-		return python.Syntax.code("self.b[{0}:{0}+{1}].decode('UTF-8','replace')", pos, len);
-		#elseif lua
-		var begin = cast(Math.min(pos, b.length), Int);
-		var end = cast(Math.min(pos + len, b.length), Int);
-		return [for (i in begin...end) String.fromCharCode(b[i])].join("");
-		#else
-		var s = "";
-		var b = b;
-		var fcc = String.fromCharCode;
-		var i = pos;
-		var max = pos + len;
-		// utf8-decode and utf16-encode
-		while (i < max)
-		{
-			var c = b[i++];
-			if (c < 0x80)
-			{
-				if (c == 0) break;
-				s += fcc(c);
-			}
-			else if (c < 0xE0) s += fcc(((c & 0x3F) << 6) | (b[i++] & 0x7F));
-			else if (c < 0xF0)
-			{
-				var c2 = b[i++];
-				s += fcc(((c & 0x1F) << 12) | ((c2 & 0x7F) << 6) | (b[i++] & 0x7F));
-			}
-			else
-			{
-				var c2 = b[i++];
-				var c3 = b[i++];
-				var u = ((c & 0x0F) << 18) | ((c2 & 0x7F) << 12) | ((c3 & 0x7F) << 6) | (b[i++] & 0x7F);
-				// surrogate pair
-				s += fcc((u >> 10) + 0xD7C0);
-				s += fcc((u & 0x3FF) | 0xDC00);
-			}
-		}
-		return s;
-		#end
-	}
-
-	@:deprecated("readString is deprecated, use getString instead")
-	@:noCompletion
-	public inline function readString(pos:Int, len:Int):String
-	{
-		return getString(pos, len);
-	}
-
-	/**
-		Returns string representation of the bytes as UTF8
-	**/
-	public function toString():String
-	{
-		#if neko
-		return new String(untyped __dollar__ssub(b, 0, length));
-		#elseif flash
-		b.position = 0;
-		return b.toString();
-		#elseif cs
-		return cs.system.text.Encoding.UTF8.GetString(b, 0, length);
-		#elseif java
-		try
-		{
-			return new String(b, 0, length, "UTF-8");
-		}
-		catch (e:Dynamic)
-			throw e;
-		#else
-		return getString(0, length);
-		#end
-	}
-
-	public function toHex():String
-	{
-		var s = new StringBuf();
-		var chars = [];
-		var str = "0123456789abcdef";
-		for (i in 0...str.length)
-			chars.push(str.charCodeAt(i));
-		for (i in 0...length)
-		{
-			var c = get(i);
-			s.addChar(chars[c >> 4]);
-			s.addChar(chars[c & 15]);
-		}
-		return s.toString();
-	}
-
-	public inline function getData():BytesData
-	{
-		return b;
-	}
-
-	public static function alloc(length:Int):Bytes
-	{
-		#if neko
-		return new Bytes(length, untyped __dollar__smake(length));
-		#elseif flash
-		var b = new flash.utils.ByteArray();
-		b.length = length;
-		return new Bytes(length, b);
-		#elseif (cpp || webassembly)
-		var a = new BytesData();
-		if (length > 0) cpp.NativeArray.setSize(a, length);
-		return new Bytes(length, a);
-		#elseif cs
-		return new Bytes(length, new cs.NativeArray(length));
-		#elseif java
-		return new Bytes(length, new java.NativeArray(length));
-		#elseif python
-		return new Bytes(length, new python.Bytearray(length));
-		#else
-		var a = new Array();
-		for (i in 0...length)
-			a.push(0);
-		return new Bytes(length, a);
-		#end
-	}
-
-	/**
-		Returns bytes representation of the given String, using specific encoding (UTF-8 by default)
-	**/
-	@:pure
-	public static function ofString(s:String, ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end):Bytes
-	{
-		#if neko
-		return new Bytes(s.length, untyped __dollar__ssub(s.__s, 0, s.length));
-		#elseif flash
-		var b = new flash.utils.ByteArray();
-		b.writeUTFBytes(s);
-		return new Bytes(b.length, b);
-		#elseif (cpp || webassembly)
-		var a = new BytesData();
-		untyped __global__.__hxcpp_bytes_of_string(a, s);
-		return new Bytes(a.length, a);
-		#elseif cs
-		var b = cs.system.text.Encoding.UTF8.GetBytes(s);
-		return new Bytes(b.Length, b);
-		#elseif java
-		try
-		{
-			var b:BytesData = untyped s.getBytes("UTF-8");
-			return new Bytes(b.length, b);
-		}
-		catch (e:Dynamic)
-			throw e;
-		#elseif python
-		var b:BytesData = new python.Bytearray(s, "UTF-8");
-		return new Bytes(b.length, b);
-		#elseif lua
-		var bytes = [for (c in 0...s.length) StringTools.fastCodeAt(s, c)];
-		return new Bytes(bytes.length, bytes);
-		#else
-		var a = new Array();
-		// utf16-decode and utf8-encode
-		var i = 0;
-		while (i < s.length)
-		{
-			var c:Int = StringTools.fastCodeAt(s, i++);
-			// surrogate pair
-			if (0xD800 <= c && c <= 0xDBFF) c = (c - 0xD7C0 << 10) | (StringTools.fastCodeAt(s, i++) & 0x3FF);
-			if (c <= 0x7F) a.push(c);
-			else if (c <= 0x7FF)
-			{
-				a.push(0xC0 | (c >> 6));
-				a.push(0x80 | (c & 63));
-			}
-			else if (c <= 0xFFFF)
-			{
-				a.push(0xE0 | (c >> 12));
-				a.push(0x80 | ((c >> 6) & 63));
-				a.push(0x80 | (c & 63));
-			}
-			else
-			{
-				a.push(0xF0 | (c >> 18));
-				a.push(0x80 | ((c >> 12) & 63));
-				a.push(0x80 | ((c >> 6) & 63));
-				a.push(0x80 | (c & 63));
-			}
-		}
-		return new Bytes(a.length, a);
-		#end
-	}
-
-	public static function ofData(b:BytesData)
-	{
-		#if flash
-		return new Bytes(b.length, b);
-		#elseif neko
-		return new Bytes(untyped __dollar__ssize(b), b);
-		#elseif cs
-		return new Bytes(b.Length, b);
-		#else
-		return new Bytes(b.length, b);
-		#end
-	}
-
-	/**
-		Convert hexadecimal string to Bytes.
-		Support only straight hex string ( Example: "0FDA14058916052309" )
-	**/
-	public static function ofHex(s:String):Bytes
-	{
-		var len:Int = s.length;
-		if ((len & 1) != 0) throw "Not a hex string (odd number of digits)";
-		var ret:Bytes = Bytes.alloc(len >> 1);
-		for (i in 0...ret.length)
-		{
-			var high = StringTools.fastCodeAt(s, i * 2);
-			var low = StringTools.fastCodeAt(s, i * 2 + 1);
-			high = (high & 0xF) + ((high & 0x40) >> 6) * 9;
-			low = (low & 0xF) + ((low & 0x40) >> 6) * 9;
-			ret.set(i, ((high << 4) | low) & 0xFF);
-		}
-
-		return ret;
-	}
-
-	/**
-		Read the most efficiently possible the n-th byte of the data.
-		Behavior when reading outside of the available data is unspecified.
-	**/
-	public inline static function fastGet(b:BytesData, pos:Int):Int
-	{
-		#if neko
-		return untyped __dollar__sget(b, pos);
-		#elseif flash
-		return b[pos];
-		#elseif (cpp || webassembly)
-		return untyped b.unsafeGet(pos);
-		#elseif java
-		return untyped b[pos] & 0xFF;
-		#else
-		return b[pos];
-		#end
-	}
-}
-#elseif js
-#if haxe4
-import js.lib.Uint8Array;
-import js.lib.DataView;
-#else
-#if !nodejs
-import js.html.compat.Uint8Array;
-import js.html.compat.DataView;
-#end
-import js.html.Uint8Array;
-import js.html.DataView;
-#end
-
-#if !macro
-@:autoBuild(lime._internal.macros.AssetsMacro.embedBytes()) // Enable @:bytes embed metadata
-#end
-class Bytes
-{
-	#if lime_bytes_length_getter
-	public var length(get, set):Int;
-
-	var l:Int;
-	#else
-	public var length(default, null):Int;
-	#end
-
-	var b:Uint8Array;
-	var data:DataView;
-
-	function new(data:BytesData)
-	{
-		this.length = data.byteLength;
-		this.b = new Uint8Array(data);
-		untyped
-		{
-			b.bufferValue = data; // some impl does not return the same instance in .buffer
-			data.hxBytes = this;
-			data.bytes = this.b;
-		}
-	}
-
-	public inline function get(pos:Int):Int
-	{
-		return b[pos];
-	}
-
-	public inline function set(pos:Int, v:Int):Void
-	{
-		b[pos] = v & 0xFF; // the &0xFF is necessary for js.html.compat support
-	}
-
-	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void
-	{
-		if (pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length) throw Error.OutsideBounds;
-		if (srcpos == 0 && len == src.b.byteLength) b.set(src.b, pos);
-		else
-			b.set(src.b.subarray(srcpos, srcpos + len), pos);
-	}
-
-	public function fill(pos:Int, len:Int, value:Int):Void
-	{
-		for (i in 0...len)
-			set(pos++, value);
-	}
-
-	public function sub(pos:Int, len:Int):Bytes
-	{
-		if (pos < 0 || len < 0 || pos + len > length) throw Error.OutsideBounds;
-		return new Bytes(b.buffer.slice(pos + b.byteOffset, pos + b.byteOffset + len));
-	}
-
-	public function compare(other:Bytes):Int
-	{
-		var b1 = b;
-		var b2 = other.b;
-		var len = (length < other.length) ? length : other.length;
-		for (i in 0...len)
-			if (b1[i] != b2[i]) return b1[i] - b2[i];
-		return length - other.length;
-	}
-
-	inline function initData():Void
-	{
-		if (data == null) data = new DataView(b.buffer, b.byteOffset, b.byteLength);
-	}
-
-	public function getDouble(pos:Int):Float
-	{
-		initData();
-		return data.getFloat64(pos, true);
-	}
-
-	public function getFloat(pos:Int):Float
-	{
-		initData();
-		return data.getFloat32(pos, true);
-	}
-
-	public function setDouble(pos:Int, v:Float):Void
-	{
-		initData();
-		data.setFloat64(pos, v, true);
-	}
-
-	public function setFloat(pos:Int, v:Float):Void
-	{
-		initData();
-		data.setFloat32(pos, v, true);
-	}
-
-	public function getUInt16(pos:Int):Int
-	{
-		initData();
-		return data.getUint16(pos, true);
-	}
-
-	public function setUInt16(pos:Int, v:Int):Void
-	{
-		initData();
-		data.setUint16(pos, v, true);
-	}
-
-	public function getInt32(pos:Int):Int
-	{
-		initData();
-		return data.getInt32(pos, true);
-	}
-
-	public function setInt32(pos:Int, v:Int):Void
-	{
-		initData();
-		data.setInt32(pos, v, true);
-	}
-
-	public function getInt64(pos:Int):haxe.Int64
-	{
-		return Int64.make(getInt32(pos + 4), getInt32(pos));
-	}
-
-	public function setInt64(pos:Int, v:haxe.Int64):Void
-	{
-		setInt32(pos, v.low);
-		setInt32(pos + 4, v.high);
-	}
-
-	public function getString(pos:Int, len:Int, ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end):String
-	{
-		if (pos < 0 || len < 0 || pos + len > length) throw Error.OutsideBounds;
-		var s = "";
-		var b = b;
-		var fcc = String.fromCharCode;
-		var i = pos;
-		var max = pos + len;
-		// utf8-decode and utf16-encode
-		while (i < max)
-		{
-			var c = b[i++];
-			if (c < 0x80)
-			{
-				if (c == 0) break;
-				s += fcc(c);
-			}
-			else if (c < 0xE0) s += fcc(((c & 0x3F) << 6) | (b[i++] & 0x7F));
-			else if (c < 0xF0)
-			{
-				var c2 = b[i++];
-				s += fcc(((c & 0x1F) << 12) | ((c2 & 0x7F) << 6) | (b[i++] & 0x7F));
-			}
-			else
-			{
-				var c2 = b[i++];
-				var c3 = b[i++];
-				var u = ((c & 0x0F) << 18) | ((c2 & 0x7F) << 12) | ((c3 & 0x7F) << 6) | (b[i++] & 0x7F);
-				// surrogate pair
-				s += fcc((u >> 10) + 0xD7C0);
-				s += fcc((u & 0x3FF) | 0xDC00);
-			}
-		}
-		return s;
-	}
-
-	@:deprecated("readString is deprecated, use getString instead")
-	@:noCompletion
-	public inline function readString(pos:Int, len:Int):String
-	{
-		return getString(pos, len);
-	}
-
-	public function toString():String
-	{
-		return getString(0, length);
-	}
-
-	public function toHex():String
-	{
-		var s = new StringBuf();
-		var chars = [];
-		var str = "0123456789abcdef";
-		for (i in 0...str.length)
-			chars.push(str.charCodeAt(i));
-		for (i in 0...length)
-		{
-			var c = get(i);
-			s.addChar(chars[c >> 4]);
-			s.addChar(chars[c & 15]);
-		}
-		return s.toString();
-	}
-
-	public inline function getData():BytesData
-	{
-		return untyped b.bufferValue;
-	}
-
-	public static inline function alloc(length:Int):Bytes
-	{
-		return new Bytes(new BytesData(length));
-	}
-
-	public static function ofString(s:String, ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end):Bytes
-	{
-		var a = new Array();
-		// utf16-decode and utf8-encode
-		var i = 0;
-		while (i < s.length)
-		{
-			var c:Int = StringTools.fastCodeAt(s, i++);
-			// surrogate pair
-			if (0xD800 <= c && c <= 0xDBFF) c = (c - 0xD7C0 << 10) | (StringTools.fastCodeAt(s, i++) & 0x3FF);
-			if (c <= 0x7F) a.push(c);
-			else if (c <= 0x7FF)
-			{
-				a.push(0xC0 | (c >> 6));
-				a.push(0x80 | (c & 63));
-			}
-			else if (c <= 0xFFFF)
-			{
-				a.push(0xE0 | (c >> 12));
-				a.push(0x80 | ((c >> 6) & 63));
-				a.push(0x80 | (c & 63));
-			}
-			else
-			{
-				a.push(0xF0 | (c >> 18));
-				a.push(0x80 | ((c >> 12) & 63));
-				a.push(0x80 | ((c >> 6) & 63));
-				a.push(0x80 | (c & 63));
-			}
-		}
-		return new Bytes(new Uint8Array(a).buffer);
-	}
-
-	public static function ofData(b:BytesData):Bytes
-	{
-		var hb = untyped b.hxBytes;
-		if (hb != null) return hb;
-		return new Bytes(b);
-	}
-
-	public static function ofHex(s:String):Bytes
-	{
-		if ((s.length & 1) != 0) throw "Not a hex string (odd number of digits)";
-		var a = new Array();
-		var i = 0;
-		var len = s.length >> 1;
-		while (i < len)
-		{
-			var high = StringTools.fastCodeAt(s, i * 2);
-			var low = StringTools.fastCodeAt(s, i * 2 + 1);
-			high = (high & 0xF) + ((high & 0x40) >> 6) * 9;
-			low = (low & 0xF) + ((low & 0x40) >> 6) * 9;
-			a.push(((high << 4) | low) & 0xFF);
-			i++;
-		}
-
-		return new Bytes(new Uint8Array(a).buffer);
-	}
-
-	public inline static function fastGet(b:BytesData, pos:Int):Int
-	{
-		// this requires that we have wrapped it with haxe.io.Bytes beforehand
-		return untyped b.bytes[pos];
-	}
-
-	#if lime_bytes_length_getter
-	private function get_length():Int
-	{
-		return l;
-	}
-
-	private function set_length(v:Int):Int
-	{
-		return l = v;
-	}
-	#end
-}
-#elseif hl
-#if !macro
-@:autoBuild(lime._internal.macros.AssetsMacro.embedBytes()) // Enable @:bytes embed metadata
-#end
-@:coreApi
-class Bytes
-{
-	public var length(default, null):Int;
-
-	var b:hl.Bytes;
-
-	function new(b:hl.Bytes, length:Int):Void
-	{
-		this.b = b;
-		this.length = length;
-	}
-
-	inline function out(pos:Int):Bool
-	{
-		return (pos : UInt) >= (length : UInt);
-	}
-
-	inline function outRange(pos:Int, len:Int):Bool
-	{
-		return pos < 0 || len < 0 || ((pos + len) : UInt) > (length : UInt);
-	}
-
-	public function get(pos:Int):Int
-	{
-		return if (out(pos)) 0 else b[pos];
-	}
-
-	public function set(pos:Int, v:Int):Void
-	{
-		if (out(pos)) throw Error.OutsideBounds;
-		b[pos] = v;
-	}
-
-	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void
-	{
-		if (outRange(pos, len) || src.outRange(srcpos, len)) throw Error.OutsideBounds;
-		b.blit(pos, src.b, srcpos, len);
-	}
-
-	public function fill(pos:Int, len:Int, value:Int):Void
-	{
-		if (outRange(pos, len)) throw Error.OutsideBounds;
-		b.fill(pos, len, value);
-	}
-
-	public function sub(pos:Int, len:Int):Bytes
-	{
-		if (outRange(pos, len)) throw Error.OutsideBounds;
-		return new Bytes(b.sub(pos, len), len);
-	}
-
-	public function compare(other:Bytes):Int
-	{
-		var len = length < other.length ? length : other.length;
-		var r = b.compare(0, other.b, 0, len);
-		if (r == 0) r = length - other.length;
-		return r;
-	}
-
-	public function getDouble(pos:Int):Float
-	{
-		return if (out(pos + 7)) 0.
-		else
-			b.getF64(pos);
-	}
-
-	public function getFloat(pos:Int):Float
-	{
-		return if (out(pos + 3)) 0.
-		else
-			b.getF32(pos);
-	}
-
-	public function setDouble(pos:Int, v:Float):Void
-	{
-		if (out(pos + 7)) throw Error.OutsideBounds;
-		b.setF64(pos, v);
-	}
-
-	public function setFloat(pos:Int, v:Float):Void
-	{
-		if (out(pos + 3)) throw Error.OutsideBounds;
-		b.setF32(pos, v);
-	}
-
-	public inline function getUInt16(pos:Int):Int
-	{
-		return if (out(pos + 1)) 0 else b.getUI16(pos);
-	}
-
-	public inline function setUInt16(pos:Int, v:Int):Void
-	{
-		if (out(pos + 1)) throw Error.OutsideBounds;
-		b.setUI16(pos, v);
-	}
-
-	public function getInt32(pos:Int):Int
-	{
-		return if (out(pos + 3)) 0 else b.getI32(pos);
-	}
-
-	public function getInt64(pos:Int):haxe.Int64
-	{
-		if (out(pos + 7)) return haxe.Int64.ofInt(0);
-		return haxe.Int64.make(b.getI32(pos + 4), b.getI32(pos));
-	}
-
-	public function setInt32(pos:Int, v:Int):Void
-	{
-		if (out(pos + 3)) throw Error.OutsideBounds;
-		b.setI32(pos, v);
-	}
-
-	public inline function setInt64(pos:Int, v:haxe.Int64):Void
-	{
-		setInt32(pos + 4, v.high);
-		setInt32(pos, v.low);
-	}
-
-	public function getString(pos:Int, len:Int #if (!hl || haxe_ver >= 4), ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end #end):String
-	{
-		if (outRange(pos, len)) throw Error.OutsideBounds;
-
-		var b = new hl.Bytes(len + 1);
-		b.blit(0, this.b, pos, len);
-		b[len] = 0;
-		return @:privateAccess String.fromUTF8(b);
-	}
-
-	@:deprecated("readString is deprecated, use getString instead")
-	@:noCompletion
-	public inline function readString(pos:Int, len:Int):String
-	{
-		return getString(pos, len);
-	}
-
-	public function toString():String
-	{
-		return getString(0, length);
-	}
-
-	public function toHex():String
-	{
-		var s = new StringBuf();
-		var chars = [];
-		var str = "0123456789abcdef";
-		for (i in 0...str.length)
-			chars.push(str.charCodeAt(i));
-		for (i in 0...length)
-		{
-			var c = get(i);
-			s.addChar(chars[c >> 4]);
-			s.addChar(chars[c & 15]);
-		}
-		return s.toString();
-	}
-
-	public inline function getData():BytesData
-	{
-		return new haxe.io.BytesData(b, length);
-	}
-
-	public static function alloc(length:Int):Bytes
-	{
-		var b = new hl.Bytes(length);
-		b.fill(0, length, 0);
-		return new Bytes(b, length);
-	}
-
-	public static function ofString(s:String
-			#if (!hl || haxe_ver >= 4), ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end #end):Bytes @:privateAccess {
-		var size = 0;
-		var b = s.bytes.utf16ToUtf8(0, size);
-		return new Bytes(b, size);
-	}
-
-	public static function ofData(b:BytesData):Bytes
-	{
-		return new Bytes(b.bytes, b.length);
-	}
-
-	#if (!hl || haxe_ver >= 4)
-	public static function ofHex(s:String):Bytes
-	{
-		var len = s.length;
-		if ((len & 1) != 0) throw "Not a hex string (odd number of digits)";
-		var l = len >> 1;
-		var b = new hl.Bytes(l);
-		for (i in 0...l)
-		{
-			var high = s.charCodeAt(i * 2);
-			var low = s.charCodeAt(i * 2 + 1);
-			high = (high & 0xf) + ((high & 0x40) >> 6) * 9;
-			low = (low & 0xf) + ((low & 0x40) >> 6) * 9;
-			b.setUI8(i, ((high << 4) | low) & 0xff);
-		}
-
-		return new Bytes(b, l);
-	}
-	#end
-
-	public inline static function fastGet(b:BytesData, pos:Int):Int
-	{
-		return b[pos];
-	}
-}
-#elseif eval
-extern class Bytes
-{
-	function new(length:Int, b:BytesData):Void;
-	public var length(default, null):Int;
-	public function get(pos:Int):Int;
-	public function set(pos:Int, v:Int):Void;
-	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void;
-	public function fill(pos:Int, len:Int, value:Int):Void;
-	public function sub(pos:Int, len:Int):Bytes;
-	public function compare(other:Bytes):Int;
-	public function getDouble(pos:Int):Float;
-	public function getFloat(pos:Int):Float;
-	public function setDouble(pos:Int, v:Float):Void;
-	public function setFloat(pos:Int, v:Float):Void;
-	public function getUInt16(pos:Int):Int;
-	public function setUInt16(pos:Int, v:Int):Void;
-	public function getInt32(pos:Int):Int;
-	public function getInt64(pos:Int):haxe.Int64;
-	public function setInt32(pos:Int, v:Int):Void;
-	public function setInt64(pos:Int, v:haxe.Int64):Void;
-	public function getString(pos:Int, len:Int, ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end):String;
-	public function toString():String;
-	public function toHex():String;
-	public function getData():BytesData;
-	public static function alloc(length:Int):Bytes;
-	@:pure
-	public static function ofString(s:String, ?encoding:#if (haxe_ver >= 4) haxe.io.Encoding #else Dynamic #end):Bytes;
-	public static function ofData(b:BytesData):Bytes;
-	public static function ofHex(s:String):Bytes;
-	public static function fastGet(b:BytesData, pos:Int):Int;
-	static function __init__():Void
-	{
-		haxe.io.Error;
-	}
-}
-#end