diff --git a/Qt/Common.pro b/Qt/Common.pro
index c790b8e949..51a503fa20 100755
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@@ -6,6 +6,7 @@ CONFIG += staticlib
 
 include(Settings.pri)
 
+# CPU
 arm {
 	SOURCES += $$P/Common/ArmCPUDetect.cpp \
 		$$P/Common/ArmEmitter.cpp \
@@ -19,11 +20,12 @@ x86 {
 		$$P/Common/x64Analyzer.cpp \
 		$$P/Common/x64Emitter.cpp
 	HEADERS +=  $$P/Common/ABI.h \
-		$$P/Common/CPUDetect.h \
 		$$P/Common/Thunk.h \
 		$$P/Common/x64Analyzer.h \
 		$$P/Common/x64Emitter.h
 }
+HEADERS += $$P/Common/CPUDetect.h
+
 win32 {
 	SOURCES += $$P/Common/stdafx.cpp
 	HEADERS += $$P/Common/stdafx.h
diff --git a/Qt/Core.pro b/Qt/Core.pro
index fadc403a27..ff74e1fca9 100755
--- a/Qt/Core.pro
+++ b/Qt/Core.pro
@@ -7,8 +7,8 @@ CONFIG += staticlib
 include(Settings.pri)
 
 version.target = $$P/git-version.cpp
-!contains(MEEGO_EDITION,harmattan):contains(QMAKE_HOST.os, "Windows") { version.commands = $$P/../Windows/git-version-gen.cmd }
-else { version.commands = $$P/Qt/git-version-gen.sh }
+!contains(MEEGO_EDITION,harmattan):contains(QMAKE_HOST.os, "Windows") { version.commands = $$P/Windows/git-version-gen.cmd }
+else { version.commands = $$P/Qt/git-version-gen.sh $$P }
 version.depends = $$P/.git
 
 QMAKE_EXTRA_TARGETS += version
@@ -56,6 +56,7 @@ SOURCES += $$P/Core/*.cpp \ # Core
 	$$P/GPU/Math3D.cpp \
 	$$P/GPU/Null/NullGpu.cpp \
 	$$P/GPU/GLES/*.cpp \
+	$$P/GPU/Software/*.cpp \
 	$$P/GPU/Common/IndexGenerator.cpp \
 	$$P/GPU/Common/TextureDecoder.cpp \
 	$$P/GPU/Common/VertexDecoderCommon.cpp \
@@ -68,10 +69,6 @@ SOURCES += $$P/Core/*.cpp \ # Core
 	SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
 }
 
-# Software GPU
-SOURCES += $$P/GPU/Software/*.cpp
-HEADERS += $$P/GPU/Software/*.h
-
 HEADERS += $$P/Core/*.h \
 	$$P/Core/Debugger/*.h \
 	$$P/Core/Dialog/*.h \
@@ -84,6 +81,7 @@ HEADERS += $$P/Core/*.h \
 	$$P/Core/MIPS/JitCommon/*.h \
 	$$P/Core/Util/*.h \
 	$$P/GPU/GLES/*.h \
+	$$P/GPU/Software/*.h \
 	$$P/GPU/Common/*.h \
 	$$P/GPU/*.h \
 	$$P/ext/libkirk/*.h \
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 9d4a908eeb..61e8535875 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -5,17 +5,17 @@ VERSION = 0.9.5
 QT += core gui opengl
 include(Settings.pri)
 
+lessThan(QT_MAJOR_VERSION, 5):(lessThan(QT_MAJOR_VERSION, 4) | lessThan(QT_MINOR_VERSION, 7)) {
+	error(PPSSPP requires Qt 4.7 or newer but Qt $$[QT_VERSION] was detected.)
+}
+
 # Extra Qt modules
 linux: CONFIG += link_pkgconfig
-win32|greaterThan(QT_MAJOR_VERSION,4) {
-	QT += multimedia
-} else {
-	linux:packagesExist(QtMultimedia) {
-		QT += multimedia
-	} else {
-		CONFIG += mobility
-		MOBILITY += multimedia
-	}
+win32|greaterThan(QT_MAJOR_VERSION,4): QT += multimedia
+else:linux:packagesExist(QtMultimedia): QT += multimedia
+else {
+	CONFIG += mobility
+	MOBILITY += multimedia
 }
 greaterThan(QT_MAJOR_VERSION,4): QT += widgets
 
@@ -23,20 +23,19 @@ mobile_platform: MOBILITY += sensors
 symbian: MOBILITY += systeminfo feedback
 
 # PPSSPP Libs
-symbian: XT=".lib"
-else: LIBS += -L$$CONFIG_DIR
-LIBS += -lCore$${XT} -lCommon$${XT} -lNative$${XT}
+QMAKE_LIBDIR += $$CONFIG_DIR
+LIBS += -lCore -lCommon -lNative
 
 # FFMPEG Path
-win32:  FFMPEG_DIR = $$P/ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/
-linux:  FFMPEG_DIR = $$P/ffmpeg/linux/$${QMAKE_TARGET.arch}/lib/
+win32:  QMAKE_LIBDIR += $$P/ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/
+linux:  QMAKE_LIBDIR += $$P/ffmpeg/linux/$${QMAKE_TARGET.arch}/lib/
 macx:!mobile_platform:   FFMPEG_DIR = $$P/ffmpeg/macosx/x86_64/lib/
-qnx:    FFMPEG_DIR = $$P/ffmpeg/blackberry/armv7/lib/
-symbian:FFMPEG_DIR = -l
+qnx:    QMAKE_LIBDIR += $$P/ffmpeg/blackberry/armv7/lib/
+symbian:QMAKE_LIBDIR += $$P/ffmpeg/symbian/armv6/lib/
+
+contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresample -lswscale
 
 # External (platform-dependant) libs
-win32|symbian: LIBS += $${FFMPEG_DIR}avformat.lib $${FFMPEG_DIR}avcodec.lib $${FFMPEG_DIR}avutil.lib $${FFMPEG_DIR}swresample.lib $${FFMPEG_DIR}swscale.lib
-else:!contains(MEEGO_EDITION,harmattan): LIBS += $${FFMPEG_DIR}libavformat.a $${FFMPEG_DIR}libavcodec.a $${FFMPEG_DIR}libavutil.a $${FFMPEG_DIR}libswresample.a $${FFMPEG_DIR}libswscale.a
 
 win32 {
 	#Use a fixed base-address under windows
@@ -51,8 +50,8 @@ linux {
 	PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
 	packagesExist(sdl) {
 		DEFINES += QT_HAS_SDL
-		HEADERS += ../SDL/SDLJoystick.h
-		SOURCES += ../SDL/SDLJoystick.cpp
+		SOURCES += $$P/SDL/SDLJoystick.cpp
+		HEADERS += $$P/SDL/SDLJoystick.h
 		PKGCONFIG += sdl
 	}
 }
diff --git a/Qt/git-version-gen.sh b/Qt/git-version-gen.sh
index d441c38379..bfbe973c3f 100755
--- a/Qt/git-version-gen.sh
+++ b/Qt/git-version-gen.sh
@@ -16,7 +16,7 @@
 ## Official git repository and contact information can be found at
 ## https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-GIT_VERSION_FILE=$(dirname $0)/../git-version.cpp
+GIT_VERSION_FILE=$1/git-version.cpp
 
 if [ -e "$GIT_VERSION_FILE" ]; then
 	# Skip updating the file if PPSSPP_GIT_VERSION_NO_UPDATE is 1.
diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp
index 0783c8da56..8a13c52f85 100644
--- a/UI/GameInfoCache.cpp
+++ b/UI/GameInfoCache.cpp
@@ -23,7 +23,6 @@
 #include "base/stringutil.h"
 #include "file/file_util.h"
 #include "file/zip_read.h"
-#include "image/png_load.h"
 #include "thread/prioritizedworkqueue.h"
 #include "Common/StringUtils.h"
 #include "GameInfoCache.h"
diff --git a/ffmpeg b/ffmpeg
index 53b1ac97da..2e462e2c1a 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 53b1ac97dad881d832f0acc45b6e7acebbfcde6e
+Subproject commit 2e462e2c1a606d1c8c80ea6e72d38a1f3be91488