diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp
index 76ebad16a..cc9767930 100644
--- a/project/src/ExternalInterface.cpp
+++ b/project/src/ExternalInterface.cpp
@@ -6,18 +6,18 @@
 #ifdef STATIC_LINK
 
 #define DEFINE_LIME_PRIM_MULT(func) value nme_##func(value *arg, int args); \
-int __reg_lime_##func = hx_register_prim(nme_#func "__MULT",(void *)(&nme_##func)); \
+int __reg_lime_##func = hx_register_prim("nme_" #func "__MULT",(void *)(&nme_##func)); \
 
 #define DEFINE_LIME_PRIM(func,nargs) \
-int __reg_lime_##func = hx_register_prim(nme_#func "__" #nargs,(void *)(&nme_##func)); \
+int __reg_lime_##func = hx_register_prim("nme_" #func "__" #nargs,(void *)(&nme_##func)); \
 
 #define DEFINE_LIME_PRIM_MULT_NATIVE(func,ext) \
-int __reg_lime_##func = hx_register_prim(nme_#func "__MULT",(void *)(&nme_##func)) + \
-                   hx_register_prim(nme_#func "__"  #ext,(void *)(&nme_##func##_##ext)) ; 
+int __reg_lime_##func = hx_register_prim("nme_" #func "__" MULT,(void *)(&nme_##func)) + \
+                   hx_register_prim("nme_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; 
 
 #define DEFINE_LIME_PRIM_NATIVE(func,nargs,ext) \
-int __reg_lime_##func = hx_register_prim(nme_#func "__" #nargs,(void *)(&nme_##func)) + \
-                   hx_register_prim(nme_#func "__" #ext,(void *)(&nme_##func##_##ext)) ; 
+int __reg_lime_##func = hx_register_prim("nme_" #func "__" #nargs,(void *)(&nme_##func)) + \
+                   hx_register_prim("nme_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; 
 
 #else
 
diff --git a/run.n b/run.n
index b426849e2..0034620e4 100644
Binary files a/run.n and b/run.n differ
diff --git a/script/src/RunScript.hx b/script/src/RunScript.hx
index 5e5b27d35..be2897af7 100644
--- a/script/src/RunScript.hx
+++ b/script/src/RunScript.hx
@@ -330,7 +330,7 @@ class RunScript {
 				
 				if (buildSharedLibs) {
 					
-					runCommand (sharedLibsPath, "neko", [ "build.n", "ios" ].concat (defines));
+					runCommand (sharedLibsPath, "neko", [ "build.n", "ios", "-DHXCPP_CPP11" ].concat (defines));
 					
 				}
 				
@@ -338,22 +338,22 @@ class RunScript {
 				
 				if (!flags.exists ("debug")) {
 					
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_CPP11" ].concat (defines));
 					synchronizeNDLL ("iPhone/liblime.iphoneos.a");
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_ARMV7" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_CPP11", "-DHXCPP_ARMV7" ].concat (defines));
 					synchronizeNDLL ("iPhone/liblime.iphoneos-v7.a");
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphonesim" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphonesim", "-DHXCPP_CPP11" ].concat (defines));
 					synchronizeNDLL ("iPhone/liblime.iphonesim.a");
 					
 				}
 				
 				if (!flags.exists ("release")) {
 					
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-Dfulldebug" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_CPP11", "-Dfulldebug" ].concat (defines));
 					synchronizeNDLL ("iPhone/liblime-debug.iphoneos.a");
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_ARMV7", "-Dfulldebug" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_CPP11", "-DHXCPP_ARMV7", "-Dfulldebug" ].concat (defines));
 					synchronizeNDLL ("iPhone/liblime-debug.iphoneos-v7.a");
-					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphonesim", "-Dfulldebug" ].concat (defines));
+					runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphonesim", "-DHXCPP_CPP11", "-Dfulldebug" ].concat (defines));
 					synchronizeNDLL ("iPhone/liblime-debug.iphonesim.a");
 					
 				}
diff --git a/templates/iphone/PROJ/haxe/makefile b/templates/iphone/PROJ/haxe/makefile
index 0f70cafcf..b5329b385 100644
--- a/templates/iphone/PROJ/haxe/makefile
+++ b/templates/iphone/PROJ/haxe/makefile
@@ -50,21 +50,21 @@ export HXCPP_COMPILE_THREADS := 2
 build-haxe-i386:
 	@echo "Haxe simulator build CONFIG : $(CONFIG)"
 	haxe Build.hxml -D simulator -cpp build/$(CONFIG) $(DEBUG)
-	cd build/$(CONFIG); haxelib run hxlibc Build.xml -Dios -Diphone -Dsimulator $(DEF_DEBUG) $(HXCPP_CLANG)
+	cd build/$(CONFIG); haxelib run ::CPP_BUILD_LIBRARY:: Build.xml -Dios -Diphone -Dsimulator -DHXCPP_CPP11 $(DEF_DEBUG) $(HXCPP_CLANG)
 	cp $(LIB_BASE).iphonesim.a ../lib/i386$(LIB_DEST)
 	touch ../Classes/Main.mm
 
 build-haxe-armv6:
 	@echo "Haxe armv6 build CONFIG : $(CONFIG)"
 	haxe Build.hxml -D HXCPP_ARMV6 -cpp build/$(CONFIG) $(DEBUG)
-	cd build/$(CONFIG); haxelib run hxlibc Build.xml -Dios -Diphone -DHXCPP_ARMV6 $(DEF_DEBUG) $(HXCPP_CLANG)
+	cd build/$(CONFIG); haxelib run ::CPP_BUILD_LIBRARY:: Build.xml -Dios -Diphone -DHXCPP_ARMV6 -DHXCPP_CPP11 $(DEF_DEBUG) $(HXCPP_CLANG)
 	cp $(LIB_BASE).iphoneos.a ../lib/armv6$(LIB_DEST)
 	touch ../Classes/Main.mm
 
 build-haxe-armv7:
 	@echo "Haxe armv7 build CONFIG : $(CONFIG)"
 	haxe Build.hxml -D HXCPP_ARMV7 -cpp build/$(CONFIG) $(DEBUG)
-	cd build/$(CONFIG); haxelib run hxlibc Build.xml -Dios -Diphone -DHXCPP_ARMV7 $(DEF_DEBUG) $(HXCPP_CLANG)
+	cd build/$(CONFIG); haxelib run ::CPP_BUILD_LIBRARY:: Build.xml -Dios -Diphone -DHXCPP_ARMV7 -DHXCPP_CPP11 $(DEF_DEBUG) $(HXCPP_CLANG)
 	cp $(LIB_BASE).iphoneos-v7.a ../lib/armv7$(LIB_DEST)
 	touch ../Classes/Main.mm