diff --git a/include.xml b/include.xml
index 9ea2b454b..524abcc75 100644
--- a/include.xml
+++ b/include.xml
@@ -8,6 +8,9 @@
 	<section unless="display">
 
 		<haxelib name="hxcpp" if="cpp" />
+		<ndll name="std" haxelib="hxcpp" if="cpp" />
+		<ndll name="regexp" haxelib="hxcpp" if="cpp" />
+		<ndll name="zlib" haxelib="hxcpp" if="cpp" />
 		
 		<ndll name="openal" register="false" if="android" />
 		
diff --git a/run.n b/run.n
index bcdd08c0b..c33b3eb33 100644
Binary files a/run.n and b/run.n differ
diff --git a/script/src/RunScript.hx b/script/src/RunScript.hx
index 63dd068a2..e6393874f 100644
--- a/script/src/RunScript.hx
+++ b/script/src/RunScript.hx
@@ -121,10 +121,10 @@ class RunScript {
 				var directories = [ PathHelper.combine (path, "obj") ];
 				var files = [ PathHelper.combine (path, "all_objs"), PathHelper.combine (path, "vc100.pdb"), PathHelper.combine (path, "vc110.pdb") ];
 				
-				if (PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) != "") {
+				if (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")) != "") {
 					
-					directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime-wiiu")), "project/obj"));
-					directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime-wiiu")), "project/all_objs"));
+					directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")), "project/obj"));
+					directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")), "project/all_objs"));
 					
 				}
 				
@@ -231,7 +231,7 @@ class RunScript {
 		
 		if (target == "wiiu" && path == PathHelper.combine (limeDirectory, "project")) {
 			
-			path = PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime-wiiu"), true), "project");
+			path = PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu"), true), "project");
 			
 		}
 		
@@ -597,19 +597,19 @@ class RunScript {
 				
 				if (buildSharedLibs) {
 					
-					runCommand (sharedLibsPath, "neko", [ "build.n", "wiiu" ].concat (defines));
+					//runCommand (sharedLibsPath, "neko", [ "build.n", "wiiu" ].concat (defines));
 					
 				}
 				
 				if (!flags.exists ("debug")) {
 					
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dnintendo", "-Dwiiu", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) + "/toolchain" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dnintendo", "-Dwiiu", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")) ].concat (defines));
 					
 				}
 				
 				if (!flags.exists ("release")) {
 					
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dnintendo", "-Dwiiu", "-Dfulldebug", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) + "/toolchain" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dnintendo", "-Dwiiu", "-Dfulldebug", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")) ].concat (defines));
 					
 				}