diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb0ea6ac0f..07289bdf4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,6 +261,8 @@ add_library(Common STATIC
 	Common/StringUtil.h
 	Common/Thread.cpp
 	Common/Thread.h
+	Common/ThreadPool.cpp
+	Common/ThreadPool.h
 	Common/Timer.cpp
 	Common/Timer.h
 	Common/Version.cpp)
@@ -576,8 +578,11 @@ add_library(native STATIC
 	native/profiler/profiler.cpp
 	native/profiler/profiler.h
 	native/thread/prioritizedworkqueue.cpp
+	native/thread/prioritizedworkqueue.h
 	native/thread/threadutil.cpp
 	native/thread/threadutil.h
+	native/thread/threadpool.cpp
+	native/thread/threadpool.h
 	native/ui/screen.cpp
 	native/ui/screen.h
 	native/ui/ui.cpp
@@ -904,6 +909,8 @@ add_library(GPU OBJECT
 	GPU/GLES/StateMapping.h
 	GPU/GLES/TextureCache.cpp
 	GPU/GLES/TextureCache.h
+	GPU/GLES/TextureScaler.cpp
+	GPU/GLES/TextureScaler.h
 	GPU/GLES/TransformPipeline.cpp
 	GPU/GLES/TransformPipeline.h
 	GPU/GLES/VertexDecoder.cpp
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 1f29b49e3b..19476c24df 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -14,6 +14,7 @@ set(SRCS
 	MsgHandler.cpp
 	StringUtil.cpp
 	Thread.cpp
+	ThreadPool.cpp
 	Timer.cpp
 )
 
diff --git a/GPU/CMakeLists.txt b/GPU/CMakeLists.txt
index 19beca69da..424e544827 100644
--- a/GPU/CMakeLists.txt
+++ b/GPU/CMakeLists.txt
@@ -9,6 +9,7 @@ set(SRCS
 	GLES/ShaderManager.cpp
 	GLES/StateMapping.cpp
 	GLES/TextureCache.cpp
+	GLES/TextureScaler.cpp
 	GLES/TransformPipeline.cpp
 	GLES/VertexDecoder.cpp
 	GLES/VertexShaderGenerator.cpp
diff --git a/GPU/GLES/TextureScaler.cpp b/GPU/GLES/TextureScaler.cpp
index 274791a763..bfe5f88498 100644
--- a/GPU/GLES/TextureScaler.cpp
+++ b/GPU/GLES/TextureScaler.cpp
@@ -26,6 +26,9 @@
 
 #ifdef __SYMBIAN32__
 #define p
+#elif defined(IOS)
+#include <tr1/functional>
+namespace p = std::tr1::placeholders;
 #else
 namespace p = std::placeholders;
 #endif
diff --git a/Qt/Common.pro b/Qt/Common.pro
index 73a619fbeb..1cfb07d64c 100755
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@@ -44,6 +44,7 @@ SOURCES += ../Common/ColorUtil.cpp \
 	../Common/MsgHandler.cpp \
 	../Common/StringUtil.cpp \
 	../Common/Thread.cpp \
+	../Common/ThreadPool.cpp \
 	../Common/Timer.cpp \
 	../Common/Version.cpp \
 	../Common/Crypto/*.cpp
@@ -61,6 +62,7 @@ HEADERS += ../Common/ChunkFile.h \
 	../Common/MsgHandler.h \
 	../Common/StringUtil.h \
 	../Common/Thread.h \
+	../Common/ThreadPool.h \
 	../Common/Timer.h \
 	../Common/Crypto/*.h
 
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 3f9bda5b36..597749c54c 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -136,6 +136,7 @@ LOCAL_SRC_FILES := \
   $(SRC)/Common/FileUtil.cpp \
   $(SRC)/Common/StringUtil.cpp \
   $(SRC)/Common/Thread.cpp \
+  $(SRC)/Common/ThreadPool.cpp \
   $(SRC)/Common/Timer.cpp \
   $(SRC)/Common/Misc.cpp \
   $(SRC)/Common/MathUtil.cpp \
diff --git a/ext/xbrz/xbrz.h b/ext/xbrz/xbrz.h
index 889142d9e1..d4598522f9 100644
--- a/ext/xbrz/xbrz.h
+++ b/ext/xbrz/xbrz.h
@@ -20,6 +20,8 @@
 #ifdef __SYMBIAN32__
 #include <libc/sys/config.h>
 typedef __uint32_t uint32_t;
+#elif defined(IOS)
+#include <stdint.h>
 #else
 #include <cstdint> //uint32_t
 #endif
diff --git a/native b/native
index eb3c3cd217..8d7fd41838 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit eb3c3cd21742f9a168f485930592194a144ade8e
+Subproject commit 8d7fd418387451dd5f4140374959519c09b75a47